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

[georg.brandl]

http://hg.python.org/cpython/rev/6de28ac08dc4
changeset:   80001:6de28ac08dc4
parent:      79998:21c6175fbcb8
parent:      80000:51f292067714
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 28 08:09:31 2012 +0100
summary:
  merge with 3.3

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


diff --git a/Doc/Makefile b/Doc/Makefile
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -187,6 +187,10 @@
 	make update
 	make dist SPHINXOPTS='-A daily=1 -A versionswitcher=1'
 
+# for quick rebuilds (HTML only)
+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)
 autobuild-stable:
 	@case $(DISTVERSION) in *[abc]*) \
@@ -194,3 +198,4 @@
 		exit 1;; \
 	esac
 	@make autobuild-dev
+

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