summaryrefslogtreecommitdiff
path: root/docs/latexindex.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-12-14 00:25:46 -0600
committerMichael Merickel <michael@merickel.org>2016-12-14 00:25:46 -0600
commit12a11daa6a29c36488f083ec7323ad1d91f11b8b (patch)
tree6967360418b3f8c1ab335598f4e5a6df3b184584 /docs/latexindex.rst
parent3c5731a1cac958e05093df56263d52433fc683a9 (diff)
parent8dfa640a52d57b630843a65b3b84bc13a8a1ed87 (diff)
downloadpyramid-12a11daa6a29c36488f083ec7323ad1d91f11b8b.tar.gz
pyramid-12a11daa6a29c36488f083ec7323ad1d91f11b8b.tar.bz2
pyramid-12a11daa6a29c36488f083ec7323ad1d91f11b8b.zip
Merge branch 'master' into pr/2853
Diffstat (limited to 'docs/latexindex.rst')
-rw-r--r--docs/latexindex.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/latexindex.rst b/docs/latexindex.rst
index 05199d313..83a139917 100644
--- a/docs/latexindex.rst
+++ b/docs/latexindex.rst
@@ -15,7 +15,7 @@ Front Matter
:maxdepth: 1
copyright
- conventions
+ style-guide
authorintro
designdefense