summaryrefslogtreecommitdiff
path: root/docs/index.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-11-28 23:25:24 -0800
committerGitHub <noreply@github.com>2016-11-28 23:25:24 -0800
commit351a741385f35e3fa3c7d251c9fb402997de957a (patch)
tree8ef98e4618c75b5c809ca37243249926a3803b68 /docs/index.rst
parent08a026807782b05ba9b171803d2cd6876338e0fc (diff)
parentfa842555b41f807c8f4a8528113d7742eb7633e8 (diff)
downloadpyramid-351a741385f35e3fa3c7d251c9fb402997de957a.tar.gz
pyramid-351a741385f35e3fa3c7d251c9fb402997de957a.tar.bz2
pyramid-351a741385f35e3fa3c7d251c9fb402997de957a.zip
Merge pull request #2843 from stevepiercy/style-guide
restore Typographical Conventions, an edited and condensed version of…
Diffstat (limited to 'docs/index.rst')
-rw-r--r--docs/index.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/index.rst b/docs/index.rst
index f41154c19..a783e8a70 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -213,12 +213,13 @@ Copyright, Trademarks, and Attributions
copyright
-Style Guide
-===========
+Typographical Conventions and Style Guide
+=========================================
.. toctree::
:maxdepth: 1
+ typographical-conventions
style-guide