summaryrefslogtreecommitdiff
path: root/docs/narr/project.rst
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2020-11-29 15:24:35 -0600
committerGitHub <noreply@github.com>2020-11-29 15:24:35 -0600
commit4988f604d0c49862643efa318a5d73272cd0a6d1 (patch)
tree123ce142766910cdb2972ef263f50f61ff18ef82 /docs/narr/project.rst
parentdba2bb6b6ffc4a01994ae1d3397187a668ff3148 (diff)
parentf79396bf461afa2c744047e20c6a39e5d6826f4a (diff)
downloadpyramid-4988f604d0c49862643efa318a5d73272cd0a6d1.tar.gz
pyramid-4988f604d0c49862643efa318a5d73272cd0a6d1.tar.bz2
pyramid-4988f604d0c49862643efa318a5d73272cd0a6d1.zip
Merge pull request #3565 from mmerickel/prep-2.0
whatsnew 2.0
Diffstat (limited to 'docs/narr/project.rst')
-rw-r--r--docs/narr/project.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/project.rst b/docs/narr/project.rst
index 6493f0fe7..ee75587e9 100644
--- a/docs/narr/project.rst
+++ b/docs/narr/project.rst
@@ -1173,8 +1173,8 @@ One popular production alternative to the default Waitress server is
using the Apache web server rather than any "pure-Python" server like Waitress.
It is fast and featureful. See :ref:`modwsgi_tutorial` for details.
-Another good production alternative is :term:`Green Unicorn` (aka
-``gunicorn``). It's faster than Waitress and slightly easier to configure than
+Another good production alternative is :term:`gunicorn`.
+It's faster than Waitress and slightly easier to configure than
``mod_wsgi``, although it depends, in its default configuration, on having a
buffering HTTP proxy in front of it. It does not, as of this writing, work on
Windows.