[Python-checkins] cpython (merge 3.5 -> default): merge with 3.5

[georg.brandl]

https://hg.python.org/cpython/rev/41df7f924de6
changeset:   102050:41df7f924de6
parent:      102046:e3bb87952c62
parent:      102049:1e7072d53b84
user:        Georg Brandl <georg at python.org>
date:        Wed Jun 15 08:58:46 2016 +0200
summary:
  merge with 3.5

files:
  Doc/Makefile |  9 ++++++++-
  1 files changed, 8 insertions(+), 1 deletions(-)


diff --git a/Doc/Makefile b/Doc/Makefile
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -166,7 +166,7 @@
 	-make suspicious
 
 # for quick rebuilds (HTML only)
-autobuild-html:
+autobuild-dev-html:
 	make html SPHINXOPTS='-A daily=1 -A versionswitcher=1'
 
 # for stable releases: only build if not in pre-release stage (alpha, beta)
@@ -177,3 +177,10 @@
 		exit 1;; \
 	esac
 	@make autobuild-dev
+
+autobuild-stable-html:
+	@case $(DISTVERSION) in *[ab]*) \
+		echo "Not building; $(DISTVERSION) is not a release version."; \
+		exit 1;; \
+	esac
+	@make autobuild-dev-html

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