10 files changed, 21 insertions, 28 deletions
diff --git a/help/C/calendar-usage-delete-appointment.page b/help/C/calendar-usage-delete-appointment.page
index 1520178c65..b4d9e818cf 100644
--- a/help/C/calendar-usage-delete-appointment.page
+++ b/help/C/calendar-usage-delete-appointment.page
@@ -2,11 +2,11 @@
       type="topic" id="calendar-usage-delete-appointment">
 
   <info>
-    <desc>Deleting in appointment in your calendar.</desc>
+    <desc>Deleting an 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"/>
+    <revision pkgversion="3.3.91" version="0.3" date="2012-02-19" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
diff --git a/help/C/contacts-searching.page b/help/C/contacts-searching.page
index ab7e826deb..0161f1a962 100644
--- a/help/C/contacts-searching.page
+++ b/help/C/contacts-searching.page
@@ -7,7 +7,7 @@
     <link type="guide" xref="searching-items" />
     <link type="guide" xref="contacts-organizing" />
 
-    <revision pkgversion="2.32.1" version="0.2" date="2010-10-12" status="draft"/>
+    <revision pkgversion="3.3.91" version="0.3" date="2012-02-19" status="draft"/>
     <credit type="author">
       <name>Max Vorobuov</name>
       <email>vmax0770@gmail.com</email>
@@ -28,7 +28,7 @@
 <title>Searching Contacts</title>
 <section id="quick-search">
 <title>Quick Search</title>
-<p>In the Calendar view, you can quickly search for contacts either by category or by contact's info.</p>
+<p>In the Contacts view, you can quickly search for contacts either by category or by contact's info.</p>
 <p>Searching by contact's info:</p>
 <steps>
 <item><p>Click the search icon <media type="image" mime="image/png" src="figures/search-icon.png"/> to expand the drop-down list.</p></item>
diff --git a/help/C/mail-cannot-see.page b/help/C/mail-cannot-see.page
index c1f92f779f..e0f9d8bb04 100644
--- a/help/C/mail-cannot-see.page
+++ b/help/C/mail-cannot-see.page
@@ -6,7 +6,7 @@
     
     <link type="guide" xref="index#common-mail-problems" />
 
-    <revision pkgversion="2.28.3" version="0.1" date="2010-10-09" status="candidate"/>
+    <revision pkgversion="3.3.91" version="0.2" date="2012-02-19" status="candidate"/>
     <credit type="author">
       <name>Phil Bull</name>
       <email>philbull@gmail.com</email>
@@ -35,7 +35,7 @@
  </item>
  <!-- Does the following option still exist? -->
  <item>
-  <p>Click <guiseq><gui>Edit</gui><gui>Show Hidden Messages</gui></guiseq> to make sure all messages are visible.</p>
+  <p>Click <guiseq><gui>Edit</gui><gui>Show Deleted Messages</gui></guiseq> to make sure all messages are visible.</p>
  </item>
  <item>
   <p>Check your default folder under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Email Accounts</gui><gui>Edit</gui><gui>Defaults</gui></guiseq>. Perhaps it is set to some other folder than the folder you thought of.</p>
diff --git a/help/C/mail-composer-html.page b/help/C/mail-composer-html.page
index 28f75058f5..59deba1aa2 100644
--- a/help/C/mail-composer-html.page
+++ b/help/C/mail-composer-html.page
@@ -5,7 +5,7 @@
     <desc>Format emails by using HTML instead of plain text.</desc>
     <link type="guide" xref="index#mail-composing" />
 
-    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <revision pkgversion="3.3.91" version="0.3" date="2012-02-19" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -24,7 +24,7 @@
 
 <p>Some people do not have HTML-capable mail clients, or prefer not to receive HTML-enhanced mail because it is slower to download and display. Because of this, Evolution sends plain text unless you explicitly ask for HTML.</p>
 
-<p>You can change the format of an email message from plain text to HTML by choosing <guiseq><gui>Format</gui><gui>HTML</gui></guiseq> from the menu bar.</p>
+<p>You can change the format of an email message from plain text to HTML in the email composer by choosing <guiseq><gui>Format</gui><gui>HTML</gui></guiseq> from the menu bar.</p>
 <p>To send all your mail as HTML by default, enable <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Default Behavior</gui><gui>Format messages in HTML</gui></guiseq>.</p>
 
   <section id="formatting-options" style="2column">
diff --git a/help/C/mail-composer-priority.page b/help/C/mail-composer-priority.page
index 6f984da57b..89b23d2b2f 100644
--- a/help/C/mail-composer-priority.page
+++ b/help/C/mail-composer-priority.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="index#mail-composing-advanced" />
 
