summaryrefslogtreecommitdiff
path: root/docs/index.rst
diff options
context:
space:
mode:
authorPaul Everitt <paul@agendaless.com>2013-08-13 13:50:06 -0400
committerPaul Everitt <paul@agendaless.com>2013-08-13 13:50:06 -0400
commit0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6 (patch)
tree6d9f12bc42fde9fea95d7754f2decff212acf6ee /docs/index.rst
parentd44d0e044555cd1287680fc8368632a64ebe979b (diff)
parent5ae91a8ef06c4484bf748c7be578b28d0ca0f12c (diff)
downloadpyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.tar.gz
pyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.tar.bz2
pyramid-0dfacfa09dcf62e5a41c3762e7f9b5d1467b54e6.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/index.rst')
-rw-r--r--docs/index.rst10
1 files changed, 3 insertions, 7 deletions
diff --git a/docs/index.rst b/docs/index.rst
index 3c3adb9a6..8fd210ed7 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -37,6 +37,7 @@ What's New
.. toctree::
:maxdepth: 1
+ whatsnew-1.5
whatsnew-1.4
whatsnew-1.3
whatsnew-1.2
@@ -55,7 +56,7 @@ Getting Started
.. _html_narrative_documentation:
-Narrative documentation
+Narrative Documentation
=======================
Narrative documentation in chapter form explaining how to use
@@ -120,7 +121,7 @@ platforms.
tutorials/modwsgi/index.rst
API Documentation
-==================
+=================
Comprehensive reference material for every public API exposed by :app:`Pyramid`:
@@ -225,13 +226,8 @@ Index and Glossary
* :ref:`genindex`
* :ref:`search`
-
-.. add glossary, foreword, and latexindex in a hidden toc to avoid warnings
-
.. toctree::
:hidden:
glossary
- foreword.rst
- latexindex.rst