summaryrefslogtreecommitdiff
path: root/docs/index.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/index.rst')
-rw-r--r--docs/index.rst11
1 files changed, 7 insertions, 4 deletions
diff --git a/docs/index.rst b/docs/index.rst
index 02c35866a..7d3393548 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -5,7 +5,7 @@ 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 <http://www.pylonsproject.org/>`_.
+developed as part of the `Pylons Project <http://pylonsproject.org/>`_.
It is licensed under a `BSD-like license <http://repoze.org/license.html>`_.
Here is one of the simplest :app:`Pyramid` applications you can make:
@@ -145,6 +145,7 @@ Narrative documentation in chapter form explaining how to use :app:`Pyramid`.
narr/extending
narr/advconfig
narr/extconfig
+ narr/cookiecutters
narr/scaffolding
narr/upgrading
narr/threadlocals
@@ -184,6 +185,8 @@ Change History
.. toctree::
:maxdepth: 1
+ whatsnew-1.9
+ whatsnew-1.8
whatsnew-1.7
whatsnew-1.6
whatsnew-1.5
@@ -213,13 +216,13 @@ Copyright, Trademarks, and Attributions
copyright
-Typographical Conventions
-=========================
+Typographical Conventions and Style Guide
+=========================================
.. toctree::
:maxdepth: 1
- conventions
+ typographical-conventions
Index and Glossary