Merge branch '3.x' into 7613_class__signature__

1 files changed, 47 insertions, 28 deletions

diff --git a/CHANGES b/CHANGES
index f181af9d3..3e5836a15 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-Release 3.3.0 (in development)
+Release 3.4.0 (in development)
 ==============================
 
 Dependencies
@@ -10,6 +10,46 @@ Incompatible changes
 Deprecated
 ----------
 
+Features added
+--------------
+
+* #6914: Add a new event :event:`warn-missing-reference` to custom warning
+  messages when failed to resolve a cross-reference
+* #6914: Emit a detailed warning when failed to resolve a ``:ref:`` reference
+
+Bugs fixed
+----------
+
+Testing
+--------
+
+Release 3.3.1 (in development)
+==============================
+
+Dependencies
+------------
+
+Incompatible changes
+--------------------
+
+Deprecated
+----------
+
+Features added
+--------------
+
+Bugs fixed
+----------
+
+Testing
+--------
+
+Release 3.3.0 (released Nov 02, 2020)
+=====================================
+
+Deprecated
+----------
+
 * ``sphinx.builders.latex.LaTeXBuilder.usepackages``
 * ``sphinx.builders.latex.LaTeXBuilder.usepackages_afger_hyperref``
 * ``sphinx.ext.autodoc.SingledispatchFunctionDocumenter``
@@ -32,6 +72,8 @@ Features added
 * #8304: sphinx.testing: Register public markers in sphinx.testing.fixtures
 * #8051: napoleon: use the obj role for all See Also items
 * #8050: napoleon: Apply :confval:`napoleon_preprocess_types` to every field
+* C and C++, show line numbers for previous declarations when duplicates are
+  detected.
 * #8183: Remove substitution_reference nodes from doctree only on LaTeX builds
 
 Bugs fixed
@@ -75,32 +117,6 @@ Bugs fixed
 * #8321: linkcheck: ``tel:`` schema hyperlinks are detected as errors
 * #8323: linkcheck: An exit status is incorrect when links having unsupported
   schema found
-* #6914: figure numbers are unexpectedly assigned to uncaptioned items
-* #8320: make "inline" line numbers un-selectable
-
-Testing
---------
-
-* #8257: Support parallel build in sphinx.testing
-
-Release 3.2.2 (in development)
-==============================
-
-Dependencies
-------------
-
-Incompatible changes
---------------------
-
-Deprecated
-----------
-
-Features added
---------------
-
-Bugs fixed
-----------
-
 * #8188: C, add missing items to internal object types dictionary,
   e.g., preventing intersphinx from resolving them.
 * C, fix anon objects in intersphinx.
@@ -108,11 +124,14 @@ Bugs fixed
   non-function declaration of the same name already exists.
 * C, fix references to function parameters.
   Link to the function instead of a non-existing anchor.
-
+* #6914: figure numbers are unexpectedly assigned to uncaptioned items
+* #8320: make "inline" line numbers un-selectable
 
 Testing
 --------
 
+* #8257: Support parallel build in sphinx.testing
+
 Release 3.2.1 (released Aug 14, 2020)
 =====================================