From e757005190abe713daf1f2d40ed6afe8d8ee5b0c Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 3 May 2008 20:52:18 +0000
Subject: [PATCH] Merge OpenSearch-related changes.

---
 Doc/conf.py                        |   6 ++++++
 Doc/tools/sphinxext/layout.html    |   5 +++++
 Doc/tools/sphinxext/opensearch.xml |  14 ++++++++++++++
 Doc/tools/sphinxext/static/py.png  | Bin 0 -> 695 bytes
 4 files changed, 25 insertions(+)
 create mode 100644 Doc/tools/sphinxext/layout.html
 create mode 100644 Doc/tools/sphinxext/opensearch.xml
 create mode 100644 Doc/tools/sphinxext/static/py.png

diff --git a/Doc/conf.py b/Doc/conf.py
index 27f5ed3965..8b1514bae9 100644
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -86,6 +86,12 @@ html_additional_pages = {
     '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('.', '')
 
diff --git a/Doc/tools/sphinxext/layout.html b/Doc/tools/sphinxext/layout.html
new file mode 100644
index 0000000000..689cbdace0
--- /dev/null
+++ b/Doc/tools/sphinxext/layout.html
@@ -0,0 +1,5 @@
+{% extends "!layout.html" %}
+{% block rootrellink %}
+<li><img src="{{ pathto('_static/py.png', 1) }}" alt="" style="vertical-align: middle; margin-top: -1px"/></li>
+{{ super() }}
+{% endblock %}
diff --git a/Doc/tools/sphinxext/opensearch.xml b/Doc/tools/sphinxext/opensearch.xml
new file mode 100644
index 0000000000..d672c2e2b8
--- /dev/null
+++ b/Doc/tools/sphinxext/opensearch.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+  <ShortName>Python Docs</ShortName>
+  <LongName>Python Documentation</LongName>
+  <Description>Search the Python documentation</Description>
+  <InputEncoding>utf-8</InputEncoding>
+  <Url type="text/html" method="get" template="{{ pathto('search') }}?">
+    <Param name="q" value="{searchTerms}" />
+    <Param name="check_keywords" value="yes" />
+    <Param name="area" value="default" />
+  </Url>
+  <Image height="16" width="16" type="image/x-icon">http://www.python.org/images/favicon16x16.ico</Image>
+</OpenSearchDescription>
+
diff --git a/Doc/tools/sphinxext/static/py.png b/Doc/tools/sphinxext/static/py.png
new file mode 100644
index 0000000000000000000000000000000000000000..93e4a02c3d321c545898a2ebb8873c26dd8a9e5b
GIT binary patch
literal 695
zcmV;o0!aOdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOD~
z5jY_RGbdgE00K8jL_t(I%Vm>KNL4`;hrfH@vv+$Uln|xSCTLTOHmzE;5FTwpDtJ)a
zz)exE-2_34AR^i+ZCXeh7m*-F5k*FrmbSHs%rX_!{PXUec{69`w(#D(>Vd<+%=bIz
zH_V)XUD5sE?K5ebbKaSDu}#Dnq^Y!3`tis9>wSO*T+WBP3wS3NNBU~*PAtw^yjZ+<
zQ5yK0z%d{y@_Pz6YdL>s7$<f+t<8@+fNGI119U%pf7@GoT&xO=P6mx?ltsrSXAI%K
zN<B?|&R2lajslk-eR%D}cBNjxdjg<TZh=Y_f)Y;b4u|PneZkvUi*DSnoO*XJ^xk!C
zSv5OtXPJkn%~8N2387O_8GQrjEa#vvh<xGRY3jAp@tdh9eFMu=wHl&85<;)qfsXPH
zv9;*N+UWfF@YDI}S8IR(DPZQtY9|l2N-s`<OF$BU{beyt?Zrk;ENXpuXkwsuaO3B#
zE3MIqOQBQIe^_Gj?uf#R)<6(Ck=fk(pUIcc<6pf!ZB>6Y^hI$}5GUX?Ns>+iCUiRP
z7h|*&%kQa?wQA%pYzqpaf*4?WM!x_ygY0K@07rplx^QhGhnE)r4wbx0x11<&3V?63
z=F8ch)p6iQ88E;iumPmSZif%JIwIgKh$T3)*ab8ImGLVf;IoYtVAb11Z&@wm>96=S
z)!B<I0N=AU*)t1`jrF?K@n>&hojbAPoik&f)Lp;=N!HK;X~5oyfJ49$pbcorTyADv
dm$H!t;2#0MumAjv0Ga>*002ovPDHLkV1gIiH5UK?

literal 0
HcmV?d00001

-- 
2.50.1