From fc8284e22074af8154e9865c8391b955f13a308b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20B?= Date: Sat, 22 Dec 2018 23:31:08 +0100 Subject: bpo-35564: add master_doc='contents' to conf.py (GH-11290) --- Doc/conf.py | 2 ++ Misc/NEWS.d/next/Documentation/2018-12-22-22-52-05.bpo-35564.TuEU_D.rst | 1 + 2 files changed, 3 insertions(+) create mode 100644 Misc/NEWS.d/next/Documentation/2018-12-22-22-52-05.bpo-35564.TuEU_D.rst 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 -- cgit v0.12