User docs: Fix styling+indents in calendar-*.page

Fix indents and add <app> tags around Evolution
in all calendar-*.pages.

27 files changed, 968 insertions, 447 deletions

diff --git a/help/C/calendar-alarms-and-reminders.page b/help/C/calendar-alarms-and-reminders.page
index 7bf3267b60..b71e59d300 100644
--- a/help/C/calendar-alarms-and-reminders.page
+++ b/help/C/calendar-alarms-and-reminders.page
@@ -1,50 +1,73 @@
-<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"
       xmlns:e="http://projectmallard.org/experimental/"
       xmlns:if="http://projectmallard.org/experimental/if/"
       type="topic" id="calendar-alarms-and-reminders">
 
   <info>
-    <desc>Setting up reminder notifications for appointments.</desc>
-    
     <link type="guide" xref="index#calendar" />
 
     <revision pkgversion="3.1.5" version="0.4" date="2011-08-02" 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/config-prefs-cal.html.en#CACHCGCI -->
- </credit>
-    
+    <credit type="author">
+     <name its:translate="no">Novell, Inc</name>
+     <!-- Content partially from http://library.gnome.org/users/evolution/2.32/config-prefs-cal.html.en#CACHCGCI -->
+    </credit>
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-      
 
+    <desc>Setting up reminder notifications for appointments.</desc>
   </info>
 
-<title>Reminders for appointments</title>
+  <title>Reminders for appointments</title>
 
 <section id="general-settings">
-<title>General Settings</title>
+  <title>General Settings</title>
+
+  <p>Under <guiseq><gui>Edit</gui><gui>Preferences</gui>
+  <gui>Calendar and Tasks</gui><gui>Reminders</gui></guiseq> you can select
+  those calendars for which you want to receive reminder notifications. If you
+  do not select a calendar, you will not receive reminders for any events in
+  this calendar. You can also define whether to show a reminder for every
+  appointment and for every birthday and anniversary.</p>
 
-<p>Under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Reminders</gui></guiseq> you can select those calendars for which you want to receive reminder notifications. If you do not select a calendar, you will not receive reminders for any events in this calendar. You can also define whether to show a reminder for every appointment and for every birthday and anniversary.</p>
-<if:choose>
-  <if:when test="platform:gnome-shell">
-    <p>For general information on displaying reminders, please see <link xref="help:gnome-help/shell-notifications" href="https://help.gnome.org/users/gnome-help/stable/shell-notifications">the GNOME Desktop Help</link>.</p>
-  </if:when>
-</if:choose>
+  <if:choose>
+    <if:when test="platform:gnome-shell">
+      <p>For general information on displaying reminders, please see
+      <link xref="help:gnome-help/shell-notifications"
+      href="https://help.gnome.org/users/gnome-help/stable/shell-notifications">
+      the GNOME Desktop Help</link>.</p>
+    </if:when>
+  </if:choose>
 
 </section>
 
 <section id="manual-reminders">
-<title>Manual Reminders</title>
-
-<p>Apart from the general settings you can also set up reminders in the appointment editor for certain appointments only:</p>
-<steps>
-<item><p>Click <guiseq><gui>Options</gui><gui>Reminders</gui></guiseq> or press the Reminder button in the toolbar.</p></item>
-<item><p>From the dropdown menu, choose either one of the available default options when to show a notification reminder, or choose <gui>Customize</gui>.</p></item>
-<item><p>In case of <gui>Customize</gui>, the reminder can be a popup, a sound played, or a program ran. You can also define whether the reminder should be repeated.</p></item>
-</steps>
+  <title>Manual Reminders</title>
+
+  <p>Apart from the general settings you can also set up reminders in the
+  appointment editor for certain appointments only:</p>
+
+  <steps>
+    <item>
+      <p>Click <guiseq><gui>Options</gui><gui>Reminders</gui></guiseq> or press
+      the Reminder button in the toolbar.</p>
+    </item>
+    <item>
+      <p>From the dropdown menu, choose either one of the available default
+      options when to show a notification reminder, or choose
+      <gui>Customize</gui>.</p>
+    </item>
+    <item>
+      <p>In case of <gui>Customize</gui>, the reminder can be a popup, a sound
+      played, or a program ran. You can also define whether the reminder should
+      be repeated.</p>
+    </item>
+  </steps>
 
 </section>
 
diff --git a/help/C/calendar-caldav.page b/help/C/calendar-caldav.page
index fc87c9eebe..3a237bee00 100644
--- a/help/C/calendar-caldav.page
+++ b/help/C/calendar-caldav.page
@@ -1,40 +1,65 @@
-<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="calendar-caldav">
 
   <info>
-    <desc>Using an online CalDAV calendar.</desc>
-    
     <link type="guide" xref="calendar-using-several-calendars"/>
 
     <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-calendar-multiple.html.en -->
- </credit>
-    
+    <credit type="author">
+      <name its:translate="no">Novell, Inc</name>
+      <!-- Content partially from
+      http://library.gnome.org/users/evolution/2.32/usage-calendar-multiple.html.en
+      -->
+    </credit>
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    
 
+    <desc>Using an online CalDAV calendar.</desc>
   </info>
 
-<title>Using a CalDAV calendar</title>
-
-<p>To add such a calendar to Evolution, perform the following steps:</p>
-<steps>
-<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>.</p></item>
-<item><p>Select the type <gui>CalDAV</gui>.</p></item>
-<item><p>Enter a name that you prefer.</p></item>
-<item><p>Optionally choose a color 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 the address of the calendar in the <gui>URL</gui> field.</p></item>
-<item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
-<item><p>Enter your username and your email address.</p></item>
-<item><p>Click <gui style="button">Apply</gui>.</p></item>
-</steps>
-
-<p>The calendar will be added to the list of calendars in Evolution.</p>
+  <title>Using a CalDAV calendar</title>
+
+  <p>To add such a calendar to <app>Evolution</app>, perform the following steps:</p>
+
+  <steps>
+    <item>
+      <p>Click
+      <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Select the type <gui>CalDAV</gui>.</p>
+    </item>
+    <item>
+      <p>Enter a name that you prefer.</p>
+    </item>
+    <item>
+      <p>Optionally choose a color 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 the address of the calendar in the <gui>URL</gui> field.</p>
+    </item>
+    <item>
+      <p>Choose <gui>Use secure connection</gui> if you want to connect
+      securely.</p>
+    </item>
+    <item>
+      <p>Enter your username and your email address.</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">Apply</gui>.</p>
+    </item>
+  </steps>
+
+  <p>The calendar will be added to the list of calendars in <app>Evolution</app>.</p>
 
 </page>
diff --git a/help/C/calendar-classifications.page b/help/C/calendar-classifications.page
index 02dd2fe789..cdf4c30af3 100644
--- a/help/C/calendar-classifications.page
+++ b/help/C/calendar-classifications.page
@@ -1,29 +1,41 @@
-<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="calendar-classifications">
 
   <info>
-    <desc>Classifying appointments and tasks on groupware servers.</desc>
-    
     <link type="guide" xref="index#calendar-advanced" />
 
     <revision pkgversion="3.0.2" version="0.1" date="2011-07-31" 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-calendar-apts.html.en#bxmtbjb -->
+      <name its:translate="no">Novell, Inc</name>
+      <!-- Content partially from
+      http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#bxmtbjb
+      -->
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-        
 
+    <desc>Classifying appointments and tasks on groupware servers.</desc>
   </info>
 
-<title>Using Classifications</title>
+  <title>Using Classifications</title>
+
+  <p>If you are using a calendar on a Novell GroupWise or Microsoft Exchange
+  server, you can select a classification to determine who can view it.</p>
+
+  <p>To set a classification for an appointment or a task, click
+  <guiseq><gui>Options</gui><gui>Classifications</gui></guiseq> and select a
+  classification in the editor. <gui>Public</gui> is the default category, and
+  a public appointment can be viewed by anyone on the calendar-sharing network.
+  <gui>Private</gui> denotes one level of security, and <gui>Confidential</gui>
+  an even higher level.</p>
 
-<p>If you are using a calendar on a Novell GroupWise or Microsoft Exchange server, you can select a classification to determine who can view it.</p>
-<p>To set a classification for an appointment or a task, click <guiseq><gui>Options</gui><gui>Classifications</gui></guiseq> and select a classification in the editor. <gui>Public</gui> is the default category, and a public appointment can be viewed by anyone on the calendar-sharing network. <gui>Private</gui> denotes one level of security, and <gui>Confidential</gui> an even higher level.</p>
-<p>The different levels vary depending on your server settings; check with your system administrator or adjust your delegation settings.</p>
+  <p>The different levels vary depending on your server settings; check with
+  your system administrator or adjust your delegation settings.</p>
 
 </page>
