diff options
| author | Paul Everitt <paul@agendaless.com> | 2013-08-13 13:58:56 -0400 |
|---|---|---|
| committer | Paul Everitt <paul@agendaless.com> | 2013-08-13 13:58:56 -0400 |
| commit | a66e00e9bd51fdffd85fef14e83f12502f2d864e (patch) | |
| tree | 43eb06f24df2818e2db5a947e9866c8076257e91 /docs/index.rst | |
| parent | bf84d90b4dccb9fc52c8fe385e52f7a63e9a5535 (diff) | |
| parent | 5ae91a8ef06c4484bf748c7be578b28d0ca0f12c (diff) | |
| download | pyramid-a66e00e9bd51fdffd85fef14e83f12502f2d864e.tar.gz pyramid-a66e00e9bd51fdffd85fef14e83f12502f2d864e.tar.bz2 pyramid-a66e00e9bd51fdffd85fef14e83f12502f2d864e.zip | |
Merge remote-tracking branch 'origin/master' into docs.gettingstarted
Conflicts:
docs/index.rst
docs/latexindex.rst
setup.py
Diffstat (limited to 'docs/index.rst')
| -rw-r--r-- | docs/index.rst | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/docs/index.rst b/docs/index.rst index 550a5312e..9d38fb297 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,8 +1,8 @@ .. _index: -================================================= +========================= The Pyramid Web Framework -================================================= +========================= :app:`Pyramid` is a small, fast, down-to-earth Python web framework. It is developed as part of the `Pylons Project @@ -65,7 +65,7 @@ up to speed right away. .. _html_narrative_documentation: -Narrative documentation +Narrative Documentation ======================= Narrative documentation in chapter form explaining how to use @@ -130,7 +130,7 @@ platforms. tutorials/modwsgi/index.rst API Documentation -================== +================= Comprehensive reference material for every public API exposed by :app:`Pyramid`: @@ -146,6 +146,7 @@ Change History .. toctree:: :maxdepth: 1 + whatsnew-1.5 whatsnew-1.4 whatsnew-1.3 whatsnew-1.2 @@ -197,12 +198,8 @@ Index and Glossary * :ref:`search` -.. add glossary, foreword, and latexindex in a hidden toc to avoid warnings - .. toctree:: :hidden: glossary - foreword.rst - latexindex.rst |