From 1dbe1036baff57d0b73d94cca236a53d2d52e87e Mon Sep 17 00:00:00 2001
From: INADA Naoki <songofacandy@gmail.com>
Date: Sun, 19 Feb 2017 13:14:10 +0900
Subject: [PATCH 1/2] bpo-29520: Fix deprecation warning from 'defindex'
 template

---
 Doc/conf.py                           |  4 ++--
 Doc/tools/templates/indexcontent.html | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Doc/conf.py b/Doc/conf.py
index 18aebb68a8d8df..d5f79a9c9d5e9c 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -33,8 +33,8 @@
 # By default, highlight as Python 3.
 highlight_language = 'python3'
 
-# Require Sphinx 1.2 for build.
-needs_sphinx = '1.2'
+# Require Sphinx 1.3 for build.
+needs_sphinx = '1.3'
 
 # Ignore any .rst files in the venv/ directory.
 exclude_patterns = ['venv/*', 'README.rst']
diff --git a/Doc/tools/templates/indexcontent.html b/Doc/tools/templates/indexcontent.html
index 1076c1f51b7d19..2bf2cce33f2345 100644
--- a/Doc/tools/templates/indexcontent.html
+++ b/Doc/tools/templates/indexcontent.html
@@ -1,5 +1,12 @@
-{% extends "defindex.html" %}
-{% block tables %}
+{% extends "layout.html" %}
+{%- block htmltitle -%}
+<title>{{ shorttitle }}</title>
+{%- endblock -%}
+{% block body %}
+  <h1>{{ docstitle|e }}</h1>
+  <p>
+  {% trans %}Welcome! This is the documentation for Python {{ release }}{% endtrans %}
+  </p>
   <p><strong>{% trans %}Parts of the documentation:{% endtrans %}</strong></p>
   <table class="contentstable" align="center"><tr>
     <td width="50%">

From 8ea989f6de905ee8d2e64d0224b58f2ff062be33 Mon Sep 17 00:00:00 2001
From: INADA Naoki <songofacandy@gmail.com>
Date: Sun, 19 Feb 2017 23:03:50 +0900
Subject: [PATCH 2/2] revert minimum sphinx version to 1.2

---
 Doc/conf.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Doc/conf.py b/Doc/conf.py
index d5f79a9c9d5e9c..18aebb68a8d8df 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -33,8 +33,8 @@
 # By default, highlight as Python 3.
 highlight_language = 'python3'
 
-# Require Sphinx 1.3 for build.
-needs_sphinx = '1.3'
+# Require Sphinx 1.2 for build.
+needs_sphinx = '1.2'
 
 # Ignore any .rst files in the venv/ directory.
 exclude_patterns = ['venv/*', 'README.rst']