Doc: Fix typos in documentation and docstring

Doc/c-api/datetime.rst

@@ -13,7 +13,7 @@ the module initialisation function.  The macro puts a pointer to a C structure
 into a static variable, :c:data:`PyDateTimeAPI`, that is used by the following
 macros.
 
-.. c:macro:: PyDateTime_IMPORT()
+.. c:macro:: PyDateTime_IMPORT
 
    Import the datetime C API.
 
@@ -51,7 +51,7 @@ macros.
    .. versionchanged:: 3.15
 
       This variable should not be accessed directly as direct access is not thread-safe.
-      Use :c:func:`PyDateTime_IMPORT` instead.
+      Use :c:macro:`PyDateTime_IMPORT` instead.
 
 .. c:type:: PyDateTime_Date
 

Doc/c-api/function.rst

@@ -193,7 +193,7 @@ There are a few functions specific to Python functions.
 
    .. versionadded:: 3.12
 
-    - ``PyFunction_PYFUNC_EVENT_MODIFY_QUALNAME``
+    - ``PyFunction_EVENT_MODIFY_QUALNAME``
 
    .. versionadded:: 3.15
 

Doc/howto/mro.rst

@@ -348,7 +348,7 @@ straightforward to compute the linearizations of O, X, Y, A and B:
 
  .. code-block:: text
 
-  L[O] = 0
+  L[O] = O
   L[X] = X O
   L[Y] = Y O
   L[A] = A X Y O

Doc/library/email.generator.rst

@@ -61,7 +61,7 @@ To accommodate reproducible processing of SMIME-signed messages
 
    If *maxheaderlen* is not ``None``, refold any header lines that are longer
    than *maxheaderlen*, or if ``0``, do not rewrap any headers.  If
-   *manheaderlen* is ``None`` (the default), wrap headers and other message
+   *maxheaderlen* is ``None`` (the default), wrap headers and other message
    lines according to the *policy* settings.
 
    If *policy* is specified, use that policy to control message generation.  If
@@ -137,7 +137,7 @@ a serialized binary representation of a message object.  For more detail, see
 Because strings cannot represent binary data, the :class:`Generator` class must
 convert any binary data in any message it flattens to an ASCII compatible
 format, by converting them to an ASCII compatible
-:mailheader:`Content-Transfer_Encoding`.  Using the terminology of the email
+:mailheader:`Content-Transfer-Encoding`.  Using the terminology of the email
 RFCs, you can think of this as :class:`Generator` serializing to an I/O stream
 that is not "8 bit clean".  In other words, most applications will want
 to be using :class:`BytesGenerator`, and not :class:`Generator`.
@@ -162,7 +162,7 @@ to be using :class:`BytesGenerator`, and not :class:`Generator`.
 
    If *maxheaderlen* is not ``None``, refold any header lines that are longer
    than *maxheaderlen*, or if ``0``, do not rewrap any headers.  If
-   *manheaderlen* is ``None`` (the default), wrap headers and other message
+   *maxheaderlen* is ``None`` (the default), wrap headers and other message
    lines according to the *policy* settings.
 
    If *policy* is specified, use that policy to control message generation.  If
@@ -267,7 +267,7 @@ in with information about the part.
 
       "[Non-text (%(type)s) part of message omitted, filename %(filename)s]"
 
-   Optional *_mangle_from_* and *maxheaderlen* are as with the
+   Optional *mangle_from_* and *maxheaderlen* are as with the
    :class:`Generator` base class.
 
 

Doc/library/email.message.rst

@@ -633,7 +633,7 @@ message objects.
    .. method:: make_mixed(boundary=None)
 
       Convert a non-``multipart``, a ``multipart/related``, or a
-      ``multipart-alternative`` into a ``multipart/mixed``, moving any existing
+      ``multipart/alternative`` into a ``multipart/mixed``, moving any existing
       :mailheader:`Content-` headers and payload into a (new) first part of the
       ``multipart``.  If *boundary* is specified, use it as the boundary string
       in the multipart, otherwise leave the boundary to be automatically

Doc/library/email.policy.rst

@@ -535,7 +535,7 @@ added matters.  To illustrate::
       If :attr:`~Policy.cte_type` is ``8bit``, non-ASCII binary data is
       converted back
       into bytes.  Headers with binary data are not refolded, regardless of the
-      ``refold_header`` setting, since there is no way to know whether the
+      ``refold_source`` setting, since there is no way to know whether the
       binary data consists of single byte characters or multibyte characters.
 
 

Doc/library/mailbox.rst

@@ -500,7 +500,7 @@ Supported mailbox formats are Maildir, mbox, MH, Babyl, and MMDF.
    .. method:: set_info(key, info)
 
       Set the info of the message corresponding to *key* to *info*.
-      Calling ``some_mailbox.set_info(key, flags)`` is similar to ::
+      Calling ``some_mailbox.set_info(key, info)`` is similar to ::
 
          one_message = some_mailbox.get_message(key)
          one_message.set_info(info)

Doc/library/select.rst