diff --git a/help/C/calendar-free-busy.page b/help/C/calendar-free-busy.page
index ff28641182..81111b2223 100644
--- a/help/C/calendar-free-busy.page
+++ b/help/C/calendar-free-busy.page
@@ -2,7 +2,6 @@
       type="topic" id="calendar-free-busy">
 
   <info>
-    <desc>Using the Free/Busy view on a groupware server to set up meetings.</desc>
 
     <link type="guide" xref="calendar-sharing-information" />
 
@@ -12,42 +11,109 @@
       <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-calendar-apts.html.en and http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#usage-calendar-freebusy -->
+      <name its:translate="no">Novell, Inc</name>
+      <!-- Content partially from
+	   http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en
+	   and
+	   http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#usage-calendar-freebusy
+	   -->
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-        
-<!-- TODO: Really split this into Exchange/Groupware section and normal people section -->
+
+    <desc>Using the Free/Busy view on a groupware server to set up
+    meetings.</desc>
+    <!-- TODO: Really split this into Exchange/Groupware section and normal people section -->
   </info>
 
-<title>Free/Busy information</title>
+  <title>Free/Busy information</title>
+
+  <p>You can use the Free/Busy search for meetings to determine the
+  availability of invitees.</p>
 
-<p>You can use the Free/Busy search for meetings to determine the availability of invitees.</p>
+  <p>In addition to the standard meeting scheduling tools, you can use the
+  Free/Busy view to check whether people are available in advance. The
+  Free/Busy feature is normally a function of dedicated groupware servers such
+  as Microsoft Exchange and Novell GroupWise. However, you can also publish
+  Free/Busy information online, and access Free/Busy information published
+  elsewhere. If not everyone you collaborate with publishes Free/Busy data, you
+  can still use
+  <link xref="calendar-meetings-sending-invitation">meeting invitations</link>
+  to coordinate schedules with other people.</p>
 
-<p>In addition to the standard meeting scheduling tools, you can use the Free/Busy view to check whether people are available in advance. The Free/Busy feature is normally a function of dedicated groupware servers such as Microsoft Exchange and Novell GroupWise. However, you can also publish Free/Busy information online, and access Free/Busy information published elsewhere. If not everyone you collaborate with publishes Free/Busy data, you can still use <link xref="calendar-meetings-sending-invitation">meeting invitations</link> to coordinate schedules with other people.</p>
+  <p>To access the free/busy view:</p>
 
-<p>To access the free/busy view:</p>
-<steps>
-<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Meeting</gui></guiseq>.</p></item>
-<item><p>Click <gui style="button">Add</gui> to add the email addresses of people you want to invite.</p></item>
-<item><p>Click the <gui>Free/Busy</gui> button on the toolbar, or click <guiseq><gui>Options</gui><gui>Free/Busy</gui></guiseq>.</p></item>
-<item><p>Adjust the meeting time, either by dragging the meeting borders or by using the <gui>Autopick</gui> buttons to choose a time automatically, then click <gui style="button">Close</gui>. Attendees on an Exchange server have the appointment updated automatically; others receive email notification of any change in plans.</p></item>
-</steps>
+  <steps>
+    <item>
+      <p>Click
+      <guiseq><gui>File</gui><gui>New</gui><gui>Meeting</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">Add</gui> to add the email addresses of
+      people you want to invite.</p>
+    </item>
+    <item>
+      <p>Click the <gui>Free/Busy</gui> button on the toolbar, or click
+      <guiseq><gui>Options</gui><gui>Free/Busy</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Adjust the meeting time, either by dragging the meeting borders or by
+      using the <gui>Autopick</gui> buttons to choose a time automatically,
+      then click <gui style="button">Close</gui>. Attendees on an Exchange
+      server have the appointment updated automatically; others receive email
+      notification of any change in plans.</p>
+    </item>
+  </steps>
 
-<list>
-<item><p>Attendee List:</p><p>The Attendee List shows the people who have been invited to the appointment.</p></item>
-<item><p>Schedule Grid:</p><p>The Schedule Grid shows the published Free/Busy information for the people you have invited. This is where you compare schedules to find free time to schedule the appointment. Individuals have visible scheduling information only if they use the same Novell GroupWise or Microsoft Exchange server you do (that is, if they are in the same organization as you), or if they publish free/busy information at a web address (URL) that you can reach and you have entered that web address for the specific contact in the <link xref="contacts-usage-edit-contact">Contact Editor</link> under <guiseq><gui>Personal information</gui><gui>Web Addresses</gui><gui>Free/Busy</gui></guiseq>.</p></item>
-</list>
+  <list>
+    <item>
+      <p>Attendee List:</p>
+      <p>The Attendee List shows the people who have been invited to the
+      appointment.</p>
+    </item>
+    <item>
+      <p>Schedule Grid:</p>
+      <p>The Schedule Grid shows the published Free/Busy information for the
+      people you have invited. This is where you compare schedules to find free
+      time to schedule the appointment. Individuals have visible scheduling
+      information only if they use the same Novell GroupWise or Microsoft
+      Exchange server you do (that is, if they are in the same organization as
+      you), or if they publish free/busy information at a web address (URL)
+      that you can reach and you have entered that web address for the specific
+      contact in the
+      <link xref="contacts-usage-edit-contact">Contact Editor</link> under
+      <guiseq><gui>Personal information</gui>
+      <gui>Web Addresses</gui><gui>Free/Busy</gui></guiseq>.</p>
+    </item>
+  </list>
 
-<p>You can publish Calendar and Free/Busy information to a WebDAV server, FTP server, a remote machine through SSH or to any other web server with HTTP PUT support.</p>
-<p>In corporate environments you can publish Calendar and Free/Busy information to an Exchange or Groupwise server. Note that you must use the top-level Exchange calendar if you want others to be able to access your Free / Busy information when inviting you to a meeting.</p>
-<p>The default server can be defined under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Publishing Information</gui><gui>Default Free/Busy Server</gui></guiseq>.</p>
-<!-- This is the location since 3.1.5, see bug https://bugzilla.gnome.org/show_bug.cgi?id=655666 -->
+  <p>You can publish Calendar and Free/Busy information to a WebDAV server, FTP
+  server, a remote machine through SSH or to any other web server with HTTP PUT
+  support.</p>
+
+  <p>In corporate environments you can publish Calendar and Free/Busy
+  information to an Exchange or Groupwise server. Note that you must use the
+  top-level Exchange calendar if you want others to be able to access your Free
+  / Busy information when inviting you to a meeting.</p> <p>The default server
+  can be defined under
+  <guiseq><gui>Edit</gui><gui>Preferences</gui>
+  <gui>Calendar and Tasks</gui>
+  <gui>Publishing Information</gui>
+  <gui>Default Free/Busy Server</gui></guiseq>.</p>
+
+  <!-- This is the location since 3.1.5, see bug
+       https://bugzilla.gnome.org/show_bug.cgi?id=655666 -->
 
 <section id="no-groupware">
-<title>Accessing Free/Busy Data Without a Groupware Server</title>
+  <title>Accessing Free/Busy Data Without a Groupware Server</title>
+
+  <p>If individuals give you a URL for Free/Busy data or for their web
+  calendar, you can add the URL under
+  <guiseq><gui>Personal Information</gui><gui>Web Addresses</gui></guiseq> in
+  the <link xref="contacts-usage-edit-contact">Contact Editor</link>. Then,
+  when you schedule a meeting with them,<app>Evolution</app> looks up the
+  schedule and displays it in the Free/Busy data.</p>
 
-<p>If individuals give you a URL for Free/Busy data or for their web calendar, you can add the URL under <guiseq><gui>Personal Information</gui><gui>Web Addresses</gui></guiseq> in the <link xref="contacts-usage-edit-contact">Contact Editor</link>. Then, when you schedule a meeting with them, Evolution looks up the schedule and displays it in the Free/Busy data.</p>
 </section>
 
 </page>
diff --git a/help/C/calendar-google.page b/help/C/calendar-google.page
index 5d22a65873..0ed08217c8 100644
--- a/help/C/calendar-google.page
+++ b/help/C/calendar-google.page
@@ -1,40 +1,62 @@
-<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="calendar-google">
 
   <info>
-    <desc>Using the online calendar of your Google account.</desc>
-    
     <link type="guide" xref="calendar-using-several-calendars"/>
     <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>
- <credit type="author">
-   <name its:translate="no">Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-view.html.en#b1a47igh -->
- </credit>
-    
+    <credit type="author">
+      <name its:translate="no">Novell, Inc</name>
+      <!-- Content partially from
+	   http://library.gnome.org/users/evolution/2.32/usage-calendar-view.html.en#b1a47igh
+	   -->
+    </credit>
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    
 
