[evolution] Fix several issues pointed out by Jiří Eischmann

[Andre Klapper <aklapper src gnome org>]

commit 95dfaf34388b1699a23d33fb0f0e4d73d617f335
Author: Andre Klapper <a9016009 gmx de>
Date:   Sun Sep 4 21:32:21 2011 +0200

    Fix several issues pointed out by JiÅÃ Eischmann

 help/C/mail-spam-marking.page             |    2 +-
 help/C/mail-spam-settings.page            |    6 +++---
 help/C/mail-wrong-fonts-in-3-0.page       |    6 +++---
 help/C/tasks-using-several-tasklists.page |    6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/help/C/mail-spam-marking.page b/help/C/mail-spam-marking.page
index 9ec9b61..42e7a63 100644
--- a/help/C/mail-spam-marking.page
+++ b/help/C/mail-spam-marking.page
@@ -27,7 +27,7 @@
 <title>Marking Junk Mail</title>
 <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 Mark as Junk 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>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>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 e6f3d51..4fbf3ee 100644
--- a/help/C/mail-spam-settings.page
+++ b/help/C/mail-spam-settings.page
@@ -2,12 +2,12 @@
       type="topic" id="mail-spam-settings">
 
   <info>
-    <desc>How to set up handling unwanted junk and spam mail.</desc>
+    <desc>How to set up handling unwanted junk/spam mail.</desc>
 
     <link type="guide" xref="mail-spam" />
     <link type="seealso" xref="mail-spam-marking"/>
 
-    <revision pkgversion="3.0.2" version="0.2" date="2011-07-30" status="final"/>
+    <revision pkgversion="3.0.2" version="0.3" date="2011-09-04" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47 gmx net</email>
@@ -51,7 +51,7 @@
 <item><p>Checking incoming mail for junk messages.</p></item>
 <item><p>Deleting junk messages upon exit, and how often junk messages are to be deleted.</p></item>
 <item><p>Checking custom headers for junk.</p></item>
-<item><p>Marking messages as junk if the sender is in the address book.</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>
 </list>
diff --git a/help/C/mail-wrong-fonts-in-3-0.page b/help/C/mail-wrong-fonts-in-3-0.page
index 7d0d8e5..18f808e 100644
--- a/help/C/mail-wrong-fonts-in-3-0.page
+++ b/help/C/mail-wrong-fonts-in-3-0.page
@@ -7,7 +7,7 @@
     <link type="guide" xref="index#common-mail-problems" />
     <link type="seealso" xref="mail-displaying-message" />
 
-    <revision pkgversion="3.0.2" version="0.1" date="2011-07-25" status="draft"/>
+    <revision pkgversion="3.1.90" version="0.2" date="2011-09-04" status="draft"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47 gmx net</email>
@@ -20,8 +20,8 @@
 
 <title>Message fonts are not the same fonts as in other applications</title>
 
-<p>It can happen that <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>Message Fonts</gui><gui>Use the same fonts as other applications</gui></guiseq> is enabled but Evolution still uses different fonts than other parts of the system.</p>
+<p>In version 3.0 it can happen that <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</gui><gui>Message Fonts</gui><gui>Use the same fonts as other applications</gui></guiseq> is enabled but Evolution still uses different fonts than other parts of the system.</p>
 
-<p>This bug is fixed in Evolution versions higher than 3.0.2 (stable series) and 3.1.3 (unstable development series). If this is not the case, please add a comment to the corresponding <link href="https://bugzilla.gnome.org/show_bug.cgi?id=655002";>bug report</link>.</p>
+<p>This bug is fixed from Evolution version 3.0.3 (stable series) and 3.1.4 (unstable development series) onwards. If this is not the case, please add a comment to the corresponding <link href="https://bugzilla.gnome.org/show_bug.cgi?id=655002";>bug report</link>. Note that from version 3.2 onwards this setting is located under <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Mail Preferences</gui><gui>General</gui><gui>Message Display</gui><gui>Use the same fonts as other applications</gui></guiseq>.</p>
 
 </page>
diff --git a/help/C/tasks-using-several-tasklists.page b/help/C/tasks-using-several-tasklists.page
index 4726a5f..cf4257f 100644
--- a/help/C/tasks-using-several-tasklists.page
+++ b/help/C/tasks-using-several-tasklists.page
@@ -6,7 +6,7 @@
 
     <link type="guide" xref="tasks-organizing" />
 
-    <revision pkgversion="3.1.5" version="0.2" date="2011-07-28" status="final"/>
+    <revision pkgversion="3.1.91" version="0.3" date="2011-09-04" status="final"/>
     <credit type="author">
       <name>Andre Klapper</name>
       <email>ak-47 gmx net</email>
@@ -19,9 +19,9 @@
 
 <title>Using several task lists or memo lists</title>
 
-<p>You can have multiple task or memo lists and overlay them one over the next. For example, you might have tasks for work, tasks for home, and tasks for the singing club that you are a member of. The side bar lists those lists, and you can select or deselect the boxes next to them to show and hide the tasks or memos in your view.</p>
+<p>You can have multiple task or memo lists and choose which of your lists get displayed. For example, you might have tasks for work, tasks for home, and tasks for the singing club that you are a member of. The side bar lists those lists, and you can select or deselect any of the boxes next to them to show and hide the corresponding tasks or memos in your view.</p>
 
-<p>Tasks and memos for each task or memo list appear as a different color.</p>
+<p>Tasks and memos from each task or memo list appear as different colors.</p>
 
 <p>You can also use lists that are not on your computer, such as on the internet.</p>