summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2020-08-22 07:47:37 (GMT)
committerGitHub <noreply@github.com>2020-08-22 07:47:37 (GMT)
commit429a86a12016ae42ea32d754e0725cbee8e99808 (patch)
tree987483f646e8c4600b543794f3faefc5408ea443
parenta2d00f04733491a56abec45e7a20fb42282bb4d1 (diff)
downloadcpython-429a86a12016ae42ea32d754e0725cbee8e99808.zip
cpython-429a86a12016ae42ea32d754e0725cbee8e99808.tar.gz
cpython-429a86a12016ae42ea32d754e0725cbee8e99808.tar.bz2
bpo-41573: Update release versions in General FAQ (GH-21915) (#21938)
(cherry picked from commit 7173fc84e61b80b19261e47fca38030206a3a78e) Co-authored-by: wyz23x2 <52805709+wyz23x2@users.noreply.github.com>
-rw-r--r--Doc/faq/general.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index eee3c3c..cf70f16 100644
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -142,9 +142,9 @@ to fix critical bugs.
Alpha, beta and release candidate versions have an additional suffix. The
suffix for an alpha version is "aN" for some small number N, the suffix for a
beta version is "bN" for some small number N, and the suffix for a release
-candidate version is "cN" for some small number N. In other words, all versions
+candidate version is "rcN" for some small number N. In other words, all versions
labeled 2.0aN precede the versions labeled 2.0bN, which precede versions labeled
-2.0cN, and *those* precede 2.0.
+2.0rcN, and *those* precede 2.0.
You may also find version numbers with a "+" suffix, e.g. "2.2+". These are
unreleased versions, built directly from the CPython development repository. In
@@ -309,8 +309,8 @@ releases.
The latest stable releases can always be found on the `Python download page
<https://www.python.org/downloads/>`_. 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, `it will not
-be maintained after January 1, 2020 <https://www.python.org/dev/peps/pep-0373/>`_.
+most widely used libraries. Although 2.x is still widely used, `it is not
+maintained anymore <https://www.python.org/dev/peps/pep-0373/>`_.
How many people are using Python?
---------------------------------