Merge branch '2.0'

doc/extdev/appapi.rst

@@ -145,9 +145,9 @@ Sphinx core events
 ------------------
 
 These events are known to the core.  The arguments shown are given to the
-registered event handlers.  Use :meth:`.Sphinx.connect` in an extension's ``setup``
-function (note that ``conf.py`` can also have a ``setup`` function) to connect
-handlers to the events.  Example:
+registered event handlers.  Use :meth:`.Sphinx.connect` in an extension's
+``setup`` function (note that ``conf.py`` can also have a ``setup`` function) to
+connect handlers to the events.  Example:
 
 .. code-block:: python
 

doc/extdev/deprecated.rst

@@ -171,6 +171,11 @@ The following is a list of deprecated interfaces.
      - 4.0
      - N/A
 
+   * - ``sphinx.ext.apidoc.makename()``
+     - 2.1
+     - 4.0
+     - ``sphinx.ext.apidoc.module_join()``
+
    * - ``sphinx.ext.autodoc.importer.MockFinder``
      - 2.1
      - 4.0
@@ -1066,7 +1071,9 @@ The following is a list of deprecated interfaces.
    * - ``sphinx.websupport``
      - 1.6
      - 2.0
-     - `sphinxcontrib-websupport <https://pypi.org/project/sphinxcontrib-websupport/>`_
+     - `sphinxcontrib-websupport`_
+
+       .. _sphinxcontrib-websupport: https://pypi.org/project/sphinxcontrib-websupport/
 
    * - ``StandaloneHTMLBuilder.css_files``
      - 1.6

doc/extdev/logging.rst

@@ -56,8 +56,8 @@ Logging API
         :meth:`SphinxLoggerAdapter.warning`.
 
       **color**
-        The color of logs.  By default, info and verbose level logs are not colored,
-        and debug level ones are colored as ``"darkgray"``.
+        The color of logs.  By default, info and verbose level logs are not
+        colored, and debug level ones are colored as ``"darkgray"``.
 
 .. autofunction:: pending_logging()
 

doc/extdev/markupapi.rst

@@ -138,8 +138,8 @@ Both APIs parse the content into a given node. They are used like this::
 
    .. deprecated:: 1.7
 
-      Until Sphinx-1.6, ``sphinx.ext.autodoc.AutodocReporter`` is used for this purpose.
-      For now, it is replaced by ``switch_source_input()``.
+      Until Sphinx-1.6, ``sphinx.ext.autodoc.AutodocReporter`` is used for this
+      purpose.  For now, it is replaced by ``switch_source_input()``.
 
 If you don't need the wrapping node, you can use any concrete node type and
 return ``node.children`` from the Directive.