summaryrefslogtreecommitdiff
path: root/docs/latexindex.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2016-06-01 17:13:27 -0400
committerChris McDonough <chrism@plope.com>2016-06-01 17:13:27 -0400
commit3e9a737500e79a6a919ce53db9557c75d874b84c (patch)
treeef674c176ab29b9dede8a8fa70c3a18a26edde44 /docs/latexindex.rst
parentb5f065906f75efdcc9f80d4f0b8b4092e92b41c0 (diff)
parent382f93e2bfec5563587e306fda3fd34759314300 (diff)
downloadpyramid-3e9a737500e79a6a919ce53db9557c75d874b84c.tar.gz
pyramid-3e9a737500e79a6a919ce53db9557c75d874b84c.tar.bz2
pyramid-3e9a737500e79a6a919ce53db9557c75d874b84c.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/latexindex.rst')
-rw-r--r--docs/latexindex.rst59
1 files changed, 45 insertions, 14 deletions
diff --git a/docs/latexindex.rst b/docs/latexindex.rst
index c4afff212..05199d313 100644
--- a/docs/latexindex.rst
+++ b/docs/latexindex.rst
@@ -14,12 +14,27 @@ Front Matter
.. toctree::
:maxdepth: 1
- copyright.rst
- conventions.rst
- authorintro.rst
+ copyright
+ conventions
+ authorintro
+ designdefense
.. mainmatter::
+.. _tutorials:
+
+Tutorials
+@@@@@@@@@
+
+.. toctree::
+ :maxdepth: 1
+
+ quick_tour
+ quick_tutorial/index
+ tutorials/wiki2/index
+ tutorials/wiki/index
+ tutorials/modwsgi/index
+
.. _narrative_documentation:
Narrative Documentation
@@ -68,31 +83,47 @@ Narrative Documentation
narr/threadlocals
narr/zca
-.. _tutorials:
-
-Tutorials
-@@@@@@@@@
+API Documentation
+@@@@@@@@@@@@@@@@@
.. toctree::
:maxdepth: 1
+ :glob:
- tutorials/wiki2/index.rst
- tutorials/wiki/index.rst
- tutorials/modwsgi/index.rst
+ api/index
+ api/*
-.. _api_documentation:
-API Documentation
-@@@@@@@@@@@@@@@@@
+``p*`` Scripts Documentation
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@
.. toctree::
:maxdepth: 1
:glob:
- api/*
+ pscripts/index
+ pscripts/*
+
.. backmatter::
+Change History
+@@@@@@@@@@@@@@
+
+.. toctree::
+ :maxdepth: 1
+
+ whatsnew-1.7
+ whatsnew-1.6
+ whatsnew-1.5
+ whatsnew-1.4
+ whatsnew-1.3
+ whatsnew-1.2
+ whatsnew-1.1
+ whatsnew-1.0
+ changes
+
+
Glossary and Index
@@@@@@@@@@@@@@@@@@