Merge branch 'main' into docs-3.14-incremental-gc

Author: hugovk

Doc/c-api/contextvars.rst

@@ -123,16 +123,10 @@ Context object management functions:
 
    Enumeration of possible context object watcher events:
 
-   - ``Py_CONTEXT_EVENT_ENTER``: A context has been entered, causing the
-     :term:`current context` to switch to it.  The object passed to the watch
-     callback is the now-current :class:`contextvars.Context` object.  Each
-     enter event will eventually have a corresponding exit event for the same
-     context object after any subsequently entered contexts have themselves been
-     exited.
-   - ``Py_CONTEXT_EVENT_EXIT``: A context is about to be exited, which will
-     cause the :term:`current context` to switch back to what it was before the
-     context was entered.  The object passed to the watch callback is the
-     still-current :class:`contextvars.Context` object.
+   - ``Py_CONTEXT_SWITCHED``: The :term:`current context` has switched to a
+     different context.  The object passed to the watch callback is the
+     now-current :class:`contextvars.Context` object, or None if no context is
+     current.
 
    .. versionadded:: 3.14
 

Doc/c-api/init_config.rst

@@ -1621,6 +1621,8 @@ Create Config
 
    Free memory of the initialization configuration *config*.
 
+   If *config* is ``NULL``, no operation is performed.
+
 
 Error Handling
 --------------
@@ -1823,14 +1825,18 @@ return ``-1`` on error:
         PyInitConfig_Free(config);
         return 0;
 
-        // Display the error message
-        const char *err_msg;
     error:
-        (void)PyInitConfig_GetError(config, &err_msg);
-        printf("PYTHON INIT ERROR: %s\n", err_msg);
-        PyInitConfig_Free(config);
+        {
+            // Display the error message
+            // This uncommon braces style is used, because you cannot make
+            // goto targets point to variable declarations.
+            const char *err_msg;
+            (void)PyInitConfig_GetError(config, &err_msg);
+            printf("PYTHON INIT ERROR: %s\n", err_msg);
+            PyInitConfig_Free(config);
 
-        return -1;
+            return -1;
+        }
     }
 
 

Doc/conf.py

@@ -614,7 +614,7 @@
     # Sphinx 8.1 has in-built CVE and CWE roles.
     extlinks |= {
         "cve": (
-            "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-%s",
+            "https://www.cve.org/CVERecord?id=CVE-%s",
             "CVE-%s",
         ),
         "cwe": ("https://cwe.mitre.org/data/definitions/%s.html", "CWE-%s"),

Doc/deprecations/c-api-pending-removal-in-3.14.rst

@@ -1,4 +1,4 @@
-Pending Removal in Python 3.14
+Pending removal in Python 3.14
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 * The ``ma_version_tag`` field in :c:type:`PyDictObject` for extension modules

Doc/deprecations/c-api-pending-removal-in-3.15.rst

@@ -1,4 +1,4 @@
-Pending Removal in Python 3.15
+Pending removal in Python 3.15
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 * The bundled copy of ``libmpdecimal``.

Doc/deprecations/c-api-pending-removal-in-future.rst

@@ -1,4 +1,4 @@
-Pending Removal in Future Versions
+Pending removal in future versions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 The following APIs are deprecated and will be removed,

Doc/deprecations/index.rst

@@ -7,7 +7,7 @@ Deprecations
 
 .. include:: pending-removal-in-future.rst
 
-C API Deprecations
+C API deprecations
 ------------------
 
 .. include:: c-api-pending-removal-in-3.15.rst

Doc/deprecations/pending-removal-in-3.13.rst

@@ -1,4 +1,4 @@
-Pending Removal in Python 3.13
+Pending removal in Python 3.13
 ------------------------------
 
 Modules (see :pep:`594`):

Doc/deprecations/pending-removal-in-3.14.rst

@@ -1,4 +1,4 @@
-Pending Removal in Python 3.14
+Pending removal in Python 3.14
 ------------------------------
 
 * The import system:

Doc/deprecations/pending-removal-in-3.15.rst

@@ -1,4 +1,4 @@
-Pending Removal in Python 3.15
+Pending removal in Python 3.15
 ------------------------------
 
 * The import system:
@@ -63,7 +63,7 @@ Pending Removal in Python 3.15
 
   * The undocumented keyword argument syntax for creating
     :class:`~typing.NamedTuple` classes
-    (e.g. ``Point = NamedTuple("Point", x=int, y=int)``)
+    (for example, ``Point = NamedTuple("Point", x=int, y=int)``)
     has been deprecated since Python 3.13.
     Use the class-based syntax or the functional syntax instead.