From 91604a3d4d0d0bae0e3e3a6ef3f6fad9e7ee7493 Mon Sep 17 00:00:00 2001 From: Iman Tabrizian Date: Sat, 2 Mar 2024 19:58:06 +0330 Subject: [PATCH 1/5] Remove link to deprecated PEP 6 in FAQ guide --- Doc/faq/general.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index 8727332594bda6..da46f7314704dc 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -133,7 +133,9 @@ Python versions are numbered "A.B.C" or "A.B": changes. * *C* is the micro version number -- it is incremented for each bugfix release. -See :pep:`6` for more information about bugfix releases. +See `Status of Python versions section of the Python's Developer Guide +`__ for more information about bugfix +releases. Not all releases are bugfix releases. In the run-up to a new feature release, a series of development releases are made, denoted as alpha, beta, or release From 5d5365d40cf5b188ae47a6f968fee51f905a750f Mon Sep 17 00:00:00 2001 From: Iman Tabrizian Date: Sat, 2 Mar 2024 20:12:58 +0330 Subject: [PATCH 2/5] Add link to PEP 387 --- Doc/faq/general.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index da46f7314704dc..b68dff67f8a59c 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -133,9 +133,10 @@ Python versions are numbered "A.B.C" or "A.B": changes. * *C* is the micro version number -- it is incremented for each bugfix release. -See `Status of Python versions section of the Python's Developer Guide -`__ for more information about bugfix -releases. +See `Status of Python versions section of the Python's Developer Guide +`__ for more information about +bugfix releases. Also, consult :pep:`387` to learn more about Python's +Backward Compatibilty policy. Not all releases are bugfix releases. In the run-up to a new feature release, a series of development releases are made, denoted as alpha, beta, or release From 64cd2cf35adea9d783e516c9dd7a729e61900ac7 Mon Sep 17 00:00:00 2001 From: Iman Tabrizian Date: Sat, 2 Mar 2024 20:46:41 +0330 Subject: [PATCH 3/5] Apply suggestion Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- Doc/faq/general.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index b68dff67f8a59c..972b9e7619d0ce 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -133,10 +133,10 @@ Python versions are numbered "A.B.C" or "A.B": changes. * *C* is the micro version number -- it is incremented for each bugfix release. -See `Status of Python versions section of the Python's Developer Guide -`__ for more information about -bugfix releases. Also, consult :pep:`387` to learn more about Python's -Backward Compatibilty policy. +See the `Developer's Guide +`__ for more information about +the development cycle, and :pep:`387` to learn more about Python's +backward compatibility policy. Not all releases are bugfix releases. In the run-up to a new feature release, a series of development releases are made, denoted as alpha, beta, or release From ff856d453bfdbfdde78d7b702b74e9a9d148fbb9 Mon Sep 17 00:00:00 2001 From: Iman Tabrizian Date: Sat, 2 Mar 2024 22:57:08 +0330 Subject: [PATCH 4/5] Move the documentation to the last paragraph --- Doc/faq/general.rst | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index 972b9e7619d0ce..a8f41632fc5be0 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -133,11 +133,6 @@ Python versions are numbered "A.B.C" or "A.B": changes. * *C* is the micro version number -- it is incremented for each bugfix release. -See the `Developer's Guide -`__ for more information about -the development cycle, and :pep:`387` to learn more about Python's -backward compatibility policy. - Not all releases are bugfix releases. In the run-up to a new feature release, a series of development releases are made, denoted as alpha, beta, or release candidate. Alphas are early releases in which interfaces aren't yet finalized; @@ -160,7 +155,11 @@ unreleased versions, built directly from the CPython development repository. In practice, after a final minor release is made, the version is incremented to the next minor version, which becomes the "a0" version, e.g. "2.4a0". -See also the documentation for :data:`sys.version`, :data:`sys.hexversion`, and +See the `Developer's Guide +__` +for more information about the development cycle, and +:pep:`387` to learn more about Python's backward compatibility policy. See also +the documentation for :data:`sys.version`, :data:`sys.hexversion`, and :data:`sys.version_info`. From 3a572cc2ae3dd6e5ef92ea696fc9908e16792802 Mon Sep 17 00:00:00 2001 From: Iman Tabrizian Date: Sun, 3 Mar 2024 13:26:43 +0330 Subject: [PATCH 5/5] Update Doc/faq/general.rst Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- Doc/faq/general.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index a8f41632fc5be0..ec7c2897594999 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -156,7 +156,7 @@ practice, after a final minor release is made, the version is incremented to the next minor version, which becomes the "a0" version, e.g. "2.4a0". See the `Developer's Guide -__` +`__ for more information about the development cycle, and :pep:`387` to learn more about Python's backward compatibility policy. See also the documentation for :data:`sys.version`, :data:`sys.hexversion`, and