Merge branch '2.0'

CHANGES

@@ -33,21 +33,33 @@ Incompatible changes
 Deprecated
 ----------
 
+* The ``info`` and ``warn`` arguments of
+  ``sphinx.ext.autosummary.generate.generate_autosummary_docs()``
+* ``sphinx.ext.autosummary.generate._simple_info()``
+* ``sphinx.ext.autosummary.generate._simple_warn()``
+* ``sphinx.ext.todo.merge_info()``
+* ``sphinx.ext.todo.process_todo_nodes()``
+* ``sphinx.ext.todo.process_todos()``
+* ``sphinx.ext.todo.purge_todos()``
+
 Features added
 --------------
 
+* #5124: graphviz: ``:graphviz_dot:`` option is renamed to ``:layout:``
+
 Bugs fixed
 ----------
 
 * py domain: duplicated warning does not point the location of source code
 * #1125: html theme: scrollbar is hard to see on classic theme and macOS
 * #5502: linkcheck: Consider HTTP 503 response as not an error
 * #6439: Make generated download links reproducible
+* #6486: UnboundLocalError is raised if broken extension installed
 
 Testing
 --------
 
-Release 2.1.1 (in development)
+Release 2.1.2 (in development)
 ==============================
 
 Dependencies
@@ -65,13 +77,29 @@ Features added
 Bugs fixed
 ----------
 
+Testing
+--------
+
+Release 2.1.1 (released Jun 10, 2019)
+=====================================
+
+Incompatible changes
+--------------------
+
+* #6447: autodoc: Stop to generate document for undocumented module variables
+
+Bugs fixed
+----------
+
 * #6442: LaTeX: admonitions of :rst:dir:`note` type can get separated from
   immediately preceding section title by pagebreak
 * #6448: autodoc: crashed when autodocumenting classes with ``__slots__ = None``
+* #6451: autodoc: generates docs for "optional import"ed modules as variables
 * #6452: autosummary: crashed when generating document of properties
-
-Testing
---------
+* #6455: napoleon: docstrings for properties are not processed
+* #6436: napoleon: "Unknown target name" error if variable name ends with
+  underscore
+* #6440: apidoc: missing blank lines between modules
 
 Release 2.1.0 (released Jun 02, 2019)
 =====================================

CONTRIBUTING.rst

@@ -250,7 +250,7 @@ the source and the compiled catalogs.
 
 When a new locale is submitted, add a new directory with the ISO 639-1 language
 identifier and put ``sphinx.po`` in there.  Don't forget to update the possible
-values for :confval:`language` in ``doc/config.rst``.
+values for :confval:`language` in ``doc/usage/configuration.rst``.
 
 The Sphinx core messages can also be translated on `Transifex
 <https://www.transifex.com/>`_.  There exists a client tool named ``tx`` in the

doc/extdev/deprecated.rst

@@ -26,6 +26,42 @@ The following is a list of deprecated interfaces.
      - (will be) Removed
      - Alternatives
 
+   * - The ``info`` and ``warn`` arguments of
+       ``sphinx.ext.autosummary.generate.generate_autosummary_docs()``
+     - 2.2
+     - 4.0
+     - ``logging.info()`` and ``logging.warning()``
+
+   * - ``sphinx.ext.autosummary.generate._simple_info()``
+     - 2.2
+     - 4.0
+     - ``logging.info()``
+
+   * - ``sphinx.ext.autosummary.generate._simple_warn()``
+     - 2.2
+     - 4.0
+     - ``logging.warning()``
+
+   * - ``sphinx.ext.todo.merge_info()``
+     - 2.2
+     - 4.0
+     - ``sphinx.ext.todo.TodoDomain``
+
+   * - ``sphinx.ext.todo.process_todo_nodes()``
+     - 2.2
+     - 4.0
+     - ``sphinx.ext.todo.TodoDomain``
+
+   * - ``sphinx.ext.todo.process_todos()``
+     - 2.2
+     - 4.0
+     - ``sphinx.ext.todo.TodoDomain``
+
+   * - ``sphinx.ext.todo.purge_todos()``
+     - 2.2
+     - 4.0
+     - ``sphinx.ext.todo.TodoDomain``
+
    * - ``sphinx.builders.latex.LaTeXBuilder.apply_transforms()``
      - 2.1
      - 4.0

doc/usage/extensions/graphviz.rst

@@ -63,13 +63,17 @@ It adds these directives:
 
       .. versionadded:: 1.1
 
-   .. rst:directive:option:: graphviz_dot: dot command of the graph
+   .. rst:directive:option:: layout: layout type of the graph
       :type: text
 
-      The graphviz command (ex. ``dot``, ``neato`` and so on) for rendering the
-      graph.  By default, :confval:`graphviz_dot` is used.
+      The layout of the graph (ex. ``dot``, ``neato`` and so on).  A path to the
+      graphviz commands are also allowed.  By default, :confval:`graphviz_dot`
+      is used.
 
       .. versionadded:: 1.4
+      .. versionchanged:: 2.2
+
+         Renamed from ``graphviz_dot``
 
    .. rst:directive:option:: name: label
       :type: text
@@ -114,10 +118,13 @@ It adds these directives:
 
       .. versionadded:: 1.1
 
-   .. rst:directive:option:: graphviz_dot: dot command of the graph
+   .. rst:directive:option:: layout: layout type of the graph
       :type: text
 
       .. versionadded:: 1.4
+      .. versionchanged:: 2.2
+
+         Renamed from ``graphviz_dot``
 
    .. rst:directive:option:: name: label
       :type: text
@@ -156,10 +163,13 @@ It adds these directives:
 
       .. versionadded:: 1.1
 
-   .. rst:directive:option:: graphviz_dot: dot command of the graph
+   .. rst:directive:option:: layout: layout type of the graph
       :type: text
 
       .. versionadded:: 1.4
+      .. versionchanged:: 2.2
+
+         Renamed from ``graphviz_dot``
 
    .. rst:directive:option:: name: label
       :type: text

setup.cfg

@@ -5,9 +5,6 @@ license_file = LICENSE
 tag_build = .dev
 tag_date = true
 
-[bdist_wheel]
-universal = 1
-
 [aliases]
 release = egg_info -Db ''
 upload = upload --sign --identity=36580288