diff --git a/doc/_static/pocoo.png b/doc/_static/pocoo.png
deleted file mode 100644
index 1648bb8d74e..00000000000
Binary files a/doc/_static/pocoo.png and /dev/null differ
diff --git a/doc/_templates/contents.html b/doc/_templates/contents.html
new file mode 100644
index 00000000000..003d8c3d75b
--- /dev/null
+++ b/doc/_templates/contents.html
@@ -0,0 +1,6 @@
+{% extends "layout.html" %}
+{% set title = _('Sphinx documentation contents') %}
+{% block body %}
+
{{ _('Sphinx documentation contents') }}
+{{ toctree(includehidden=True, collapse=False, maxdepth=3) }}
+{% endblock %}
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
deleted file mode 100644
index 3cb884ab77e..00000000000
--- a/doc/_templates/index.html
+++ /dev/null
@@ -1,129 +0,0 @@
-{% extends "layout.html" %}
-{% set title = _('Overview') %}
-{% block body %}
- {{ _('Welcome') }}
-
-
-
{%trans%}What users say:{%endtrans%}
-
{%trans%}“Cheers for a great tool that actually makes programmers want
- to write documentation!“{%endtrans%}
-
-
- {%trans%}
- Sphinx is a tool that makes it easy to create intelligent and beautiful
- documentation, written by Georg Brandl and licensed under the BSD license.{%endtrans%}
- {%trans%}It was originally created for the
- Python documentation , and it has excellent facilities for the
- documentation of software projects in a range of languages. Of
- course, this site is also created from reStructuredText sources using
- Sphinx! The following features should be highlighted:{%endtrans%}
-
-
- {%trans%}Output formats: HTML (including Windows HTML Help), LaTeX (for
- printable PDF versions), ePub, Texinfo, manual pages, plain text{%endtrans%}
- {%trans%}Extensive cross-references: semantic markup and automatic links
- for functions, classes, citations, glossary terms and similar pieces of
- information{%endtrans%}
- {%trans%}Hierarchical structure: easy definition of a document tree, with
- automatic links to siblings, parents and children{%endtrans%}
- {%trans%}Automatic indices: general index as well as a language-specific
- module indices{%endtrans%}
- {%trans%}Code handling: automatic highlighting using the Pygments highlighter{%endtrans%}
- {%trans path=pathto('ext/builtins')%}Extensions: automatic testing of code snippets, inclusion of
- docstrings from Python modules (API docs), and
- more {%endtrans%}
- {%trans path=pathto("usage/extensions/index")%}Contributed extensions: dozens of
- extensions contributed by users ;
- most of them installable from PyPI{%endtrans%}
-
- {%trans%}
- Sphinx uses reStructuredText
- as its markup language, and many of its strengths come from the power and
- straightforwardness of reStructuredText and its parsing and translating
- suite, the Docutils .{%endtrans%}
-
-
- {%trans%}Documentation{%endtrans%}
-
-
-
-
- {%trans%}First steps with Sphinx{%endtrans%}
- {%trans%}overview of basic tasks{%endtrans%}
-
- {%trans%}Tutorial{%endtrans%}
- {%trans%}beginners tutorial{%endtrans%}
-
-
-
- {%trans%}Contents{%endtrans%}
- {%trans%}for a complete overview{%endtrans%}
-
- {%- if hasdoc('search') %}{%trans%}Search page{%endtrans%}
- {%trans%}search the documentation{%endtrans%}
{%- endif %}
-
-
-
- {%trans%}Changes{%endtrans%}
- {%trans%}release history{%endtrans%}
-
- {%- if hasdoc('genindex') %}{%trans%}General Index{%endtrans%}
- {%trans%}all functions, classes, terms{%endtrans%}
{%- endif %}
-
-
-
-
- {%trans%}
- You can also download PDF/EPUB versions of the Sphinx documentation
- from pop up menu on lower right corner.{%endtrans%}
-
-
- {%trans%}Examples{%endtrans%}
- {%trans path=pathto("examples")%}Links to documentation generated with Sphinx can be found on the
- Projects using Sphinx page.{%endtrans%}
-
- {%trans%}
- For examples of how Sphinx source files look, use the “Show
- source” links on all pages of the documentation apart from this
- welcome page.{%endtrans%}
-
-
- {%trans%}You may also be interested in the very nice
- tutorial on how to
- create a customized documentation using Sphinx written by the matplotlib
- developers.{%endtrans%}
-
- {%trans%}There is a translation team in Transifex
- of this documentation, thanks to the Sphinx document translators.{%endtrans%}
- {%trans%}A Japanese book about Sphinx has been published by O'Reilly:
- Sphinxをはじめよう /
- Learning Sphinx .{%endtrans%}
- {%trans%}In 2019 the second edition of a German book about Sphinx was published:
- Software-Dokumentation mit Sphinx .{%endtrans%}
-
-
-
- {%trans%}Hosting{%endtrans%}
-
- {%trans%}Need a place to host your Sphinx docs?
- readthedocs.org hosts a lot of Sphinx docs
- already, and integrates well with projects' source control. It also features a
- powerful built-in search that exceeds the possibilities of Sphinx' JavaScript-based
- offline search.{%endtrans%}
-
- {%trans%}Contributor Guide{%endtrans%}
-
- {%trans%}If you want to contribute to the project,
- this part of the documentation is for you.{%endtrans%}
-
-
-
- {%trans%}Code of Conduct{%endtrans%}
-
- {%trans path=pathto("internals/code-of-conduct")%}Please adhere to our Code of Conduct .{%endtrans%}
-
-{% endblock %}
diff --git a/doc/_templates/indexsidebar.html b/doc/_templates/indexsidebar.html
deleted file mode 100644
index e765648b2e7..00000000000
--- a/doc/_templates/indexsidebar.html
+++ /dev/null
@@ -1,23 +0,0 @@
-A
-
- {%trans%}project{%endtrans%}
-
-Download
-{%trans%}Current version: {%endtrans%}
-{%trans%}Install Sphinx with:{%endtrans%}
-pip install -U Sphinx
-
-{%trans%}Questions? Suggestions?{%endtrans%}
-
-{%trans%}Join the sphinx-users mailing list on Google Groups:{%endtrans%}
-
-
-
-{%trans%}or come to the #sphinx-doc channel on libera.chat .{%endtrans%}
-{%trans%}You can also open an issue at the
- tracker .{%endtrans%}
diff --git a/doc/_themes/sphinx13/layout.html b/doc/_themes/sphinx13/layout.html
index 7fe550ebde2..f6f858a57d5 100644
--- a/doc/_themes/sphinx13/layout.html
+++ b/doc/_themes/sphinx13/layout.html
@@ -1,75 +1,60 @@
-{#
- sphinxdoc/layout.html
- ~~~~~~~~~~~~~~~~~~~~~
-
- Sphinx layout template for the sphinxdoc theme.
-
- :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS.
- :license: BSD, see LICENSE for details.
-#}
+{# Sphinx layout template for the sphinxdoc theme. #}
{%- extends "basic/layout.html" %}
-{# put the sidebar before the body #}
-{% block sidebar1 %}{{ sidebar() }}{% endblock %}
-{% block sidebar2 %}{% endblock %}
-
{% block extrahead %}
-
{{ super() }}
-{%- if not embedded %}
-
-
+{%- if not embedded and pagename == 'index' %}
+
{%- endif %}
{% endblock %}
-{% block rootrellink %}
- Sphinx home |
- Documentation »
-{% endblock %}
-
{% block header %}
+{% endblock %}
+
+{%- block relbar1 %}
+
+{% endblock %}
+
+{%- block content %}
+
+
+ {%- block document %}
+
+ {% block body %}{% endblock %}
+ {%- endblock %}
-{% endblock %}
+{%- endblock %}
+
+{%- block relbar2 %}{% endblock %}
+
+{%- block footer %}
+
+{%- endblock %}
diff --git a/doc/_themes/sphinx13/static/bodybg.png b/doc/_themes/sphinx13/static/bodybg.png
deleted file mode 100644
index 6f667b99e1c..00000000000
Binary files a/doc/_themes/sphinx13/static/bodybg.png and /dev/null differ
diff --git a/doc/_themes/sphinx13/static/footerbg.png b/doc/_themes/sphinx13/static/footerbg.png
deleted file mode 100644
index d1bcb009b75..00000000000
Binary files a/doc/_themes/sphinx13/static/footerbg.png and /dev/null differ
diff --git a/doc/_themes/sphinx13/static/headerbg.png b/doc/_themes/sphinx13/static/headerbg.png
deleted file mode 100644
index 522504964d5..00000000000
Binary files a/doc/_themes/sphinx13/static/headerbg.png and /dev/null differ
diff --git a/doc/_themes/sphinx13/static/listitem.png b/doc/_themes/sphinx13/static/listitem.png
deleted file mode 100644
index f7f814d0021..00000000000
Binary files a/doc/_themes/sphinx13/static/listitem.png and /dev/null differ
diff --git a/doc/_themes/sphinx13/static/relbg.png b/doc/_themes/sphinx13/static/relbg.png
deleted file mode 100644
index 68a9b77eb74..00000000000
Binary files a/doc/_themes/sphinx13/static/relbg.png and /dev/null differ
diff --git a/doc/_themes/sphinx13/static/sphinx13.css b/doc/_themes/sphinx13/static/sphinx13.css
index 5d64eda512a..562b1757b6b 100644
--- a/doc/_themes/sphinx13/static/sphinx13.css
+++ b/doc/_themes/sphinx13/static/sphinx13.css
@@ -1,187 +1,74 @@
-/*
- * sphinx13.css
- * ~~~~~~~~~~~~
- *
- * Sphinx stylesheet -- sphinx13 theme.
- *
- * :copyright: Copyright 2007-2019 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
+/* Stylesheet for Sphinx's documentation */
-@import url("basic.css");
-
-/* -- page layout ----------------------------------------------------------- */
+/* Set master colours */
+:root {
+ --fonts-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji";
+ --colour-sphinx-blue: #0A507A;
+ --colour-text: #333;
+ --colour-links-light: #057;
+}
body {
- font-family: 'Open Sans', 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva',
- 'Verdana', sans-serif;
- font-size: 14px;
- text-align: center;
- background-image: url(bodybg.png);
- color: black;
- padding: 0;
- border-right: 1px solid #0a507a;
- border-left: 1px solid #0a507a;
-
+ font-family: var(--fonts-sans-serif);
margin: 0 auto;
- min-width: 780px;
- max-width: 1080px;
+ color: var(--colour-text);
}
.pageheader {
- background-image: url(headerbg.png);
- text-align: left;
+ background-color: var(--colour-sphinx-blue);
padding: 10px 15px;
}
-.pageheader ul {
- float: right;
- color: white;
- list-style-type: none;
- padding-left: 0;
- margin-top: 30px;
- margin-right: 10px;
-}
-
-.pageheader li {
- float: left;
- margin: 0 0 0 10px;
-}
-
-.pageheader li a {
- border-radius: 1px;
- padding: 8px 12px;
- color: #f9f9f0;
- text-shadow: 0 0 5px rgba(0, 0, 0, 0.5);
-}
-
-.pageheader li a:hover {
- background-color: #f9f9f0;
- color: #0a507a;
- text-shadow: none;
-}
-
div.document {
- background-color: white;
- text-align: left;
-}
-
-div.bodywrapper {
- margin: 0 240px 0 0;
- border-right: 1px solid #0a507a;
+ display: flex;
+ margin: 0 0.5em;
}
div.body {
+ border-left: 1px solid var(--colour-sphinx-blue);
margin: 0;
- padding: 0.5em 20px 20px 20px;
+ padding: 0.5em 1.25em;
+ min-width: 0;
+ max-width: 800px;
}
div.related {
- font-size: 1em;
+ display: flex;
color: white;
-}
-
-div.related ul {
- background-image: url(relbg.png);
- height: 1.9em;
+ background-color: var(--colour-sphinx-blue);
border-top: 1px solid #002e50;
- border-bottom: 1px solid #002e50;
}
div.related ul li {
margin: 0 5px 0 0;
- padding: 0;
float: left;
}
-div.related ul li.right {
- float: right;
- margin-right: 5px;
-}
-
div.related ul li a {
- margin: 0;
padding: 0 5px 0 5px;
line-height: 1.75em;
- color: #f9f9f0;
- text-shadow: 0px 0px 1px rgba(0, 0, 0, 0.5);
+ color: white;
}
div.related ul li a:hover {
- color: white;
- /*text-decoration: underline;*/
- text-shadow: 0px 0px 1px rgba(255, 255, 255, 0.5);
+ text-shadow: 0 0 1px rgba(255, 255, 255, 0.5);
}
div.sphinxsidebarwrapper {
- position: relative;
- top: 0px;
padding: 0;
}
div.sphinxsidebar {
+ overflow-wrap: break-word;
margin: 0;
- padding: 0 15px 15px 0;
+ padding-right: 15px;
width: 210px;
- float: right;
font-size: 1em;
- text-align: left;
- max-height: 0px;
-}
-
-div.sphinxsidebar .logo {
- font-size: 1.8em;
- color: #0A507A;
- font-weight: 300;
- text-align: center;
-}
-
-div.sphinxsidebar .logo img {
- vertical-align: middle;
-}
-
-div.sphinxsidebar .download a img {
- vertical-align: middle;
-}
-
-div.subscribeformwrapper {
- display: block;
- overflow: auto;
- margin-bottom: 1.2em;
-}
-
-div.sphinxsidebar input {
- border: 1px solid #aaa;
- font-family: 'Open Sans', 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva',
- 'Verdana', sans-serif;
-}
-
-div.sphinxsidebar .subscribeform {
- margin-top: 0;
-}
-
-div.sphinxsidebar .subscribeform input {
- border: 1px solid #aaa;
- font-size: 0.9em;
- float: left;
- padding: 0.25em 0.5em;
- box-sizing: border-box;
-}
-
-div.sphinxsidebar .subscribeform input[type="text"] {
- width: 60%;
-}
-
-div.sphinxsidebar .subscribeform input[type="submit"] {
- width: 40%;
- border-left: none;
}
div.sphinxsidebar h3 {
font-size: 1.5em;
- border-top: 1px solid #0a507a;
- margin-top: 1em;
+ margin-top: 0;
margin-bottom: 0.5em;
padding-top: 0.5em;
}
@@ -198,12 +85,6 @@ div.sphinxsidebar h3, div.sphinxsidebar h4 {
padding-left: 14px;
color: #333;
font-weight: 300;
- /*text-shadow: 0px 0px 0.5px rgba(0, 0, 0, 0.4);*/
-}
-
-div.sphinxsidebarwrapper > h3:first-child {
- margin-top: 0.5em;
- border: none;
}
div.sphinxsidebar h3 a {
@@ -219,17 +100,16 @@ div.sphinxsidebar ul {
div.sphinxsidebar ul ul {
margin-left: 20px;
- list-style-image: url(listitem.png);
+ list-style-type: none;
}
div.footer {
- background-image: url(footerbg.png);
+ background-color: var(--colour-sphinx-blue);
color: #ccc;
text-shadow: 0 0 .2px rgba(255, 255, 255, 0.8);
padding: 3px 8px 3px 0;
clear: both;
font-size: 0.8em;
- text-align: right;
}
/* no need to make a visible link to Sphinx on the Sphinx page */
@@ -244,14 +124,10 @@ p {
}
a {
- color: #A2881D;
+ color: var(--colour-links-light);
text-decoration: none;
}
-a:hover {
- color: #E1C13F;
-}
-
div.body a {
text-decoration: underline;
}
@@ -259,12 +135,18 @@ div.body a {
h1 {
margin: 10px 0 0 0;
font-size: 2.4em;
- color: #0A507A;
+ color: var(--colour-sphinx-blue);
font-weight: 300;
}
+h1 span.pre {
+ /* for code in titles */
+ word-break: break-all;
+ white-space: normal;
+}
+
h2 {
- margin: 1.em 0 0.2em 0;
+ margin: 1em 0 0.2em 0;
font-size: 1.5em;
font-weight: 300;
padding: 0;
@@ -282,12 +164,12 @@ div.body h1 a, div.body h2 a, div.body h3 a, div.body h4 a, div.body h5 a, div.b
}
div.body h1 a tt, div.body h2 a tt, div.body h3 a tt, div.body h4 a tt, div.body h5 a tt, div.body h6 a tt {
- color: #0A507A !important;
+ color: var(--colour-sphinx-blue) !important;
font-size: inherit !important;
}
a.headerlink {
- color: #0A507A !important;
+ color: var(--colour-sphinx-blue) !important;
font-size: 12px;
margin-left: 6px;
padding: 0 4px 0 4px;
@@ -308,7 +190,7 @@ h1 code, h2 code, h3 code, h4 code {
cite, code, tt {
font-family: 'Consolas', 'DejaVu Sans Mono',
'Bitstream Vera Sans Mono', monospace;
- font-size: 14px;
+ font-size: 1em;
letter-spacing: -0.02em;
}
@@ -335,17 +217,13 @@ hr {
a tt {
border: 0;
- color: #a2881d;
-}
-
-a tt:hover {
- color: #e1c13f;
+ color: var(--colour-links-light);
}
pre {
font-family: 'Consolas', 'Courier New', 'DejaVu Sans Mono',
'Bitstream Vera Sans Mono', monospace;
- font-size: 13px;
+ font-size: 1em;
letter-spacing: 0.015em;
line-height: 120%;
padding: 0.5em;
@@ -428,8 +306,7 @@ div.admonition div.highlight {
}
.viewcode-back {
- font-family: 'Open Sans', 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva',
- 'Verdana', sans-serif;
+ font-family: var(--fonts-sans-serif);
}
div.viewcode-block:target {
@@ -438,8 +315,15 @@ div.viewcode-block:target {
border-bottom: 1px solid #ac9;
}
-.contentstable {
- margin-left: 30px;
- margin: 0 auto;
- table-layout: fixed;
+
+/* media queries */
+
+/* Reduce padding & margins for smaller screens */
+@media (max-width: 750px) {
+ .sphinxsidebar {
+ display: none;
+ }
+ div.body {
+ border-left: none;
+ }
}
diff --git a/doc/_themes/sphinx13/theme.conf b/doc/_themes/sphinx13/theme.conf
index 19a480a6b36..78bb78f1013 100644
--- a/doc/_themes/sphinx13/theme.conf
+++ b/doc/_themes/sphinx13/theme.conf
@@ -1,4 +1,4 @@
[theme]
inherit = basic
-stylesheet = sphinx13.css
pygments_style = default
+sidebars =
diff --git a/doc/conf.py b/doc/conf.py
index 2f504f699f7..1bcf5d559e1 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -2,6 +2,7 @@
import os
import re
+import time
import sphinx
@@ -10,23 +11,25 @@
'sphinx.ext.intersphinx',
'sphinx.ext.viewcode', 'sphinx.ext.inheritance_diagram']
-root_doc = 'contents'
templates_path = ['_templates']
exclude_patterns = ['_build']
project = 'Sphinx'
-copyright = '2007-2022, Georg Brandl and the Sphinx team'
+copyright = f'2007-{time.strftime("%Y")}, the Sphinx developers'
version = sphinx.__display_version__
release = version
show_authors = True
html_theme = 'sphinx13'
html_theme_path = ['_themes']
+html_css_files = [
+ # 'basic.css', # included through inheritance from the basic theme
+ 'sphinx13.css',
+]
modindex_common_prefix = ['sphinx.']
html_static_path = ['_static']
-html_sidebars = {'index': ['indexsidebar.html', 'searchbox.html']}
html_title = 'Sphinx documentation'
-html_additional_pages = {'index': 'index.html'}
+html_additional_pages = {'contents': 'contents.html'}
html_use_opensearch = 'https://www.sphinx-doc.org/en/master'
html_baseurl = 'https://www.sphinx-doc.org/en/master/'
html_favicon = '_static/favicon.svg'
@@ -35,7 +38,7 @@
epub_theme = 'epub'
epub_basename = 'sphinx'
-epub_author = 'Georg Brandl'
+epub_author = 'the Sphinx developers'
epub_publisher = 'https://www.sphinx-doc.org/'
epub_uid = 'web-site'
epub_scheme = 'url'
@@ -52,11 +55,10 @@
epub_max_image_width = 0
epub_show_urls = 'inline'
epub_use_index = False
-epub_guide = (('toc', 'contents.xhtml', 'Table of Contents'),)
epub_description = 'Sphinx documentation generator system manual'
-latex_documents = [('contents', 'sphinx.tex', 'Sphinx Documentation',
- 'Georg Brandl', 'manual', 1)]
+latex_documents = [('index', 'sphinx.tex', 'Sphinx Documentation',
+ 'the Sphinx developers', 'manual', 1)]
latex_logo = '_static/sphinx.png'
latex_elements = {
'fontenc': r'\usepackage[LGR,X2,T1]{fontenc}',
@@ -94,8 +96,8 @@
'directives.html#%s', '%s')}
man_pages = [
- ('contents', 'sphinx-all', 'Sphinx documentation generator system manual',
- 'Georg Brandl', 1),
+ ('index', 'sphinx-all', 'Sphinx documentation generator system manual',
+ 'the Sphinx developers', 1),
('man/sphinx-build', 'sphinx-build', 'Sphinx documentation generator tool',
'', 1),
('man/sphinx-quickstart', 'sphinx-quickstart', 'Sphinx documentation '
@@ -107,7 +109,7 @@
]
texinfo_documents = [
- ('contents', 'sphinx', 'Sphinx Documentation', 'Georg Brandl',
+ ('index', 'sphinx', 'Sphinx Documentation', 'the Sphinx developers',
'Sphinx', 'The Sphinx documentation builder.', 'Documentation tools',
1),
]
diff --git a/doc/contents.rst b/doc/contents.rst
deleted file mode 100644
index 21a27e233cb..00000000000
--- a/doc/contents.rst
+++ /dev/null
@@ -1,39 +0,0 @@
-.. _contents:
-
-Sphinx documentation contents
-=============================
-
-.. toctree::
- :maxdepth: 2
-
- usage/index
- tutorial/index
- development/index
- man/index
-
- templating
- latex
- extdev/index
-
- internals/index
-
- faq
- glossary
- changes
- examples
-
-
-Indices and tables
-==================
-
-.. only:: builder_html
-
- * :ref:`genindex`
- * :ref:`modindex`
- * :ref:`search`
- * :ref:`glossary`
-
-.. only:: not builder_html
-
- * :ref:`modindex`
- * :ref:`glossary`
diff --git a/doc/index.rst b/doc/index.rst
new file mode 100644
index 00000000000..50571cdb70b
--- /dev/null
+++ b/doc/index.rst
@@ -0,0 +1,101 @@
+=======
+Welcome
+=======
+
+**Sphinx makes it easy to create intelligent and beautiful documentation.**
+
+Install
+=======
+
+Install Sphinx with ``pip install -U Sphinx``. See :doc:`usage/installation` for
+further details.
+
+Features
+========
+
+* **Output formats:** HTML (including Windows HTML Help), LaTeX (for printable
+ PDF versions), ePub, Texinfo, manual pages, plain text
+* **Extensive cross-references:** semantic markup and automatic links for
+ functions, classes, citations, glossary terms and similar pieces of
+ information
+* **Hierarchical structure:** easy definition of a document tree, with automatic
+ links to siblings, parents and children
+* **Automatic indices:** general index as well as a language-specific module
+ indices
+* **Code handling:** automatic highlighting using the Pygments_ highlighter
+* **Extensions:** automatic testing of code snippets, inclusion of docstrings
+ from Python modules (API docs), and :ref:`more `
+* **Contributed extensions:** dozens of extensions
+ :ref:`contributed by users `; most of them installable
+ from PyPI
+
+.. _Pygments: https://pygments.org/
+
+Sphinx uses reStructuredText_ as its markup language, and many of its strengths
+come from the power and straightforwardness of reStructuredText and its parsing
+and translating suite, the Docutils_.
+
+.. _reStructuredText: https://docutils.sourceforge.io/rst.html
+.. _Docutils: https://docutils.sourceforge.io/
+
+Documentation
+=============
+
+* :doc:`First steps with Sphinx `: overview of basic tasks
+* :doc:`Tutorial `: beginners tutorial
+* :ref:`Search page `: search the documentation
+* :doc:`Changes `: release history
+* :ref:`General Index `: all functions, classes, terms
+* :ref:`Python Module Index `: the index of Python modules
+* :doc:`Glossary `: definitions of various terms
+* :doc:`Sphinx's Authors `: the Sphinx developers
+* `Contents `__: full table of contents
+
+Support
+=======
+
+For questions or to report problems with Sphinx, join the `sphinx-users`_
+mailing list on Google Groups, come to the ``#sphinx-doc`` channel on
+`libera.chat`_, or open an issue at the tracker_.
+
+.. _sphinx-users: https://groups.google.com/group/sphinx-users
+.. _libera.chat: https://web.libera.chat/?channel=#sphinx-doc
+.. _tracker: https://github.com/sphinx-doc/sphinx/issues
+
+Examples of other projects using Sphinx can be found in the :doc:`examples page
+`. A useful tutorial_ has been written by the matplotlib developers.
+
+.. _tutorial: http://matplotlib.sourceforge.net/sampledoc/
+
+There is a translation team in Transifex_ of this documentation, thanks to the
+Sphinx document translators.
+
+.. _Transifex: https://www.transifex.com/sphinx-doc/sphinx-doc/dashboard/
+
+Contributor guide
+=================
+
+See the :doc:`Sphinx contributors' guide ` if you would
+like to contribute to the project.
+
+.. master toctree:
+
+.. toctree::
+ :maxdepth: 5
+ :hidden:
+
+ usage/index
+ tutorial/index
+ development/index
+ man/index
+
+ templating
+ latex
+ extdev/index
+
+ internals/index
+
+ faq
+ glossary
+ changes
+ examples
diff --git a/doc/tutorial/end.rst b/doc/tutorial/end.rst
index ba96abca0d5..9f35b0752bf 100644
--- a/doc/tutorial/end.rst
+++ b/doc/tutorial/end.rst
@@ -2,5 +2,5 @@ Where to go from here
=====================
This tutorial covered the very first steps to create a documentation project
-with Sphinx. To continue learning more about Sphinx, check out the :ref:`rest
-of the documentation `.
+with Sphinx. To continue learning more about Sphinx, check out the `rest of the
+documentation <../contents.html>`__.
diff --git a/tox.ini b/tox.ini
index 549f002abd9..66421595528 100644
--- a/tox.ini
+++ b/tox.ini
@@ -75,7 +75,7 @@ description =
extras =
docs
commands =
- python -X dev -X warn_default_encoding -m sphinx -M html ./doc ./build/sphinx -W
+ python -X dev -X warn_default_encoding -m sphinx -M html ./doc ./build/sphinx -W --keep-going
[testenv:docslint]
basepython = python3