1 files changed, 57 insertions, 83 deletions
diff --git a/help/C/calendar-searching.page b/help/C/calendar-searching.page
index fbfcd9f049..d99be63a60 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>