diff --git a/docs/source/settings.rst b/docs/source/settings.rst
index 5e11b421..16d8961a 100644
--- a/docs/source/settings.rst
+++ b/docs/source/settings.rst
@@ -363,6 +363,18 @@ statsd_host
 
 .. versionadded:: 19.1
 
+.. _dogstatsd-tags:
+
+dogstatsd_tags
+~~~~~~~~~~~~~~
+
+* ``--dogstatsd-tags DOGSTATSD_TAGS``
+* ``(empty string)``
+
+A comma-delimited list of datadog statsd (dogstatsd) tags to append to statsd metrics.
+
+.. versionadded:: 20
+
 .. _statsd-prefix:
 
 statsd_prefix
@@ -376,17 +388,6 @@ if not provided).
 
 .. versionadded:: 19.2
 
-dogstatsd_tags
-~~~~~~~~~~~~~~
-
-* ``--dogstatsd-tags DOGSTATSD_TAGS``
-* ``(empty string)``
-
-Comma-delimited list of static dogstatsd (datadog statsd) tags sent with all statsd metrics
-See: `Datadog Docs <https://docs.datadoghq.com/developers/dogstatsd/>`
-
-.. versionadded:: 20
-
 Process Naming
 --------------
 
@@ -1213,31 +1214,25 @@ The type of workers to use.
 The default class (``sync``) should handle most "normal" types of
 workloads. You'll want to read :doc:`design` for information on when
 you might want to choose one of the other worker classes. Required
-libraries may be installed using setuptools' ``extra_require`` feature.
+libraries may be installed using setuptools' ``extras_require`` feature.
 
 A string referring to one of the following bundled classes:
 
 * ``sync``
-* ``eventlet`` - Requires eventlet >= 0.9.7 (or install it via 
+* ``eventlet`` - Requires eventlet >= 0.24.1 (or install it via
   ``pip install gunicorn[eventlet]``)
-* ``gevent``   - Requires gevent >= 0.13 (or install it via 
+* ``gevent``   - Requires gevent >= 1.4 (or install it via
   ``pip install gunicorn[gevent]``)
-* ``tornado``  - Requires tornado >= 0.2 (or install it via 
+* ``tornado``  - Requires tornado >= 0.2 (or install it via
   ``pip install gunicorn[tornado]``)
 * ``gthread``  - Python 2 requires the futures package to be installed
   (or install it via ``pip install gunicorn[gthread]``)
-* ``gaiohttp`` - Deprecated.
 
 Optionally, you can provide your own worker by giving Gunicorn a
 Python path to a subclass of ``gunicorn.workers.base.Worker``.
 This alternative syntax will load the gevent class:
 ``gunicorn.workers.ggevent.GeventWorker``.
 
-.. deprecated:: 19.8
-   The ``gaiohttp`` worker is deprecated. Please use
-   ``aiohttp.worker.GunicornWebWorker`` instead. See
-   :ref:`asyncio-workers` for more information on how to use it.
-
 .. _threads:
 
 threads
@@ -1273,7 +1268,7 @@ worker_connections
 
 The maximum number of simultaneous clients.
 
-This setting only affects the Eventlet, Gevent and Gthread worker types.
+This setting only affects the Eventlet and Gevent worker types.
 
 .. _max-requests:
 
diff --git a/gunicorn/config.py b/gunicorn/config.py
index aae5270c..e8e0f926 100644
--- a/gunicorn/config.py
+++ b/gunicorn/config.py
@@ -625,7 +625,7 @@ class WorkerClass(Setting):
         The default class (``sync``) should handle most "normal" types of
         workloads. You'll want to read :doc:`design` for information on when
         you might want to choose one of the other worker classes. Required
-        libraries may be installed using setuptools' ``extra_require`` feature.
+        libraries may be installed using setuptools' ``extras_require`` feature.
 
         A string referring to one of the following bundled classes:
 
diff --git a/setup.py b/setup.py
index fd24c0df..ee898d88 100644
--- a/setup.py
+++ b/setup.py
@@ -73,7 +73,7 @@ install_requires = [
     'setuptools>=3.0',
 ]
 
-extra_require = {
+extras_require = {
     'gevent':  ['gevent>=0.13'],
     'eventlet': ['eventlet>=0.9.7'],
     'tornado': ['tornado>=0.2'],
@@ -108,5 +108,5 @@ setup(
     [paste.server_runner]
     main=gunicorn.app.pasterapp:serve
     """,
-    extras_require=extra_require,
+    extras_require=extras_require,
 )