-    <revision pkgversion="2.32.2" version="0.1" date="2011-07-22" status="draft"/>
+    <revision pkgversion="3.3.91" version="0.2" date="2012-02-19" status="draft"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -22,7 +22,7 @@
 
 <title>Prioritizing outgoing messages</title>
 
-<p>You can prioritize a message to be sent, so that the recipient sees its relative importance. To prioritize a message, click <guiseq><gui>Insert</gui><gui>Prioritize Message</gui></guiseq> in the composer window.</p>
+<p>You can prioritize a message to be sent, so that the recipient sees its relative importance. To prioritize a message, click <guiseq><gui>Options</gui><gui>Prioritize Message</gui></guiseq> in the composer window.</p>
 
 <note style="tip"><p>Evolution will ignore the message priority of incoming messages because the recipient should decide whether the message is important or not. You can set the "Important" flag for any messages.</p></note>
 
diff --git a/help/C/mail-composer-reply.page b/help/C/mail-composer-reply.page
index 334da2869d..b974276384 100644
--- a/help/C/mail-composer-reply.page
+++ b/help/C/mail-composer-reply.page
@@ -6,7 +6,7 @@
     
     <link type="guide" xref="index#mail-composing" />
 
-    <revision pkgversion="3.2.3" version="0.5" date="2012-02-09" status="final"/>
+    <revision pkgversion="3.3.91" version="0.6" date="2012-02-19" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -24,7 +24,7 @@
 
 <section id="general-info">
 <title>Replying to Email Messages</title>
-<p>To reply to a message, select the message to reply to in the message list and click the Reply button in the toolbar, or right-click within the message and select Reply to Sender. This opens the message composer. The <gui>To:</gui> and <gui>Subject:</gui> fields are already filled, although you can alter them if you prefer. In addition, the full text of the old message is inserted into the new message, either in grey with a blue line on one side (for HTML display) or with the &gt; character before each line (in plain text mode), to indicate that it is part of the previous message.</p>
+<p>To reply to a message, select the message to reply to in the message list and click the <gui>Reply</gui> button in the toolbar, or right-click within the message and select <gui>Reply to Sender</gui>. This opens the message composer. The <gui>To:</gui> and <gui>Subject:</gui> fields are already filled, although you can alter them if you prefer. In addition, the full text of the old message is inserted into the new message, either in grey with a blue line on one side (for HTML display) or with the &gt; character before each line (in plain text mode), to indicate that it is part of the previous message.</p>
 <p>If you are reading a message with several recipients, you can use <gui>Reply to All</gui> instead of <gui>Reply</gui>. If there are large numbers of people in the <gui>Cc:</gui> or <gui>To:</gui> fields, this can save substantial amounts of time.</p>
 </section>
 
diff --git a/help/C/mail-spam-marking.page b/help/C/mail-spam-marking.page
index 42e7a6355e..a16660e65b 100644
--- a/help/C/mail-spam-marking.page
+++ b/help/C/mail-spam-marking.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="mail-spam" />
 
-    <revision pkgversion="2.32.1" version="0.2" date="2011-01-04" status="draft"/>
+    <revision pkgversion="3.3.91" version="0.3" date="2012-02-19" status="draft"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -28,6 +28,6 @@
 <p>Evolution can check for junk mail for you. Evolution uses SpamAssassin and/or Bogofilter with trainable Bayesian filters to perform the spam check. When the software detects mail that appears to be junk mail, it will flag it and hide it from your view. Messages that are flagged as junk mail are displayed only in the Junk folder.</p>
 <p>The junk mail filter can learn which kinds of mail are legitimate and which are not if you train it by marking as junk incoming mail that you determine is spam. When you first start using junk mail blocking, check the Junk folder frequently to be sure that legitimate mail doesn't get flagged as junk mail.</p>
 <p>If legitimate mail is incorrectly flagged, remove it from the Junk folder by right-clicking it and selecting <gui>Mark as Not Junk</gui> or pressing <keyseq><key>Shift</key><key>Ctrl</key><key>J</key></keyseq>. If Evolution misses junk mail, right-click the message, then click <gui>Mark as Junk</gui> or press <keyseq><key>Ctrl</key><key>J</key></keyseq>. When you correct it, the filter can recognize similar messages in the future, and becomes more accurate as time goes on.</p>
