Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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:42:13 +00:00
parent 10b4e8c0b8
commit a93c4e395f
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: check:
$(PYTHON) tools/rstlint.py -i tools $(PYTHON) tools/rstlint.py -i tools
# Targets for automatic doc build # Targets for daily automated doc build
# for development releases: always build # for development releases: always build
autobuild-dev: autobuild-dev:
make update 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: autobuild-stable:
@case $(DISTVERSION) in *[abc]*) \ @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 esac
@make autobuild-dev @make autobuild-dev

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

@ -1,15 +1,14 @@
{% extends "layout.html" %} {% extends "layout.html" %}
{% set title = 'Download' %} {% set title = 'Download' %}
{% set dlbase = 'http://docs.python.org/ftp/python/doc/current' %} {% if daily is defined %}
{% block body %} {% 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> <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 %} {% 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 <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 <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> email to <a href="mailto:docs@python.org">docs@python.org</a>.</p>
{% endif %}
{% endblock %} {% endblock %}