merge with 3.4

2014-10-29 08:11:55 +01:00 · 2014-10-29 08:11:55 +01:00 · 76c49a2fb9
parent d51c1a1953 a1f8486325
commit 76c49a2fb9
6 changed files with 1 additions and 1 deletions
--- a/Doc/conf.py
+++ b/Doc/conf.py
@ -53,7 +53,7 @@ html_short_title = '%s Documentation' % release
 html_last_updated_fmt = '%b %d, %Y'

 # Path to find HTML templates.
-templates_path = ['tools']
+templates_path = ['tools/templates']

 # Custom sidebar templates, filenames relative to this file.
 html_sidebars = {
--- a/Doc/tools/templates/download.html
+++ b/Doc/tools/templates/download.html
--- a/Doc/tools/templates/indexcontent.html
+++ b/Doc/tools/templates/indexcontent.html
--- a/Doc/tools/templates/indexsidebar.html
+++ b/Doc/tools/templates/indexsidebar.html
--- a/Doc/tools/templates/layout.html
+++ b/Doc/tools/templates/layout.html
--- a/Doc/tools/templates/opensearch.xml
+++ b/Doc/tools/templates/opensearch.xml