Merge branch '4.0.x' into 4.x

CHANGES

@@ -59,23 +59,15 @@ Bugs fixed
 Testing
 --------
 
-Release 4.0.2 (in development)
+Release 4.0.3 (in development)
 ==============================
 
 Dependencies
 ------------
 
-* #9216: Support jinja2-3.0
-
 Incompatible changes
 --------------------
 
-* #9222: Update Underscore.js to 1.13.1
-* #9217: manpage: Stop creating a section directory on build manpage by default
-  (see :confval:`man_make_section_directory`)
-* #9240: Unknown node error for pending_xref_condition is raised if an extension
-  that does not support the node installs a missing-reference handler
-
 Deprecated
 ----------
 
@@ -85,11 +77,31 @@ Features added
 Bugs fixed
 ----------
 
-* #9210: viewcode: crashed if non importable modules found on parallel build
-
 Testing
 --------
 
+Release 4.0.2 (released May 20, 2021)
+=====================================
+
+Dependencies
+------------
+
+* #9216: Support jinja2-3.0
+
+Incompatible changes
+--------------------
+
+* #9222: Update Underscore.js to 1.13.1
+* #9217: manpage: Stop creating a section directory on build manpage by default
+  (see :confval:`man_make_section_directory`)
+
+Bugs fixed
+----------
+
+* #9210: viewcode: crashed if non importable modules found on parallel build
+* #9240: Unknown node error for pending_xref_condition is raised if an extension
+  that does not support the node installs a missing-reference handler
+
 Release 4.0.1 (released May 11, 2021)
 =====================================