From: Georg Brandl <georg@python.org>
Date: Sat, 7 Apr 2012 17:23:00 +0000 (+0200)
Subject: Closes #14511: merge with 3.2
X-Git-Tag: v3.3.0a3~293
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30e4ca45ad95fd34fb766fdf75b7144001e6cf88;p=python

Closes #14511: merge with 3.2
---

30e4ca45ad95fd34fb766fdf75b7144001e6cf88
diff --cc Doc/conf.py
index f8278405b5,555f281b5c..6bbe4ce35c
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@@ -91,7 -91,7 +91,7 @@@ html_additional_pages = 
  }
  
  # Output an OpenSearch description file.
- html_use_opensearch = 'http://docs.python.org/dev/py3k'
 -html_use_opensearch = 'http://docs.python.org/3.2'
++html_use_opensearch = 'http://docs.python.org/3.3'
  
  # Additional static files.
  html_static_path = ['tools/sphinxext/static']