diff options
| author | Georg Brandl <georg@python.org> | 2014-03-28 19:49:02 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-03-28 19:49:02 +0100 |
| commit | aa1403c440dc1fce80ee08c790ed3c20ebea753e (patch) | |
| tree | 6f17f65628b869dd510bc8e2f23e945710c61bea | |
| parent | c318288f69e11c537baeca6799c212e8dd294b85 (diff) | |
| parent | 865bdbf4af88a32cab4d92709fad3c8ae7fb62d5 (diff) | |
| download | cpython-git-aa1403c440dc1fce80ee08c790ed3c20ebea753e.tar.gz | |
merge with 3.4
| -rw-r--r-- | Doc/Makefile | 10 | ||||
| -rw-r--r-- | Doc/tools/sphinxext/download.html | 4 |
2 files changed, 4 insertions, 10 deletions
diff --git a/Doc/Makefile b/Doc/Makefile index d85fb94a2c..12fc6986cf 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -136,16 +136,10 @@ dist: 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 index 31a53cfb39..0550111085 100644 --- a/Doc/tools/sphinxext/download.html +++ b/Doc/tools/sphinxext/download.html @@ -34,8 +34,8 @@ in the table are the size of the download files in megabytes.</p> <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> |