User Docs: Rewrite Spam Marking. Fixes bug #665008

2 files changed, 19 insertions, 8 deletions

diff --git a/help/C/mail-spam-marking.page b/help/C/mail-spam-marking.page
index ccc879f346..cb9ce30829 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="3.3.91" version="0.3" date="2012-02-19" status="draft"/>
+    <revision pkgversion="3.3.91" version="0.4" date="2012-03-07" status="draft"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -24,10 +24,14 @@
 
   </info>
 
-<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 <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 <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>
+<title>Marking Mail as Junk</title>
+
+<p>While SpamAssassin comes with a set of predefined rules, Bogofilter needs to be taught first before it will automatically filter junk mail. In any case, when you first start using junk mail blocking, check the <gui>Junk</gui> mail folder frequently to be sure that legitimate mail doesn't get flagged as junk mail.</p>
+
+<section id="marking-junk">
+<title>Manually Marking Junk Mail</title>
+<p>If Evolution misses junk mail, right-click the message, then click <gui>Mark as Junk</gui>, or mark the message and press <keyseq><key>Ctrl</key><key>J</key></keyseq> or click the <gui>Junk</gui> button in the tool bar. 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 <gui>Junk</gui> 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>, or mark the message and click the <gui>Not Junk</gui> button.</p>
+
+</section>
 </page>
diff --git a/help/C/mail-spam-settings.page b/help/C/mail-spam-settings.page
index 1795e27e1a..026e95e951 100644
--- a/help/C/mail-spam-settings.page
+++ b/help/C/mail-spam-settings.page
@@ -35,6 +35,8 @@
 
 <title>Junk Mail Settings</title>
 
+<section id="junk-folder">
+<title>Tools</title>
 <p><app>Evolution</app> lets you check for unwanted junk or spam emails by using the <app>Bogofilter</app> or <app>SpamAssassin</app> tools. To use these tools, you need to make sure that they are installed via the software management tool of your distribution.</p>
 
 <note style="info package">
@@ -48,11 +50,16 @@
 </note>
 
 <p>SpamAssassin works through a set of predefined rules, hence it can determine spam straight away. Bogofilter does not come with a default set of spam criteria so it will not automatically filter anything after installing it. You must <link xref="mail-spam-marking">train it</link> first to make it work. You can modify the actions of SpamAssassin by training it as well.</p>
+</section>
 
-<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="junk-folder">
+<title>Junk Mail Folder</title>
+<p>Messages that are marked as junk (either manually by the user or automatically via SpamAssassin or Bogofilter) will be moved to the <gui>Junk</gui> mail folder.</p>
+</section>
 
 <section id="preferences">
 <title>Junk Mail Preferences</title>
+<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>
 <p>You can modify how Evolution handles junk mail by changing the Junk Mail Preferences:</p>
 <steps>
 <item><p>Click <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> or press <keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>.</p></item>