summaryrefslogtreecommitdiff
path: root/docs/narr/project.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2020-12-30 07:24:59 -0800
committerSteve Piercy <web@stevepiercy.com>2020-12-30 07:24:59 -0800
commit2ca12d8a7b317120f4d2f9c7b60308f281e78357 (patch)
tree61c9b775680dd4ea93e118f15614185f6fa42e25 /docs/narr/project.rst
parentd1f88ec51042acb5a44106228cc4f8b7a3d772e0 (diff)
parentb24e9cf29b93c89b257497cd677ffcec3c9ad3a8 (diff)
downloadpyramid-2ca12d8a7b317120f4d2f9c7b60308f281e78357.tar.gz
pyramid-2ca12d8a7b317120f4d2f9c7b60308f281e78357.tar.bz2
pyramid-2ca12d8a7b317120f4d2f9c7b60308f281e78357.zip
Merge branch 'master' of https://github.com/Pylons/pyramid
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.