Fix indents, <app> tags in remaining c*.page

Make indentation more consistent.
Enclose Evolution within <app> tags.

15 files changed, 557 insertions, 263 deletions

diff --git a/help/C/change-switcher-appearance.page b/help/C/change-switcher-appearance.page
index bc5482ab9c..afb34b74f3 100644
--- a/help/C/change-switcher-appearance.page
+++ b/help/C/change-switcher-appearance.page
@@ -1,40 +1,51 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="topic" id="change-switcher-appearance">
 
   <info>
-    <desc>Changing the display of the window buttons in the lower left corner.</desc>
     <link type="guide" xref="index#common-other-problems" />
-<!-- TODO:POST-3-8: Create a general interface adjustment guide page that also includes mail-layout-changing.page -->
+
+     <!-- TODO:POST-3-8: Create a general interface adjustment guide page that
+	  also includes mail-layout-changing.page -->
+
     <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="stub"/>
+
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-        
 
+    <desc>Changing the display of the window buttons in the lower left
+    corner.</desc>
   </info>
 
   <title>Changing the Switcher appearance</title>
 
-<p>The display of the window buttons in the lower left corner (Mail, Contacts, Calendar, Tasks and Memos) can be changed via <guiseq><gui>View</gui><gui>Switcher Appearance</gui></guiseq>. This can be helpful if you have a small display. You can also completely hide them.</p>
-<p>The available options are:</p>
-<list>
-<item><p>
-Icons and Text
-</p></item>
-<item><p>
-Icons Only
-</p></item>
-<item><p>
-Text Only
-</p></item>
-<item><p>
-Toolbar Style
-</p></item>
-<item><p>
-Show Buttons
-</p></item>
-</list>
+  <p>The display of the window buttons in the lower left corner (Mail,
+  Contacts, Calendar, Tasks and Memos) can be changed via
+  <guiseq><gui>View</gui><gui>Switcher Appearance</gui></guiseq>. This can be
+  helpful if you have a small display. You can also completely hide them.</p>
+
+  <p>The available options are:</p>
+
+  <list>
+    <item>
+      <p>Icons and Text</p>
+    </item>
+    <item>
+      <p>Icons Only</p>
+    </item>
+    <item>
+      <p>Text Only</p>
+    </item>
+    <item>
+      <p>Toolbar Style</p>
+    </item>
+    <item>
+      <p>Show Buttons</p>
+    </item>
+  </list>
+
 </page>
diff --git a/help/C/contacts-add-automatically.page b/help/C/contacts-add-automatically.page
index 339ba1d0a4..39c10588c4 100644
--- a/help/C/contacts-add-automatically.page
+++ b/help/C/contacts-add-automatically.page
@@ -1,12 +1,12 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="topic" id="contacts-add-automatically">
 
   <info>
-    <desc>Automatically add senders of mail that you have received to your contacts.</desc>
-    
     <link type="guide" xref="contacts-usage"/>
 
     <revision pkgversion="3.1.5" version="0.3" date="2011-08-19" status="final"/>
+
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -15,16 +15,28 @@
       <name its:translate="no">Barbara Tobias</name>
       <email its:translate="no">barbtobias09@gmail.com</email>
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    
 
+    <desc>Automatically add senders of mail that you have received to your
+    contacts.</desc>
   </info>
 
-<title>Adding people automatically to my contacts</title>
+  <title>Adding people automatically to my contacts</title>
+
+  <p>You can add people automatically to your contacts when you reply to
+  received email. Enable the plugin <gui>Automatic Contacts</gui> by going to
+  <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>; click on
+  <gui>Automatic Contacts</gui> so that it shows a check mark. Then go to
+  <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Contacts</gui>
+  <gui>Automatic Contacts</gui></guiseq> and enable the
+  <gui>Create address book entries when sending emails</gui> option and select
+  an address book in the drop-down field below that will receive the new
+  contacts.</p>
 
+  <p>From now on, contacts will be automatically created for senders of
+  received mail when you reply to that mail.</p>
+  <!-- Location in Preferences is correct only since 3.1.5, as
+     https://bugzilla.gnome.org/show_bug.cgi?id=655492 was fixed -->
 
-<p>You can add people automatically to your contacts when you reply to received email. Enable the plugin <gui>Automatic Contacts</gui> by going to <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>; click on <gui>Automatic Contacts</gui> so that it shows a check mark. Then go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Contacts</gui><gui>Automatic Contacts</gui></guiseq> and enable the <gui>Create address book entries when sending emails</gui> option and select an address book in the drop-down field below that will receive the new contacts.</p>
-<p>From now on, contacts will be automatically created for senders of received mail when you reply to that mail.</p>
-<!-- Location in Preferences is correct only since 3.1.5, as https://bugzilla.gnome.org/show_bug.cgi?id=655492 was fixed -->
 </page>
