[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#22484)

[benjamin.peterson]

https://hg.python.org/cpython/rev/7d6297450943
changeset:   92570:7d6297450943
parent:      92568:2ba974365964
parent:      92569:8ce21ffc6df5
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Sep 24 20:22:49 2014 -0400
summary:
  merge 3.4 (#22484)

files:
  Doc/Makefile |  5 +++--
  1 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/Doc/Makefile b/Doc/Makefile
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -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

-- 
Repository URL: https://hg.python.org/cpython