diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-12-13 13:13:47 -0800 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2016-12-13 13:13:47 -0800 |
| commit | 9bbed79e04378d6534c07d73ab801191f0489e88 (patch) | |
| tree | 6ec01ee3cb5389cd0cbe8234280bf4408123659d /docs/index.rst | |
| parent | 4393f8b8e54e636b5655e0a8d2477e0b15820f68 (diff) | |
| parent | 884bcdc628e7144abf8e1cd1cde1ed3019e7e699 (diff) | |
| download | pyramid-9bbed79e04378d6534c07d73ab801191f0489e88.tar.gz pyramid-9bbed79e04378d6534c07d73ab801191f0489e88.tar.bz2 pyramid-9bbed79e04378d6534c07d73ab801191f0489e88.zip | |
Merge remote-tracking branch 'upstream/pcreate-to-cookiecutter' into pcreate-to-cookiecutter
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 |