Some Doc tweaks.

diff --git a/Doc/Makefile b/Doc/Makefile
index c1fcf6e52198555355928509d2d6e38b82a67c04..2b2fd14315f24019cd99e1d03ac70e284144f2c5 100644 (file)
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -111,7 +111,7 @@ dist:
 
        # archive the HTML
        make html
-       cp -a build/html dist/python$(DISTVERSION)-docs-html
+       cp -pPR build/html dist/python$(DISTVERSION)-docs-html
        tar -C dist -cf dist/python$(DISTVERSION)-docs-html.tar python$(DISTVERSION)-docs-html
        bzip2 -9 -k dist/python$(DISTVERSION)-docs-html.tar
        (cd dist; zip -q -r -9 python$(DISTVERSION)-docs-html.zip python$(DISTVERSION)-docs-html)
@@ -120,7 +120,7 @@ dist:
 
        # archive the text build
        make text
-       cp -a build/text dist/python$(DISTVERSION)-docs-text
+       cp -pPR build/text dist/python$(DISTVERSION)-docs-text
        tar -C dist -cf dist/python$(DISTVERSION)-docs-text.tar python$(DISTVERSION)-docs-text
        bzip2 -9 -k dist/python$(DISTVERSION)-docs-text.tar
        (cd dist; zip -q -r -9 python$(DISTVERSION)-docs-text.zip python$(DISTVERSION)-docs-text)

diff --git a/Doc/tools/sphinxext/download.html b/Doc/tools/sphinxext/download.html
index 1f51399bacf373d94f4f223b72429adf4e6efd9b..59aea630389e6b13c93e1779b5816c0bd1f98730 100644 (file)
--- a/Doc/tools/sphinxext/download.html
+++ b/Doc/tools/sphinxext/download.html
@@ -31,8 +31,8 @@ in the table are the size of the download files in Kilobytes.</p>
     <td><a href="{{ dlbase }}/python-docs-html.tar.bz2">Download</a> (ca. 4 MB)</td>
   </tr>
   <tr><td>Plain Text</td>
-    <td><a href="{{ dlbase }}/python-docs-pdf-text.zip">Download</a> (ca. 2 MB)</td>
-    <td><a href="{{ dlbase }}/python-docs-pdf-text.tar.bz2">Download</a> (ca. 1.5 MB)</td>
+    <td><a href="{{ dlbase }}/python-docs-text.zip">Download</a> (ca. 2 MB)</td>
+    <td><a href="{{ dlbase }}/python-docs-text.tar.bz2">Download</a> (ca. 1.5 MB)</td>
   </tr>
 </table>
 

diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html
index 689cbdace076c91430d5caf375478db073d266d6..a6afd1506e5c29bb63cce90e0510ae6af3c7adb3 100644 (file)
--- a/Doc/tools/sphinxext/layout.html
+++ b/Doc/tools/sphinxext/layout.html
@@ -1,5 +1,4 @@
 {% extends "!layout.html" %}
 {% block rootrellink %}
-<li><img src="{{ pathto('_static/py.png', 1) }}" alt="" style="vertical-align: middle; margin-top: -1px"/></li>
-{{ super() }}
+<li><img src="{{ pathto('_static/py.png', 1) }}" alt="" style="vertical-align: middle; margin-top: -1px"/></li><li><a href="{{ pathto('index') }}">{{ shorttitle }}</a>{{ reldelim1 }}</li>
 {% endblock %}