[Python-checkins] bpo-34203: FAQ now recommends python 3.x over 2.x (GH-9796)

[Miss Islington (bot)]

https://github.com/python/cpython/commit/86cfac47cf736fae90a617959288ccade18fd07e
commit: 86cfac47cf736fae90a617959288ccade18fd07e
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018-10-12T05:06:12-07:00
summary:

bpo-34203: FAQ now recommends python 3.x over 2.x (GH-9796)

(cherry picked from commit 4505f65ae7807f2420ed14d4f060e7cd5c4039d3)

Co-authored-by: Gus Goulart <augusto at goulart.me>

files:
M Doc/faq/general.rst

diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index 4e842f5366ef..9ec90e802ef6 100644
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -306,17 +306,19 @@ usually around 18 months between major releases.
 
 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. 2.5.3, 2.6.2), are managed for stability;
+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
 guaranteed that interfaces will remain the same throughout a series of bugfix
 releases.
 
 The latest stable releases can always be found on the `Python download page
-<https://www.python.org/downloads/>`_.  There are two recommended production-ready
-versions at this point in time, because at the moment there are two branches of
-stable releases: 2.x and 3.x.  Python 3.x may be less useful than 2.x, since
-currently there is more third party software available for Python 2 than for
-Python 3.  Python 2 code will generally not run unchanged in Python 3.
+<https://www.python.org/downloads/>`_.  There are two production-ready version
+of Python: 2.x and 3.x, but the recommended one at this times is Python 3.x.
+Although Python 2.x is still widely used, `it will not be
+maintained after January 1, 2020 <https://www.python.org/dev/peps/pep-0373/>`_.
+Python 2.x was known for having more third-party libraries available, however,
+by the time of this writing, most of the widely used libraries support Python 3.x,
+and some are even dropping the Python 2.x support.
 
 
 How many people are using Python?