diff --git a/help/C/contacts-autocompletion.page b/help/C/contacts-autocompletion.page
index 6d07c1d3ba..0f58ec79a7 100644
--- a/help/C/contacts-autocompletion.page
+++ b/help/C/contacts-autocompletion.page
@@ -1,9 +1,8 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="topic" id="contacts-autocompletion">
 
   <info>
-    <desc>Autocompletion of names and email addresses entered in the mail composer.</desc>
-    
     <link type="guide" xref="index#contacts"/>
     <link type="guide" xref="index#mail-composing"/>
     <link type="seealso" xref="mail-composer-forward"/>
@@ -11,26 +10,41 @@
     <link type="seealso" xref="mail-composer-write-new-message"/>
 
     <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="draft"/>
+
     <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-mail-getnsend-send.html.en#usage-mail-getnsend-send-to -->
+      <name its:translate="no">Novell, Inc</name>
+      <!-- Content partially from
+	   http://library.gnome.org/users/evolution/2.32/usage-mail-getnsend-send.html.en#usage-mail-getnsend-send-to
+	   -->
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    
 
+    <desc>Autocompletion of names and email addresses entered in the mail composer.</desc>
   </info>
 
-<title>Autocompletion of mail recipients</title>
+  <title>Autocompletion of mail recipients</title>
+
+  <p>You can enter the first three letters of names and email addresses in the
+  recipients text field and <app>Evolution</app> will present you with a list
+  of matches from your address books.</p>
 
-<p>You can enter the first three letters of names and email addresses in the recipients text field and Evolution will present you with a list of matches from your address books.</p>
-<p>To enable autocompletion, go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Contacts</gui><gui>Autocompletion</gui></guiseq> and choose the address books from the list that Evolution should look in for matches.</p>
+  <p>To enable autocompletion, go to
+  <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Contacts</gui>
+  <gui>Autocompletion</gui></guiseq> and choose the address books from the list
+  that <app>Evolution</app> should look in for matches.</p>
 
-<p>Select <gui>Always show address of the autocompleted contact</gui> to also show the email address along with the name. This can be helpful to distinguish if a contact has several email addresses.</p>
+  <p>Select <gui>Always show address of the autocompleted contact</gui> to also
+  show the email address along with the name. This can be helpful to
+  distinguish if a contact has several email addresses.</p>
 
-<p>Alternately, you can click the <gui>To:</gui>, <gui>Cc:</gui>, or <gui>Bcc:</gui> buttons to get a list of the email addresses in your contacts. Select addresses and click the arrow buttons to move them into the appropriate address columns.</p>
+  <p>Alternately, you can click the <gui>To:</gui>, <gui>Cc:</gui>, or
+  <gui>Bcc:</gui> buttons to get a list of the email addresses in your
+  contacts. Select addresses and click the arrow buttons to move them into the
+  appropriate address columns.</p>
 
 </page>
diff --git a/help/C/contacts-google.page b/help/C/contacts-google.page
index 196115da85..dcedf06b64 100644
--- a/help/C/contacts-google.page
+++ b/help/C/contacts-google.page
@@ -1,36 +1,56 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="topic" id="contacts-google">
 
   <info>
-    <desc>Use the online address book of your Google account.</desc>
-    
     <link type="guide" xref="contacts-using-several-addressbooks"/>
     <link type="guide" xref="google-services"/>
 
     <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    
 
+    <desc>Use the online address book of your Google account.</desc>
   </info>
 
-<title>Using a Google addressbook</title>
+  <title>Using a Google addressbook</title>
+
+  <p>To add such an address book to <app>Evolution</app>, perform the following
+  steps:</p>
 
-<p>To add such an address book to Evolution, perform the following steps:</p>
-<steps>
-<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Address Book</gui></guiseq>.</p></item>
-<item><p>Select the type <gui>Google</gui>.</p></item>
-<item><p>Enter a name that you prefer.</p></item>
-<item><p>Choose if you want to be able to view the content also when being offline.</p></item>
-<item><p>Enter your Google username.</p></item>
-<item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
-<item><p>Click <gui style="button">Apply</gui>.</p></item>
-</steps>
+  <steps>
+    <item>
+      <p>Click <guiseq><gui>File</gui><gui>New</gui>
+      <gui>Address Book</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Select the type <gui>Google</gui>.</p>
+    </item>
+    <item>
+      <p>Enter a name that you prefer.</p>
+    </item>
+    <item>
+      <p>Choose if you want to be able to view the content also when being
+      offline.</p>
+    </item>
+    <item>
+      <p>Enter your Google username.</p>
+    </item>
+    <item>
+      <p>Choose <gui>Use secure connection</gui> if you want to connect
+      securely.</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">Apply</gui>.</p>
+    </item>
+  </steps>
 
