traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
  ........
................
This commit is contained in:
Georg Brandl 2010-03-13 13:43:01 +00:00
parent e869313e85
commit 8c8430e2af
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Doc/Makefile
View File

@ -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

15
Doc/tools/sphinxext/download.html
View File

@ -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 %}