From: Jean-François B <jfbu@free.fr>
Date: Sat, 22 Dec 2018 22:31:08 +0000 (+0100)
Subject: bpo-35564: add master_doc='contents' to conf.py (GH-11290)
X-Git-Tag: v3.8.0a1~219
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc8284e22074af8154e9865c8391b955f13a308b;p=thirdparty%2FPython%2Fcpython.git

bpo-35564: add master_doc='contents' to conf.py (GH-11290)
---

diff --git a/Doc/conf.py b/Doc/conf.py
index eb57ee0c9339..a9dfe827a0dd 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -53,6 +53,8 @@ smartquotes_excludes = {
     'languages': ['ja', 'fr', 'zh_TW', 'zh_CN'], 'builders': ['man', 'text'],
 }
 
+# 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 000000000000..8ca95eed4c56
--- /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