diff options
| author | Michael Merickel <michael@merickel.org> | 2016-12-14 00:25:46 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-12-14 00:25:46 -0600 |
| commit | 12a11daa6a29c36488f083ec7323ad1d91f11b8b (patch) | |
| tree | 6967360418b3f8c1ab335598f4e5a6df3b184584 /docs/index.rst | |
| parent | 3c5731a1cac958e05093df56263d52433fc683a9 (diff) | |
| parent | 8dfa640a52d57b630843a65b3b84bc13a8a1ed87 (diff) | |
| download | pyramid-12a11daa6a29c36488f083ec7323ad1d91f11b8b.tar.gz pyramid-12a11daa6a29c36488f083ec7323ad1d91f11b8b.tar.bz2 pyramid-12a11daa6a29c36488f083ec7323ad1d91f11b8b.zip | |
Merge branch 'master' into pr/2853
Diffstat (limited to 'docs/index.rst')
| -rw-r--r-- | docs/index.rst | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/index.rst b/docs/index.rst index 02c35866a..a783e8a70 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -213,13 +213,14 @@ Copyright, Trademarks, and Attributions copyright -Typographical Conventions -========================= +Typographical Conventions and Style Guide +========================================= .. toctree:: :maxdepth: 1 - conventions + typographical-conventions + style-guide Index and Glossary |