diff options
| author | Michael Merickel <michael@merickel.org> | 2017-01-02 19:22:28 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-02 19:22:28 -0600 |
| commit | f01e74d21e7cadd052c1853d7fe482bd7b9970fa (patch) | |
| tree | abcec287bda4b706bfa3e6bc40601d0883206122 /docs/glossary.rst | |
| parent | fc163d411bd57b232f68ed6554aff3a3ef8f2339 (diff) | |
| parent | a36d33bf7872575fb79cdc0e5959a62b30df5742 (diff) | |
| download | pyramid-f01e74d21e7cadd052c1853d7fe482bd7b9970fa.tar.gz pyramid-f01e74d21e7cadd052c1853d7fe482bd7b9970fa.tar.bz2 pyramid-f01e74d21e7cadd052c1853d7fe482bd7b9970fa.zip | |
Merge pull request #2889 from stevepiercy/docs-cookiecutter-changes-only
Docs cookiecutter changes only - Quick Tutorial and all other files
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index 35d35740d..b4673f73e 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -992,7 +992,7 @@ Glossary pages rendered by your application, displaying request, routing, and database information. :mod:`pyramid_debugtoolbar` is configured into the ``development.ini`` of all applications which use a Pyramid - :term:`scaffold`. For more information, see + :term:`cookiecutter`. For more information, see http://docs.pylonsproject.org/projects/pyramid_debugtoolbar/en/latest/. scaffold @@ -1062,8 +1062,8 @@ Glossary :class:`pyramid.interfaces.IAssetDescriptor`. Waitress - A :term:`WSGI` server that runs on UNIX and Windows under Python 2.6+ - and Python 3.2+. Projects generated via Pyramid scaffolding use + A :term:`WSGI` server that runs on UNIX and Windows under Python 2.7+ + and Python 3.3+. Projects generated via Pyramid cookiecutters use Waitress as a WGSI server. See http://docs.pylonsproject.org/projects/waitress/en/latest/ for detailed information. |