-<p>The address book will be added to the list of address books in Evolution.</p>
+  <p>The address book will be added to the list of address books in
+  <app>Evolution</app>.</p>
 
 </page>
diff --git a/help/C/contacts-ldap.page b/help/C/contacts-ldap.page
index e9a586d7c5..d6784ada7b 100644
--- a/help/C/contacts-ldap.page
+++ b/help/C/contacts-ldap.page
@@ -1,76 +1,156 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="topic" id="contacts-ldap">
 
   <info>
-    <desc>Use shared address books on a local network.</desc>
-    
     <link type="guide" xref="contacts-using-several-addressbooks"/>
 
     <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+
     <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-sharing.html.en and http://library.gnome.org/users/evolution/2.32/config-prefs-contact.html.en#bxmw6w5 -->
- </credit>
-    
+    <credit type="author">
+      <name its:translate="no">Novell, Inc</name>
+      <!-- Content partially from
+	   http://library.gnome.org/users/evolution/2.32/usage-contact-sharing.html.en
+	   and
+	   http://library.gnome.org/users/evolution/2.32/config-prefs-contact.html.en#bxmw6w5
+	   -->
+    </credit>
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    
 
+    <desc>Use shared address books on a local network.</desc>
   </info>
 
-<title>Adding LDAP access</title>
+  <title>Adding LDAP access</title>
 
-<p>The LDAP protocol was created to let users share contact information over a network by sharing access to a central directory. LDAP allows a company to maintain a shared set of contact information. Many companies keep a common LDAP address book for all their employees or for client contacts.</p>
+  <p>The LDAP protocol was created to let users share contact information over
+  a network by sharing access to a central directory. LDAP allows a company to
+  maintain a shared set of contact information. Many companies keep a common
+  LDAP address book for all their employees or for client contacts.</p>
 
 <section id="add-ldap-addressbook">
-<title>Adding an LDAP address book</title>
-
-<steps>
-<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Address Book</gui></guiseq>.</p></item>
-<item><p>In the <gui>General</gui> tab, select the type <gui>On LDAP Servers</gui>.</p></item>
-<item><p>Enter a name that you prefer.</p></item>
-<item><p>Enter the address of the server, the port number (the default number is 389) and whether you want to connect securely.</p></item>
-<item><p>Define the login method and your user name.</p></item>
-<item><p>Click <gui style="button">Apply</gui>.</p></item>
-<item><p>In the <gui>Details</gui> tab you can define the following settings:</p>
-<list>
- <item><p>Search Base: The search base is the starting point for a directory search. Contact your system administrator for information about the correct settings.</p></item>
- <item><p>Search Scope: The search scope is the breadth of a given search. The following options are available:</p>
-  <list>
-  <item><p>One: Searches the Search Base and one entry below it.</p></item>
-  <item><p>Sub: Searches the Search Base and all entries below it.</p></item>
-  </list>
- </item>
- <item><p>Search Filter: The search filter can be set here for all the LDAP queries. For example:</p>
-  <list>
-  <item><p><code>ObjectClass=*</code>: Lists all the objects from the server.</p></item>
-  <item><p><code>ObjectClass=User</code>: Lists only the users.</p></item>
-  <item><p><code>Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))</code>: Retrieves the User and Contact List objects.</p></item>
-  <item><p><code>(&amp;(mail=*)(ObjectClass=*))</code>: Lists the objects associated with the email addresses.</p></item>
-  </list>
- </item>
- <item><p>Timeout (minutes): The maximum time Evolution attempts to download data from the server before giving up.</p></item>
- <item><p>Download Limit: The maximum number of results for a given search. Most servers refuse to send more than 500 contacts, but you can set the number lower if you want to shorten downloads for very broad searches.</p></item>
-</list>
-</item>
-</steps>
+  <title>Adding an LDAP address book</title>
 
