summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2023-06-16 08:56:32 (GMT)
committerGitHub <noreply@github.com>2023-06-16 08:56:32 (GMT)
commit1eeb2e62d0a7d37fea192df47d7a8ec1227bef6d (patch)
tree4fd067a09f81d70a985fad3697f6e60168165777
parent6f0f27eba0f41375ae12a37c6cc8a278526917a6 (diff)
downloadcpython-1eeb2e62d0a7d37fea192df47d7a8ec1227bef6d.zip
cpython-1eeb2e62d0a7d37fea192df47d7a8ec1227bef6d.tar.gz
cpython-1eeb2e62d0a7d37fea192df47d7a8ec1227bef6d.tar.bz2
[3.12] gh-105844: Consistently use 'minor version' for X.Y versions (GH-105851) (#105853)
(cherry picked from commit 0bffe1acd78069ea21f6b1347bec9cc9747342cb) Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
-rw-r--r--Doc/faq/general.rst4
-rw-r--r--Doc/install/index.rst2
2 files changed, 3 insertions, 3 deletions
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index a9b2622..298ce11 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 major release, a
+Not all releases are bugfix releases. In the run-up to a new minor 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,7 +297,7 @@ 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 major new release every 12 months (:pep:`602`).
+Python will have a minor new release every 12 months (:pep:`602`).
The developers issue "bugfix" releases of older versions, so the stability of
existing releases gradually improves. Bugfix releases, indicated by a third
diff --git a/Doc/install/index.rst b/Doc/install/index.rst
index ab581d7..beb34f0 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 major 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.