-<p>You can also flag mail as junk by selecting it and clicking the Junk icon in the menu bar; you can flag mail in the junk folder as "Not Junk" by selecting it and clicking the <gui>Not Junk</gui> icon.</p>
+<p>You can also flag mail as junk by selecting it and clicking the <gui>Junk</gui> button in the tool bar; you can flag mail in the junk folder as "Not Junk" by selecting it and clicking the <gui>Not Junk</gui> button.</p>
 <p>Each time you flag a message as Junk, the sender is added to your Spam List; each time you flag a message as Not Junk, the sender is removed from your Spam List.</p>
 </page>
diff --git a/help/C/mail-spam-settings.page b/help/C/mail-spam-settings.page
index 4fbf3ee198..029f86a1f5 100644
--- a/help/C/mail-spam-settings.page
+++ b/help/C/mail-spam-settings.page
@@ -7,7 +7,7 @@
     <link type="guide" xref="mail-spam" />
     <link type="seealso" xref="mail-spam-marking"/>
 
-    <revision pkgversion="3.0.2" version="0.3" date="2011-09-04" status="final"/>
+    <revision pkgversion="3.3.91" version="0.4" date="2012-02-19" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -27,17 +27,10 @@
 
 <title>Junk Mail Settings</title>
 
-<p>Evolution lets you check for unwanted junk or spam emails by using the Bogofilter or SpamAssassin tools. To use these tools, you need to make sure that they are installed via the software management tool of your distribution and you need enable their respective plugins.</p>
+<p>Evolution lets you check for unwanted junk or spam emails by using the Bogofilter or SpamAssassin tools. To use these tools, you need to make sure that they are installed via the software management tool of your distribution.</p>
 <p><link action="install:bogofilter" href="http://bogofilter.sourceforge.net/">Install bogofilter now.</link></p>
 <p><link action="install:spamassassin" href="http://spamassassin.apache.org/">Install spamassassin now.</link></p>
 
-<p>To enable the plugins:</p>
-<steps>
-<item><p>Click <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq>.</p></item>
-<item><p>Select the plugins you wish to enable. You can select either Bogofilter or SpamAssassin, or both.</p></item>
-<item><p>Click <gui>Close</gui>.</p></item>
-</steps>
-
 <note style="tip"><p>The junk mail options discussed in this page refer only to POP and Local Delivery. For handling junk mails on IMAP, see the Evolution settings under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Accounts</gui><gui style="button">Edit</gui><gui>Receiving Options</gui></guiseq>.</p></note>
 
 <section id="preferences">
@@ -53,7 +46,7 @@
 <item><p>Checking custom headers for junk.</p></item>
 <item><p>Marking messages as not junk if the sender is in the address book.</p></item>
 <item><p>The default junk filter.</p></item>
-<item><p>Bogofilter and SpamAssassin options. These options are available only if the plugins are enabled.</p></item>
+<item><p>Bogofilter and SpamAssassin options.</p></item>
 </list>
 </item>
 </steps>
diff --git a/help/C/memos-usage-edit-memo.page b/help/C/memos-usage-edit-memo.page
index d0915eb104..419a495418 100644
--- a/help/C/memos-usage-edit-memo.page
+++ b/help/C/memos-usage-edit-memo.page
@@ -6,7 +6,7 @@
     
     <link type="guide" xref="memos-usage" />
 
-    <revision pkgversion="3.0.2" version="0.1" date="2011-08-01" status="final"/>
+    <revision pkgversion="3.0.2" version="0.2" date="2012-02-19" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -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 memo 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 <gui>Open Memo</gui>.</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/using-categories.page b/help/C/using-categories.page
index c688b884c1..72d6dac27a 100644
--- a/help/C/using-categories.page
+++ b/help/C/using-categories.page
@@ -8,7 +8,7 @@
     <link type="guide" xref="tasks-organizing" />
     <link type="guide" xref="calendar-organizing" />
 
-    <revision pkgversion="3.1.5" version="0.5" date="2011-08-01" status="final"/>
+    <revision pkgversion="3.3.91" version="0.6" date="2012-02-19" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47@gmx.net</email>
@@ -45,7 +45,7 @@
 
 <p>If the default list of categories does not suit your needs, you can add your own categories either directly via <guiseq><gui>Edit</gui><gui>Available Categories</gui></guiseq>, or indirectly when editing an object:</p>
 <steps>
-<item><p>Double-click any object to bring up th corresponding editor.</p></item>
+<item><p>Double-click any object to bring up the corresponding editor.</p></item>
 <item><p>Click <gui style="button">Categories...</gui>. (If this button is not available, select <guiseq><gui>View</gui><gui>Categories</gui></guiseq>.)</p></item>
 <item><p>Enter the new category in the entry box at the top.</p></item>
 <item><p>Click <gui style="button">OK</gui>.</p></item>