Adding 'Waitress' where 'FastCGI' was previously referenced

diff --git a/docs/source/siteadmin/configuration.rst b/docs/source/siteadmin/configuration.rst
index 8962d5fa6c52dd9ec18bac087a9cede4eefe5d68..3df2c9efc9782af1b2c3bb57c3a5f1f6ed48a3d1 100644 (file)
--- a/docs/source/siteadmin/configuration.rst
+++ b/docs/source/siteadmin/configuration.rst
@@ -39,7 +39,7 @@ paste.ini
   <http://pythonpaste.org/script/>`_).  It also sets up some
   middleware that you can mostly ignore, except to configure
   sessions... more on that later.  If you are adding a different
-  Python server other than plain HTTP, you might configure it
+  Python server other than Waitress / plain HTTP, you might configure it
   here.  You probably won't need to change this file very much.
 
 

diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index f70ad6ce93c2c214fa0ddba0a7875922834bd8e9..60ec2dce1583f097e5289c65c5aa97a9130b8969 100644 (file)
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@ -25,7 +25,7 @@ will take you step-by-step through setting up your own instance of MediaGoblin.
 Of course, when it comes to setting up web applications like MediaGoblin,
 there's an almost infinite way to deploy things, so for now, we'll keep it
 simple with some assumptions. We recommend a setup that combines MediaGoblin +
-virtualenv + Nginx on a .deb- or .rpm-based GNU/Linux distro.
+virtualenv + Waitress + Nginx on a .deb- or .rpm-based GNU/Linux distro.
 
 Other deployment options (e.g., deploying on FreeBSD, Arch Linux, using
 Apache, etc.) are possible, though! If you'd prefer a different deployment
@@ -343,7 +343,7 @@ exit to return to the root/sudo account.::
 .. _webserver-config:
 
 
-nginx
+Waitress and nginx
 ~~~~~~~~~~~~~~~~~
 
 This configuration example will use Nginx, however, you may