summaryrefslogtreecommitdiff
path: root/docs/narr/project.rst
diff options
context:
space:
mode:
authorTheron Luhn <theron@luhn.com>2020-12-11 09:21:41 -0800
committerTheron Luhn <theron@luhn.com>2020-12-11 09:21:41 -0800
commit43bd1a16de441d971bb6e1f3f6dbae055394e324 (patch)
treea87e5f7e18b224b9a2f8a2751f972d550751e48b /docs/narr/project.rst
parent86cb46d4d977d3a948308326bee628421cab93ea (diff)
parent6cf061e170039ff48e7f892f1176d1ab359e2001 (diff)
downloadpyramid-43bd1a16de441d971bb6e1f3f6dbae055394e324.tar.gz
pyramid-43bd1a16de441d971bb6e1f3f6dbae055394e324.tar.bz2
pyramid-43bd1a16de441d971bb6e1f3f6dbae055394e324.zip
Merge remote-tracking branch 'upstream/master' into wiki2-request-identity
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.