[docs] Fixes doc build errors

docs/glossary.rst

@@ -18,8 +18,7 @@ Glossary
     ack
         Short for :term:`acknowledged`.
 
-    early acknowledgement
-
+    early acknowledgment
         Task is :term:`acknowledged` just-in-time before being executed,
         meaning the task will not be redelivered to another worker if the
         machine loses power, or the worker instance is abruptly killed,
@@ -28,7 +27,6 @@ Glossary
         Configured using :setting:`task_acks_late`.
 
     late acknowledgment
-
         Task is :term:`acknowledged` after execution (both if successful, or
         if the task is raising an error), which means the task will be
         redelivered to another worker in the event of the machine losing
@@ -37,12 +35,10 @@ Glossary
         Configured using :setting:`task_acks_late`.
 
     early ack
-
-        Short for :term:`early acknowledgement`
+        Short for :term:`early acknowledgment`
 
     late ack
-
-        Short for :term:`late acknowledgement`
+        Short for :term:`late acknowledgment`
 
     request
         Task messages are converted to *requests* within the worker.
@@ -105,7 +101,7 @@ Glossary
         :setting:`worker_prefetch_multiplier` setting, which is multiplied
         by the number of pool slots (threads/processes/greenthreads).
 
-    prefetch count
+    `prefetch count`
         Maximum number of unacknowledged messages a consumer can hold and if
         exceeded the transport should not deliver any more messages to that
         consumer.  See :ref:`optimizing-prefetch-limit`.

docs/history/changelog-3.1.rst

@@ -87,7 +87,7 @@ new in Celery 3.1.
 
 - **Worker**: Bootsteps can now hook into ``on_node_join``/``leave``/``lost``.
 
-    See :ref:`extending-consumer-gossip` for an example.
+    See :ref:`extending-consumer-attributes` for an example.
 
 - **Events**: Fixed handling of DST timezones (Issue #2983).
 

docs/userguide/optimizing.rst

@@ -191,7 +191,7 @@ they really mean by that is to have a worker only reserve as many tasks as
 there are worker processes (10 unacknowledged tasks for `-c 10`)
 
 That is possible, but not without also enabling
-:term:`late acknowledgments`.  Using this option over the
+:term:`late acknowledgment`.  Using this option over the
 default beahvior means a task that has already started executing will be
 retried in the event of a power failure or the worker instance being killed
 abruptly, so this also means the task must be :term:`idempotent`

docs/whatsnew-4.0.rst

@@ -258,19 +258,19 @@ the intent of the required connection.
 
 .. note::
 
-Two connection pools are available: ``app.pool`` (read), and
-``app.producer_pool`` (write).  The latter does not actually give connections
-but full :class:`kombu.Producer` instances.
+    Two connection pools are available: ``app.pool`` (read), and
+    ``app.producer_pool`` (write).  The latter does not actually give connections
+    but full :class:`kombu.Producer` instances.
 
-.. code-block:: python
+    .. code-block:: python
 
-    def publish_some_message(app, producer=None):
-        with app.producer_or_acquire(producer) as producer:
-            ...
+        def publish_some_message(app, producer=None):
+            with app.producer_or_acquire(producer) as producer:
+                ...
 
-    def consume_messages(app, connection=None):
-        with app.connection_or_acquire(connection) as connection:
-            ...
+        def consume_messages(app, connection=None):
+            with app.connection_or_acquire(connection) as connection:
+                ...
 
 Canvas Refactor
 ===============
@@ -467,9 +467,9 @@ In Other News
 
 - **Requirements**:
 
-    - Now depends on :ref:`Kombu 3.1 <kombu:version-3.1.0>`.
+    - Now depends on :ref:`Kombu 4.0 <kombu:version-4.0>`.
 
-    - Now depends on :mod:`billiard` version 3.4.
+    - Now depends on :mod:`billiard` version 3.5.
 
     - No longer depends on ``anyjson`` :sadface:
 
@@ -480,7 +480,7 @@ In Other News
   in addition it also improves reliability for the Redis broker transport.
 
 - **Eventlet/Gevent**: Fixed race condition leading to "simultaneous read"
- errors (Issue #2812).
+  errors (Issue #2812).
 
 - **Programs**: ``%n`` format for :program:`celery multi` is now synonym with
   ``%N`` to be consistent with :program:`celery worker`.
@@ -626,7 +626,7 @@ In Other News
   file formats.
 
 - **Programs**: ``%p`` can now be used to expand to the full worker nodename
- in logfile/pidfile arguments.
+  in logfile/pidfile arguments.
 
 - **Programs**: A new command line option :option:``--executable`` is now
   available for daemonizing programs.
@@ -640,7 +640,7 @@ In Other News
 
 - **Deployment**: Generic init scripts now support
   :envvar:`CELERY_SU`` and :envvar:`CELERYD_SU_ARGS` environment variables
-  to set the path and arguments for :man:`su(1)`.
+  to set the path and arguments for :manpage:`su(1)`.
 
 - **Prefork**: Prefork pool now uses ``poll`` instead of ``select`` where
   available (Issue #2373).