From 2b7b4dc34e57d1a78ac1b07211da785e297b1ff6 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: [PATCH] [3.6] bpo-35564: add master_doc='contents' to conf.py (GH-11290). (cherry picked from commit fc8284e22074af8154e9865c8391b955f13a308b) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 e2758bcd00b5bb..fab963e23a0fee 100644 --- a/Doc/conf.py +++ b/Doc/conf.py @@ -40,6 +40,8 @@ venvdir = os.getenv('VENVDIR', 'venv') exclude_patterns = [venvdir+'/*', 'README.rst'] +# 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 00000000000000..8ca95eed4c56e5 --- /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