[Python-checkins] [3.11] gh-105844: Consistently use 'minor version' for X.Y versions (GH-105851) (#105852)
erlend-aasland
webhook-mailer at python.org
Fri Jun 16 04:57:04 EDT 2023
https://github.com/python/cpython/commit/bb72d77c320f947774b08d82dfe468ee9ed6006d
commit: bb72d77c320f947774b08d82dfe468ee9ed6006d
branch: 3.11
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: erlend-aasland <erlend.aasland at protonmail.com>
date: 2023-06-16T10:56:58+02:00
summary:
[3.11] gh-105844: Consistently use 'minor version' for X.Y versions (GH-105851) (#105852)
(cherry picked from commit 0bffe1acd78069ea21f6b1347bec9cc9747342cb)
Co-authored-by: Erlend E. Aasland <erlend.aasland at protonmail.com>
files:
M Doc/faq/general.rst
M Doc/install/index.rst
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index a9b2622e02ef3..298ce111698a6 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 d2d8e567c03c2..b9588df611c59 100644
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -692,7 +692,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.
More information about the Python-checkins
mailing list