From 8828e0c042ed3d956f2b480cf088f1d7a480785a Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Sat, 17 Jun 2023 10:34:17 +0200 Subject: [PATCH 1/2] gh-105844: Use devguide terminology to denote versions --- Doc/faq/general.rst | 6 +++--- Doc/install/index.rst | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst index 298ce111698a65..8727332594bda6 100644 --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -135,7 +135,7 @@ Python versions are numbered "A.B.C" or "A.B": See :pep:`6` for more information about bugfix releases. -Not all releases are bugfix releases. In the run-up to a new minor release, a +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; it's not unexpected to see an interface change between two alpha releases. @@ -297,9 +297,9 @@ How stable is Python? Very stable. New, stable releases have been coming out roughly every 6 to 18 months since 1991, and this seems likely to continue. As of version 3.9, -Python will have a minor new release every 12 months (:pep:`602`). +Python will have a new feature release every 12 months (:pep:`602`). -The developers issue "bugfix" releases of older versions, so the stability of +The developers issue bugfix releases of older versions, so the stability of existing releases gradually improves. Bugfix releases, indicated by a third component of the version number (e.g. 3.5.3, 3.6.2), are managed for stability; only fixes for known problems are included in a bugfix release, and it's diff --git a/Doc/install/index.rst b/Doc/install/index.rst index beb34f0cf21b22..d7f8a738158263 100644 --- a/Doc/install/index.rst +++ b/Doc/install/index.rst @@ -696,7 +696,7 @@ is supplied to suppress this behaviour. So you could simply edit import sys sys.path.append('/www/python/') -However, if you reinstall the same minor version of Python (perhaps when +However, if you reinstall the same feature version of Python (perhaps when upgrading from 2.2 to 2.2.2, for example) :file:`site.py` will be overwritten by the stock version. You'd have to remember that it was modified and save a copy before doing the installation. From 13d51cd73f640e956152f0f5ea22ef817cfd4474 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Sun, 18 Jun 2023 01:29:38 +0200 Subject: [PATCH 2/2] Update Doc/install/index.rst Co-authored-by: C.A.M. Gerlach --- Doc/install/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/install/index.rst b/Doc/install/index.rst index d7f8a738158263..beb34f0cf21b22 100644 --- a/Doc/install/index.rst +++ b/Doc/install/index.rst @@ -696,7 +696,7 @@ is supplied to suppress this behaviour. So you could simply edit import sys sys.path.append('/www/python/') -However, if you reinstall the same feature version of Python (perhaps when +However, if you reinstall the same minor version of Python (perhaps when upgrading from 2.2 to 2.2.2, for example) :file:`site.py` will be overwritten by the stock version. You'd have to remember that it was modified and save a copy before doing the installation.