[evolution] User docs: Use XInclude for common Search help to avoid string duplication

From: Andre Klapper <aklapper src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] User docs: Use XInclude for common Search help to avoid string duplication
Date: Fri, 19 Apr 2013 18:00:05 +0000 (UTC)
commit a962b07708eb68a40769a605988e89c3b067ab0e
Author: Andre Klapper <a9016009 gmx de>
Date:   Fri Apr 19 19:59:30 2013 +0200

    User docs: Use XInclude for common Search help to avoid string duplication

 help/C/calendar-searching.page | 140 +++++++++++++++----------------------
 help/C/contacts-searching.page | 153 +++++++++++++++++-----------------------
 help/C/mail-searching.page     | 150 +++++++++++++++++----------------------
 help/C/memos-searching.page    | 154 +++++++++++++++++------------------------
 help/C/tasks-searching.page    | 154 +++++++++++++++++------------------------
 help/C/xinclude-searching.xml  |  34 +++++++++
 6 files changed, 344 insertions(+), 441 deletions(-)
---
diff --git a/help/C/calendar-searching.page b/help/C/calendar-searching.page
index fbfcd9f..d99be63 100644
--- a/help/C/calendar-searching.page
+++ b/help/C/calendar-searching.page
@@ -1,83 +1,57 @@
-<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
-      type="topic" id="calendar-searching">
-
-  <info>
-    <desc>Searching appointments and meetings.</desc>
-
-    <link type="guide" xref="searching-items" />
-    <link type="guide" xref="calendar-organizing" />
-
-    <revision pkgversion="3.5.90" version="0.3" date="2012-08-16" 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> <!-- Content partially from 
http://library.gnome.org/users/evolution/2.32/usage-contact-organize.html.en -->
-    </credit>
-    <license>
-      <p>Creative Commons Share Alike 3.0</p>
-    </license>    
-
-  </info>
-
-<title>Searching for Calendar Items</title>
-<section id="quick-search">
-<title>Quick Search</title>
-<p>In the Calendar view, you can quickly search for appointments and meetings either by summary or by 
category.</p>
-<p>Searching by summary:</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>To go through the results you can use the two arrow buttons next to the search field. This searches in 
currently enabled calendars. It searches from the currently selected day in the given direction, in a range 
of 10 years by default.</p>
-
-<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>
- 
-</page>
+<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
+      type="topic" id="calendar-searching">
+
+  <info>
+    <desc>Searching appointments and meetings.</desc>
+
+    <link type="guide" xref="searching-items" />
+    <link type="guide" xref="calendar-organizing" />
+
+    <revision pkgversion="3.5.90" version="0.3" date="2012-08-16" 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> <!-- Content partially from 
http://library.gnome.org/users/evolution/2.32/usage-contact-organize.html.en -->
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>    
+
+  </info>
+
+<title>Searching for Calendar Items</title>
+<section id="quick-search">
+<title>Quick Search</title>
+<p>In the Calendar view, you can quickly search for appointments and meetings either by summary or by 
category.</p>
+<p>Searching by summary:</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>To go through the results you can use the two arrow buttons next to the search field. This searches in 
currently enabled calendars. It searches from the currently selected day in the given direction, in a range 
of 10 years by default.</p>
+
+<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"/>
+ 
+</page>
diff --git a/help/C/contacts-searching.page b/help/C/contacts-searching.page
index b4c3b80..ccf3455 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>
diff --git a/help/C/mail-searching.page b/help/C/mail-searching.page
index 1872784..87911cb 100644
--- a/help/C/mail-searching.page
+++ b/help/C/mail-searching.page
@@ -1,88 +1,62 @@
-<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
-      type="topic" id="mail-searching">
- 
-  <info>
-    <desc>Searching messages.</desc>
-    
-    <link type="guide" xref="searching-items" />
-    <link type="guide" xref="mail-organizing" />
- 
-    <revision pkgversion="3.3.91" version="0.5" date="2012-02-18" 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 Mail</title>
-
-<section id="search-single">
-<title>Searching in a Single Message</title>
-<p>To find text in the displayed message, select <guiseq><gui>Edit</gui><gui>Find in 
Message...</gui></guiseq> from the main menu.</p>
-</section>
-
-<section id="search-many">
-<title>Searching Across Messages</title>
-
-<section id="quick-search">
-<title>Quick Search</title>
-<p>In the mail view, you can quickly search for messages by defining conditions.</p>
-<steps>
-<item><p>Click on 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>Select the scope from the drop-down list right to the text box.</p>
-<note style="tip"><p>For the <gui>Current Account</gui> scope, the term "account" refers to top-level nodes 
in the <link xref="intro-main-window#e-mail"> mail folder list</link>, like "On this computer" and remote 
mail accounts.</p></note>
-</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>
-<note style="tip"><p>If you start directly from the fourth step, text will be searched in mail's subjects 
and addresses and scope will be "Current folder".</p></note>
-<note style="tip"><p>If you search for messages that are not in the same folder rather often you might want 
to create a search folder instead; see <link xref="mail-search-folders">Using Search Folders</link> for more 
detail.</p></note>
-<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="mail-searching">
+ 
+  <info>
+    <desc>Searching messages.</desc>
+    
+    <link type="guide" xref="searching-items" />
+    <link type="guide" xref="mail-organizing" />
+ 
+    <revision pkgversion="3.3.91" version="0.5" date="2012-02-18" 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 Mail</title>
+
+<section id="search-single">
+<title>Searching in a Single Message</title>
+<p>To find text in the displayed message, select <guiseq><gui>Edit</gui><gui>Find in 
Message...</gui></guiseq> from the main menu.</p>
+</section>
+
+<section id="search-many">
+<title>Searching Across Messages</title>
+
+<section id="quick-search">
+<title>Quick Search</title>
+<p>In the mail view, you can quickly search for messages by defining conditions.</p>
+<steps>
+<item><p>Click on 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>Select the scope from the drop-down list right to the text box.</p>
+<note style="tip"><p>For the <gui>Current Account</gui> scope, the term "account" refers to top-level nodes 
in the <link xref="intro-main-window#e-mail"> mail folder list</link>, like "On this computer" and remote 
mail accounts.</p></note>
+</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>
+<note style="tip"><p>If you start directly from the fourth step, text will be searched in mail's subjects 
and addresses and scope will be "Current folder".</p></note>
+<note style="tip"><p>If you search for messages that are not in the same folder rather often you might want 
to create a search folder instead; see <link xref="mail-search-folders">Using Search Folders</link> for more 
detail.</p></note>
+<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>
diff --git a/help/C/memos-searching.page b/help/C/memos-searching.page
index 3b12abc..bf7e404 100644
--- a/help/C/memos-searching.page
+++ b/help/C/memos-searching.page
@@ -1,90 +1,64 @@
-<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
-      type="topic" id="memos-searching">
-
-  <info>
-    <desc>Searching memos.</desc>
-    
-    <link type="guide" xref="searching-items" />
-    <link type="guide" xref="tasks-organizing" />
-
-    <revision pkgversion="3.5.90" version="0.3" 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 Memos</title>
-
-<section id="search-single">
-<title>Searching in a Single Memo</title>
-<p>To find text in the displayed memo, select <guiseq><gui>Edit</gui><gui>Find in Memo...</gui></guiseq> 
from the main menu.</p>
-</section>
-
-<section id="search-many">
-<title>Searching Across Memos</title>
-
-<section id="quick-search">
-<title>Quick Search</title>
-<p>In the Memos view, you can quickly search for memos either by summary or by category.</p>
-<p>Searching by summary:</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="memos-searching">
+
+  <info>
+    <desc>Searching memos.</desc>
+    
+    <link type="guide" xref="searching-items" />
+    <link type="guide" xref="tasks-organizing" />
+
+    <revision pkgversion="3.5.90" version="0.3" 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 Memos</title>
+
+<section id="search-single">
+<title>Searching in a Single Memo</title>
+<p>To find text in the displayed memo, select <guiseq><gui>Edit</gui><gui>Find in Memo...</gui></guiseq> 
from the main menu.</p>
+</section>
+
+<section id="search-many">
+<title>Searching Across Memos</title>
+
+<section id="quick-search">
+<title>Quick Search</title>
+<p>In the Memos view, you can quickly search for memos either by summary or by category.</p>
+<p>Searching by summary:</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>
diff --git a/help/C/tasks-searching.page b/help/C/tasks-searching.page
index 9297668..4abf430 100644
--- a/help/C/tasks-searching.page
+++ b/help/C/tasks-searching.page
@@ -1,90 +1,64 @@
-<page xmlns="http://projectmallard.org/1.0/"; xmlns:its="http://www.w3.org/2005/11/its";
-      type="topic" id="tasks-searching">
-
-  <info>
-    <desc>Searching tasks.</desc>
-    
-    <link type="guide" xref="searching-items" />
-    <link type="guide" xref="tasks-organizing" />
-
-    <revision pkgversion="3.5.90" version="0.3" 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 Tasks</title>
-
-<section id="search-single">
-<title>Searching in a Single Task</title>
-<p>To find text in the displayed task, select <guiseq><gui>Edit</gui><gui>Find in Task...</gui></guiseq> 
from the main menu.</p>
-</section>
-
-<section id="search-many">
-<title>Searching Across Tasks</title>
-
-<section id="quick-search">
-<title>Quick Search</title>
-<p>In the Tasks view, you can quickly search for tasks either by summary or by category.</p>
-<p>Searching by summary:</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="tasks-searching">
+
+  <info>
+    <desc>Searching tasks.</desc>
+    
+    <link type="guide" xref="searching-items" />
+    <link type="guide" xref="tasks-organizing" />
+
+    <revision pkgversion="3.5.90" version="0.3" 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 Tasks</title>
+
+<section id="search-single">
+<title>Searching in a Single Task</title>
+<p>To find text in the displayed task, select <guiseq><gui>Edit</gui><gui>Find in Task...</gui></guiseq> 
from the main menu.</p>
+</section>
+
+<section id="search-many">
+<title>Searching Across Tasks</title>
+
+<section id="quick-search">
+<title>Quick Search</title>
+<p>In the Tasks view, you can quickly search for tasks either by summary or by category.</p>
+<p>Searching by summary:</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>
diff --git a/help/C/xinclude-searching.xml b/help/C/xinclude-searching.xml
new file mode 100644
index 0000000..b06486d
--- /dev/null
+++ b/help/C/xinclude-searching.xml
@@ -0,0 +1,34 @@
+<info xmlns="http://projectmallard.org/1.0/";>
+
+<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>
+
+<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>
+
+</info>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]