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

jfbu · JulienPalard · commit fc8284e22074 · 2018-12-22T23:31:08.000+01:00
diff --git 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
@@ -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
`@@ -53,6 +53,8 @@`
`53`	`53`	`'languages': ['ja', 'fr', 'zh_TW', 'zh_CN'], 'builders': ['man', 'text'],`
`54`	`54`	`}`
`55`	`55`
	`56`	`+# Avoid a warning with Sphinx >= 2.0`
	`57`	`+master_doc = 'contents'`
`56`	`58`
`57`	`59`	`# Options for HTML output`
`58`	`60`	`# -----------------------`
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`