Merge branch '3.15' into backport-1dd8e71-3.15

Author: picnixz

Doc/builtins/stdtypes.rst

@@ -2129,13 +2129,23 @@ expression support in the :mod:`re` module).
 .. method:: str.capitalize()
 
    Return a copy of the string with its first character capitalized and the
-   rest lowercased.
+   rest lowercased. For example:
+
+   .. doctest::
+
+      >>> 'PYTHON IS AMAZING'.capitalize()
+      'Python is amazing'
+      >>> 'Njemačka starts With a non-ASCII digraph'.capitalize()
+      'Njemačka starts with a non-ascii digraph'
+
+   See also :meth:`title`.
 
    .. versionchanged:: 3.8
       The first character is now put into titlecase rather than uppercase.
       This means that characters like digraphs will only have their first
       letter capitalized, instead of the full character.
 
+
 .. method:: str.casefold()
 
    Return a casefolded copy of the string. Casefolded strings may be used for
@@ -3137,7 +3147,7 @@ expression support in the :mod:`re` module).
         >>> titlecase("they're bill's friends.")
         "They're Bill's Friends."
 
-   See also :meth:`istitle`.
+   See also :meth:`istitle` and :meth:`capitalize`.
 
 
 .. method:: str.translate(table, /)

Doc/c-api/frame.rst

@@ -99,8 +99,6 @@ See also :ref:`Reflection <reflection>`.
 
    Get the *frame*'s :attr:`~frame.f_lasti` attribute.
 
-   Returns -1 if ``frame.f_lasti`` is ``None``.
-
    .. versionadded:: 3.11
 
 

Doc/c-api/gcsupport.rst

@@ -42,7 +42,7 @@ rules:
    .. warning::
       If a type adds the Py_TPFLAGS_HAVE_GC, then it *must* implement at least
       a :c:member:`~PyTypeObject.tp_traverse` handler or explicitly use one
-      from its subclass or subclasses.
+      from a base class.
 
       When calling :c:func:`PyType_Ready` or some of the APIs that indirectly
       call it like :c:func:`PyType_FromSpecWithBases` or

Doc/c-api/gen.rst

@@ -6,8 +6,8 @@ Generator Objects
 -----------------
 
 Generator objects are what Python uses to implement generator iterators. They
-are normally created by iterating over a function that yields values, rather
-than explicitly calling :c:func:`PyGen_New` or :c:func:`PyGen_NewWithQualName`.
+are normally created by calling a generator function, rather than explicitly
+calling :c:func:`PyGen_New` or :c:func:`PyGen_NewWithQualName`.
 
 
 .. c:type:: PyGenObject

Doc/c-api/object.rst

@@ -423,7 +423,7 @@ Object Protocol
    If *cls* has a :meth:`~type.__subclasscheck__` method, it will be called to
    determine the subclass status as described in :pep:`3119`.  Otherwise,
    *derived* is a subclass of *cls* if it is a direct or indirect subclass,
-   i.e. contained in :attr:`cls.__mro__ <type.__mro__>`.
+   i.e. if *cls* is contained in :attr:`derived.__mro__ <type.__mro__>`.
 
    Normally only class objects, i.e. instances of :class:`type` or a derived
    class, are considered classes.  However, objects can override this by having

Doc/c-api/typeobj.rst

@@ -2527,7 +2527,7 @@ and :c:data:`PyType_Type` effectively act as defaults.)
 
       Specifically, if *type* uses the default metaclass,
       ``type->tp_vectorcall`` must behave the same as
-      :c:expr:`PyType_Type->tp_call`, which:
+      ``Py_TYPE(type)->tp_call``, which:
 
       - calls ``type->tp_new``,
 

Doc/howto/descriptor.rst

@@ -1754,7 +1754,7 @@ At this point, the metaclass has loaded member objects for *x* and *y*::
     >>> isinstance(vars(H)['y'], Member)
     True
 
-When instances are created, they have a ``slot_values`` list where the
+When instances are created, they have a ``_slotvalues`` list where the
 attributes are stored:
 
 .. doctest::

Doc/howto/enum.rst

@@ -913,7 +913,7 @@ Some rules:
    :class:`~dataclasses.dataclass`
 6. %-style formatting:  ``%s`` and ``%r`` call the :class:`Enum` class's
    :meth:`~object.__str__` and :meth:`~object.__repr__` respectively; other codes (such as
-   ``%i`` or ``%h`` for IntEnum) treat the enum member as its mixed-in type.
+   ``%i`` or ``%x`` for IntEnum) treat the enum member as its mixed-in type.
 7. :ref:`Formatted string literals <f-strings>`, :meth:`str.format`,
    and :func:`format` will use the enum's :meth:`~object.__str__` method.
 

Doc/howto/isolating-extensions.rst

@@ -530,7 +530,7 @@ and the corresponding :c:type:`PyCMethod` signature::
        PyTypeObject *defining_class, // defining class
        PyObject *const *args,        // C array of arguments
        Py_ssize_t nargs,             // length of "args"
-       PyObject *kwnames)            // NULL, or dict of keyword arguments
+       PyObject *kwnames)            // NULL, or tuple of keyword argument names
 
 Once you have the defining class, call :c:func:`PyType_GetModuleState` to get
 the state of its associated module.

Doc/howto/perf_profiling.rst

@@ -273,7 +273,7 @@ or using the environment variable::
 
 ``perf inject --jit`` command will read ``perf.data``,
 automatically pick up the perf dump file that Python creates (in
-``/tmp/perf-$PID.dump``), and then create ``perf.jit.data`` which merges all the
+``/tmp/jit-$PID.dump``), and then create ``perf.jit.data`` which merges all the
 JIT information together. It should also create a lot of ``jitted-XXXX-N.so``
 files in the current directory which are ELF images for all the JIT trampolines
 that were created by Python.