15 files changed, 28 insertions, 25 deletions
diff --git a/help/C/backup-restore.page b/help/C/backup-restore.page
index 96dcab1888..bbfdbf5dcd 100644
--- a/help/C/backup-restore.page
+++ b/help/C/backup-restore.page
@@ -7,7 +7,7 @@
     <link type="guide" xref="index#data-migration-and-sync"/>
     <link type="seealso" xref="data-storage"/>
 
-    <revision pkgversion="2.32.1" version="0.1" date="2011-01-06" status="draft"/>
+    <revision pkgversion="3.1.5" version="0.2" date="2011-08-05" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -25,7 +25,7 @@
 <section id="backup">
 <title>Backing up</title>
 <list>
-<item><p>Select <guiseq><gui>File</gui><gui>Back up Evolution Settings...</gui></guiseq>.</p></item>
+<item><p>Select <guiseq><gui>File</gui><gui>Back up Evolution Data...</gui></guiseq>.</p></item>
 <item><p>Choose a filename and the folder where you want to save the backup file, and click <gui style="button">Save</gui>.</p></item>
 <item><p>You will get asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
 </list>
@@ -34,7 +34,7 @@
 <section id="restore">
 <title>Restoring</title>
 <list>
-<item><p>Select <guiseq><gui>File</gui><gui>Restore Evolution Settings...</gui></guiseq>.</p></item>
+<item><p>Select <guiseq><gui>File</gui><gui>Restore Evolution Data...</gui></guiseq>.</p></item>
 <item><p>Choose the file, and click <gui style="button">Open</gui>.</p></item>
 <item><p>You will get asked to close Evolution. Answer with <gui style="button">Yes</gui>.</p></item>
 </list>
diff --git a/help/C/calendar-meetings-sending-invitation.page b/help/C/calendar-meetings-sending-invitation.page
index 654a17205d..373978ad7f 100644
--- a/help/C/calendar-meetings-sending-invitation.page
+++ b/help/C/calendar-meetings-sending-invitation.page
@@ -35,7 +35,7 @@
 <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 appointment 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>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>
diff --git a/help/C/calendar-usage-add-appointment.page b/help/C/calendar-usage-add-appointment.page
index 04d20010b7..eb3e66f7ea 100644
--- a/help/C/calendar-usage-add-appointment.page
+++ b/help/C/calendar-usage-add-appointment.page
@@ -25,7 +25,7 @@
 <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 appointment 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>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>
diff --git a/help/C/contacts-usage-delete-contact.page b/help/C/contacts-usage-delete-contact.page
index 065c2e941c..4db6c0f8c2 100644
--- a/help/C/contacts-usage-delete-contact.page
+++ b/help/C/contacts-usage-delete-contact.page
@@ -19,6 +19,6 @@
 
 <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 appointment 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/exchange-connectors-overview.page b/help/C/exchange-connectors-overview.page
index 7703786b80..efa7f8467e 100644
--- a/help/C/exchange-connectors-overview.page
+++ b/help/C/exchange-connectors-overview.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="exchange-placeholder"/>
 
-    <revision pkgversion="3.1.5" version="0.2" date="2011-07-28" status="final"/>
+    <revision pkgversion="3.1.5" version="0.3" date="2011-08-05" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -23,8 +23,8 @@
 
 <p>For Microsoft Exchange 2000 and 2003 (and possibly earlier versions of Exchange that use Outlook Web Access) it is recommended to use the package evolution-exchange. <link action="install:evolution-exchange" href="http://projects.gnome.org/evolution/download">Install evolution-exchange now.</link>
 </p>