-<note style="tip"><p>If you are unsure about some settings, ask your system administrator.</p></note>
+  <steps>
+    <item>
+      <p>Click <guiseq><gui>File</gui><gui>New</gui>
+      <gui>Address Book</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>In the <gui>General</gui> tab, select the type
+      <gui>On LDAP Servers</gui>.</p>
+    </item>
+    <item>
+      <p>Enter a name that you prefer.</p>
+    </item>
+    <item>
+      <p>Enter the address of the server, the port number (the default number
+      is 389) and whether you want to connect securely.</p>
+    </item>
+    <item>
+      <p>Define the login method and your user name.</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">Apply</gui>.</p>
+    </item>
+    <item>
+      <p>In the <gui>Details</gui> tab you can define the following
+      settings:</p>
+      <list>
+        <item>
+	  <p>Search Base: The search base is the starting point for a directory
+	  search. Contact your system administrator for information about the
+	  correct settings.</p>
+        </item>
+        <item>
+	  <p>Search Scope: The search scope is the breadth of a given search.
+	  The following options are available:</p>
+          <list>
+            <item>
+	      <p>One: Searches the Search Base and one entry below it.</p>
+	    </item>
+            <item>
+	      <p>Sub: Searches the Search Base and all entries below it.</p>
+            </item>
+          </list>
+        </item>
+        <item>
+	  <p>Search Filter: The search filter can be set here for all the LDAP
+	  queries. For example:</p>
+          <list>
+            <item>
+              <p><code>ObjectClass=*</code>: Lists all the objects from the
+              server.</p>
+	    </item>
+            <item>
+	      <p><code>ObjectClass=User</code>: Lists only the users.</p>
+	    </item>
+            <item>
+	      <p><code>Filter (|(ObjectClass=User)(ObjectClass=groupOfNames))</code>:
+	      Retrieves the User and Contact List objects.</p>
+	    </item>
+            <item>
+	      <p><code>(&amp;(mail=*)(ObjectClass=*))</code>: Lists the objects
+	      associated with the email addresses.</p>
+	    </item>
+          </list>
+        </item>
+        <item>
+	  <p>Timeout (minutes): The maximum time <app>Evolution</app> attempts
+	  to download data from the server before giving up.</p>
+        </item>
+        <item>
+	  <p>Download Limit: The maximum number of results for a given search.
+	  Most servers refuse to send more than 500 contacts, but you can set
+	  the number lower if you want to shorten downloads for very broad
+	  searches.</p>
+        </item>
+      </list>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>If you are unsure about some settings, ask your system
+    administrator.</p>
+  </note>
 
 </section>
 
 <section id="ldap-vs-local-addressbooks">
-<title>Differences to local address books</title>
-
-<p>LDAP address books work like local address books on your computer, with the following exceptions:</p>
-<list>
-<item><p>Network folders are only available when you are connected to the network. If you use a laptop or have a modem connection, you might want to copy or cache some of the network directory. You do this by dragging and dropping your desired contacts into the local address books.</p></item>
-<item><p>You can also mark the network folder for offline usage. To mark the folder, right-click the folder, click Properties and select Copy Folder Content Locally for Offline Operation.</p></item>
-<item><p>To prevent excess network traffic, Evolution does not normally load data from the LDAP server upon opening.</p></item>
-<item><p>Depending on your server settings, you might not be able to edit all the fields in a contact stored on an LDAP server. Some servers prohibit some or all changes, and others use a smaller set of fields than Evolution allows. Check with your system administrator if you need different settings.</p></item>
-</list>
+  <title>Differences to local address books</title>
+
+  <p>LDAP address books work like local address books on your computer, with
+  the following exceptions:</p>
+
+  <list>
+    <item>
+      <p>Network folders are only available when you are connected to the
+      network. If you use a laptop or have a modem connection, you might want
+      to copy or cache some of the network directory. You do this by dragging
+      and dropping your desired contacts into the local address books.</p>
+    </item>
+    <item>
+      <p>You can also mark the network folder for offline usage. To mark the
+      folder, right-click the folder, click Properties and select Copy Folder
+      Content Locally for Offline Operation.</p>
+    </item>
+    <item>
+      <p>To prevent excess network traffic, <app>Evolution</app> does not
+      normally load data from the LDAP server upon opening.</p>
+    </item>
+    <item>
+      <p>Depending on your server settings, you might not be able to edit all
+      the fields in a contact stored on an LDAP server. Some servers prohibit
+      some or all changes, and others use a smaller set of fields than
+      <app>Evolution</app> allows. Check with your system administrator if you
+      need different settings.</p>
+    </item>
+  </list>
+
 </section>
 
 </page>
diff --git a/help/C/contacts-libreoffice.page b/help/C/contacts-libreoffice.page
index dec0d22fb4..3c3f229881 100644
--- a/help/C/contacts-libreoffice.page
+++ b/help/C/contacts-libreoffice.page
@@ -1,35 +1,61 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="topic" id="contacts-libreoffice">
 
   <info>
-    <desc>Using data from Evolution address books in LibreOffice documents.</desc>
-
     <link type="guide" xref="index#data-migration-and-sync"/>
 
     <revision pkgversion="3.1.5" version="0.2" date="2012-02-18" status="draft"/>
+
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    
 
+    <desc>Using data from <app>Evolution</app> address books in LibreOffice
+    documents.</desc>
   </info>
 
   <title>Contacts in LibreOffice</title>
 
