CHANGES: Merge 4.1.3 (unreleased) to 4.2.0

Author: tk0miya

CHANGES

@@ -30,6 +30,10 @@ Bugs fixed
 
 * #9608: apidoc: apidoc does not generate a module definition for implicit
   namespace package
+* #9504: autodoc: generate incorrect reference to the parent class if the target
+  class inherites the class having ``_name`` attribute
+* #9537, #9589: autodoc: Some objects under ``typing`` module are not displayed
+  well with the HEAD of 3.10
 * #9487: autodoc: typehint for cached_property is not shown
 * #9509: autodoc: AttributeError is raised on failed resolving typehints
 * #9518: autodoc: autodoc_docstring_signature does not effect to ``__init__()``
@@ -53,32 +57,6 @@ Bugs fixed
   function pointers.
 * #9564: smartquotes: don't adjust typography for text with
   language-highlighted ``:code:`` role.
-
-Testing
---------
-
-Release 4.1.3 (in development)
-==============================
-
-Dependencies
-------------
-
-Incompatible changes
---------------------
-
-Deprecated
-----------
-
-Features added
---------------
-
-Bugs fixed
-----------
-
-* #9504: autodoc: generate incorrect reference to the parent class if the target
-  class inherites the class having ``_name`` attribute
-* #9537, #9589: autodoc: Some objects under ``typing`` module are not displayed
-  well with the HEAD of 3.10
 * #9512: sphinx-build: crashed with the HEAD of Python 3.10
 
 Testing