summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2020-05-19 12:31:57 (GMT)
committerGitHub <noreply@github.com>2020-05-19 12:31:57 (GMT)
commit73812a49941f7a1d01ae48ed533f7d57af680e1a (patch)
tree62142152384dcc1b7928d4db15f1e1bebc1ed289
parente2991308c9b49547d9762157ac913dda94b5eb32 (diff)
downloadcpython-73812a49941f7a1d01ae48ed533f7d57af680e1a.zip
cpython-73812a49941f7a1d01ae48ed533f7d57af680e1a.tar.gz
cpython-73812a49941f7a1d01ae48ed533f7d57af680e1a.tar.bz2
[3.9] Doc: Python 3.10 in sidebar and version switcher. (GH-20209) (GH-20221)
(cherry picked from commit 19e3e0026417caa92ffe21a67157363b45da9aa2) Co-authored-by: Julien Palard <julien@palard.fr>
-rw-r--r--Doc/tools/static/switchers.js3
-rw-r--r--Doc/tools/templates/indexsidebar.html3
2 files changed, 4 insertions, 2 deletions
diff --git a/Doc/tools/static/switchers.js b/Doc/tools/static/switchers.js
index e1ef91a..c51f178 100644
--- a/Doc/tools/static/switchers.js
+++ b/Doc/tools/static/switchers.js
@@ -10,7 +10,8 @@
'(?:release/\\d.\\d[\\x\\d\\.]*)'];
var all_versions = {
- '3.9': 'dev (3.9)',
+ '3.10': 'dev (3.10)',
+ '3.9': 'pre (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 4730a5f..7a40be7 100644
--- a/Doc/tools/templates/indexsidebar.html
+++ b/Doc/tools/templates/indexsidebar.html
@@ -2,7 +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.9/">{% trans %}Python 3.9 (in development){% endtrans %}</a></li>
+ <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>