-<p>You can use your Evolution address books in LibreOffice as a data source. The following steps refer to LibreOffice version 3.3.3.</p>
-
-<steps>
-<item><p>Click <guiseq><gui>Edit</gui><gui>Exchange Database...</gui></guiseq> in the menu bar. This will bring up the <gui>Exchange databases</gui> dialog box.</p></item>
-<item><p>In the right pane under <gui>Available Databases</gui>, <gui>EvolutionLocal</gui> is available as a source. Click on the small triangle to get the list of your Evolution address books.</p></item>
-<item><p>Choose an addressbook and click <gui style="button">Define</gui>.</p></item>
-<item><p>In case it is not listed already, click <gui style="button">Browse...</gui>. A file chooser dialog opens.</p></item>
-<item><p>As Evolution stores its data in a hidden directory, press <keyseq><key>Ctrl</key><key>L</key></keyseq> to get the location bar displayed.</p></item>
-<item><p>Go to <file>/home/username/.local/share/evolution/addressbook/system/addressbook.db</file> and click <gui style="button">Open</gui>.</p></item>
-</steps>
-
-<p>This makes the Evolution address book the default data source for LibreOffice. You can now select a field to insert into an LibreOffice document via <guiseq><gui>Insert</gui><gui>Fields</gui><gui>Other</gui></guiseq>.</p>
+  <p>You can use your <app>Evolution</app> address books in LibreOffice as a data source.
+  The following steps refer to LibreOffice version 3.3.3.</p>
+
+  <steps>
+    <item>
+      <p>Click <guiseq><gui>Edit</gui><gui>Exchange Database…</gui></guiseq>
+      in the menu bar. This will bring up the <gui>Exchange databases</gui>
+      dialog box.</p>
+    </item>
+    <item>
+      <p>In the right pane under <gui>Available Databases</gui>,
+      <gui>EvolutionLocal</gui> is available as a source. Click on the small
+      triangle to get the list of your <app>Evolution</app> address books.</p>
+    </item>
+    <item>
+      <p>Choose an addressbook and click <gui style="button">Define</gui>.</p>
+    </item>
+    <item>
+      <p>In case it is not listed already, click
+      <gui style="button">Browse…</gui>. A file chooser dialog opens.</p>
+    </item>
+    <item>
+      <p>As <app>Evolution</app> stores its data in a hidden directory, press
+      <keyseq><key>Ctrl</key><key>L</key></keyseq> to get the location bar
+      displayed.</p>
+    </item>
+    <item>
+      <p>Go to
+      <file>/home/username/.local/share/evolution/addressbook/system/addressbook.db</file>
+      and click <gui style="button">Open</gui>.</p>
+    </item>
+  </steps>
+
+  <p>This makes the <app>Evolution</app> address book the default data source
+  for LibreOffice. You can now select a field to insert into a LibreOffice
+  document via
+  <guiseq><gui>Insert</gui><gui>Fields</gui><gui>Other</gui></guiseq>.</p>
 
 </page>
diff --git a/help/C/contacts-local.page b/help/C/contacts-local.page
index 146416175a..606ac461c1 100644
--- a/help/C/contacts-local.page
+++ b/help/C/contacts-local.page
@@ -1,32 +1,44 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="topic" id="contacts-local">
 
   <info>
-    <desc>Adding another local address book.</desc>
-    
     <link type="guide" xref="contacts-using-several-addressbooks"/>
 
     <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    
 
+    <desc>Adding another local address book.</desc>
   </info>
 
-<title>Adding another local address book</title>
+  <title>Adding another local address book</title>
+
+  <p>To add another local address book to <app>Evolution</app>, perform the
+  following steps:</p>
 
-<p>To add another local address book to Evolution, perform the following steps:</p>
-<steps>
-<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Address Book</gui></guiseq>.</p></item>
-<item><p>Select the type <gui>On This Computer</gui>.</p></item>
-<item><p>Enter a name that you prefer.</p></item>
-<item><p>Click <gui style="button">Apply</gui>.</p></item>
-</steps>
+  <steps>
+    <item>
+      <p>Click <guiseq><gui>File</gui><gui>New</gui>
+      <gui>Address Book</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Select the type <gui>On This Computer</gui>.</p>
+    </item>
+    <item>
+      <p>Enter a name that you prefer.</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">Apply</gui>.</p>
+    </item>
+  </steps>
 
-<p>The address book will be added to the list of address books in Evolution.</p>
+  <p>The address book will be added to the list of address books in
+  <app>Evolution</app>.</p>
 
 </page>
diff --git a/help/C/contacts-organizing.page b/help/C/contacts-organizing.page
index 8550cc3283..5d7b39fb5d 100644
--- a/help/C/contacts-organizing.page
+++ b/help/C/contacts-organizing.page
@@ -1,25 +1,27 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="guide" id="contacts-organizing">
 
   <info>
-    <desc>On address books, searching, contact lists, and categories.</desc>
-
     <link type="guide" xref="index#contacts" />
     <link type="guide" xref="organizing" />
 
     <revision pkgversion="2.32.1" version="0.1" date="2011-01-05" status="stub"/>
