Merge pull request #2879 from stevepiercy/master

remove style-guide, defer to 1.9
Pylons · Dec 23, 2016 · 933d349 · 933d349
2 parents 721d1b0 + 4584c74
commit 933d349
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 1,261 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -221,7 +221,6 @@ Typographical Conventions and Style Guide
    :maxdepth: 1
 
    typographical-conventions
-   style-guide
 
 
 Index and Glossary

diff --git a/docs/latexindex.rst b/docs/latexindex.rst
@@ -15,7 +15,7 @@ Front Matter
    :maxdepth: 1
 
    copyright
-   style-guide
+   typographical-conventions
    authorintro
    designdefense