Merge branch '4.x' into new-tutorial-describing-code

Author: astrojuanlu

CHANGES

@@ -27,6 +27,8 @@ Bugs fixed
 * #9509: autodoc: AttributeError is raised on failed resolving typehints
 * #9518: autodoc: autodoc_docstring_signature does not effect to ``__init__()``
   and ``__new__()``
+* #9522: autodoc: PEP 585 style typehints having arguments (ex. ``list[int]``)
+  are not displayed well
 * #9481: autosummary: some warnings contain non-existing filenames
 * #9481: c domain: some warnings contain non-existing filenames
 * #9481: cpp domain: some warnings contain non-existing filenames
@@ -54,6 +56,10 @@ Features added
 Bugs fixed
 ----------
 
+* #9504: autodoc: generate incorrect reference to the parent class if the target
+  class inherites the class having ``_name`` attribute
+* #9537: 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

doc/development/tutorials/examples/recipe.py

@@ -24,7 +24,7 @@ def handle_signature(self, sig, signode):
 
     def add_target_and_index(self, name_cls, sig, signode):
         signode['ids'].append('recipe' + '-' + sig)
-        if 'contains' not in self.options:
+        if 'contains' in self.options:
             ingredients = [
                 x.strip() for x in self.options.get('contains').split(',')]
 

doc/usage/installation.rst

@@ -223,7 +223,7 @@ of images:
 
 .. _Docker Hub: https://hub.docker.com/
 .. _sphinxdoc/sphinx: https://hub.docker.com/repository/docker/sphinxdoc/sphinx
-.. _sphinxdoc/sphinx-latexpdf: https://hub.docker.com/repository/docker/sphinxdoc/sphinx-latexpdf>
+.. _sphinxdoc/sphinx-latexpdf: https://hub.docker.com/repository/docker/sphinxdoc/sphinx-latexpdf
 
 Former one is used for standard usage of Sphinx, and latter one is mainly used for
 PDF builds using LaTeX.  Please choose one for your purpose.