diff options
| author | Chris McDonough <chrism@plope.com> | 2012-01-18 16:38:36 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-01-18 16:38:36 -0500 |
| commit | c3a36b9b11b9414caabff957e07d4baa2d3367ad (patch) | |
| tree | b5758ff5225e598705831ca2271be98872d1eb9a /docs/glossary.rst | |
| parent | a82a1eaabe315bfe8467640c20a2f8b9eba773ee (diff) | |
| download | pyramid-c3a36b9b11b9414caabff957e07d4baa2d3367ad.tar.gz pyramid-c3a36b9b11b9414caabff957e07d4baa2d3367ad.tar.bz2 pyramid-c3a36b9b11b9414caabff957e07d4baa2d3367ad.zip | |
untangle some docs about using alternate wsgi servers (divide into 2 sections, one about pserve, the other about waitress vs. others)
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. |