Merge branch '2.0'

CHANGES

@@ -30,9 +30,13 @@ Dependencies
 Incompatible changes
 --------------------
 
+* apidoc: template files are renamed to ``.rst_t``
+
 Deprecated
 ----------
 
+* ``sphinx.domains.math.MathDomain.add_equation()``
+* ``sphinx.domains.math.MathDomain.get_next_equation_number()``
 * The ``info`` and ``warn`` arguments of
   ``sphinx.ext.autosummary.generate.generate_autosummary_docs()``
 * ``sphinx.ext.autosummary.generate._simple_info()``
@@ -46,11 +50,16 @@ Features added
 --------------
 
 * #5124: graphviz: ``:graphviz_dot:`` option is renamed to ``:layout:``
+* #1464: html: emit a warning if :confval:`html_static_path` and
+  :confval:`html_extra_path` directories are inside output directory
+* #5602: apidoc: Add ``--templatedir`` option
 
 Bugs fixed
 ----------
 
 * py domain: duplicated warning does not point the location of source code
+* #6499: html: Sphinx never updates a copy of :confval:`html_logo` even if
+  original file has changed
 * #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
@@ -59,7 +68,7 @@ Bugs fixed
 Testing
 --------
 
-Release 2.1.2 (in development)
+Release 2.1.3 (in development)
 ==============================
 
 Dependencies
@@ -80,6 +89,15 @@ Bugs fixed
 Testing
 --------
 
+Release 2.1.2 (released Jun 19, 2019)
+=====================================
+
+Bugs fixed
+----------
+
+* #6497: custom lexers fails highlighting when syntax error
+* #6478, #6488: info field lists are incorrectly recognized
+
 Release 2.1.1 (released Jun 10, 2019)
 =====================================