So long Python 3.6 (#779)

hugovk · ned-deily · zware · web-flow · commit 61da98d334bb · 2021-12-31T21:12:43.000-05:00
Co-authored-by: Ned Deily &lt;nad@python.org&gt;
Co-authored-by: Zachary Ware &lt;zachary.ware@gmail.com&gt;
diff --git a/devcycle.rst b/devcycle.rst
@@ -131,6 +131,8 @@ For reference, here are the Python versions that most recently reached their end
 +------------------+--------------+----------------+----------------+----------------------------------+
 | Branch           | Schedule     | First release  | End-of-life    | Release manager                  |
 +==================+==============+================+================+==================================+
+| 3.6              | :pep:`494`   | 2016-12-23     | 2021-12-23     | Ned Deily                        |
++------------------+--------------+----------------+----------------+----------------------------------+
 | 3.5              | :pep:`478`   | 2015-09-13     | 2020-09-30     | Larry Hastings                   |
 +------------------+--------------+----------------+----------------+----------------------------------+
 | 3.4              | :pep:`429`   | 2014-03-16     | 2019-03-18     | Larry Hastings                   |
@@ -329,7 +331,7 @@ Current Administrators
 +-------------------+----------------------------------------------------------+-----------------+
 | Ned Deily         | Python 3.6 and 3.7 Release Manager                       | ned-deily       |
 +-------------------+----------------------------------------------------------+-----------------+
-| Lary Hastings     | Retired Release Manager (for Python 3.4 and 3.5)         | larryhastings   |
+| Larry Hastings    | Retired Release Manager (for Python 3.4 and 3.5)         | larryhastings   |
 +-------------------+----------------------------------------------------------+-----------------+
 | Berker Peksag     | Maintainer of bpo-linkify and cpython-emailer-webhook    | berkerpeksag    |
 +-------------------+----------------------------------------------------------+-----------------+
diff --git a/index.rst b/index.rst
@@ -107,8 +107,6 @@ Status of Python branches
 +------------------+--------------+-------------+----------------+----------------+-----------------------+
 | 3.7              | :pep:`537`   | security    | 2018-06-27     | *2023-06-27*   | Ned Deily             |
 +------------------+--------------+-------------+----------------+----------------+-----------------------+
-| 3.6              | :pep:`494`   | security    | 2016-12-23     | *2021-12-23*   | Ned Deily             |
-+------------------+--------------+-------------+----------------+----------------+-----------------------+
 
 .. Remember to update the end-of-life table in devcycle.rst.
 
diff --git a/setup.rst b/setup.rst
@@ -240,7 +240,8 @@ Windows
 For a quick guide to building you can read `this documentation`_ from Victor
 Stinner.
 
-**Python 3.6** and later can use Microsoft Visual Studio 2017.  You can download
+All current versions of Python can be built using Microsoft Visual Studio 2017
+or later.  You can download
 and use any of the free or paid versions of `Visual Studio 2017`_.
 
 When installing Visual Studio 2017, select the **Python development** workload