+
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-        
 
+    <desc>On address books, searching, contact lists, and categories.</desc>
   </info>
 
-<title>Sorting, organizing and grouping contacts</title>
+  <title>Sorting, organizing and grouping contacts</title>
 
-<p>There are several ways how to organize your contacts. You can use several addressbooks and categories, and for conveniently sending messages to a group of people contact lists are available.</p>
+  <p>There are several ways how to organize your contacts. You can use several
+  addressbooks and categories, and for conveniently sending messages to a group
+  of people contact lists are available.</p>
 
 </page>
diff --git a/help/C/contacts-searching.page b/help/C/contacts-searching.page
index 8491f5626c..531a851268 100644
--- a/help/C/contacts-searching.page
+++ b/help/C/contacts-searching.page
@@ -1,13 +1,13 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+<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>
@@ -19,45 +19,78 @@
     <credit type="author">
       <name its:translate="no">Novell, Inc</name>
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-        
+
+    <desc>Searching contacts.</desc>
   </info>
 
-<title>Searching Contacts</title>
+  <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>
+  <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" its:translate="no" 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>
+  <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" its:translate="no" 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><app>Evolution</app> displays the search results.</p>
+	</item>
+      </steps>
+
+      <p>Searching by category:</p>
 
-<!-- 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"/>
+      <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><app>Evolution</app> 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/contacts-usage-add-contact.page b/help/C/contacts-usage-add-contact.page
index fbf9e643b8..58cbbbee58 100644
--- a/help/C/contacts-usage-add-contact.page
+++ b/help/C/contacts-usage-add-contact.page
@@ -1,41 +1,68 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="topic" id="contacts-usage-add-contact">
 
   <info>
-    <desc>Adding a contact to your address book.</desc>
-    
     <link type="guide" xref="contacts-usage" />
 
     <revision pkgversion="3.0.2" version="0.2" date="2011-09-29" status="final"/>
+
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-        
 
+    <desc>Adding a contact to your address book.</desc>
   </info>
 
-<title>Adding a Contact</title>
+  <title>Adding a Contact</title>
 
-<steps>
-<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact</gui></guiseq>, or right-click in a blank space in the list of contacts and click <gui>New Contact...</gui>, or press <keyseq><key>Shift</key><key>Ctrl</key><key>C</key></keyseq>.</p></item>
-<item><p>Select the address book under <gui>Where:</gui> to which it will be added.</p></item>
-<item><p>Enter the contact information. Note that there are several tabs.</p></item>
-<item><p>You can add a photograph to the contact by clicking the large field (showing a stylized person) next to <gui>Full Name</gui> and <gui>Categories</gui>.</p></item>
-<item><p>Click <gui style="button">OK</gui>.</p></item>
-</steps>
+  <steps>
+    <item>
+      <p>Click
+      <guiseq><gui>File</gui><gui>New</gui><gui>Contact</gui></guiseq>, or
+      right-click in a blank space in the list of contacts and click
+      <gui>New Contact…</gui>, or press
+      <keyseq><key>Shift</key><key>Ctrl</key><key>C</key></keyseq>.</p>
+    </item>
+    <item>
+      <p>Select the address book under <gui>Where:</gui> to which it will be
+      added.</p>
+    </item>
+    <item>
+      <p>Enter the contact information. Note that there are several tabs.</p>
+    </item>
+    <item>
+      <p>You can add a photograph to the contact by clicking the large field
+      (showing a stylized person) next to <gui>Full Name</gui> and
+      <gui>Categories</gui>.</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">OK</gui>.</p>
+    </item>
+  </steps>
 
 <section id="contact-quick-add">
-<title>Contact Quick-Add from the Email Window</title>
-
-<p>You can also add a contact directly from an email.</p>
-<steps>
-<item><p>Right-click on the email address in the message header.</p></item>
-<item><p>Select <gui>Add to Address Book...</gui>.</p></item>
-<item><p>Either press <gui style="button">Edit Full</gui> to bring up the full <gui>Contact Editor</gui>, or click <gui style="button">OK</gui> to directly add the contact to the chosen address book.</p></item>
-</steps>
+  <title>Contact Quick-Add from the Email Window</title>
+
+  <p>You can also add a contact directly from an email.</p>
+
+  <steps>
+    <item>
+      <p>Right-click on the email address in the message header.</p>
+    </item>
+    <item>
+      <p>Select <gui>Add to Address Book…</gui>.</p>
+    </item>
+    <item>
+      <p>Either press <gui style="button">Edit Full</gui> to bring up the full
+      <gui>Contact Editor</gui>, or click <gui style="button">OK</gui> to
+      directly add the contact to the chosen address book.</p>
+    </item>
+  </steps>
+
 </section>
 
 </page>
