diff options
| author | Chris McDonough <chrism@plope.com> | 2017-02-17 20:38:40 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2017-02-17 20:38:40 -0500 |
| commit | b2e8884a94d9e869bf29ea55298ad308f16ed420 (patch) | |
| tree | e46bf79d1a8811ad273a40ce194d05836fcc7409 /docs/index.rst | |
| parent | 7bb06f28ee296ecf43ba63279fc4c2439b4571d3 (diff) | |
| parent | 40d71e805bfcf8522c6af71995c05c496f1c4b4f (diff) | |
| download | pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.gz pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.tar.bz2 pyramid-b2e8884a94d9e869bf29ea55298ad308f16ed420.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/index.rst')
| -rw-r--r-- | docs/index.rst | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/docs/index.rst b/docs/index.rst index 02c35866a..ed5b458ea 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,7 @@ Change History .. toctree:: :maxdepth: 1 + whatsnew-1.8 whatsnew-1.7 whatsnew-1.6 whatsnew-1.5 @@ -213,13 +215,13 @@ Copyright, Trademarks, and Attributions copyright -Typographical Conventions -========================= +Typographical Conventions and Style Guide +========================================= .. toctree:: :maxdepth: 1 - conventions + typographical-conventions Index and Glossary |