next version is 19.2

next version is 19.2. Also fix the setting.rst, regenerate it from
config.py .

docs/source/2014-news.rst

@@ -1,7 +1,7 @@
 Changelog - 2014
 ================
 
-20.0 / unreleased
+19.2 / unreleased
 -----------------
 
 Changes
@@ -10,12 +10,12 @@ Changes
 Core
 ++++
 
-- fix `#863 <https://github.com/benoitc/gunicorn/issues/863`_: fix race condition error.
+- fix `#863 <https://github.com/benoitc/gunicorn/issues/863>`_: fix race condition error.
 
 Logging
 +++++++
 
-- fix `#832 <https://github.com/benoitc/gunicorn/issues/835>`_: log to console by default.
+- fix `#832 <https://github.com/benoitc/gunicorn/issues/832>`_: log to console by default.
 
 19.1.1 / 2014-08-16
 -------------------

docs/source/news.rst

@@ -1,7 +1,7 @@
 Changelog
 =========
 
-20.0 / unreleased
+19.2 / unreleased
 -----------------
 
 Changes
@@ -10,12 +10,12 @@ Changes
 Core
 ++++
 
-- fix `#863 <https://github.com/benoitc/gunicorn/issues/863`_: fix race condition error.
+- fix `#863 <https://github.com/benoitc/gunicorn/issues/863>`_: fix race condition error.
 
 Logging
 +++++++
 
-- fix `#832 <https://github.com/benoitc/gunicorn/issues/832`_: log to console by default.
+- fix `#832 <https://github.com/benoitc/gunicorn/issues/832>`_: log to console by default.
 
 19.1.1 / 2014-08-16
 -------------------

docs/source/settings.rst

@@ -293,7 +293,7 @@ chdir
 ~~~~~
 
 * ``--chdir``
-* ``/home/benoitc/work/gunicorn/env_py3/src/gunicorn/docs``
+* ``/Users/benoitc/work/gunicorn/py27/gunicorn/docs``
 
 Chdir to specified directory before apps loading.
 
@@ -346,7 +346,7 @@ user
 ~~~~
 
 * ``-u USER, --user USER``
-* ``1000``
+* ``501``
 
 Switch worker processes to run as this user.
 
@@ -358,7 +358,7 @@ group
 ~~~~~
 
 * ``-g GROUP, --group GROUP``
-* ``1000``
+* ``20``
 
 Switch worker process to run as this group.
 
@@ -396,7 +396,7 @@ temporary directory.
 secure_scheme_headers
 ~~~~~~~~~~~~~~~~~~~~~
 
-* ``{'X-FORWARDED-SSL': 'on', 'X-FORWARDED-PROTO': 'https', 'X-FORWARDED-PROTOCOL': 'ssl'}``
+* ``{'X-FORWARDED-PROTOCOL': 'ssl', 'X-FORWARDED-PROTO': 'https', 'X-FORWARDED-SSL': 'on'}``
 
 A dictionary containing headers and values that the front-end proxy
 uses to indicate HTTPS requests. These tell gunicorn to set
@@ -475,7 +475,7 @@ The Error log file to write to.
 
 "-" means log to stderr.
 
-.. versionchanged:: 20.0
+.. versionchanged:: 19.2
    Log to ``stderr`` by default.
 
 loglevel
@@ -524,7 +524,7 @@ syslog_addr
 ~~~~~~~~~~~
 
 * ``--log-syslog-to SYSLOG_ADDR``
-* ``udp://localhost:514``
+* ``unix:///var/run/syslog``
 
 Address to send syslog messages.
 
@@ -563,16 +563,6 @@ syslog_facility
 
 Syslog facility name
 
-statsd_host
-~~~~~~~~~~~
-
-* ``--statsd-host STATSD_ADDR``
-* ``None``
-
-host:port of the statsd server to log to
-
-.. versionadded:: 19.1
-
 enable_stdio_inheritance
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -942,3 +932,15 @@ ciphers
 * ``TLSv1``
 
 Ciphers to use (see stdlib ssl module's)
+
+Logging
+-------
+
+statsd_host
+~~~~~~~~~~~
+
+* ``--statsd-host STATSD_ADDR``
+* ``None``
+
+host:port of the statsd server to log to
+

gunicorn/__init__.py

@@ -3,6 +3,6 @@
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.
 
-version_info = (19, 1, 1)
+version_info = (19, 2, 0)
 __version__ = ".".join([str(v) for v in version_info])
 SERVER_SOFTWARE = "gunicorn/%s" % __version__

gunicorn/config.py

@@ -529,7 +529,7 @@ class Workers(Setting):
     type = int
     default = int(os.environ.get('WEB_CONCURRENCY', 1))
     desc = """\
-        The number of worker process for handling requests.
+        The number of worker processes for handling requests.
 
         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
@@ -1050,6 +1050,10 @@ class ErrorLog(Setting):
         The Error log file to write to.
 
         "-" means log to stderr.
+
+        .. versionchanged:: 19.2
+           Log to ``stderr`` by default.
+
         """