diff options
| author | Georg Brandl <georg@python.org> | 2014-10-29 07:11:55 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-10-29 07:11:55 (GMT) |
| commit | 76c49a2fb9e48439dc5094be06462bea74ead538 (patch) | |
| tree | 78d110867d6e1331aae9f67c35adf60aa997194e | |
| parent | d51c1a195322e24e86a3c10eaf444a97dbc35b4a (diff) | |
| parent | a1f84863252e937b3f93a65d8f5686ba3322bb7d (diff) | |
| download | cpython-76c49a2fb9e48439dc5094be06462bea74ead538.zip cpython-76c49a2fb9e48439dc5094be06462bea74ead538.tar.gz cpython-76c49a2fb9e48439dc5094be06462bea74ead538.tar.bz2 | |
merge with 3.4
| -rw-r--r-- | Doc/conf.py | 2 | ||||
| -rw-r--r-- | Doc/tools/templates/download.html (renamed from Doc/tools/download.html) | 0 | ||||
| -rw-r--r-- | Doc/tools/templates/indexcontent.html (renamed from Doc/tools/indexcontent.html) | 0 | ||||
| -rw-r--r-- | Doc/tools/templates/indexsidebar.html (renamed from Doc/tools/indexsidebar.html) | 0 | ||||
| -rw-r--r-- | Doc/tools/templates/layout.html (renamed from Doc/tools/layout.html) | 0 | ||||
| -rw-r--r-- | Doc/tools/templates/opensearch.xml (renamed from Doc/tools/opensearch.xml) | 0 |
6 files changed, 1 insertions, 1 deletions
diff --git a/Doc/conf.py b/Doc/conf.py index ff073b1..84458ff 100644 --- 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 = { diff --git a/Doc/tools/download.html b/Doc/tools/templates/download.html index 0550111..0550111 100644 --- a/Doc/tools/download.html +++ b/Doc/tools/templates/download.html diff --git a/Doc/tools/indexcontent.html b/Doc/tools/templates/indexcontent.html index 969099a..969099a 100644 --- a/Doc/tools/indexcontent.html +++ b/Doc/tools/templates/indexcontent.html diff --git a/Doc/tools/indexsidebar.html b/Doc/tools/templates/indexsidebar.html index 690c3d5..690c3d5 100644 --- a/Doc/tools/indexsidebar.html +++ b/Doc/tools/templates/indexsidebar.html diff --git a/Doc/tools/layout.html b/Doc/tools/templates/layout.html index d3b2801..d3b2801 100644 --- a/Doc/tools/layout.html +++ b/Doc/tools/templates/layout.html diff --git a/Doc/tools/opensearch.xml b/Doc/tools/templates/opensearch.xml index 69cec80..69cec80 100644 --- a/Doc/tools/opensearch.xml +++ b/Doc/tools/templates/opensearch.xml |