[Python-3000-checkins] r62679 - in python/branches/py3k: Doc/conf.py Doc/tools/sphinxext/layout.html Doc/tools/sphinxext/opensearch.xml Doc/tools/sphinxext/static

[georg.brandl]

Author: georg.brandl
Date: Sat May  3 22:52:18 2008
New Revision: 62679

Log:
Merge OpenSearch-related changes.


Added:
   python/branches/py3k/Doc/tools/sphinxext/layout.html
      - copied unchanged from r62540, /python/trunk/Doc/tools/sphinxext/layout.html
   python/branches/py3k/Doc/tools/sphinxext/opensearch.xml
      - copied unchanged from r62540, /python/trunk/Doc/tools/sphinxext/opensearch.xml
   python/branches/py3k/Doc/tools/sphinxext/static/
      - copied from r62540, /python/trunk/Doc/tools/sphinxext/static/
Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/conf.py

Modified: python/branches/py3k/Doc/conf.py
==============================================================================
--- python/branches/py3k/Doc/conf.py	(original)
+++ python/branches/py3k/Doc/conf.py	Sat May  3 22:52:18 2008
@@ -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('.', '')