diff options
author | Georg Brandl <georg@python.org> | 2010-03-13 13:42:13 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2010-03-13 13:42:13 (GMT) |
commit | a93c4e395fe51494fbc958741fb79919610c751f (patch) | |
tree | bd076e928e9597d782511d9940a14af6c10d06ba /Doc | |
parent | 10b4e8c0b82f90c17c92df4e7f4b2b9e35feb8cb (diff) | |
download | cpython-a93c4e395fe51494fbc958741fb79919610c751f.zip cpython-a93c4e395fe51494fbc958741fb79919610c751f.tar.gz cpython-a93c4e395fe51494fbc958741fb79919610c751f.tar.bz2 |
Merged revisions 78921 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78921 | georg.brandl | 2010-03-13 14:39:46 +0100 (Sa, 13 Mär 2010) | 1 line
Change/fix handling of docs download location: for daily builds, put them right next to the HTML.
........
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/Makefile | 9 | ||||
-rw-r--r-- | Doc/tools/sphinxext/download.html | 15 |
2 files changed, 11 insertions, 13 deletions
diff --git a/Doc/Makefile b/Doc/Makefile index f874a87..f82aceb 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -157,16 +157,17 @@ dist: check: $(PYTHON) tools/rstlint.py -i tools -# Targets for automatic doc build +# Targets for daily automated doc build # for development releases: always build autobuild-dev: make update - make dist + make dist SPHINXOPTS='-A daily=1' -# for stable releases: only build if not in development mode +# for stable releases: only build if not in pre-release stage (alpha, beta, rc) autobuild-stable: @case $(DISTVERSION) in *[abc]*) \ - echo "Not building; not a release version."; exit 1;; \ + echo "Not building; $(DISTVERSION) is not a release version."; \ + exit 1;; \ esac @make autobuild-dev diff --git a/Doc/tools/sphinxext/download.html b/Doc/tools/sphinxext/download.html index a9c6120..4fca138 100644 --- a/Doc/tools/sphinxext/download.html +++ b/Doc/tools/sphinxext/download.html @@ -1,15 +1,14 @@ {% extends "layout.html" %} {% set title = 'Download' %} -{% set dlbase = 'http://docs.python.org/ftp/python/doc/current' %} -{% block body %} +{% if daily is defined %} + {% set dlbase = pathto('archives', 1) %} +{% else %} + {% set dlbase = 'http://docs.python.org/ftp/python/doc/' + release %} +{% endif %} +{% block body %} <h1>Download Python {{ release }} Documentation</h1> -{% if 'a' in release or 'b' in release or 'c' in release %} -<p>We don't package the documentation for development releases for download. - Downloads will be available for the final release.</p> - -{% else %} {% if last_updated %}<p><b>Last updated on: {{ last_updated }}.</b></p>{% endif %} <p>To download an archive containing all the documents for this version of @@ -55,6 +54,4 @@ platform. These are created on Unix using the InfoZIP zip program.</p> <p>If you have comments or suggestions for the Python documentation, please send email to <a href="mailto:docs@python.org">docs@python.org</a>.</p> -{% endif %} - {% endblock %} |