diff options
| author | Julien Palard <julien@palard.fr> | 2019-03-20 16:41:20 +0100 |
|---|---|---|
| committer | Ned Deily <nad@python.org> | 2019-03-20 11:41:20 -0400 |
| commit | 4508bc37dd80c71adfaa0925a67c438389817076 (patch) | |
| tree | 681d4a427471e09851f27c88895a188f76b8168b | |
| parent | 75f8a691a45442c94972cf0fb7fb7d413d44601e (diff) | |
| download | cpython-git-4508bc37dd80c71adfaa0925a67c438389817076.tar.gz | |
[3.6] bpo-35564: add master_doc='contents' to conf.py (GH-11290). (GH-12461)
(cherry picked from commit fc8284e22074af8154e9865c8391b955f13a308b)
Co-authored-by: Jean-François B <jfbu@free.fr>
| -rw-r--r-- | Doc/conf.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Documentation/2018-12-22-22-52-05.bpo-35564.TuEU_D.rst | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Doc/conf.py b/Doc/conf.py index e2758bcd00..fab963e23a 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -40,6 +40,8 @@ needs_sphinx = '1.2' venvdir = os.getenv('VENVDIR', 'venv') exclude_patterns = [venvdir+'/*', 'README.rst'] +# Avoid a warning with Sphinx >= 2.0 +master_doc = 'contents' # Options for HTML output # ----------------------- diff --git a/Misc/NEWS.d/next/Documentation/2018-12-22-22-52-05.bpo-35564.TuEU_D.rst b/Misc/NEWS.d/next/Documentation/2018-12-22-22-52-05.bpo-35564.TuEU_D.rst new file mode 100644 index 0000000000..8ca95eed4c --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2018-12-22-22-52-05.bpo-35564.TuEU_D.rst @@ -0,0 +1 @@ +Explicitly set master_doc variable in conf.py for compliance with Sphinx 2.0 |