diff options
| author | Julien Palard <julien@palard.fr> | 2019-03-20 09:40:59 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-20 09:40:59 (GMT) |
| commit | 07b8018d75f3d4495708cf1d4175f33b40e13d30 (patch) | |
| tree | cdae85c254c1a87aeb658dd3ef7150f10e2fa158 | |
| parent | d9c6564f90ead067c2e288f01825684821b7a129 (diff) | |
| download | cpython-07b8018d75f3d4495708cf1d4175f33b40e13d30.zip cpython-07b8018d75f3d4495708cf1d4175f33b40e13d30.tar.gz cpython-07b8018d75f3d4495708cf1d4175f33b40e13d30.tar.bz2 | |
[2.7] bpo-35564: add master_doc='contents' to conf.py (GH-12462)
(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 df76b94..d82514f6 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -41,6 +41,8 @@ exclude_patterns = [ # Require Sphinx 1.2 for build. needs_sphinx = '1.2' +# 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 0000000..8ca95ee --- /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 |