changeset: 92570:7d6297450943 parent: 92568:2ba974365964 parent: 92569:8ce21ffc6df5 user: Benjamin Peterson date: Wed Sep 24 20:22:49 2014 -0400 description: merge 3.4 (#22484) diff -r 2ba974365964 -r 7d6297450943 Doc/Makefile --- a/Doc/Makefile Thu Sep 25 00:39:17 2014 +0200 +++ b/Doc/Makefile Wed Sep 24 20:22:49 2014 -0400 @@ -165,9 +165,10 @@ autobuild-html: make html SPHINXOPTS='-A daily=1 -A versionswitcher=1' -# for stable releases: only build if not in pre-release stage (alpha, beta, rc) +# 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 autobuild-stable: - @case $(DISTVERSION) in *[abc]*) \ + @case $(DISTVERSION) in *[ab]*) \ echo "Not building; $(DISTVERSION) is not a release version."; \ exit 1;; \ esac