Browse Source

merge with 3.4

pull/9921/head
Georg Brandl 12 years ago
parent
commit
76c49a2fb9
  1. 2
      Doc/conf.py
  2. 0
      Doc/tools/templates/download.html
  3. 0
      Doc/tools/templates/indexcontent.html
  4. 0
      Doc/tools/templates/indexsidebar.html
  5. 0
      Doc/tools/templates/layout.html
  6. 0
      Doc/tools/templates/opensearch.xml

2
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 = {

0
Doc/tools/download.html → Doc/tools/templates/download.html

0
Doc/tools/indexcontent.html → Doc/tools/templates/indexcontent.html

0
Doc/tools/indexsidebar.html → Doc/tools/templates/indexsidebar.html

0
Doc/tools/layout.html → Doc/tools/templates/layout.html

0
Doc/tools/opensearch.xml → Doc/tools/templates/opensearch.xml

Loading…
Cancel
Save