Merge remote-tracking branch 'upstream/main' into remove-setuptools-wheel-upgrade

Author: EpicWink

source/discussions/deploying-python-applications.rst

@@ -97,7 +97,7 @@ services, and DLL/EXE COM servers might work but it is not actively supported.
 The distutils extension is released under the MIT-licence and Mozilla
 Public License 2.0.
 
-.. __: https://devguide.python.org/#status-of-python-branches
+.. __: https://devguide.python.org/versions/
 
 macOS
 -----

source/specifications/pyproject-toml.rst

@@ -14,8 +14,6 @@
 The ``pyproject.toml`` file acts as a configuration file for packaging-related
 tools (as well as other tools).
 
-.. note:: This specification was originally defined in :pep:`518` and :pep:`621`.
-
 The ``pyproject.toml`` file is written in `TOML <https://toml.io>`_. Three
 tables are currently specified, namely
 :ref:`[build-system] <pyproject-build-system-table>`,