[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

[georg.brandl]

http://hg.python.org/cpython/rev/19b374217d07
changeset:   90009:19b374217d07
parent:      90007:d8659dbebfd1
parent:      90008:1f4daa805922
user:        Georg Brandl <georg at python.org>
date:        Fri Mar 28 19:49:02 2014 +0100
summary:
  merge with 3.4

files:
  Doc/Makefile                      |  10 ++--------
  Doc/tools/sphinxext/download.html |   4 ++--
  2 files changed, 4 insertions(+), 10 deletions(-)


diff --git a/Doc/Makefile b/Doc/Makefile
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -136,16 +136,10 @@
 	cp build/latex/docs-pdf.zip dist/python-$(DISTVERSION)-docs-pdf-letter.zip
 	cp build/latex/docs-pdf.tar.bz2 dist/python-$(DISTVERSION)-docs-pdf-letter.tar.bz2
 
-	# archive the epub build
+	# copy the epub build
 	rm -rf build/epub
 	make epub
-	mkdir -p dist/python-$(DISTVERSION)-docs-epub
-	cp -pPR build/epub/*.epub dist/python-$(DISTVERSION)-docs-epub/
-	tar -C dist -cf dist/python-$(DISTVERSION)-docs-epub.tar python-$(DISTVERSION)-docs-epub
-	bzip2 -9 -k dist/python-$(DISTVERSION)-docs-epub.tar
-	(cd dist; zip -q -r -9 python-$(DISTVERSION)-docs-epub.zip python-$(DISTVERSION)-docs-epub)
-	rm -r dist/python-$(DISTVERSION)-docs-epub
-	rm dist/python-$(DISTVERSION)-docs-epub.tar
+	cp -pPR build/epub/Python.epub dist/python-$(DISTVERSION)-docs.epub
 
 check:
 	$(PYTHON) tools/rstlint.py -i tools
diff --git a/Doc/tools/sphinxext/download.html b/Doc/tools/sphinxext/download.html
--- a/Doc/tools/sphinxext/download.html
+++ b/Doc/tools/sphinxext/download.html
@@ -34,8 +34,8 @@
     <td><a href="{{ dlbase }}/python-{{ release }}-docs-text.tar.bz2">Download</a> (ca. 1.5 MB)</td>
   </tr>
  <tr><td>EPUB</td>
-    <td><a href="{{ dlbase }}/python-{{ release }}-docs-epub.zip">Download</a> (ca. 3.5 MB)</td>
-    <td><a href="{{ dlbase }}/python-{{ release }}-docs-epub.tar.bz2">Download</a> (ca. 3.5 MB)</td>
+    <td><a href="{{ dlbase }}/python-{{ release }}-docs.epub">Download</a> (ca. 4.5 MB)</td>
+    <td></td>
   </tr>
 </table>
 

-- 
Repository URL: http://hg.python.org/cpython