From acc10c17a88c4a7d79172fa894a4d04b0727a5f6 Mon Sep 17 00:00:00 2001
From: Thomas Nagy <tnagy@waf.io>
Date: Mon, 22 Jan 2018 19:26:52 +0100
Subject: [PATCH] Update the documentation to recent python-sphinx versions

---
 docs/sphinx/_templates/indexcontent.html | 10 +++++++---
 docs/sphinx/conf.py                      |  2 +-
 docs/sphinx/confmap.rst                  | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/docs/sphinx/_templates/indexcontent.html b/docs/sphinx/_templates/indexcontent.html
index b1a10281..313b9006 100644
--- a/docs/sphinx/_templates/indexcontent.html
+++ b/docs/sphinx/_templates/indexcontent.html
@@ -1,7 +1,11 @@
-{% extends "defindex.html" %}
-{% block tables %}
+{% extends "layout.html" %}
+{%- block htmltitle -%}
+<title>{{ shorttitle }}</title>
+{%- endblock -%}
+{% block body %}
+  <h1>{{ docstitle|e }}</h1>
+  <p><strong>{% trans %}Parts of the documentation:{% endtrans %}</strong></p>
 
-  <p><strong>Parts of the documentation:</strong></p>
   <table class="contentstable" align="center"><tr>
     <td width="50%" style="vertical-align:top;">
       <p class="biglink"><a class="biglink" href="{{ pathto("tutorial") }}">Tutorial</a><br/>
diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py
index 3b61a24c..bd359f54 100644
--- a/docs/sphinx/conf.py
+++ b/docs/sphinx/conf.py
@@ -331,7 +331,7 @@ f.close()
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.pngmath', 'sphinx.ext.inheritance_diagram', 'sphinx.ext.graphviz', 'sphinx.ext.viewcode']
+extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.imgmath', 'sphinx.ext.inheritance_diagram', 'sphinx.ext.graphviz', 'sphinx.ext.viewcode']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
diff --git a/docs/sphinx/confmap.rst b/docs/sphinx/confmap.rst
index 814ece3c..5832d1a8 100644
--- a/docs/sphinx/confmap.rst
+++ b/docs/sphinx/confmap.rst
@@ -77,6 +77,14 @@ Configuration methods
 
 * check_fortran_verbose_flag_
 
+.. _check_gcc_o_space: tools/c_config.html#waflib.Tools.c_config.check_gcc_o_space
+
+* check_gcc_o_space_
+
+.. _check_gfortran_o_space: tools/fc_config.html#waflib.Tools.fc_config.check_gfortran_o_space
+
+* check_gfortran_o_space_
+
 .. _check_inline: tools/c_tests.html#waflib.Tools.c_tests.check_inline
 
 * check_inline_
@@ -405,6 +413,10 @@ Configuration methods
 
 * gather_msvc_versions_
 
+.. _gather_vswhere_versions: tools/msvc.html#waflib.Tools.msvc.gather_vswhere_versions
+
+* gather_vswhere_versions_
+
 .. _gather_wince_targets: tools/msvc.html#waflib.Tools.msvc.gather_wince_targets
 
 * gather_wince_targets_
@@ -665,6 +677,10 @@ Configuration methods
 
 * set_qt5_defines_
 
+.. _set_qt5_libs_dir: tools/qt5.html#waflib.Tools.qt5.set_qt5_libs_dir
+
+* set_qt5_libs_dir_
+
 .. _set_qt5_libs_to_check: tools/qt5.html#waflib.Tools.qt5.set_qt5_libs_to_check
 
 * set_qt5_libs_to_check_