Merge OpenSearch-related changes.
diff --git a/Doc/conf.py b/Doc/conf.py
index 27f5ed3..8b1514b 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -86,6 +86,12 @@
     'index': 'indexcontent.html',
 }
 
+# Output an OpenSearch description file.
+html_use_opensearch = 'http://docs.python.org/dev/3.0'
+
+# Additional static files.
+html_static_path = ['tools/sphinxext/static']
+
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'python' + release.replace('.', '')