-<p>For Microsoft Exchange 2007 (and possibly earlier versions that support MAPI) it is recommended to use the package evolution-mapi. <link action="install:evolution-mapi" href="http://projects.gnome.org/evolution/download">Install evolution-mapi now.</link></p>
-<p>For Microsoft Exchange 2010 it is recommended to use the package evolution-ews which is currently still under development and might not be available yet for your distribution. evolution-ews also supports Microsoft Exchange 2007. <link action="install:evolution-ews" href="http://projects.gnome.org/evolution/download">Install evolution-ews now.</link></p>
+<p>For Microsoft Exchange 2007 and 2010 (and possibly earlier versions that support MAPI) it is recommended to use the package evolution-mapi. <link action="install:evolution-mapi" href="http://projects.gnome.org/evolution/download">Install evolution-mapi now.</link></p>
+<p>For Microsoft Exchange 2007 and 2010 the package evolution-ews is currently under development and will replace evolution-mapi in the future. It might not be available yet for your distribution. <link action="install:evolution-ews" href="http://projects.gnome.org/evolution/download">Install evolution-ews now.</link></p>
 
 <note style="tip"><p>If you are unsure which Microsoft Exchange server version is used, you may want to contact your system administrator for more information.</p></note>
 
diff --git a/help/C/exporting-data-contacts.page b/help/C/exporting-data-contacts.page
index 0f61cfb8a6..57a9945c81 100644
--- a/help/C/exporting-data-contacts.page
+++ b/help/C/exporting-data-contacts.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="exporting-data" />
 
-    <revision pkgversion="3.1.4" version="0.1" date="2011-07-27" status="final"/>
+    <revision pkgversion="3.1.5" version="0.2" date="2011-08-05" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -24,6 +24,6 @@
 
 <p>Contacts files are stored in a database, but can be saved as a vCard file.</p>
 <p>To export a complete address book, click <guiseq><gui>File</gui><gui>Save Address Book As vCard</gui></guiseq>.</p>
-<p>If you want to export only one contact, click <guiseq><gui>File</gui><gui>Save Contact as VCard</gui></guiseq> or right-click on the contact and click <gui>Save as vCard</gui>.</p>
+<p>If you want to export only one contact, click <guiseq><gui>File</gui><gui>Save as vCard</gui></guiseq> or right-click on the contact and click <gui>Save as vCard</gui>.</p>
 
 </page>
diff --git a/help/C/express-mode.page b/help/C/express-mode.page
index 41257ec951..bca3a07a78 100644
--- a/help/C/express-mode.page
+++ b/help/C/express-mode.page
@@ -6,7 +6,7 @@
     
     <link type="guide" xref="index#common-other-problems" />
 
-    <revision pkgversion="3.0.2" version="0.1" date="2011-07-25" status="draft"/>
+    <revision pkgversion="3.0.2" version="0.2" date="2011-08-05" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -22,4 +22,6 @@
 <p>This is a known problem and hard to solve for a complex application with many settings such as Evolution.</p>
 <p>You can use the Express version which is targeted for mobile and small-screen devices. This is available from version 2.30 on and can be enabled by starting <code>evolution --express</code> from the terminal window.</p>
 
+<note><p>You can also explicitly open Evolution in a specific component. For the calendar, use <code>evolution --express --component=calendar</code>.</p></note>
+
 </page>
diff --git a/help/C/intro-main-window.page b/help/C/intro-main-window.page
index bae6b59a2f..2a4162a198 100644
--- a/help/C/intro-main-window.page
+++ b/help/C/intro-main-window.page
@@ -8,7 +8,7 @@
     <link type="seealso" xref="calendar-layout"/>
     <link type="seealso" xref="mail-layout-changing"/>
 
-    <revision pkgversion="2.32.1" version="0.2" date="2011-01-06" status="draft"/>
+    <revision pkgversion="3.1.5" version="0.3" date="2011-08-05" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -93,7 +93,7 @@
     <td colspan="3"><p><media type="image" src="./figures/color-ce5c00.png" width="10" /> Tool bar</p></td>
   </tr>
   <tr>
-    <td rowspan="2"><p><media type="image" src="./figures/color-8f5902.png" width="10" /> Folder list</p></td>
+    <td rowspan="2"><p><media type="image" src="./figures/color-8f5902.png" width="10" /> Calendar list</p></td>
     <td colspan="2"><p><media type="image" src="./figures/color-4e9a06.png" width="10" /> Search bar</p></td>
   </tr>
   <tr>
