From 3a0c8235676ac29b5b2b175eb21814aa9ee47fdd Mon Sep 17 00:00:00 2001 From: jfbu Date: Sat, 22 Dec 2018 22:39:58 +0100 Subject: [PATCH 1/2] [DOC] bpo-35564: add master_doc='contents' to conf.py This does no harm currently and will be needed with Sphinx 2.0 as they modified the default from 'contents' to 'index'. --- Doc/conf.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Doc/conf.py b/Doc/conf.py index eb57ee0c93399e..a9dfe827a0dd0a 100644 --- 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 # ----------------------- From fcd3b3a93e06d3a708a68a047a61f46d7fe1ff9e Mon Sep 17 00:00:00 2001 From: jfbu Date: Sat, 22 Dec 2018 22:52:12 +0100 Subject: [PATCH 2/2] Misc/NEWS.d/next/Documentation/2018-12-22-22-52-05.bpo-35564.TuEU_D.rst --- .../next/Documentation/2018-12-22-22-52-05.bpo-35564.TuEU_D.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Documentation/2018-12-22-22-52-05.bpo-35564.TuEU_D.rst 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