+    <desc>Using the online calendar of your Google account.</desc>
   </info>
 
-<title>Using a Google calendar</title>
-
-<p>To add such a calendar to Evolution, perform the following steps:</p>
-<steps>
-<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</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>Optionally choose a color 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>If you have more than one Google calendar, define which of them to use.</p></item>
-<item><p>Click <gui style="button">Apply</gui>.</p></item>
-</steps>
-
-<p>The calendar will be added to the list of calendars in Evolution.</p>
+  <title>Using a Google calendar</title>
+
+  <p>To add such a calendar to <app>Evolution</app>, perform the following
+  steps:</p>
+
+  <steps>
+    <item>
+      <p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</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>Optionally choose a color 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>If you have more than one Google calendar, define which of them to use.</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">Apply</gui>.</p>
+    </item>
+  </steps>
+
+  <p>The calendar will be added to the list of calendars in
+  <app>Evolution</app>.</p>
 
 </page>
diff --git a/help/C/calendar-layout-appointment-display.page b/help/C/calendar-layout-appointment-display.page
index 3e197bb9bf..f34d32936c 100644
--- a/help/C/calendar-layout-appointment-display.page
+++ b/help/C/calendar-layout-appointment-display.page
@@ -1,53 +1,86 @@
-<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="calendar-layout-appointment-display">
 
   <info>
-    <desc>Define the displaying of appointments in the calendar.</desc>
-    
     <link type="guide" xref="calendar-layout" />
 
     <revision pkgversion="3.0.2" version="0.4" date="2012-02-18" 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/config-prefs-cal.html.en#bshpsxa -->
+      <name its:translate="no">Novell, Inc</name>
+      <!-- Content partially from
+	   http://library.gnome.org/users/evolution/2.32/config-prefs-cal.html.en#bshpsxa
+	   -->
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    
 
+    <desc>Define the displaying of appointments in the calendar.</desc>
   </info>
 
-<title>Appearance of Appointments</title>
+  <title>Appearance of Appointments</title>
 
-<!-- TODO:POST-3-8: Just listing the partially busted UI options (also see calendar-layout-general-formatting) here is very poor and not task-oriented, but that's it for the time being. Better ideas welcome. -->
+  <!-- TODO:POST-3-8: Just listing the partially busted UI options (also see
+       calendar-layout-general-formatting) here is very poor and not
+       task-oriented, but that's it for the time being. Better ideas welcome.
+       -->
 
-<!-- TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=657233 is fixed, as the current UI is a huge mess. -->
+  <!-- TODO: Recheck once https://bugzilla.gnome.org/show_bug.cgi?id=657233 is
+       fixed, as the current UI is a huge mess. -->
 
-<p>The following calendar-related options are available under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Display</gui></guiseq>.</p>
+  <p>The following calendar-related options are available under
+  <guiseq><gui>Edit</gui><gui>Preferences</gui>
+  <gui>Calendar and Tasks</gui><gui>Display</gui></guiseq>.</p>
 
 <section id="general">
-<title>General</title>
-<list>
-<item><p>Time Divisions:</p>
-<p>Sets the time increments shown as fine lines on the daily view in the calendar.</p></item>
-<item><p>Show appointment end times in week and month views:</p>
-<p>If there is space, Evolution shows the end times in the week and month views for each appointment.</p></item>
-<item><p>Compress weekends in month view:</p>
-<p>Select this option to display weekends in one box instead of two in the month view.</p></item>
-<item><p>Show week numbers:</p>
-<p>Shows the week numbers next to the respective weeks in the calendar.</p></item>
-<item><p>Show recurring events in italic in bottom left calendar</p></item>
-<item><p>Scroll Month View by a week</p></item>
-</list>
+  <title>General</title>
+
+  <list>
+    <item>
+      <p>Time Divisions:</p>
+      <p>Sets the time increments shown as fine lines on the daily view in the
+      calendar.</p>
+    </item>
+    <item>
+      <p>Show appointment end times in week and month views:</p>
+      <p>If there is space, <app>Evolution</app> shows the end times in the
+      week and month views for each appointment.</p>
+    </item>
+    <item>
+      <p>Compress weekends in month view:</p>
+      <p>Select this option to display weekends in one box instead of two in
+      the month view.</p>
+    </item>
+    <item>
+      <p>Show week numbers:</p>
+      <p>Shows the week numbers next to the respective weeks in the
+      calendar.</p>
+    </item>
+    <item>
+      <p>Show recurring events in italic in bottom left calendar.</p>
+    </item>
+    <item>
+      <p>Scroll Month View by a week</p>
+    </item>
+  </list>
+
 </section>
 
 <section id="date-time">
-<title>Date/Time Format</title>
-<p>You can change the format of the <gui>Date</gui> column by setting your preferred format.</p>
-<p>The placeholders in the format expression are strftime formats. For a complete list of available strftime formats, run <cmd>date --help</cmd> in the <app>Terminal</app> application.</p>
+  <title>Date/Time Format</title>
+
+  <p>You can change the format of the <gui>Date</gui> column by setting your
+  preferred format.</p>
+
+  <p>The placeholders in the format expression are strftime formats. For a
+  complete list of available strftime formats, run <cmd>date --help</cmd> in
+  the <app>Terminal</app> application.</p>
+
 </section>
 
 </page>
diff --git a/help/C/calendar-layout-general-formatting.page b/help/C/calendar-layout-general-formatting.page
index 6912904f67..1ed585b223 100644
--- a/help/C/calendar-layout-general-formatting.page
+++ b/help/C/calendar-layout-general-formatting.page
@@ -2,56 +2,83 @@
       type="topic" id="calendar-layout-general-formatting">
 
   <info>
-    <desc>General formatting options for the calendar.</desc>
-    
     <link type="guide" xref="calendar-layout" />
 
     <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" 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/config-prefs-cal.html.en#bshpskx -->
+      <name its:translate="no">Novell, Inc</name>
+      <!-- Content partially from
+	   http://library.gnome.org/users/evolution/2.32/config-prefs-cal.html.en#bshpskx
+	   -->
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    
 
-<!-- TODO:POST-3-8: Just listing the partially busted UI options (also see calendar-layout-appointment-display) here is very poor and not task-oriented, but that's it for the time being. Better ideas welcome. -->
+    <!-- TODO:POST-3-8: Just listing the partially busted UI options (also see
+	 calendar-layout-appointment-display) here is very poor and not
+	 task-oriented, but that's it for the time being. Better ideas welcome.
+	 -->
 
+    <desc>General formatting options for the calendar.</desc>
   </info>
 
-<title>General formatting options</title>
+  <title>General formatting options</title>
+
+  <p>The following options are available under
+  <guiseq><gui>Edit</gui><gui>Preferences</gui>
+  <gui>Calendar and Tasks</gui><gui>General</gui></guiseq>.</p>
 
-<p>The following options are available under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>General</gui></guiseq>.</p>
 <section id="time">
-<title>Time</title>
-<list>
-<item><p>Time format:</p>
-<p>Choose between twelve-hour (AM/PM) and twenty-four-hour time formats.</p></item>
-<item><p><link xref="calendar-timezones">Time zone</link> and Second zone:</p>
-<p>The city you are located in, and optionally a second city.</p></item>
-</list>
+  <title>Time</title>
+
+  <list>
+    <item>
+      <p>Time format:</p>
+      <p>Choose between twelve-hour (AM/PM) and twenty-four-hour time
+      formats.</p>
+    </item>
+    <item>
+      <p><link xref="calendar-timezones">Time zone</link> and Second zone:</p>
+      <p>The city you are located in, and optionally a second city.</p>
+    </item>
+  </list>
 </section>
 
 <section id="work-week">
-<title>Work Week</title>
-<list>
-<item><p>Week starts on:</p>
-<p>Select the day to display as the first in each week.</p></item>
-<item><p>Work days:</p>
-<p>Define which week days are work days.</p></item>
-<item><p>Day begins:</p>
-<p>Define at which time your work day begins.</p></item>
-<item><p>Day ends:</p>
-<p>Define at which time your work day ends.</p></item>
-</list>
+  <title>Work Week</title>
+
+  <list>
+    <item>
+      <p>Week starts on:</p>
+      <p>Select the day to display as the first in each week.</p>
+    </item>
+    <item>
+      <p>Work days:</p>
+      <p>Define which week days are work days.</p>
+    </item>
+    <item>
+      <p>Day begins:</p>
+      <p>Define at which time your work day begins.</p>
+    </item>
+    <item>
+      <p>Day ends:</p>
+      <p>Define at which time your work day ends.</p>
+    </item>
+  </list>
+
 </section>
 
 <section id="alerts">