@@ -130,7 +130,7 @@
 
 <section id="contacts">
 <title>Contacts</title>
-<p>Elements in the calendar main window:</p>
+<p>Elements in the contacts main window:</p>
 <table frame="all" rules="all">
   <tr>
     <td colspan="2"><p><media type="image" src="./figures/color-c4a000.png" width="10"/> Menu bar</p></td>
@@ -139,7 +139,7 @@
     <td colspan="2"><p><media type="image" src="./figures/color-ce5c00.png" width="10" /> Tool bar</p></td>
   </tr>
   <tr>
-    <td rowspan="2"><p><media type="image" src="./figures/color-8f5902.png" width="10" /> Folder list</p></td>
+    <td rowspan="2"><p><media type="image" src="./figures/color-8f5902.png" width="10" /> Address book list</p></td>
     <td><p><media type="image" src="./figures/color-4e9a06.png" width="10" /> Search bar</p></td>
   </tr>
   <tr>
diff --git a/help/C/mail-duplicates.page b/help/C/mail-duplicates.page
index 88a537081d..4ac136163e 100644
--- a/help/C/mail-duplicates.page
+++ b/help/C/mail-duplicates.page
@@ -6,7 +6,7 @@
     
     <link type="guide" xref="index#common-mail-problems" />
 
-    <revision pkgversion="3.0.2" version="0.4" date="2011-08-01" status="final"/>
+    <revision pkgversion="3.0.2" version="0.5" date="2011-08-05" status="final"/>
     <credit type="author">
       <name>April Gonzales</name>
       <email>loonycookie@gmail.com</email>
@@ -25,7 +25,7 @@
 
 <section id="remove">
 <title>Removing duplicate emails</title>
-<p>To remove duplicate emails in a folder, click <guiseq><gui>Message</gui><gui>Remove Duplicate Messages</gui></guiseq>.</p>
+<p>To remove duplicate emails in a folder, select multiple messages (or select all messages in a folder by clicking <guiseq><gui>Edit</gui><gui>Select All</gui></guiseq> or pressing <keyseq><key>Ctrl</key><key>A</key></keyseq>) and click <guiseq><gui>Message</gui><gui>Remove Duplicate Messages</gui></guiseq>.</p>
 <!-- available by default since 2.91, as per http://mail.gnome.org/archives/evolution-list/2011-August/msg00000.html -->
 </section>
 
diff --git a/help/C/mail-imap-subscriptions.page b/help/C/mail-imap-subscriptions.page
index 711922f848..1b49fc8e0c 100644
--- a/help/C/mail-imap-subscriptions.page
+++ b/help/C/mail-imap-subscriptions.page
@@ -8,7 +8,7 @@
     <link type="guide" xref="mail-account-manage-imap#other-settings"/>
     <link type="guide" xref="mail-account-manage-imap-plus#other-settings"/>
 
-    <revision pkgversion="3.0.2" version="0.2" date="2011-07-29" status="final"/>
+    <revision pkgversion="3.0.2" version="0.3" date="2011-08-05" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -27,7 +27,7 @@
 
 <p>As opening many IMAP folders on the server takes time you can define which IMAP folders to check and display in Evolution, and which ones to ignore for the time being, via the <gui>IMAP Subscriptions Manager</gui>.</p>
 <steps>
-<item><p>Select <guiseq><gui>Folder</gui><gui>Subscriptions</gui></guiseq>.</p></item>
+<item><p>Select <guiseq><gui>Folder</gui><gui>Subscriptions</gui></guiseq>, or right-click on the top level node of an email account in the folder list and click <gui>Manage subscriptions</gui>.</p></item> 
 <item><p>If you have accounts on multiple servers, select the server where you want to manage your subscriptions.</p></item>
 <item><p>Evolution displays a list of files and folders available on the IMAP server.</p></item>
 <item><p>Select a file or folder by clicking it.</p>
diff --git a/help/C/mail-send-and-receive-manual.page b/help/C/mail-send-and-receive-manual.page
index f075fede7e..a5daf49048 100644
--- a/help/C/mail-send-and-receive-manual.page
+++ b/help/C/mail-send-and-receive-manual.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="mail-send-and-receive" />
 
