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

[Julien Palard]

https://github.com/python/cpython/commit/fc8284e22074af8154e9865c8391b955f13a308b
commit: fc8284e22074af8154e9865c8391b955f13a308b
branch: master
author: Jean-François B <jfbu at free.fr>
committer: Julien Palard <julien at palard.fr>
date: 2018-12-22T23:31:08+01:00
summary:

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

files:
A Misc/NEWS.d/next/Documentation/2018-12-22-22-52-05.bpo-35564.TuEU_D.rst
M Doc/conf.py

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 @@
     '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