diff --git a/help/C/contacts-usage-delete-contact.page b/help/C/contacts-usage-delete-contact.page
index 408b055341..852a65f9c7 100644
--- a/help/C/contacts-usage-delete-contact.page
+++ b/help/C/contacts-usage-delete-contact.page
@@ -1,24 +1,28 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="topic" id="contacts-usage-delete-contact">
 
   <info>
-    <desc>Deleting a contact from your address book.</desc>
-    
     <link type="guide" xref="contacts-usage" />
 
     <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-        
 
+    <desc>Deleting a contact from your address book.</desc>
   </info>
 
-<title>Deleting a Contact</title>
+  <title>Deleting a Contact</title>
 
-<p>If you want to delete a contact in your address books, right-click on the contact and select <gui>Delete</gui>, or click on the contact and click <gui>Delete</gui> in the tool bar or press <keyseq><key>Ctrl</key><key>D</key></keyseq>, or click <guiseq><gui>Edit</gui><gui>Delete Contact</gui></guiseq>.</p>
+  <p>If you want to delete a contact in your address books, right-click on the
+  contact and select <gui>Delete</gui>, or click on the contact and click
+  <gui>Delete</gui> in the tool bar or press
+  <keyseq><key>Ctrl</key><key>D</key></keyseq>, or click
+  <guiseq><gui>Edit</gui><gui>Delete Contact</gui></guiseq>.</p>
 
 </page>
diff --git a/help/C/contacts-usage-edit-contact.page b/help/C/contacts-usage-edit-contact.page
index 891445e464..6ca55e5338 100644
--- a/help/C/contacts-usage-edit-contact.page
+++ b/help/C/contacts-usage-edit-contact.page
@@ -1,30 +1,38 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="topic" id="contacts-usage-edit-contact">
 
   <info>
-    <desc>Editing a contact in your address book.</desc>
-    
     <link type="guide" xref="contacts-usage" />
 
     <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-        
 
+    <desc>Editing a contact in your address book.</desc>
   </info>
 
-<title>Editing a Contact</title>
+  <title>Editing a Contact</title>
 
-<p>If you want to change a contact that already exists in your address books,</p>
+  <p>If you want to change a contact that already exists in your address
+  books,</p>
 
-<steps>
-<item><p>Double-click on the contact that you want to edit in the list of contacts, or select the contact and press <key>Enter</key>.</p></item>
-<item><p>Edit the contact information.</p></item>
-<item><p>Click <gui style="button">OK</gui>.</p></item>
-</steps>
+  <steps>
+    <item>
+      <p>Double-click on the contact that you want to edit in the list of
+      contacts, or select the contact and press <key>Enter</key>.</p>
+    </item>
+    <item>
+      <p>Edit the contact information.</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">OK</gui>.</p>
+    </item>
+  </steps>
 
 </page>
diff --git a/help/C/contacts-usage.page b/help/C/contacts-usage.page
index 7052f949c7..c976b46656 100644
--- a/help/C/contacts-usage.page
+++ b/help/C/contacts-usage.page
@@ -1,22 +1,22 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="guide" id="contacts-usage">
 
   <info>
-    <desc>On adding, editing, and deleting contacts in address books.</desc>
-    
     <link type="guide" xref="index#contacts" />
 
     <revision pkgversion="2.32.1" version="0.1" date="2011-07-21" status="stub"/>
+
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-        
 
+    <desc>On adding, editing, and deleting contacts in address books.</desc>
   </info>
 
-<title>Add, Edit, and Delete Contacts</title>
+  <title>Add, Edit, and Delete Contacts</title>
 
 </page>
diff --git a/help/C/contacts-using-contact-lists.page b/help/C/contacts-using-contact-lists.page
index 3bb9ecadb7..fce71fc3ff 100644
--- a/help/C/contacts-using-contact-lists.page
+++ b/help/C/contacts-using-contact-lists.page
@@ -1,48 +1,88 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="topic" id="contacts-using-contact-lists">
 
   <info>
-    <desc>Using contact lists for grouping contacts.</desc>
-
     <link type="guide" xref="contacts-organizing" />
 
     <revision pkgversion="2.32.1" version="0.2" date="2011-07-28" status="final"/>
+
     <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#usage-contact-organize-group-list -->
- </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#usage-contact-organize-group-list
+	   -->
+    </credit>
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-        
 
+    <desc>Using contact lists for grouping contacts.</desc>
   </info>
 
-<title>Using Contact Lists</title>
+  <title>Using Contact Lists</title>
 
-<p>A contact list is a set of contacts with a single nickname that you create. When you send mail to this nickname it is actually sent to every member of the list. This differs from a "real" mailing list in that it exists only on your computer as a convenience to you, rather than as an actual email address managed by a mailing list application on a server.</p>
+  <p>A contact list is a set of contacts with a single nickname that you
+  create. When you send mail to this nickname it is actually sent to every
+  member of the list. This differs from a "real" mailing list in that it exists
+  only on your computer as a convenience to you, rather than as an actual email
+  address managed by a mailing list application on a server.</p>
 