@@ -563,26 +563,26 @@
    | Constant                  | Meaning                                     |
    +===========================+=============================================+
    | :const:`KQ_FILTER_READ`   | Takes a descriptor and returns whenever     |
    |                           | there is data available to read.            |
    +---------------------------+---------------------------------------------+
    | :const:`KQ_FILTER_WRITE`  | Takes a descriptor and returns whenever     |
    |                           | there is data available to write.           |
    +---------------------------+---------------------------------------------+
    | :const:`KQ_FILTER_AIO`    | AIO requests.                               |
    +---------------------------+---------------------------------------------+
    | :const:`KQ_FILTER_VNODE`  | Returns when one or more of the requested   |
-   |                           | events watched in *fflag* occurs.           |
+   |                           | events watched in *fflags* occurs.          |
    +---------------------------+---------------------------------------------+
    | :const:`KQ_FILTER_PROC`   | Watch for events on a process ID.           |
    +---------------------------+---------------------------------------------+
    | :const:`KQ_FILTER_NETDEV` | Watch for events on a network device        |
    |                           | (not available on macOS).                   |
    +---------------------------+---------------------------------------------+
    | :const:`KQ_FILTER_SIGNAL` | Returns whenever the watched signal is      |
    |                           | delivered to the process.                   |
    +---------------------------+---------------------------------------------+
    | :const:`KQ_FILTER_TIMER`  | Establishes an arbitrary timer.             |
    +---------------------------+---------------------------------------------+
 
 .. attribute:: kevent.flags
 

Doc/whatsnew/3.10.rst

@@ -1648,7 +1648,7 @@ Deprecated
   :meth:`~importlib.abc.Loader.exec_module` instead.
   (Contributed by Brett Cannon in :issue:`26131`.)
 
-* :meth:`!zimport.zipimporter.load_module` has been deprecated in
+* :meth:`!zipimport.zipimporter.load_module` has been deprecated in
   preference for :meth:`~zipimport.zipimporter.exec_module`.
   (Contributed by Brett Cannon in :issue:`26131`.)
 
@@ -1711,8 +1711,8 @@ Deprecated
   (Contributed by Brett Cannon in :issue:`42137`.)
 
 * :meth:`!importlib.abc.Loader.module_repr`,
-  :meth:`!importlib.machinery.FrozenLoader.module_repr`, and
-  :meth:`!importlib.machinery.BuiltinLoader.module_repr` are deprecated and
+  :meth:`!importlib.machinery.FrozenImporter.module_repr`, and
+  :meth:`!importlib.machinery.BuiltinImporter.module_repr` are deprecated and
   slated for removal in Python 3.12.
   (Contributed by Brett Cannon in :issue:`42136`.)
 
@@ -1742,7 +1742,7 @@ Deprecated
 
   * ``threading.Thread.setName`` => :attr:`threading.Thread.name`
 
-  * ``threading.thread.getName`` => :attr:`threading.Thread.name`
+  * ``threading.Thread.getName`` => :attr:`threading.Thread.name`
 
   * ``threading.Thread.isDaemon`` => :attr:`threading.Thread.daemon`
 

Doc/whatsnew/3.11.rst

@@ -1904,11 +1904,11 @@ C APIs pending removal are
 * :meth:`!importlib.abc.PathEntryFinder.find_loader`
 * :meth:`!importlib.abc.PathEntryFinder.find_module`
 * :meth:`!importlib.machinery.BuiltinImporter.find_module`
-* :meth:`!importlib.machinery.BuiltinLoader.module_repr`
+* :meth:`!importlib.machinery.BuiltinImporter.module_repr`
 * :meth:`!importlib.machinery.FileFinder.find_loader`
 * :meth:`!importlib.machinery.FileFinder.find_module`
 * :meth:`!importlib.machinery.FrozenImporter.find_module`
-* :meth:`!importlib.machinery.FrozenLoader.module_repr`
+* :meth:`!importlib.machinery.FrozenImporter.module_repr`
 * :meth:`!importlib.machinery.PathFinder.find_module`
 * :meth:`!importlib.machinery.WindowsRegistryFinder.find_module`
 * :func:`!importlib.util.module_for_loader`

Lib/email/policy.py

@@ -197,7 +197,7 @@ def fold_binary(self, name, value):
 
         If cte_type is 8bit, non-ASCII binary data is converted back into
         bytes.  Headers with binary data are not refolded, regardless of the
-        refold_header setting, since there is no way to know whether the binary
+        refold_source setting, since there is no way to know whether the binary
         data consists of single byte characters or multibyte characters.
 
         If utf8 is true, headers are encoded to utf8, otherwise to ascii with

Misc/NEWS.d/3.15.0a1.rst

@@ -5914,8 +5914,8 @@ Exception text when trying to delete attributes of types was clarified.
 .. nonce: ALByCb
 .. section: C API
 
-Function watchers can now receive a PyFunction_PYFUNC_EVENT_MODIFY_QUALNAME
-event when a watched functions qualname is changed.
+Function watchers can now receive a PyFunction_EVENT_MODIFY_QUALNAME
+event when a watched function's qualname is changed.
 
 ..