From a962b07708eb68a40769a605988e89c3b067ab0e Mon Sep 17 00:00:00 2001
From: Andre Klapper <a9016009@gmx.de>
Date: Fri, 19 Apr 2013 19:59:30 +0200
Subject: User docs: Use XInclude for common Search help to avoid string
 duplication

---
 help/C/contacts-searching.page | 153 +++++++++++++++++------------------------
 1 file changed, 63 insertions(+), 90 deletions(-)

(limited to 'help/C/contacts-searching.page')

diff --git a/help/C/contacts-searching.page b/help/C/contacts-searching.page
index b4c3b809e1..ccf3455de6 100644
--- a/help/C/contacts-searching.page
+++ b/help/C/contacts-searching.page
@@ -1,90 +1,63 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
-      type="topic" id="contacts-searching">
-
-  <info>
-    <desc>Searching contacts.</desc>
-
-    <link type="guide" xref="searching-items" />
-    <link type="guide" xref="contacts-organizing" />
-
-    <revision pkgversion="3.5.90" version="0.4" date="2012-08-17" status="draft"/>
-    <credit type="author">
-      <name its:translate="no">Max Vorobuov</name>
-      <email its:translate="no">vmax0770@gmail.com</email>
-    </credit>
-    <credit type="author">
-      <name its:translate="no">Andre Klapper</name>
-      <email its:translate="no">ak-47@gmx.net</email>
-    </credit>
-    <credit type="author">
-      <name its:translate="no">Novell, Inc</name>
-    </credit>
-    <license>
-      <p>Creative Commons Share Alike 3.0</p>
-    </license>    
-  </info>
-
-<title>Searching Contacts</title>
-
-<section id="search-single">
-<title>Searching in a Single Contact</title>
-<p>To find text in the displayed contact, select <guiseq><gui>Edit</gui><gui>Find in Contact...</gui></guiseq> from the main menu.</p>
-</section>
-
-<section id="search-many">
-<title>Searching Across Contacts</title>
-
-
-<section id="quick-search">
-<title>Quick Search</title>
-<p>In the Contacts view, you can quickly search for contacts either by category or by contact's info.</p>
-<p>Searching by contact's info:</p>
-<steps>
-<item><p>Click the search icon <media type="image" mime="image/png" src="figures/search-icon.png"/> to expand the drop-down list.</p></item>
-<item><p>Select the search condition from the list.</p></item>
-<item><p>Enter the text you want to search for and press <key>Enter</key>.</p></item>
-<item><p>Evolution displays the search results.</p></item>
-</steps>
-<p>Searching by category:</p>
-<steps>
-<item><p>Click the <gui>Show</gui> drop-down list.</p></item>
-<item><p>Select the category from the list.</p></item>
-<item><p>Evolution displays the search results.</p></item>
-</steps>
-<p>If you want to set several search conditions, you should use an Advanced search, which is described below.</p>
-</section>
-
-<section id="advanced-search">
-<title>Advanced Search</title>
-<steps>
-<item><p>Select the <guiseq><gui>Search</gui><gui>Advanced Search</gui></guiseq> menu to open the dialog box.</p></item>
-<item><p>Click <gui style="button">Add Condition</gui> to add any number of rules.</p></item>
-<item><p>Select the condition from the dropdown list, and then type a search entry in the field.</p></item>
-<item><p>Click <gui style="button">OK</gui> to get the search results displayed.</p></item>
-</steps>
-</section>
-
-<!-- TODO:XINCLUDE: Needs refactoring as clearing-search and saved-searches are totally identical in all *-searching.page files -->
-<section id="clearing-search">
-<title>Clearing the Search results</title>
-<p>To clear your search view and get back to the default view, click the <gui>Clear</gui> icon in the search string field, or choose <guiseq><gui>Search</gui><gui>Clear</gui></guiseq> from the menubar. You can also press <keyseq><key>Shift</key><key>Ctrl</key><key>Q</key></keyseq> to clear the search.</p>
-</section>
-
-<section id="saved-searches">
-<title>Saved Searches</title>
-<p>If you search for something rather often, you will prefer not to type it many times. In this case you can use saved searches.</p>
-<p>To save your search results, either click <gui>Save</gui> instead of <gui>OK</gui> in the Search dialog, or in case the search results are already displayed, select <guiseq><gui>Search</gui><gui>Save Search</gui></guiseq>. From now on this search will be directly available from the <gui>Search</gui> menu.</p>
-</section>
-
-<section id="editing-a-saved-search">
-<title>Editing a Saved Search</title>
-<steps>
-<item><p>Select <guiseq><gui>Search</gui><gui>Edit Saved Searches</gui></guiseq> from the menu bar to open the window.</p></item>
-<item><p>Click the <gui style="button">Edit</gui> button to open the <gui>Edit Rule</gui> window.</p></item>
-<item><p>Edit the title or search conditions from the dialog box.</p></item>
-<item><p>Click <gui>OK</gui>.</p></item>
-</steps>
-</section>
-
-</section>
-</page>
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic" id="contacts-searching">
+
+  <info>
+    <desc>Searching contacts.</desc>
+
+    <link type="guide" xref="searching-items" />
+    <link type="guide" xref="contacts-organizing" />
+
+    <revision pkgversion="3.5.90" version="0.4" date="2012-08-17" status="draft"/>
+    <credit type="author">
+      <name its:translate="no">Max Vorobuov</name>
+      <email its:translate="no">vmax0770@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name its:translate="no">Andre Klapper</name>
+      <email its:translate="no">ak-47@gmx.net</email>
+    </credit>
+    <credit type="author">
+      <name its:translate="no">Novell, Inc</name>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+  </info>
+
+<title>Searching Contacts</title>
+
+<section id="search-single">
+<title>Searching in a Single Contact</title>
+<p>To find text in the displayed contact, select <guiseq><gui>Edit</gui><gui>Find in Contact...</gui></guiseq> from the main menu.</p>
+</section>
+
+<section id="search-many">
+<title>Searching Across Contacts</title>
+
+<section id="quick-search">
+<title>Quick Search</title>
+<p>In the Contacts view, you can quickly search for contacts either by category or by contact's info.</p>
+<p>Searching by contact's info:</p>
+<steps>
+<item><p>Click the search icon <media type="image" mime="image/png" src="figures/search-icon.png"/> to expand the drop-down list.</p></item>
+<item><p>Select the search condition from the list.</p></item>
+<item><p>Enter the text you want to search for and press <key>Enter</key>.</p></item>
+<item><p>Evolution displays the search results.</p></item>
+</steps>
+<p>Searching by category:</p>
+<steps>
+<item><p>Click the <gui>Show</gui> drop-down list.</p></item>
+<item><p>Select the category from the list.</p></item>
+<item><p>Evolution displays the search results.</p></item>
+</steps>
+<p>If you want to set several search conditions, you should use an Advanced search, which is described below.</p>
+</section>
+
+<!-- As advanced-search, clearing-search, saved-searches, editing-a-saved-search are totally identical in all *-searching.page files, this is centrally in one file that's included by XInclude. See
+http://blogs.gnome.org/shaunm/2011/07/21/understanding-xinclude/ for how it works. -->
+<include href="xinclude-searching.xml"
+  xpointer="xmlns(mal=http://projectmallard.org/1.0/)xpointer(/mal:info/mal:section)"
+  xmlns="http://www.w3.org/2001/XInclude"/>
+
+</section>
+</page>
-- 
cgit