-<title>Alerts</title>
-<p>If you want to be warned before you delete any appointment, select this option.</p>
+  <title>Alerts</title>
+
+  <p>If you want to be warned before you delete any appointment, select this
+  option.</p>
+
 </section>
 
 </page>
diff --git a/help/C/calendar-layout-views.page b/help/C/calendar-layout-views.page
index 6f1864fd08..b1887b632f 100644
--- a/help/C/calendar-layout-views.page
+++ b/help/C/calendar-layout-views.page
@@ -1,42 +1,64 @@
-<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="calendar-layout-views">
 
   <info>
-    <desc>Using date ranges (day, week, month) to look at the calendar.</desc>
-    
     <link type="guide" xref="calendar-layout" />
 
     <revision pkgversion="3.1.5" version="0.2" date="2011-07-27" 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-calendar-view.html.en -->
- </credit>
-    
+    <credit type="author">
+      <name its:translate="no">Novell, Inc</name>
+      <!-- Content partially from
+	   http://library.gnome.org/users/evolution/2.32/usage-calendar-view.html.en
+	   -->
+    </credit>
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-    
 
+    <desc>Using date ranges (day, week, month) to look at the calendar.</desc>
   </info>
 
-<title>Available views</title>
+  <title>Available views</title>
+
+  <p><app>Evolution</app> offers five different views of your calendar
+  data:</p>
 
-<p>Evolution offers five different views of your calendar data:</p>
-<list>
-<item><p>Day (<keyseq><key>Ctrl</key><key>Y</key></keyseq>)</p></item>
-<item><p>Work Week (<keyseq><key>Ctrl</key><key>J</key></keyseq>)</p></item>
-<item><p>Week (<keyseq><key>Ctrl</key><key>K</key></keyseq>)</p></item>
-<item><p>Month (<keyseq><key>Ctrl</key><key>M</key></keyseq>)</p></item>
-<item><p>List (<keyseq><key>Ctrl</key><key>L</key></keyseq>)</p></item>
-</list>
+  <list>
+    <item>
+      <p>Day (<keyseq><key>Ctrl</key><key>Y</key></keyseq>)</p>
+    </item>
+    <item>
+      <p>Work Week (<keyseq><key>Ctrl</key><key>J</key></keyseq>)</p>
+    </item>
+    <item>
+      <p>Week (<keyseq><key>Ctrl</key><key>K</key></keyseq>)</p>
+    </item>
+    <item>
+      <p>Month (<keyseq><key>Ctrl</key><key>M</key></keyseq>)</p>
+    </item>
+    <item>
+      <p>List (<keyseq><key>Ctrl</key><key>L</key></keyseq>)</p>
+    </item>
+  </list>
 
-<p>You can switch the view by either using the buttons in the toolbar, or by clicking <guiseq><gui>View</gui><gui>Current View</gui></guiseq>.</p>
+  <p>You can switch the view by either using the buttons in the toolbar, or by
+  clicking <guiseq><gui>View</gui><gui>Current View</gui></guiseq>.</p>
 
-<p>You can also select an arbitrary range of days in the small calendar in the side bar. To do this, select the days that you want to view in your calendar.</p>
+  <p>You can also select an arbitrary range of days in the small calendar in
+  the side bar. To do this, select the days that you want to view in your
+  calendar.</p>
 
-<p>The Previous and Next buttons move you forward and back in your calendar pages. If you are using a week or month view, you can move by week or month. To return to today's listing, click the <gui>Select today</gui> button between the two arrow buttons in the toolbar.</p>
+  <p>The Previous and Next buttons move you forward and back in your calendar
+  pages. If you are using a week or month view, you can move by week or month.
+  To return to today's listing, click the <gui>Select today</gui> button
+  between the two arrow buttons in the toolbar.</p>
 
-<p>To visit calendar entries for a specific date, click the <gui>Select a specific date</gui> button in the toolbar.</p>
+  <p>To visit calendar entries for a specific date, click the <gui>Select a
+  specific date</gui> button in the toolbar.</p>
 
 </page>
diff --git a/help/C/calendar-layout.page b/help/C/calendar-layout.page
index 234c90a468..33130cce5d 100644
--- a/help/C/calendar-layout.page
+++ b/help/C/calendar-layout.page
@@ -1,20 +1,20 @@
-<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="calendar-layout">
 
   <info>
-    <desc>Adjusting the display and views of the calendar.</desc>
-
     <link type="guide" xref="index#calendar"/>
 
     <revision pkgversion="3.0.0" version="0.1" date="2011-07-21" 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>Adjusting the display and views of the calendar.</desc>
   </info>
 
   <title>Changing the calendar layout</title>
diff --git a/help/C/calendar-local.page b/help/C/calendar-local.page
index bbd0e6c653..346cfea6cd 100644
--- a/help/C/calendar-local.page
+++ b/help/C/calendar-local.page
@@ -1,34 +1,53 @@
-<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="calendar-local">
 
   <info>
-    <desc>Adding another local calendar.</desc>
-    
     <link type="guide" xref="calendar-using-several-calendars"/>
 
     <revision pkgversion="3.10.3" version="0.4" date="2014-01-27" 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 calendar.</desc>
   </info>
 
-<title>Adding another local calendar</title>
+  <title>Adding another local calendar</title>
+
+  <p>To add another local calendar to <app>Evolution</app>, perform the
+  following steps:</p>
 
-<p>To add another local calendar to Evolution, perform the following steps:</p>
-<steps>
-<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</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>Optionally choose a color that you prefer.</p></item>
-<item><p>If you choose to use an existing calendar file which is already located on your computer, you need to provide its location and whether Evolution should only read from the file or if Evolution can also add and alter items in that file.</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>Calendar</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>Optionally choose a color that you prefer.</p>
+    </item>
+    <item>
+      <p>If you choose to use an existing calendar file which is already
+      located on your computer, you need to provide its location and whether
+      <app>Evolution</app> should only read from the file or if
+      <app>Evolution</app> can also add and alter items in that file.</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">Apply</gui>.</p>
+    </item>
+  </steps>
 
-<p>The calendar will be added to the list of calendars in Evolution.</p>
+  <p>The calendar will be added to the list of calendars in
+  <app>Evolution</app>.</p>
 
 </page>
diff --git a/help/C/calendar-marcus-bains-line.page b/help/C/calendar-marcus-bains-line.page
index d330aab648..8456442b35 100644
--- a/help/C/calendar-marcus-bains-line.page
+++ b/help/C/calendar-marcus-bains-line.page
@@ -1,23 +1,25 @@
-<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="calendar-marcus-bains-line">
 
   <info>
-    <desc>The red "Marcus Bains" line displays the current time.</desc>
-
     <link type="guide" xref="calendar-layout" />
 
     <revision pkgversion="2.32.1" version="0.1" date="2011-07-21" 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>The red "Marcus Bains" line displays the current time.</desc>
   </info>
 
-<title>Time display in the Day view</title>
+  <title>Time display in the Day view</title>
 
-<p>The red Marcus Bains Line in the Day view of the calendar is a marker to show the current date and time.</p>
+  <p>The red Marcus Bains Line in the Day view of the calendar is a marker to
+  show the current date and time.</p>
 
 </page>
diff --git a/help/C/calendar-meetings-delegating.page b/help/C/calendar-meetings-delegating.page
index 6584669d4c..677231aa91 100644
--- a/help/C/calendar-meetings-delegating.page
+++ b/help/C/calendar-meetings-delegating.page
@@ -1,40 +1,47 @@
-<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="calendar-meetings-delegating">
 
   <info>
-    <desc>Ask somebody else to run the meeting.</desc>
-    
     <link type="guide" xref="calendar-meetings" />
 
     <revision pkgversion="3.5.91" version="0.3" date="2012-09-14" status="stub"/>
+
     <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/bxqatxt.html -->
+      <name its:translate="no">Novell, Inc</name>
+      <!-- Content partially from
+	   http://library.gnome.org/users/evolution/2.32/bxqatxt.html -->
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-      
 
+    <desc>Ask somebody else to run the meeting.</desc>
   </info>
 
