Merge branch '3.x'

doc/usage/configuration.rst

@@ -70,9 +70,14 @@ Project information
    The author name(s) of the document.  The default value is ``'unknown'``.
 
 .. confval:: copyright
+.. confval:: project_copyright
 
    A copyright statement in the style ``'2008, Author Name'``.
 
+   .. versionchanged:: 3.5
+
+      As an alias, ``project_copyright`` is also allowed.
+
 .. confval:: version
 
    The major project version, used as the replacement for ``|version|``.  For

doc/usage/extensions/autodoc.rst

@@ -182,6 +182,16 @@ inserting them into the page source under a suitable :rst:dir:`py:module`,
 
      .. versionadded:: 3.1
 
+   * autodoc considers a variable member does not have any default value if its
+     docstring contains ``:meta hide-value:`` in its :ref:`info-field-lists`.
+     Example:
+
+     .. code-block:: rst
+
+        var1 = None  #: :meta hide-value:
+
+     .. versionadded:: 3.5
+
    * Python "special" members (that is, those named like ``__special__``) will
      be included if the ``special-members`` flag option is given::
 
@@ -554,7 +564,7 @@ There are also config values that you can set:
         ...
 
    If you set ``autodoc_type_aliases`` as
-   ``{'AliasType': 'your.module.TypeAlias'}``, it generates a following document
+   ``{'AliasType': 'your.module.AliasType'}``, it generates the following document
    internally::
 
      .. py:function:: f() -> your.module.AliasType: