fix doc

docs/source/2014-news.rst

@@ -78,8 +78,7 @@ core
 - add: syslog logging can now be done to a unix socket
 - fix logging: don't try to redirect stdout/stderr to the logfile.
 - fix logging: don't propagate log
-- improve logging: file option can be overriden by the gunicorn options
+- improve logging: file option can be overriden by the gunicorn options `--error-logfile` and `--access-logfile` if they are given.
-`--error-logfile` and `--access-logfile` if they are given.
 - fix: dont' override SERVER_* by the Host header 
 - fix: handle_error
 - add more option to configure SSL
@@ -122,26 +121,3 @@ tornado worker
 ++++++++++++++
 
 - add gracefull stop support
-
-
-Breaking Changes
-++++++++++++++++
-
-- switch QUIT and TERM signals:
-
-With this change, when gunicorn receives a QUIT all the workers are
-killed immediately and exit and TERM is used for the graceful shutdown.
-
-Note: the old behaviour was based on the NGINX but the new one is more
-correct according the following doc:
-
-https://www.gnu.org/software/libc/manual/html_node/Termination-Signals.html
-
-also it is complying with the way the signals are sent by heroku:
-
-https://devcenter.heroku.com/articles/python-faq#what-constraints-exist-when-developing-applications-on-heroku
-
-
-- `run_gunicorn`, `gunicorn_django` and `gunicorn_paster` are now
-  completely deprecated and will be removed in the next release. Use the
-  `gunicorn` command instead.

docs/source/news.rst

@@ -123,30 +123,6 @@ tornado worker
 
 - add gracefull stop support
 
-
-Breaking Changes
-++++++++++++++++
-
-- switch QUIT and TERM signals:
-
-With this change, when gunicorn receives a QUIT all the workers are
-killed immediately and exit and TERM is used for the graceful shutdown.
-
-Note: the old behaviour was based on the NGINX but the new one is more
-correct according the following doc:
-
-https://www.gnu.org/software/libc/manual/html_node/Termination-Signals.html
-
-also it is complying with the way the signals are sent by heroku:
-
-https://devcenter.heroku.com/articles/python-faq#what-constraints-exist-when-developing-applications-on-heroku
-
-
-- `run_gunicorn`, `gunicorn_django` and `gunicorn_paster` are now
-  completely deprecated and will be removed in the next release. Use the
-  `gunicorn` command instead.
-
-
 18.0 / 2013-08-26
 -----------------
 
@@ -366,6 +342,7 @@ History
 .. toctree::
    :titlesonly:
 
+   2014-news
    2013-news
    2012-news
    2011-news

docs/source/settings.rst

@@ -104,6 +104,22 @@ alternative syntax will load the gevent class:
 ``gunicorn.workers.ggevent.GeventWorker``. Alternatively the syntax
 can also load the gevent class with ``egg:gunicorn#gevent``
 
+threads
+~~~~~~~
+
+* ``--threads INT``
+* ``1``
+
+The number of worker threads for handling requests.
+
+Run each worker with the specified number of threads.
+
+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.
+
+If it is not defined, the default is 1.
+
 worker_connections
 ~~~~~~~~~~~~~~~~~~
 
@@ -380,7 +396,7 @@ temporary directory.
 secure_scheme_headers
 ~~~~~~~~~~~~~~~~~~~~~
 
-* ``{'X-FORWARDED-SSL': 'on', 'X-FORWARDED-PROTO': 'https', 'X-FORWARDED-PROTOCOL': 'ssl'}``
+* ``{'X-FORWARDED-SSL': 'on', 'X-FORWARDED-PROTOCOL': 'ssl', 'X-FORWARDED-PROTO': 'https'}``
 
 A dictionary containing headers and values that the front-end proxy
 uses to indicate HTTPS requests. These tell gunicorn to set
@@ -716,6 +732,21 @@ Called just after a worker exited on SIGINT or SIGTERM.
 The callable needs to accept one instance variable for the initialized
 Worker.
 
+worker_abort
+~~~~~~~~~~~~
+
+*  ::
+
+        def worker_abort(worker):
+            pass
+
+Called when a worker received the SIGABRT signal.
+
+This call generally happen on timeout.
+
+The callable needs to accept one instance variable for the initialized
+Worker.
+
 pre_exec
 ~~~~~~~~