-<title>Delegating Meetings</title>
-<p>Only attendees of a meeting can delegate a meeting, but not the organizer of a meeting.</p>
-<steps>
- <item>
-  <p>Right-click on the meeting that you want to delegate.</p>
- </item>
- <item>
-  <p>Click <gui>Delegate Meeting</gui>.</p>
- </item>
- <item>
-  <p>Select the contacts you want to delegate the meeting to.</p>
- </item>
- <item>
-  <p>Click <gui style="button">OK</gui>.</p>
- </item>
-</steps>
- <p>Each contact receives a copy of the meeting invitation.</p>
+  <title>Delegating Meetings</title>
+
+  <p>Only attendees of a meeting can delegate a meeting, but not the organizer
+  of a meeting.</p>
+
+  <steps>
+    <item>
+      <p>Right-click on the meeting that you want to delegate.</p>
+    </item>
+    <item>
+      <p>Click <gui>Delegate Meeting</gui>.</p>
+    </item>
+    <item>
+      <p>Select the contacts you want to delegate the meeting to.</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">OK</gui>.</p>
+    </item>
+  </steps>
+
+  <p>Each contact receives a copy of the meeting invitation.</p>
+
 </page>
diff --git a/help/C/calendar-meetings-sending-invitation.page b/help/C/calendar-meetings-sending-invitation.page
index 8389c556f2..8190d8a4fb 100644
--- a/help/C/calendar-meetings-sending-invitation.page
+++ b/help/C/calendar-meetings-sending-invitation.page
@@ -1,52 +1,116 @@
-<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="calendar-meetings-sending-invitation">
 
   <info>
-    <desc>Sending a Meeting Invitation.</desc>
-    
     <link type="guide" xref="calendar-meetings" />
 
     <revision pkgversion="3.0.2" version="0.2" date="2011-07-29" status="stub"/>
+
     <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-calendar-apts.html.en#usage-calendar-rsvp -->
+      <name its:translate="no">Novell, Inc</name>
+      <!-- Content partially from
+	   http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#usage-calendar-rsvp
+	   -->
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-      
 
+    <desc>Sending a Meeting Invitation.</desc>
   </info>
 
-<title>Sending a Meeting Invitation</title>
+  <title>Sending a Meeting Invitation</title>
+
+  <p>When you create a meeting (group appointment), you can specify the
+  attendees in several categories, such as "chair" or "required". When you save
+  the meeting listing, each attendee is sent an email with the meeting
+  information, which also gives them the option to respond.</p>
 
-<p>When you create a meeting (group appointment), you can specify the attendees in several categories, such as "chair" or "required". When you save the meeting listing, each attendee is sent an email with the meeting information, which also gives them the option to respond.</p>
-<p>If you do not need to collect attendance information when you're scheduling an event, and would rather just announce the event, right-click the meeting and select <gui>Forward as iCalendar</gui>. This opens a new email message with the event notification attached as an announcement. Recipients can add the event to their calendars with one click, but it will not automatically send you email about whether they plan to attend.</p>
+  <p>If you do not need to collect attendance information when you're
+  scheduling an event, and would rather just announce the event, right-click
+  the meeting and select <gui>Forward as iCalendar</gui>. This opens a new
+  email message with the event notification attached as an announcement.
+  Recipients can add the event to their calendars with one click, but it will
+  not automatically send you email about whether they plan to attend.</p>
 
-<p>To schedule a meeting:</p>
+  <p>To schedule a meeting:</p>
 
-<steps>
-<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Meeting</gui></guiseq>.</p></item>
-<item><p>If you have multiple email accounts, select the one to use by selecting an item in the <gui>Organizer</gui> field.</p></item>
-<item><p>Select a calendar in the <gui>Calendar</gui> drop-down list.</p></item>
-<item><p>Click <gui style="button">Add</gui> to add the email addresses of people you want to invite.</p></item>
-<item><p>Click <gui>View</gui> in the menu bar to show or hide the <gui>Type</gui>, <gui>Role</gui>, <gui>Status</gui>, and <gui>RSVP</gui> fields.</p></item>
-<item><p>Enter a brief summary in the <gui>Summary</gui> field.</p></item>
-<item><p>(Optional) Type a location in the <gui>Location</gui> field.</p></item>
-<item><p>To select this event as an all day event, click <guiseq><gui>Options</gui><gui>All Day Event</gui></guiseq>, or click the <gui>All Day Event</gui> button on the toolbar.</p></item>
-<item><p>Select the date and time.</p></item>
-<item><p>If the event is not an all day event, select either <gui>For</gui> to specify the duration, or select <gui>Until</gui> to specify the ending time of the event.</p></item>
-<item><p>(Optional) Enter a description in the <gui>Description</gui> field.</p></item>
-<item><p>To query <link xref="calendar-free-busy">free/busy</link> information for the attendees, click the <gui>Free/Busy</gui> button on the toolbar, or click <guiseq><gui>Options</gui><gui>Free/Busy</gui></guiseq>.</p></item>
-<item><p>Click <gui>Save</gui> to save the meeting.</p></item>
-</steps>
+  <steps>
+    <item>
+      <p>Click
+      <guiseq><gui>File</gui><gui>New</gui><gui>Meeting</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>If you have multiple email accounts, select the one to use by
+      selecting an item in the <gui>Organizer</gui> field.</p>
+    </item>
+    <item>
+      <p>Select a calendar in the <gui>Calendar</gui> drop-down list.</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">Add</gui> to add the email addresses of
+      people you want to invite.</p>
+    </item>
+    <item>
+      <p>Click <gui>View</gui> in the menu bar to show or hide the
+      <gui>Type</gui>, <gui>Role</gui>, <gui>Status</gui>, and <gui>RSVP</gui>
+      fields.</p>
+    </item>
+    <item>
+      <p>Enter a brief summary in the <gui>Summary</gui> field.</p>
+    </item>
+    <item>
+      <p>(Optional) Type a location in the <gui>Location</gui> field.</p>
+    </item>
+    <item>
+      <p>To select this event as an all day event, click
+      <guiseq><gui>Options</gui><gui>All Day Event</gui></guiseq>, or click the
+      <gui>All Day Event</gui> button on the toolbar.</p>
+    </item>
+    <item>
+      <p>Select the date and time.</p>
+    </item>
+    <item>
+      <p>If the event is not an all day event, select either <gui>For</gui> to
+      specify the duration, or select <gui>Until</gui> to specify the ending
+      time of the event.</p>
+    </item>
+    <item>
+      <p>(Optional) Enter a description in the <gui>Description</gui>
+      field.</p>
+    </item>
+    <item>
+      <p>To query <link xref="calendar-free-busy">free/busy</link> information
+      for the attendees, click the <gui>Free/Busy</gui> button on the toolbar,
+      or click <guiseq><gui>Options</gui><gui>Free/Busy</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Click <gui>Save</gui> to save the meeting.</p>
+    </item>
+  </steps>
 
-<p>An email is sent out to all the recipients, inviting them to your event.</p>
+  <p>An email is sent out to all the recipients, inviting them to your
+  event.</p>
 
-<p>You can also define a <link xref="calendar-timezones">time zone</link>, a <link xref="using-categories">category</link>, a <link xref="calendar-alarms-and-reminders">reminder</link>, a <link xref="calendar-recurrence">recurrence</link>, or a <link xref="calendar-classifications">classification</link> for the event, or add an attachment.</p>
+  <p>You can also define a <link xref="calendar-timezones">time zone</link>, a
+  <link xref="using-categories">category</link>, a
+  <link xref="calendar-alarms-and-reminders">reminder</link>, a
+  <link xref="calendar-recurrence">recurrence</link>, or a
+  <link xref="calendar-classifications">classification</link> for the event, or
+  add an attachment.</p>
 
-<note style="tip"><p>In Evolution, a meeting can have only one organizer, and only the organizer can add participants to that meeting. Though it is possible to change the organizer of a meeting, this is not recommended as a means to invite additional participants to meetings. If you want to invite additional people to a meeting and are not that meeting's organizer, it is recommended that you forward the invitation message you received from the original meeting organiser to additional participants.</p></note>
+  <note style="tip">
+    <p>In <app>Evolution</app>, a meeting can have only one organizer, and only
+    the organizer can add participants to that meeting. Though it is possible
+    to change the organizer of a meeting, this is not recommended as a means to
+    invite additional participants to meetings. If you want to invite
+    additional people to a meeting and are not that meeting's organizer, it is
+    recommended that you forward the invitation message you received from the
+    original meeting organiser to additional participants.</p>
+  </note>
 
 </page>
diff --git a/help/C/calendar-meetings.page b/help/C/calendar-meetings.page
index 0a99bb2f03..c588812e3a 100644
--- a/help/C/calendar-meetings.page
+++ b/help/C/calendar-meetings.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="calendar-meetings">
 
   <info>
-    <desc>Using meetings in the calendar.</desc>
-
     <link type="guide" xref="index#calendar-advanced" />
 
     <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" 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 meetings in the calendar.</desc>
   </info>
 
-<title>Meetings</title>
+  <title>Meetings</title>
 
 </page>