-    <revision pkgversion="3.0.2" version="0.2" date="2011-08-01" status="final"/>
+    <revision pkgversion="3.0.2" version="0.3" date="2011-08-05" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -20,6 +20,7 @@
 <title>Manually send and receive message</title>
 <p>To receive new messages from the mail server and to send messages you have written that are in the local Outbox, click the <gui style="button">Send / Receive</gui> button in the toolbar, or press <key>F9</key>, or choose <guiseq><gui>File</gui><gui>Send / Receive </gui></guiseq> from the main menu.</p>
 <p>To send and receive only for one of your mail accounts, or to only send or only receive, click the small down-arrow next to the <gui style="button">Send / Receive</gui> button and choose the corresponding option.</p>
+<p>If you just want to send messages which are in your Outbox, you can right-click on the Outbox and click <gui>Flush Outbox</gui>.</p>
 
 </page>
 
diff --git a/help/C/memos-usage-delete-memo.page b/help/C/memos-usage-delete-memo.page
index cfb874807e..7bb0d602f9 100644
--- a/help/C/memos-usage-delete-memo.page
+++ b/help/C/memos-usage-delete-memo.page
@@ -19,6 +19,6 @@
 
 <title>Deleting a Memo</title>
 
-<p>If you want to delete a memo in your memo lists, right-click on the memo and select <gui>Delete</gui>, or click on the task and click <gui>Delete</gui> in the tool bar, or click <guiseq><gui>Edit</gui><gui>Delete Memo</gui></guiseq>.</p>
+<p>If you want to delete a memo in your memo lists, right-click on the memo and select <gui>Delete</gui>, or click on the memo and click <gui>Delete</gui> in the tool bar, or click <guiseq><gui>Edit</gui><gui>Delete Memo</gui></guiseq>.</p>
 
 </page>
diff --git a/help/C/memos-usage-edit-memo.page b/help/C/memos-usage-edit-memo.page
index 5dacae9ba6..d0915eb104 100644
--- a/help/C/memos-usage-edit-memo.page
+++ b/help/C/memos-usage-edit-memo.page
@@ -22,7 +22,7 @@
 <p>If you want to change a memo that already exists in your memo lists,</p>
 
 <steps>
-<item><p>Double-click on the memo that you want to edit in the list of contacts, or right-click on the task and click <key>Open Memo</key>.</p></item>
+<item><p>Double-click on the memo that you want to edit in the list of contacts, or right-click on the memo and click <key>Open Memo</key>.</p></item>
 <item><p>Edit the memo information.</p></item>
 <item><p>Click the <gui style="button">Save</gui> button, or <guiseq><gui>File</gui><gui>Save</gui></guiseq>.</p></item>
 </steps>
diff --git a/help/C/tasks-usage-edit-task.page b/help/C/tasks-usage-edit-task.page
index 0ccf108727..3d6757ade2 100644
--- a/help/C/tasks-usage-edit-task.page
+++ b/help/C/tasks-usage-edit-task.page
@@ -22,7 +22,7 @@
 <p>If you want to change a task that already exists in your task lists,</p>
 
 <steps>
-<item><p>Double-click on the task that you want to edit in the list of contacts, or right-click on the task and click <key>Open Task</key>.</p></item>
+<item><p>Double-click on the task that you want to edit in the list of tasks, or right-click on the task and click <key>Open Task</key>.</p></item>
 <item><p>Edit the task information.</p></item>
 <item><p>Click the <gui style="button">Save</gui> button, or <guiseq><gui>File</gui><gui>Save</gui></guiseq>.</p></item>
 </steps>
diff --git a/help/C/tasks-webdav.page b/help/C/tasks-webdav.page
index cec7953efc..2ca4cb25bc 100644
--- a/help/C/tasks-webdav.page
+++ b/help/C/tasks-webdav.page
@@ -34,6 +34,6 @@
 <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 list will be added in Evolution.</p>
 
 </page>