summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Doc/conf.py2
-rw-r--r--Misc/NEWS.d/next/Documentation/2018-12-22-22-52-05.bpo-35564.TuEU_D.rst1
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