diff --git a/help/C/calendar-organizing.page b/help/C/calendar-organizing.page
index 2cc8d84ec4..816b96b0e8 100644
--- a/help/C/calendar-organizing.page
+++ b/help/C/calendar-organizing.page
@@ -1,23 +1,23 @@
-<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="calendar-organizing">
 
   <info>
-    <desc>On using several calendars, searching, and categories.</desc>
-
     <link type="guide" xref="index#calendar" />
     <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 using several calendars, searching, and categories.</desc>
   </info>
 
-<title>Sorting and organizing calendars</title>
+  <title>Sorting and organizing calendars</title>
 
 </page>
diff --git a/help/C/calendar-publishing.page b/help/C/calendar-publishing.page
index 7cfacd46e0..723840ae81 100644
--- a/help/C/calendar-publishing.page
+++ b/help/C/calendar-publishing.page
@@ -1,32 +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="calendar-publishing">
 
   <info>
-    <desc>Post your calendar content in public.</desc>
-
     <link type="guide" xref="calendar-sharing-information" />
 
     <revision pkgversion="3.1.5" version="0.4" date="2011-08-24" 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 Reuse http://library.gnome.org/users/evolution/2.32/config-prefs-cal.html.en#bxjng8p and http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#publishing-freebusy -->
- </credit>
-    
+    <credit type="author">
+      <name its:translate="no">Novell, Inc</name>
+      <!-- Content partially from Reuse
+	   http://library.gnome.org/users/evolution/2.32/config-prefs-cal.html.en#bxjng8p
+	   and
+	   http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#publishing-freebusy
+	   -->
+    </credit>
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-        
 
+    <desc>Post your calendar content in public.</desc>
   </info>
 
-<title>Calendar Publishing</title>
-<p>In order to make one of your calendars available to the public, you can define calendars to be uploaded to a web server under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>Publishing Information</gui><gui>Locations</gui><gui style="button">Add</gui></guiseq>.</p>
-<!-- This is the location since 3.1.5, see bug https://bugzilla.gnome.org/show_bug.cgi?id=655666 -->
+  <title>Calendar Publishing</title>
+
+  <p>In order to make one of your calendars available to the public, you can
+  define calendars to be uploaded to a web server under
+  <guiseq><gui>Edit</gui><gui>Preferences</gui>
+  <gui>Calendar and Tasks</gui>
+  <gui>Publishing Information</gui>
+  <gui>Locations</gui><gui style="button">Add</gui></guiseq>.</p>
+
+  <!-- This is the location since 3.1.5, see bug
+     https://bugzilla.gnome.org/show_bug.cgi?id=655666 -->
+
+  <p>You can specify the online location, the frequency of publishing, which
+  calendar(s) to publish, and authentication information for uploading.</p>
 
-<p>You can specify the online location, the frequency of publishing, which calendar(s) to publish, and authentication information for uploading.</p>
+  <p>You can publish Calendar and Free/Busy information to a WebDAV server, FTP
+  server, a remote machine through SSH or to any other web server with HTTP PUT
+  support.</p>
 
-<p>You can publish Calendar and Free/Busy information to a WebDAV server, FTP server, a remote machine through SSH or to any other web server with HTTP PUT support.</p>
+  <p>To immediately publish calendar information, click
+  <guiseq><gui>Actions</gui><gui>Publish Calendar Information</gui></guiseq> in
+  the calendar.</p>
 
-<p>To immediately publish calendar information, click <guiseq><gui>Actions</gui><gui>Publish Calendar Information</gui></guiseq> in the calendar.</p>
 </page>
diff --git a/help/C/calendar-recurrence.page b/help/C/calendar-recurrence.page
index fb4895d922..2c5b6f53a7 100644
--- a/help/C/calendar-recurrence.page
+++ b/help/C/calendar-recurrence.page
@@ -1,27 +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="guide" id="calendar-recurrence">
 
   <info>
-    <desc>Repeating appointments.</desc>
-    
     <link type="guide" xref="index#calendar-advanced" />
 
     <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>
     <credit type="author">
-      <name its:translate="no">Novell, Inc</name> <!-- Content partially from http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#bxmtcp3 -->
+      <name its:translate="no">Novell, Inc</name>
+      <!-- Content partially from
+      http://library.gnome.org/users/evolution/2.32/usage-calendar-apts.html.en#bxmtcp3
+      -->
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-        
 
+    <desc>Repeating appointments.</desc>
   </info>
 
-<title>Using Recurrence</title>
+  <title>Using Recurrence</title>
 
-<p>If you have an appointment that takes place regularly, you can define its recurrence by clicking the <gui>Recurrence</gui> button in the <gui>Appointment Editor</gui> or by clicking <guiseq><gui>Options</gui><gui>Recurrence</gui></guiseq>. You can then choose a time and date when the appointment stops recurring, and, under <gui>Exceptions</gui>, pick individual days when the appointment does not recur. Make your selections from left to right, and you form a sentence: "Every two weeks on Monday and Friday until January 3, 2015" or "Every month on the first Friday for 12 occurrences."</p>
+  <p>If you have an appointment that takes place regularly, you can define its
+  recurrence by clicking the <gui>Recurrence</gui> button in the
+  <gui>Appointment Editor</gui> or by clicking
+  <guiseq><gui>Options</gui><gui>Recurrence</gui></guiseq>. You can then choose
+  a time and date when the appointment stops recurring, and, under
+  <gui>Exceptions</gui>, pick individual days when the appointment does not
+  recur. Make your selections from left to right, and you form a sentence:
+  "Every two weeks on Monday and Friday until January 3, 2015" or "Every month
+  on the first Friday for 12 occurrences."</p>
 
 </page>
diff --git a/help/C/calendar-searching.page b/help/C/calendar-searching.page
index d162c2e857..bda7d9dfef 100644
--- a/help/C/calendar-searching.page
+++ b/help/C/calendar-searching.page
@@ -2,12 +2,11 @@
       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>
@@ -17,41 +16,76 @@
       <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 -->
+      <name its:translate="no">Novell, Inc</name>
+      <!-- Content partially from
+	   http://library.gnome.org/users/evolution/2.32/usage-contact-organize.html.en
+	   -->
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-        
 
+    <desc>Searching appointments and meetings.</desc>
   </info>
 
-<title>Searching for Calendar Items</title>
+  <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" 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>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>
+  <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" 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>
+
+  <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>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"/>
- 
+  <!-- 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/calendar-sharing-information.page b/help/C/calendar-sharing-information.page
index fc88d48256..e89113f2f0 100644
--- a/help/C/calendar-sharing-information.page
+++ b/help/C/calendar-sharing-information.page
@@ -1,22 +1,23 @@
-<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="calendar-sharing-information">
 
   <info>
-    <desc>Make your information (appointments and free/busy times) available to others.</desc>
-
     <link type="guide" xref="index#calendar-advanced" />
 
     <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" 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>Make your information (appointments and free/busy times) available to
+    others.</desc>
   </info>
 
-<title>Sharing your calendar information</title>
+  <title>Sharing your calendar information</title>
 
 </page>
diff --git a/help/C/calendar-timezones.page b/help/C/calendar-timezones.page
index 90ba2a90c3..e888b5ba1f 100644
--- a/help/C/calendar-timezones.page
+++ b/help/C/calendar-timezones.page
@@ -1,41 +1,59 @@
-<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="calendar-timezones">
 
   <info>
-    <desc>Using time zones in the calendar.</desc>
-
     <link type="guide" xref="index#calendar-advanced" />
 
     <revision pkgversion="3.1.5" version="0.4" 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/bshlzlu.html.en -->
+      <name its:translate="no">Novell, Inc</name>
+      <!-- Content partially from
+	   http://library.gnome.org/users/evolution/2.32/bshlzlu.html.en -->
     </credit>
-    
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-        
 
+    <desc>Using time zones in the calendar.</desc>
   </info>
 
-<title>Using time zones</title>
+  <title>Using time zones</title>
 
-<p>Evolution supports using multiple time zones.</p>
+  <p><app>Evolution</app> supports using multiple time zones.</p>
 
 <section id="default-timezone">
-<title>Setting your global timezone(s)</title>
+  <title>Setting your global timezone(s)</title>
+
+  <p>By default <app>Evolution</app> uses the system-wide time zone. This can
+  be changed under <guiseq><gui>Edit</gui><gui>Preferences</gui>
+  <gui>Calendar and Tasks</gui><gui>General</gui><gui>Time</gui>
+  <gui>Time zone</gui></guiseq>.</p>
 
