From ecdae40c680e55a277f742747b739c10771921d6 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Sun, 18 May 2014 03:01:18 +0300
Subject: [PATCH] Sync settings documentation with gunicorn/config.py.

---
 docs/source/settings.rst | 18 ++++++++++++++----
 gunicorn/config.py       |  5 +++--
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/docs/source/settings.rst b/docs/source/settings.rst
index 38a9b0d1..476355c1 100644
--- a/docs/source/settings.rst
+++ b/docs/source/settings.rst
@@ -73,6 +73,9 @@ A positive integer generally in the 2-4 x $(NUM_CORES) range. You'll
 want to vary this a bit to find the best for your particular
 application's work load.
 
+By default, the value of the WEB_CONCURRENCY environment variable. If
+it is not defined, the default is 1.
+
 worker_class
 ~~~~~~~~~~~~
 
@@ -215,8 +218,10 @@ debug
 * ``--debug``
 * ``False``
 
-**DEPRECATED**: This no functionality was removed after v18.0.  This
-option is now a no-op.
+Turn on debugging in the server.
+
+**DEPRECATED**: This no functionality was removed after v18.0.
+This option is now a no-op.
 
 reload
 ~~~~~~
@@ -609,10 +614,15 @@ e.g.
 paste
 ~~~~~
 
-* ``--paster STRING``
+* ``--paste STRING, --paster STRING``
 * ``None``
 
-Load a paste.deploy config file.
+Load a paste.deploy config file. The argument may contain a "#" symbol
+followed by the name of an app section from the config file, e.g.
+"production.ini#admin".
+
+At this time, using alternate server blocks is not supported. Use the
+command line arguments to control server configuration instead.
 
 Server Hooks
 ------------
diff --git a/gunicorn/config.py b/gunicorn/config.py
index ab0040bd..51125f2f 100644
--- a/gunicorn/config.py
+++ b/gunicorn/config.py
@@ -425,6 +425,7 @@ def get_default_config_file():
     return None
 
 
+# Please remember to run "make html" in docs/ after update "desc" attributes.
 class ConfigFile(Setting):
     name = "config"
     section = "Config File"
@@ -527,7 +528,7 @@ class WorkerClass(Setting):
 
         * ``sync``
         * ``eventlet`` - Requires eventlet >= 0.9.7
-        * ``gevent``   - Requires gevent >= 0.12.2 (?)
+        * ``gevent``   - Requires gevent >= 0.13
         * ``tornado``  - Requires tornado >= 0.2
 
         Optionally, you can provide your own worker by giving gunicorn a
@@ -799,7 +800,7 @@ class Env(Setting):
 
             $ gunicorn -b 127.0.0.1:8000 --env FOO=1 test:app
 
-        and test for the foo variable environement in your application.
+        and test for the foo variable environment in your application.
         """