From 8d999cbf4adea053be6dbb612b9844635c4dfb8e Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@python.org>
Date: Tue, 28 Dec 2021 02:08:54 -0500
Subject: Update REAME and Docs sidebar for EOL

---
 Doc/tools/static/switchers.js         | 5 +++--
 Doc/tools/templates/indexsidebar.html | 9 +++------
 README.rst                            | 1 +
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
index 30801917ed..3008e1631e 100644
--- a/Doc/tools/static/switchers.js
+++ b/Doc/tools/static/switchers.js
@@ -10,8 +10,9 @@
     '(?:release/\\d.\\d[\\x\\d\\.]*)'];
 
   var all_versions = {
-    '3.10': 'dev (3.10)',
-    '3.9': 'pre (3.9)',
+    '3.11': 'dev (3.11)',
+    '3.10': '3.10',
+    '3.9': '3.9',
     '3.8': '3.8',
     '3.7': '3.7',
     '3.6': '3.6',
diff --git a/Doc/tools/templates/indexsidebar.html b/Doc/tools/templates/indexsidebar.html
index 2ef90f094d..f7bf6d8e49 100644
--- a/Doc/tools/templates/indexsidebar.html
+++ b/Doc/tools/templates/indexsidebar.html
@@ -2,12 +2,8 @@
 <p><a href="{{ pathto('download') }}">{% trans %}Download these documents{% endtrans %}</a></p>
 <h3>{% trans %}Docs by version{% endtrans %}</h3>
 <ul>
-  <li><a href="https://docs.python.org/3.10/">{% trans %}Python 3.10 (in development){% endtrans %}</a></li>
-  <li><a href="https://docs.python.org/3.9/">{% trans %}Python 3.9 (pre-release){% endtrans %}</a></li>
-  <li><a href="https://docs.python.org/3.8/">{% trans %}Python 3.8 (stable){% endtrans %}</a></li>
-  <li><a href="https://docs.python.org/3.7/">{% trans %}Python 3.7 (stable){% endtrans %}</a></li>
-  <li><a href="https://docs.python.org/3.6/">{% trans %}Python 3.6 (security-fixes){% endtrans %}</a></li>
-  <li><a href="https://docs.python.org/2.7/">{% trans %}Python 2.7 (EOL){% endtrans %}</a></li>
+  <li><a href="https://docs.python.org/">{% trans %}Stable{% endtrans %}</a></li>
+  <li><a href="https://docs.python.org/dev/">{% trans %}In development{% endtrans %}</a></li>
   <li><a href="https://www.python.org/doc/versions/">{% trans %}All versions{% endtrans %}</a></li>
 </ul>
 
@@ -18,4 +14,5 @@
   <li><a href="https://wiki.python.org/moin/BeginnersGuide">{% trans %}Beginner's Guide{% endtrans %}</a></li>
   <li><a href="https://wiki.python.org/moin/PythonBooks">{% trans %}Book List{% endtrans %}</a></li>
   <li><a href="https://www.python.org/doc/av/">{% trans %}Audio/Visual Talks{% endtrans %}</a></li>
+  <li><a href="https://devguide.python.org/">{% trans %}Python Developer’s Guide{% endtrans %}</a></li>
 </ul>
diff --git a/README.rst b/README.rst
index 3e72bad19a..570b6f1669 100644
--- a/README.rst
+++ b/README.rst
@@ -236,6 +236,7 @@ All current PEPs, as well as guidelines for submitting a new PEP, are listed at
 Release Schedule
 ----------------
 
+As of 2021-12-23, Python 3.6 has reached ``end-of-life`` status.
 See :pep:`494` for Python 3.6 release details.
 
 
-- 
cgit v1.2.1