-<p>By default Evolution uses the system-wide time zone. This can be changed under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>General</gui><gui>Time</gui><gui>Time zone</gui></guiseq>.</p>
+  <p>If you deal a lot with people in another specific time zone you can
+  display that second time zone in the day view of the calendar. You can set a
+  second time zone under <guiseq><gui>Edit</gui><gui>Preferences</gui>
+  <gui>Calendar and Tasks</gui><gui>General</gui><gui>Time</gui>
+  <gui>Second zone</gui></guiseq>.</p>
 
-<p>If you deal a lot with people in another specific time zone you can display that second time zone in the day view of the calendar. You can set a second time zone under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Calendar and Tasks</gui><gui>General</gui><gui>Time</gui><gui>Second zone</gui></guiseq>.</p>
 </section>
 
 <section id="appointment-timezone">
-<title>Setting a timezone for an appointment</title>
+  <title>Setting a timezone for an appointment</title>
+
+  <p>You can also configure time zone information specific to each appointment.
+  To do that,
+  <link xref="calendar-usage">add a new or edit an existing appointment</link>
+  and click the globe button to customize the time zone that the time exists
+  in. For example, if you live in New York but have a telephone meeting set for
+  noon with someone in California, you need to make sure that your schedules
+  are coordinated. Setting time zones on a per-appointment basis helps avoid
+  that potential confusion.</p>
 
-<p>You can also configure time zone information specific to each appointment. To do that, <link xref="calendar-usage">add a new or edit an existing appointment</link> and click the globe button to customize the time zone that the time exists in. For example, if you live in New York but have a telephone meeting set for noon with someone in California, you need to make sure that your schedules are coordinated. Setting time zones on a per-appointment basis helps avoid that potential confusion.</p>
 </section>
 
 </page>
diff --git a/help/C/calendar-usage-add-appointment.page b/help/C/calendar-usage-add-appointment.page
index 3976a5b6a3..c528a565b6 100644
--- a/help/C/calendar-usage-add-appointment.page
+++ b/help/C/calendar-usage-add-appointment.page
@@ -1,36 +1,74 @@
-<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="calendar-usage-add-appointment">
 
   <info>
-    <desc>Adding an appointment.</desc>
-    
     <link type="guide" xref="calendar-usage" />
 
     <revision pkgversion="3.0.2" version="0.2" 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>Adding an appointment.</desc>
   </info>
 
-<title>Adding an Appointment</title>
-
-<steps>
-<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Appointment</gui></guiseq>, or double-click in a blank space in the calendar to open the Appointment dialog. The particular time on the calendar view against which you have double clicked on will be suggested for the new appointment. You can also directly write in the calendar and then adjust the duration by dragging it with the mouse.</p></item>
-<item><p>If you use the Appointment dialog:</p></item>
-<item><p>Select a calendar in the <gui>Calendar</gui> drop-down list.</p></item>
-<item><p>Enter a brief summary in the <gui>Summary</gui> field.</p></item>
-<item><p>(Optional) Type a location in the <gui>Location</gui> field.</p></item>
-<item><p>To select this event as an all day event, click <guiseq><gui>Options</gui><gui>All Day Event</gui></guiseq>, or click the <gui>All Day Event</gui> button on the toolbar.</p></item>
-<item><p>Select the date and time.</p></item>
-<item><p>If the event is not an all day event, select either <gui>For</gui> to specify the duration, or select <gui>Until</gui> to specify the ending time of the event.</p></item>
-<item><p>(Optional) Enter a description in the <gui>Description</gui> field.</p></item>
-<item><p>To show the time as <link xref="calendar-free-busy">busy</link> to others, click <guiseq><gui>Options</gui><gui>Show Time as Busy</gui></guiseq>.</p></item>
-</steps>
-<p>You can also define a <link xref="calendar-timezones">time zone</link>, a <link xref="using-categories">category</link>, a <link xref="calendar-alarms-and-reminders">reminder</link>, a <link xref="calendar-recurrence">recurrence</link>, or a <link xref="calendar-classifications">classification</link> for the event, or add an attachment.</p>
+  <title>Adding an Appointment</title>
+
+  <steps>
+    <item>
+      <p>Click
+      <guiseq><gui>File</gui><gui>New</gui><gui>Appointment</gui></guiseq>, or
+      double-click in a blank space in the calendar to open the Appointment
+      dialog. The particular time on the calendar view against which you have
+      double clicked on will be suggested for the new appointment. You can also
+      directly write in the calendar and then adjust the duration by dragging
+      it with the mouse.</p>
+    </item>
+    <item>
+      <p>If you use the Appointment dialog:</p>
+    </item>
+    <item>
+      <p>Select a calendar in the <gui>Calendar</gui> drop-down list.</p>
+    </item>
+    <item>
+      <p>Enter a brief summary in the <gui>Summary</gui> field.</p>
+    </item>
+    <item>
+      <p>(Optional) Type a location in the <gui>Location</gui> field.</p>
+    </item>
+    <item>
+      <p>To select this event as an all day event, click
+      <guiseq><gui>Options</gui><gui>All Day Event</gui></guiseq>, or click the
+      <gui>All Day Event</gui> button on the toolbar.</p>
+    </item>
+    <item>
+      <p>Select the date and time.</p>
+    </item>
+    <item>
+      <p>If the event is not an all day event, select either <gui>For</gui> to
+      specify the duration, or select <gui>Until</gui> to specify the ending
+      time of the event.</p>
+    </item>
+    <item>
+      <p>(Optional) Enter a description in the <gui>Description</gui> field.</p>
+    </item>
+    <item>
+      <p>To show the time as <link xref="calendar-free-busy">busy</link> to
+      others, click <guiseq><gui>Options</gui>
+      <gui>Show Time as Busy</gui></guiseq>.</p>
+    </item>
+  </steps>
+
+  <p>You can also define a <link xref="calendar-timezones">time zone</link>, a
+  <link xref="using-categories">category</link>, a
+  <link xref="calendar-alarms-and-reminders">reminder</link>, a
+  <link xref="calendar-recurrence">recurrence</link>, or a
+  <link xref="calendar-classifications">classification</link> for the event, or
+  add an attachment.</p>
 
 </page>
diff --git a/help/C/calendar-usage-delete-appointment.page b/help/C/calendar-usage-delete-appointment.page
index 4219fec05a..62599cd41c 100644
--- a/help/C/calendar-usage-delete-appointment.page
+++ b/help/C/calendar-usage-delete-appointment.page
@@ -1,24 +1,29 @@
-<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="calendar-usage-delete-appointment">
 
   <info>
-    <desc>Deleting an appointment in your calendar.</desc>
-    
     <link type="guide" xref="calendar-usage" />
 
     <revision pkgversion="3.3.91" version="0.3" date="2012-02-19" 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 an appointment in your calendar.</desc>
   </info>
 
-<title>Deleting an Appointment</title>
+  <title>Deleting an Appointment</title>
 
-<p>If you want to delete an appointment in your calendars, right-click on the appointment in the calendar and select <gui>Delete Appointment</gui>, or click on the appointment and click <gui>Delete</gui> in the tool bar or press <keyseq><key>Ctrl</key><key>D</key></keyseq>. If you are in the <link xref="calendar-layout-views">list view</link> you can also use <guiseq><gui>Edit</gui><gui>Delete Appointment</gui></guiseq>.</p>
+  <p>If you want to delete an appointment in your calendars, right-click on the
+  appointment in the calendar and select <gui>Delete Appointment</gui>, or
+  click on the appointment and click <gui>Delete</gui> in the tool bar or press
+  <keyseq><key>Ctrl</key><key>D</key></keyseq>. If you are in the
+  <link xref="calendar-layout-views">list view</link> you can also use
+  <guiseq><gui>Edit</gui><gui>Delete Appointment</gui></guiseq>.</p>
 
 </page>
diff --git a/help/C/calendar-usage-edit-appointment.page b/help/C/calendar-usage-edit-appointment.page
index cadc47f9da..225b59a8e9 100644
--- a/help/C/calendar-usage-edit-appointment.page
+++ b/help/C/calendar-usage-edit-appointment.page
@@ -1,30 +1,41 @@
-<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="calendar-usage-edit-appointment">
 
   <info>
-    <desc>Editing in appointment in your calendar.</desc>
-    
     <link type="guide" xref="calendar-usage" />
 
     <revision pkgversion="3.0.2" version="0.2" 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 in appointment in your calendar.</desc>
   </info>
 
-<title>Editing an Appointment</title>
+  <title>Editing an Appointment</title>
 
-<p>If you want to change an appointment that already exists in your calendars,</p>
+  <p>If you want to change an appointment that already exists in your
+  calendars:</p>
 
