[3.7] bpo-35564: add master_doc='contents' to conf.py (GH-12460)

JulienPalard · jfbu · web-flow · commit 756cfd88920c · 2019-03-20T10:40:30.000+01:00
(cherry picked from commit fc8284e) Co-authored-by: Jean-François B <jfbu@free.fr>
diff --git a/Doc/conf.py b/Doc/conf.py
@@ -46,6 +46,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
@@ -0,0 +1 @@
+Explicitly set master_doc variable in conf.py for compliance with Sphinx 2.0

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@`
`46`	`46`	`'languages': ['ja', 'fr', 'zh_TW', 'zh_CN'], 'builders': ['man', 'text'],`
`47`	`47`	`}`
`48`	`48`
	`49`	`+# Avoid a warning with Sphinx >= 2.0`
	`50`	`+master_doc = 'contents'`
`49`	`51`
`50`	`52`	`# Options for HTML output`
`51`	`53`	`# -----------------------`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Explicitly set master_doc variable in conf.py for compliance with Sphinx 2.0`