[Python-checkins] cpython (merge 3.2 -> default): Closes #14511: merge with 3.2

[georg.brandl]

http://hg.python.org/cpython/rev/57a8a8f5e0bc
changeset:   76154:57a8a8f5e0bc
parent:      76152:4862619fe28b
parent:      76153:7f123dec2731
user:        Georg Brandl <georg at python.org>
date:        Sat Apr 07 19:23:00 2012 +0200
summary:
  Closes #14511: merge with 3.2

files:
  Doc/conf.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/conf.py b/Doc/conf.py
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -91,7 +91,7 @@
 }
 
 # Output an OpenSearch description file.
-html_use_opensearch = 'http://docs.python.org/dev/py3k'
+html_use_opensearch = 'http://docs.python.org/3.3'
 
 # Additional static files.
 html_static_path = ['tools/sphinxext/static']

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