-<steps>
-<item><p>Double-click on the appointment that you want to edit in the calendar.</p></item>
-<item><p>Edit the appointment (see <link xref="calendar-usage-add-appointment">Adding an Appointment</link> for the list of available options).</p></item>
-<item><p>Click the <gui style="button">Save</gui> button, or <guiseq><gui>File</gui><gui>Save</gui></guiseq>.</p></item>
-</steps>
+  <steps>
+    <item>
+      <p>Double-click on the appointment that you want to edit in the
+      calendar.</p>
+    </item>
+    <item>
+      <p>Edit the appointment (see
+      <link xref="calendar-usage-add-appointment">Adding an Appointment</link>
+      for the list of available options).</p>
+    </item>
+    <item>
+      <p>Click the <gui style="button">Save</gui> button, or
+      <guiseq><gui>File</gui><gui>Save</gui></guiseq>.</p>
+    </item>
+  </steps>
 
 </page>
diff --git a/help/C/calendar-usage.page b/help/C/calendar-usage.page
index 70bce431c3..7a7560a0c4 100644
--- a/help/C/calendar-usage.page
+++ b/help/C/calendar-usage.page
@@ -1,23 +1,23 @@
-<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="calendar-usage">
 
   <info>
-    <desc>On adding, editing, and deleting appointments.</desc>
-    
     <link type="guide" xref="index#calendar" />
     <link type="seealso" xref="calendar-meetings" />
 
     <revision pkgversion="3.1.5" 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>On adding, editing, and deleting appointments.</desc>
   </info>
 
-<title>Add, Edit, and Delete Appointments</title>
+  <title>Add, Edit, and Delete Appointments</title>
 
 </page>
diff --git a/help/C/calendar-using-several-calendars.page b/help/C/calendar-using-several-calendars.page
index de1caba898..88d2bf7263 100644
--- a/help/C/calendar-using-several-calendars.page
+++ b/help/C/calendar-using-several-calendars.page
@@ -1,33 +1,48 @@
-<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="calendar-using-several-calendars">
 
   <info>
-    <desc>Adding and using more than one calendar and different types.</desc>
-
     <link type="guide" xref="calendar-organizing" />
 
     <revision pkgversion="3.1.5" 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-calendar-multiple.html.en and http://library.gnome.org/users/evolution/2.32/usage-calendar-view.html.en -->
- </credit>
-    
+    <credit type="author">
+      <name its:translate="no">Novell, Inc</name>
+      <!-- Content partially from
+	   http://library.gnome.org/users/evolution/2.32/usage-calendar-multiple.html.en
+	   and
+	   http://library.gnome.org/users/evolution/2.32/usage-calendar-view.html.en
+	   -->
+    </credit>
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
-        
 
+    <desc>Adding and using more than one calendar and different types.</desc>
   </info>
 
-<title>Using several calendars</title>
+  <title>Using several calendars</title>
 
-<p>You can have multiple calendars and overlay them one over the other. For example, you might have a schedule of events for work, one for home, and one for your favorite sports team. The side bar lists those calendars, and you can select or deselect the boxes next to them to show and hide the appointments in your calendar view. By hiding and showing different sets of appointments, you can be sure to avoid conflicts, while keeping a minimum of clutter in your view.</p>
+  <p>You can have multiple calendars and overlay them one over the other. For
+  example, you might have a schedule of events for work, one for home, and one
+  for your favorite sports team. The side bar lists those calendars, and you
+  can select or deselect the boxes next to them to show and hide the
+  appointments in your calendar view. By hiding and showing different sets of
+  appointments, you can be sure to avoid conflicts, while keeping a minimum of
+  clutter in your view.</p>
 
-<p>Appointments for each calendar appear in different color.</p>
+  <p>Appointments for each calendar appear in different color.</p>
 
-<p>You can also use calendars that are not on your computer, such as on the internet or in a local network.</p>
+  <p>You can also use calendars that are not on your computer, such as on the
+  internet or in a local network.</p>
 
-<p>For example, the <link href="http://icalshare.com">icalshare.com website</link> has an extensive list of shared online calendars, including national and religious holidays, phases of the moon, sports, and local and regional events.</p>
+  <p>For example, the
+  <link href="http://icalshare.com">icalshare.com website</link> has an
+  extensive list of shared online calendars, including national and religious
+  holidays, phases of the moon, sports, and local and regional events.</p>
 
 </page>
diff --git a/help/C/calendar-weather.page b/help/C/calendar-weather.page
index dc81305d02..68073581b0 100644
--- a/help/C/calendar-weather.page
+++ b/help/C/calendar-weather.page
@@ -1,39 +1,63 @@
-<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="calendar-weather">
 
   <info>
-    <desc>Display the weather in the calendar.</desc>
-    
     <link type="guide" xref="calendar-using-several-calendars"/>
 
     <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>Display the weather in the calendar.</desc>
   </info>
 
-<title>Using a weather calendar</title>
-
-<p>Calendars of this type are read-only.</p>
-
-<p>To add such a calendar to Evolution, perform the following steps:</p>
-<steps>
-<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>.</p></item>
-<item><p>Select the type <gui>Weather</gui>.</p></item>
-<item><p>Enter a name that you prefer.</p></item>
-<item><p>Optionally choose a color 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>Choose a location by selecting continent, country and city.</p></item>
-<item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
-<item><p>Choose the temperature unit.</p></item>
-<item><p>Click <gui style="button">Apply</gui>.</p></item>
-</steps>
-
-<p>The calendar will be added to the list of calendars in Evolution.</p>
+  <title>Using a weather calendar</title>
+
+  <p>Calendars of this type are read-only.</p>
+
+  <p>To add such a calendar to <app>Evolution</app>, perform the following
+  steps:</p>
+
+  <steps>
+    <item>
+      <p>Click
+      <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Select the type <gui>Weather</gui>.</p>
+    </item>
+    <item>
+      <p>Enter a name that you prefer.</p>
+    </item>
+    <item>
+      <p>Optionally choose a color 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>Choose a location by selecting continent, country and city.</p>
+    </item>
+    <item>
+      <p>Choose <gui>Use secure connection</gui> if you want to connect
+      securely.</p>
+    </item>
+    <item>
+      <p>Choose the temperature unit.</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">Apply</gui>.</p>
+    </item>
+  </steps>
+
+  <p>The calendar will be added to the list of calendars in
+  <app>Evolution</app>.</p>
 
 </page>
diff --git a/help/C/calendar-webdav.page b/help/C/calendar-webdav.page
index d90fad5502..2c1a142846 100644
--- a/help/C/calendar-webdav.page
+++ b/help/C/calendar-webdav.page
@@ -2,38 +2,61 @@
       type="topic" id="calendar-webdav">
 
   <info>
-    <desc>Using an online Webcal/WebDAV calendar.</desc>
-    
     <link type="guide" xref="calendar-using-several-calendars"/>
 
     <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>Using an online Webcal/WebDAV calendar.</desc>
   </info>
 
-<title>Using a WebDAV calendar</title>
-
-<p>Calendars of this type are read-only.</p>
-
-<p>To add such a calendar to Evolution, perform the following steps:</p>
-<steps>
-<item><p>Click <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>.</p></item>
-<item><p>Select the type <gui>On the Web</gui>.</p></item>
-<item><p>Enter a name that you prefer.</p></item>
-<item><p>Optionally choose a color 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 the address of the calendar in the <gui>URL</gui> field.</p></item>
-<item><p>Choose <gui>Use secure connection</gui> if you want to connect securely.</p></item>
-<item><p>Enter your username.</p></item>
-<item><p>Click <gui style="button">Apply</gui>.</p></item>
-</steps>
-
-<p>The calendar will be added to the list of calendars in Evolution.</p>
+  <title>Using a WebDAV calendar</title>
+
+  <p>Calendars of this type are read-only.</p>
+
+  <p>To add such a calendar to <app>Evolution</app>, perform the following
+  steps:</p>
+
+  <steps>
+    <item>
+      <p>Click
+      <guiseq><gui>File</gui><gui>New</gui><gui>Calendar</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Select the type <gui>On the Web</gui>.</p>
+    </item>
+    <item>
+      <p>Enter a name that you prefer.</p>
+    </item>
+    <item>
+      <p>Optionally choose a color 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 the address of the calendar in the <gui>URL</gui> field.</p>
+    </item>
+    <item>
+      <p>Choose <gui>Use secure connection</gui> if you want to connect
+      securely.</p>
+    </item>
+    <item>
+      <p>Enter your username.</p>
+    </item>
+    <item>
+      <p>Click <gui style="button">Apply</gui>.</p>
+    </item>
+  </steps>
+
+  <p>The calendar will be added to the list of calendars in
+  <app>Evolution</app>.</p>
 
 </page>