summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-03-13 13:43:01 (GMT)
committerGeorg Brandl <georg@python.org>2010-03-13 13:43:01 (GMT)
commit8c8430e2af6583056e059027c04013e9c5627e97 (patch)
tree375a4254a206b385a5cf08b9aaaea9a3f98fbc44
parente869313e8537d74044325d5dac0c3ae4102d1725 (diff)
downloadcpython-8c8430e2af6583056e059027c04013e9c5627e97.zip
cpython-8c8430e2af6583056e059027c04013e9c5627e97.tar.gz
cpython-8c8430e2af6583056e059027c04013e9c5627e97.tar.bz2
Merged revisions 78924 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ................ r78924 | georg.brandl | 2010-03-13 14:42:16 +0100 (Sa, 13 Mär 2010) | 9 lines 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. ........ ................
-rw-r--r--Doc/Makefile9
-rw-r--r--Doc/tools/sphinxext/download.html15
2 files changed, 11 insertions, 13 deletions
diff --git a/Doc/Makefile b/Doc/Makefile
index 8e56855..a2724a1 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 22a03a0..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/' + release %}
-{% 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 %}