Skip to content

Commit

Permalink
Fix reST format in docs
Browse files Browse the repository at this point in the history
  • Loading branch information
tnir committed Sep 18, 2017
1 parent 4c3ee6f commit 47cf167
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 16 deletions.
2 changes: 2 additions & 0 deletions docs/gunicorn_ext.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ def fmt_setting(s):
val = inspect.getsource(s.default)
val = "\n".join(" %s" % l for l in val.splitlines())
val = " ::\n\n" + val
elif s.default == '':
val = "``(empty string)``"
else:
val = "``%s``" % s.default

Expand Down
11 changes: 1 addition & 10 deletions docs/source/2015-news.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Testing

- fix tornado worker (:issue:`1154`)

19.4.0 / 2015/11/20
19.4.0 / 2015/11/20
===================

Core
Expand Down Expand Up @@ -140,9 +140,6 @@ Misc
19.3.0 / 2015/03/06
===================

Changes
-------

Core
++++

Expand All @@ -167,9 +164,6 @@ Documentation
19.2.1 / 2015/02/4
==================

Changes
-------

Logging
+++++++

Expand All @@ -188,9 +182,6 @@ Documentation
19.2 / 2015/01/30
=================

Changes
-------

Core
++++

Expand Down
6 changes: 3 additions & 3 deletions docs/source/2016-news.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ Core & Logging

- improvement of the binary upgrade behaviour using USR2: remove file locking (:issue:`1270`)
- add the ``--capture-output`` setting to capture stdout/stderr tot the log
file (:issue:`1271`)
file (:issue:`1271`)
- Allow disabling ``sendfile()`` via the ``SENDFILE`` environment variable
(:issue:`1252`)
(:issue:`1252`)
- fix reload under pycharm (:issue:`1129`)

Workers
+++++++

- fix: make sure to remove the signal from the worker pipe (:issue:`1269`)
- fix: **gthread** worker, handle removed socket in the select loop
(:issue:`1258`)
(:issue:`1258`)

19.5.0 / 2016/05/10
===================
Expand Down
12 changes: 9 additions & 3 deletions docs/source/settings.rst
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,11 @@ If it is not defined, the default is ``1``.

This setting only affects the Gthread worker type.

.. note::
If you try to use the ``sync`` worker type and set the ``threads``
setting to more than 1, the ``gthread`` worker type will be used
instead.

.. _worker-connections:

worker_connections
Expand Down Expand Up @@ -618,8 +623,8 @@ The Access log file to write to.

.. _disable-redirect-access-to-syslog:

disable-redirect-access-to-syslog
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
disable_redirect_access_to_syslog
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

* ``--disable-redirect-access-to-syslog``
* ``False``
Expand Down Expand Up @@ -826,7 +831,7 @@ statsd_prefix
~~~~~~~~~~~~~

* ``--statsd-prefix STATSD_PREFIX``
* ````
* ``(empty string)``

Prefix to use when emitting statsd metrics (a trailing ``.`` is added,
if not provided).
Expand Down Expand Up @@ -1271,3 +1276,4 @@ The variables are passed to the the PasteDeploy entrypoint. Example::
$ gunicorn -b 127.0.0.1:8000 --paste development.ini --paste-global FOO=1 --paste-global BAR=2

.. versionadded:: 19.7

0 comments on commit 47cf167

Please sign in to comment.