[Python-checkins] cpython (merge 3.2 -> 3.3): #8040: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/5c30f8fdd896
changeset:   79981:5c30f8fdd896
branch:      3.3
parent:      79977:9505a34b4484
parent:      79980:740be7346c92
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sat Oct 27 22:29:50 2012 +0300
summary:
  #8040: merge with 3.2.

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


diff --git a/Doc/Makefile b/Doc/Makefile
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -185,7 +185,7 @@
 # for development releases: always build
 autobuild-dev:
 	make update
-	make dist SPHINXOPTS='-A daily=1'
+	make dist SPHINXOPTS='-A daily=1 -A versionswitcher=1'
 
 # for stable releases: only build if not in pre-release stage (alpha, beta, rc)
 autobuild-stable:

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