[Python-checkins] r66745 - in python/trunk/Doc: Makefile tools/sphinxext/download.html tools/sphinxext/layout.html

georg.brandl python-checkins at python.org
Thu Oct 2 21:09:48 CEST 2008


Author: georg.brandl
Date: Thu Oct  2 21:09:47 2008
New Revision: 66745

Log:
Forward-port r66736.


Modified:
   python/trunk/Doc/Makefile
   python/trunk/Doc/tools/sphinxext/download.html
   python/trunk/Doc/tools/sphinxext/layout.html

Modified: python/trunk/Doc/Makefile
==============================================================================
--- python/trunk/Doc/Makefile	(original)
+++ python/trunk/Doc/Makefile	Thu Oct  2 21:09:47 2008
@@ -111,7 +111,7 @@
 
 	# 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 @@
 
 	# 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)

Modified: python/trunk/Doc/tools/sphinxext/download.html
==============================================================================
--- python/trunk/Doc/tools/sphinxext/download.html	(original)
+++ python/trunk/Doc/tools/sphinxext/download.html	Thu Oct  2 21:09:47 2008
@@ -31,8 +31,8 @@
     <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>
 

Modified: python/trunk/Doc/tools/sphinxext/layout.html
==============================================================================
--- python/trunk/Doc/tools/sphinxext/layout.html	(original)
+++ python/trunk/Doc/tools/sphinxext/layout.html	Thu Oct  2 21:09:47 2008
@@ -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 %}


More information about the Python-checkins mailing list