summaryrefslogtreecommitdiff
path: root/docs/index.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-12-08 15:35:28 -0800
committerGitHub <noreply@github.com>2016-12-08 15:35:28 -0800
commit05467bdf20f28e47bffb3d236fb93b44ca293091 (patch)
tree9c926105af9919579b19a046db53217c0691a366 /docs/index.rst
parent1154ebf6ae89c200b4be19831377472b19fdf7dd (diff)
parente5add4c591bde659f050adca1ad6934674822525 (diff)
downloadpyramid-05467bdf20f28e47bffb3d236fb93b44ca293091.tar.gz
pyramid-05467bdf20f28e47bffb3d236fb93b44ca293091.tar.bz2
pyramid-05467bdf20f28e47bffb3d236fb93b44ca293091.zip
Merge pull request #2838 from Pylons/style-guide
Overhaul Style Guide
Diffstat (limited to 'docs/index.rst')
-rw-r--r--docs/index.rst7
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