From 756cfd88920c2349d4546024856c406409b0ab7b Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Wed, 20 Mar 2019 10:40:30 +0100 Subject: [PATCH] [3.7] bpo-35564: add master_doc='contents' to conf.py (GH-12460) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit (cherry picked from commit fc8284e22074af8154e9865c8391b955f13a308b) Co-authored-by: Jean-François B --- Doc/conf.py | 2 ++ .../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 eab3c39cfb7c..da8b9d7b2a65 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -46,6 +46,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 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 -- 2.47.3