From: Julien Palard <julien@palard.fr>
Date: Wed, 20 Mar 2019 09:40:59 +0000 (+0100)
Subject: [2.7] bpo-35564: add master_doc='contents' to conf.py (GH-12462)
X-Git-Tag: v2.7.17rc1~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07b8018d75f3d4495708cf1d4175f33b40e13d30;p=thirdparty%2FPython%2Fcpython.git

[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 df76b943b794..d82514f60519 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 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