Merge 5.1.2 CHANGES into 5.2.0

AA-Turner · AA-Turner · commit bc59a1d1de17 · 2022-09-24T21:55:52.000+01:00
diff --git a/CHANGES b/CHANGES
@@ -19,6 +19,8 @@ Deprecated
 Features added
 --------------
 
+* #10738: napoleon: Add support for docstring types using 'of', like
+  ``type of type``. Example: ``tuple of int``.
 * #10286: C++, support requires clauses not just between the template
   parameter lists and the declaration.
 * #10755: linkcheck: Check the source URL of raw directives that use the ``url``
@@ -38,6 +40,8 @@ Features added
 Bugs fixed
 ----------
 
+* #10723: LaTeX: 5.1.0 has made the 'sphinxsetup' ``verbatimwithframe=false``
+  become without effect.
 * #10257: C++, ensure consistent non-specialization template argument
   representation.
 * #10729: C++, fix parsing of certain non-type template parameter packs.
@@ -46,33 +50,6 @@ Bugs fixed
 Testing
 --------
 
-Release 5.1.2 (in development)
-==============================
-
-Dependencies
-------------
-
-Incompatible changes
---------------------
-
-Deprecated
-----------
-
-Features added
---------------
-
-* #10738: napoleon: Add support for docstring types using 'of', like
-  ``type of type``. Example: ``tuple of int``.
-
-Bugs fixed
-----------
-
-* #10723: LaTeX: 5.1.0 has made the 'sphinxsetup' ``verbatimwithframe=false``
-  become without effect.
-
-Testing
---------
-
 Release 5.1.1 (released Jul 26, 2022)
 =====================================
 
