Merge 3.5

This commit is contained in:
Victor Stinner 2016-10-18 15:48:14 +02:00
commit 33bb64fb30

View file

@ -162,12 +162,12 @@ serve:
# for development releases: always build
autobuild-dev:
make dist SPHINXOPTS='-A daily=1 -A versionswitcher=1'
make dist SPHINXOPTS='$(SPHINXOPTS) -A daily=1 -A versionswitcher=1'
-make suspicious
# for quick rebuilds (HTML only)
autobuild-dev-html:
make html SPHINXOPTS='-A daily=1 -A versionswitcher=1'
make html SPHINXOPTS='$(SPHINXOPTS) -A daily=1 -A versionswitcher=1'
# for stable releases: only build if not in pre-release stage (alpha, beta)
# release candidate downloads are okay, since the stable tree can be in that stage