-<p>For example, you could create one contact for each family member, then add those contacts to a contact list called "Family". Then, instead of entering each person's email address individually, you can send emails to "Family" and the messages would go to all of them.</p>
+  <p>For example, you could create one contact for each family member, then add
+  those contacts to a contact list called "Family". Then, instead of entering
+  each person's email address individually, you can send emails to "Family" and
+  the messages would go to all of them.</p>
 
 <section id="create-contact-list">
-<title>Creating a contact list</title>
-<steps>
-<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Contact List</gui></guiseq>.</p></item>
-<item><p>Enter a name that you prefer.</p></item>
-<item><p>Select the address book under <gui>Where:</gui> to which it will be added.</p></item>
-<item><p>Specify the list members by either entering the names or email addresses of contacts (the text field supports autocompletion), or by dragging contacts from the Contacts window into the list, or by using the <gui style="button">Select...</gui> button.</p></item>
-<item><p>Choose whether you want to hide the email addresses when you send a message to the list.</p><p>Unless it is a very small list, it is recommended that you leave the addresses hidden. This is the same thing as using the “Bcc:” feature discussed in <link xref="mail-composer-several-recipients">Sending a message to several recipients</link>.</p></item>
-<item><p>Click <gui style="button">OK</gui>.</p></item>
-</steps>
-
-<p>The contact list will be added to the chosen address book in Evolution.</p>
+  <title>Creating a contact list</title>
+
+  <steps>
+    <item>
+      <p>Click <guiseq><gui>File</gui><gui>New</gui>
+      <gui>Contact List</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Enter a name that you prefer.</p>
+    </item>
+    <item>
+      <p>Select the address book under <gui>Where:</gui> to which it will be
+      added.</p>
+    </item>
+    <item>
+      <p>Specify the list members by either entering the names or email
+      addresses of contacts (the text field supports autocompletion), or by
+      dragging contacts from the Contacts window into the list, or by using the
+      <gui style="button">Select…</gui> button.</p>
+    </item>
+    <item>
+      <p>Choose whether you want to hide the email addresses when you send a
+      message to the list.</p><p>Unless it is a very small list, it is
+      recommended that you leave the addresses hidden. This is the same thing
+      as using the “Bcc:” feature discussed in
+      <link xref="mail-composer-several-recipients">Sending a message to
+      several recipients</link>.</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">OK</gui>.</p>
+    </item>
+  </steps>
+
+  <p>The contact list will be added to the chosen address book in
+  <app>Evolution</app>.</p>
+
 </section>
 
 <section id="send-to-contact-list">
-<title>Sending messages to a contact list</title>
-<p>To send a message to the contact list, enter the name that you chose for the contact list as the recipient in the mail composer. You can also right-click the contact list in your address book and select <gui>Send Message to List</gui>.</p>
+  <title>Sending messages to a contact list</title>
+
+  <p>To send a message to the contact list, enter the name that you chose for
+  the contact list as the recipient in the mail composer. You can also
+  right-click the contact list in your address book and select
+  <gui>Send Message to List</gui>.</p>
+
 </section>
- 
+
 </page>
diff --git a/help/C/contacts-using-several-addressbooks.page b/help/C/contacts-using-several-addressbooks.page
index def04bb21d..736e995e1e 100644
--- a/help/C/contacts-using-several-addressbooks.page
+++ b/help/C/contacts-using-several-addressbooks.page
@@ -1,26 +1,31 @@
-<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="guide" id="contacts-using-several-addressbooks">
 
   <info>
-    <desc>Adding different types of address books and using more than one address book.</desc>
-
     <link type="guide" xref="contacts-organizing" />
 
     <revision pkgversion="3.8.2" version="0.4" date="2013-06-20" status="final"/>
+
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-        
 
+    <desc>Adding different types of address books and using more than one
+    address book.</desc>
   </info>
 
-<title>Adding and creating address books</title>
+  <title>Adding and creating address books</title>
+
+  <p>You can have multiple address books. For example, you might have one
+  address book for work related contacts and one for private contacts. The side
+  bar lists those address books, and you can select which address book is
+  shown.</p>
 
-<p>You can have multiple address books. For example, you might have one address book for work related contacts and one for private contacts. The side bar lists those address books, and you can select which address book is shown.</p>
+  <p>You can also use address books that are not on your computer, such as on
+  the internet (e.g. Google) or in a local network (e.g. LDAP).</p>
 
-<p>You can also use address books that are not on your computer, such as on the internet (e.g. Google) or in a local network (e.g. LDAP).</p>
- 
 </page>