[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>

diff --git a/Doc/conf.py b/Doc/conf.py
index df76b943b794462b550e5e8c003821cde45f95fb..d82514f6051973d0428996fdbb4567edfa7801e4 100644 (file)
--- 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 (file)
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