diff --git a/Doc/contents.rst b/Doc/contents.rst
index 852be4a6d5b6ba7..40f9c090e3d00b6 100644
--- a/Doc/contents.rst
+++ b/Doc/contents.rst
@@ -6,19 +6,19 @@
whatsnew/index.rst
tutorial/index.rst
- using/index.rst
- reference/index.rst
builtins/index.rst
library/index.rst
+ reference/index.rst
+ howto/index.rst
+ using/index.rst
+ installing/index.rst
extending/index.rst
c-api/index.rst
- installing/index.rst
- howto/index.rst
faq/index.rst
deprecations/index.rst
glossary.rst
- about.rst
bugs.rst
- copyright.rst
license.rst
+ copyright.rst
+ about.rst
diff --git a/Doc/tools/templates/indexcontent.html b/Doc/tools/templates/indexcontent.html
index 59a693c00003c45..dc2a95fc021b029 100644
--- a/Doc/tools/templates/indexcontent.html
+++ b/Doc/tools/templates/indexcontent.html
@@ -16,17 +16,17 @@
@@ -50,84 +50,68 @@
{{ docstitle|e }}
{% trans %}Welcome! This is the official documentation for Python {{ release }}.{% endtrans %}
{% trans %}Documentation sections:{% endtrans %}
-
+
+ - {% trans %}What's new in Python {{ version }}?{% endtrans %}
+ {% trans whatsnew_index=pathto("whatsnew/index") %}Or all "What's new" documents since Python 2.0{% endtrans %}
+ - {% trans %}Tutorial{% endtrans %}
+ {% trans %}Start here: a tour of Python's syntax and features{% endtrans %}
+ - {% trans %}Built-ins reference{% endtrans %}
+ {% trans %}Built-in functions and classes{% endtrans %}
+ - {% trans %}Library reference{% endtrans %}
+ {% trans %}Standard library modules{% endtrans %}
+ - {% trans %}Language reference{% endtrans %}
+ {% trans %}Syntax and language elements{% endtrans %}
+ - {% trans %}Python HOWTOs{% endtrans %}
+ {% trans %}In-depth topic manuals{% endtrans %}
+ - {% trans %}Python setup and usage{% endtrans %}
+ {% trans %}How to install, configure, and use Python{% endtrans %}
+ - {% trans %}Installing Python modules{% endtrans %}
+ {% trans %}Third-party modules and PyPI.org{% endtrans %}
+ - {% trans %}Extending and embedding{% endtrans %}
+ {% trans %}For C/C++ programmers{% endtrans %}
+ - {% trans %}Python's C API{% endtrans %}
+ {% trans %}C API reference{% endtrans %}
+ - {% trans %}FAQs{% endtrans %}
+ {% trans %}Frequently asked questions (with answers!){% endtrans %}
+ - {% trans %}Deprecations{% endtrans %}
+ {% trans %}Deprecated functionality{% endtrans %}
+
{% trans %}Other resources:{% endtrans %}
-
+
+ - {% trans %}Python developer's guide{% endtrans %}
+ {% trans %}Information on contributing to Python{% endtrans %}
+ - {% trans %}Python Packaging User Guide{% endtrans %}
+ {% trans %}Resources relating to Python packaging{% endtrans %}
+ - {% trans %}Audio/visual talks{% endtrans %}
+ {% trans %}Podcasts, talks, and video presentations from the community{% endtrans %}
+ - {% trans %}Python Enhancement Proposals{% endtrans %}
+ {% trans %}Index of proposed improvements to Python{% endtrans %}
+ - {% trans %}Static Typing with Python{% endtrans %}
+ {% trans %}Information and guides about Python type safety{% endtrans %}
+
{% trans %}Indices, glossary, and search:{% endtrans %}
-
+
+ - {% trans %}Global module index{% endtrans %}
+ {% trans %}All modules and libraries{% endtrans %}
+ - {% trans %}General index{% endtrans %}
+ {% trans %}All functions, classes, and terms{% endtrans %}
+ - {% trans %}Glossary{% endtrans %}
+ {% trans %}Terms explained{% endtrans %}
+ - {% trans %}Search page{% endtrans %}
+ {% trans %}Search this documentation{% endtrans %}
+ - {% trans %}Complete table of contents{% endtrans %}
+ {% trans %}All sections and subsections{% endtrans %}
+
{% trans %}Project information:{% endtrans %}
-
+
{% endblock %}