summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-François B <jfbu@free.fr>2018-12-22 22:31:08 (GMT)
committerJulien Palard <julien@palard.fr>2018-12-22 22:31:08 (GMT)
commitfc8284e22074af8154e9865c8391b955f13a308b (patch)
tree0520a01e90ac3b9f232b9e73ac2c59bd121c3490
parent8ac658114dec4964479baecfbc439fceb40eaa79 (diff)
downloadcpython-fc8284e22074af8154e9865c8391b955f13a308b.zip
cpython-fc8284e22074af8154e9865c8391b955f13a308b.tar.gz
cpython-fc8284e22074af8154e9865c8391b955f13a308b.tar.bz2
bpo-35564: add master_doc='contents' to conf.py (GH-11290)
-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 eb57ee0..a9dfe82 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 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