diff options
| author | Chris McDonough <chrism@plope.com> | 2012-01-19 03:24:04 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-01-19 03:24:04 -0500 |
| commit | 077f3d1d0b28d9f565cc07a3ad11f4a8bb359054 (patch) | |
| tree | 09ac1c9fb803fc89a557eb7283452e526614232e /docs/glossary.rst | |
| parent | 4ef8a99d3260d99fa5522a0d26f1e7c1487c0265 (diff) | |
| parent | 520676451b8b89177ad95cfcaa3f90484f5a6a18 (diff) | |
| download | pyramid-077f3d1d0b28d9f565cc07a3ad11f4a8bb359054.tar.gz pyramid-077f3d1d0b28d9f565cc07a3ad11f4a8bb359054.tar.bz2 pyramid-077f3d1d0b28d9f565cc07a3ad11f4a8bb359054.zip | |
Merge branch '1.3-branch'
Diffstat (limited to 'docs/glossary.rst')
| -rw-r--r-- | docs/glossary.rst | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst index e4de15bd6..8307c0472 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -983,3 +983,15 @@ Glossary :meth:`pyramid.path.AssetResolver.resolve` method. It supports the methods and attributes documented in :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 + Waitress as a WGSI server. See + http://docs.pylonsproject.org/projects/waitress/en/latest/ for detailed + information. + + Green Unicorn + Aka ``gunicorn``, a fast :term:`WSGI` server that runs on UNIX under + Python 2.5+ (although at the time of this writing does not support + Python 3). See http://gunicorn.org/ for detailed information. |