Merge branch '4.x'

Author: tk0miya

CHANGES

@@ -19,7 +19,7 @@ Bugs fixed
 Testing
 --------
 
-Release 4.2.0 (in development)
+Release 4.3.0 (in development)
 ==============================
 
 Dependencies
@@ -34,10 +34,46 @@ Deprecated
 Features added
 --------------
 
+Bugs fixed
+----------
+
+Testing
+--------
+
+Release 4.2.1 (in development)
+==============================
+
+Dependencies
+------------
+
+Incompatible changes
+--------------------
+
+Deprecated
+----------
+
+Features added
+--------------
+
+Bugs fixed
+----------
+
+Testing
+--------
+
+Release 4.2.0 (released Sep 12, 2021)
+=====================================
+
+Features added
+--------------
+
 * #9445: autodoc: Support class properties
 * #9479: autodoc: Emit a warning if target is a mocked object
+* #9560: autodoc: Allow to refer NewType instances with module name in Python
+  3.10 or above
 * #9447: html theme: Expose the version of Sphinx in the form of tuple as a
   template variable ``sphinx_version_tuple``
+* #9594: manpage: Suppress the title of man page if description is empty
 * #9445: py domain: ``:py:property:`` directive supports ``:classmethod:``
   option to describe the class property
 * #9524: test: SphinxTestApp can take ``builddir`` as an argument
@@ -48,6 +84,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__()``
@@ -71,37 +111,8 @@ 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
---------
-
 Release 4.1.2 (released Jul 27, 2021)
 =====================================
 

doc/conf.py

@@ -35,7 +35,7 @@
 epub_theme = 'epub'
 epub_basename = 'sphinx'
 epub_author = 'Georg Brandl'
-epub_publisher = 'https://sphinx-doc.org/'
+epub_publisher = 'https://www.sphinx-doc.org/'
 epub_uid = 'web-site'
 epub_scheme = 'url'
 epub_identifier = epub_publisher

doc/make.bat

@@ -19,7 +19,7 @@ if errorlevel 9009 (
 	echo.may add the Sphinx directory to PATH.
 	echo.
 	echo.If you don't have Sphinx installed, grab it from
-	echo.https://sphinx-doc.org/
+	echo.https://www.sphinx-doc.org/
 	exit /b 1
 )
 

doc/usage/configuration.rst

@@ -2331,6 +2331,8 @@ These options influence manual page output.
 
    *description*
      Description of the manual page.  This is used in the NAME section.
+     Can be an empty string if you do not want to automatically generate
+     the NAME section.
 
    *authors*
      A list of strings with authors, or a single string.  Can be an empty
@@ -2554,7 +2556,7 @@ Options for the linkcheck builder
 
    A dictionary that maps baseurls to HTTP request headers.
 
-   The key is a URL base string like ``"https://sphinx-doc.org/"``.  To specify
+   The key is a URL base string like ``"https://www.sphinx-doc.org/"``.  To specify
    headers for other hosts, ``"*"`` can be used.  It matches all hosts only when
    the URL does not match other settings.
 
@@ -2565,7 +2567,7 @@ Options for the linkcheck builder
    .. code-block:: python
 
       linkcheck_request_headers = {
-          "https://sphinx-doc.org/": {
+          "https://www.sphinx-doc.org/": {
               "Accept": "text/html",
               "Accept-Encoding": "utf-8",
           },

doc/usage/extensions/graphviz.rst

@@ -227,13 +227,13 @@ There are also these config values:
    attribute must be set, such as ``"_top"`` and ``"_blank"``. For example, the
    link in the following graph should work in the svg output: ::
 
-       .. graphviz::
+     .. graphviz::
 
-            digraph example {
-                a [label="sphinx", href="https://sphinx-doc.org", target="_top"];
-                b [label="other"];
-                a -> b;
-            }
+          digraph example {
+              a [label="sphinx", href="https://www.sphinx-doc.org/", target="_top"];
+              b [label="other"];
+              a -> b;
+          }
 
    .. versionadded:: 1.0
       Previously, output always was PNG.

sphinx/cmd/build.py

@@ -101,7 +101,7 @@ def jobs_argument(value: str) -> int:
 def get_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(
         usage='%(prog)s [OPTIONS] SOURCEDIR OUTPUTDIR [FILENAMES...]',
-        epilog=__('For more information, visit <http://sphinx-doc.org/>.'),
+        epilog=__('For more information, visit <https://www.sphinx-doc.org/>.'),
         description=__("""
 Generate documentation from source files.
 

sphinx/cmd/quickstart.py

@@ -467,7 +467,7 @@ def get_parser() -> argparse.ArgumentParser:
     )
     parser = argparse.ArgumentParser(
         usage='%(prog)s [OPTIONS] <PROJECT_DIR>',
-        epilog=__("For more information, visit <http://sphinx-doc.org/>."),
+        epilog=__("For more information, visit <https://www.sphinx-doc.org/>."),
         description=description)
 
     parser.add_argument('-q', '--quiet', action='store_true', dest='quiet',

sphinx/ext/apidoc.py

@@ -304,7 +304,7 @@ def get_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(
         usage='%(prog)s [OPTIONS] -o <OUTPUT_PATH> <MODULE_PATH> '
               '[EXCLUDE_PATTERN, ...]',
-        epilog=__('For more information, visit <http://sphinx-doc.org/>.'),
+        epilog=__('For more information, visit <https://www.sphinx-doc.org/>.'),
         description=__("""
 Look recursively in <MODULE_PATH> for Python modules and packages and create
 one reST file with automodule directives per package in the <OUTPUT_PATH>.

sphinx/ext/autosummary/generate.py

@@ -595,7 +595,7 @@ def find_autosummary_in_lines(lines: List[str], module: str = None, filename: st
 def get_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(
         usage='%(prog)s [OPTIONS] <SOURCE_FILE>...',
-        epilog=__('For more information, visit <http://sphinx-doc.org/>.'),
+        epilog=__('For more information, visit <https://www.sphinx-doc.org/>.'),
         description=__("""
 Generate ReStructuredText using autosummary directives.
 

sphinx/ext/napoleon/__init__.py

@@ -309,11 +309,11 @@ def setup(app: Sphinx) -> Dict[str, Any]:
     See Also
     --------
     `The Sphinx documentation on Extensions
-    <http://sphinx-doc.org/extensions.html>`_
+    <https://www.sphinx-doc.org/extensions.html>`_
 
-    `The Extension Tutorial <http://sphinx-doc.org/extdev/tutorial.html>`_
+    `The Extension Tutorial <https://www.sphinx-doc.org/extdev/tutorial.html>`_
 
-    `The Extension API <http://sphinx-doc.org/extdev/appapi.html>`_
+    `The Extension API <https://www.sphinx-doc.org/extdev/appapi.html>`_
 
     """
     if not isinstance(app, Sphinx):