From ed18c36af85e5290683df525b327d5a9b9f3eb94 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:07:34 +0300
Subject: [PATCH 1/3] Docs: de-emphasise Python 2 in the FAQ
---
Doc/faq/general.rst | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index 31df5ebbfb83dd..578777d7f23621 100644
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -309,10 +309,9 @@ guaranteed that interfaces will remain the same throughout a series of bugfix
releases.
The latest stable releases can always be found on the `Python download page
-`_. There are two production-ready versions
-of Python: 2.x and 3.x. The recommended version is 3.x, which is supported by
-most widely used libraries. Although 2.x is still widely used, :pep:`it is not
-maintained anymore <0373>`.
+`_.
+Python 3.x is the recommended version and supported by most widely used libraries.
+Python 2.x :pep:`is not maintained anymore <373>`.
How many people are using Python?
---------------------------------
From 934eb2125ada013c41a966dacbf1042042abc8f0 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Thu, 19 Sep 2024 17:37:31 +0300
Subject: [PATCH 2/3] Update extending FAQ for Python 3
---
Doc/faq/extending.rst | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst
index 1cff2c4091df06..06ec1dbd972e9e 100644
--- a/Doc/faq/extending.rst
+++ b/Doc/faq/extending.rst
@@ -246,13 +246,12 @@ Then, when you run GDB:
I want to compile a Python module on my Linux system, but some files are missing. Why?
--------------------------------------------------------------------------------------
-Most packaged versions of Python don't include the
-:file:`/usr/lib/python2.{x}/config/` directory, which contains various files
+Most packaged versions of Python don't include some files
required for compiling Python extensions.
-For Red Hat, install the python-devel RPM to get the necessary files.
+For Red Hat, install the python3-devel RPM to get the necessary files.
-For Debian, run ``apt-get install python-dev``.
+For Debian, run ``apt-get install python3-dev``.
How do I tell "incomplete input" from "invalid input"?
------------------------------------------------------
From e0868ae1855bb31e936df2cd0c7d18cc98be2a29 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Thu, 19 Sep 2024 20:32:54 +0300
Subject: [PATCH 3/3] Improve wording
Co-authored-by: Alex Waygood
---
Doc/faq/extending.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst
index 06ec1dbd972e9e..3147fda7c37124 100644
--- a/Doc/faq/extending.rst
+++ b/Doc/faq/extending.rst
@@ -246,7 +246,7 @@ Then, when you run GDB:
I want to compile a Python module on my Linux system, but some files are missing. Why?
--------------------------------------------------------------------------------------
-Most packaged versions of Python don't include some files
+Most packaged versions of Python omit some files
required for compiling Python extensions.
For Red Hat, install the python3-devel RPM to get the necessary files.