Bug 519228 - Add help for the anti virus and scam preferences in the MailNews Preferences UI
authorIan Neal <iann_cvs@blueyonder.co.uk>
Tue, 29 Sep 2009 22:34:45 +0100
changeset 3982 4b184d873c66a3120c7f591386c32c3548a8c64a
parent 3981 8ee1764e1ced3ee7c3c8c6b1fd165e93cc12e49b
child 3983 5c30e830c725c019a376ce425e068376055b3a22
push id3105
push useriann_cvs@blueyonder.co.uk
push dateTue, 29 Sep 2009 21:35:09 +0000
treeherdercomm-central@4b184d873c66 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs519228
Bug 519228 - Add help for the anti virus and scam preferences in the MailNews Preferences UI r=jh a-SM2.0=KaiRo
suite/locales/en-US/chrome/common/help/mail_help.xhtml
suite/locales/en-US/chrome/common/help/suite-toc.rdf
--- a/suite/locales/en-US/chrome/common/help/mail_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/mail_help.xhtml
@@ -2735,18 +2735,18 @@ to filter unwanted mail, and how phishin
   Controls do not work, select some messages and explicitly mark them as Not
   Junk.</p>
 
 <p>[<a href="#controlling_junk_mail">Return to beginning of section</a>]</p>
 
 <h2 id="junk_controls_options">Junk Mail Controls Options</h2>
 
 <p>To fine-tune how Junk Mail Controls work, use the 
-  <a href="#global_junk_settings">global Junk Mail preference panel</a> for
-  account-independent settings and the account manager's 
+  <a href="#junk_and_suspect_preferences">Junk &amp; Suspect Mail preference
+  panel</a> for account-independent settings and the account manager's
   <a href="#junk_settings">Junk Settings</a> for settings of a specific mail
   account.</p>
 
 <p>[<a href="#controlling_junk_mail">Return to beginning of section</a>]</p>
 
 <h2 id="junk_controls_and_filters">Junk Mail Controls and Filters</h2>
 
 <p>Junk Mail Controls run after mail filters and apply only to the Inbox folder
@@ -4645,18 +4645,18 @@ to filter unwanted mail, and how phishin
 <ol>
   <li>Open the Edit menu, and choose Mail &amp; Newsgroups Account Settings.
     You see the Mail &amp; Newsgroups Account Settings dialog box.</li>
   <li>Click the Junk Settings category for your mail account.</li>
 </ol>
 
 <p>You use the Junk Settings panel to define your account-specific settings
   for the adaptive mail filter. Global junk settings are changed under
-  <a href="#global_junk_settings">Mail &amp; Newsgroups Preferences -
-  Junk Mail</a>.</p>
+  <a href="#junk_and_suspect_preferences">Mail &amp; Newsgroups Preferences -
+  Junk &amp; Suspect Mail</a>.</p>
   
 <ul>  
   <li><strong>Enable adaptive junk mail controls for this account</strong>:
     Toggle this option to activate or deactivate junk mail classification.</li>
   <li><strong>Do not mark mail as junk if the sender is in [the address
     book chosen from all your address books available in the drop down
     box]</strong>:
     Choose this option to prevent messages from people you know inadvertently
@@ -4946,17 +4946,17 @@ to filter unwanted mail, and how phishin
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#mail_and_newsgroups">Mail &amp; Newsgroups</a></li>
     <li><a href="#message_display">Message Display</a></li>
     <li><a href="#notifications">Notifications</a></li>
     <li><a href="#composition">Composition</a></li>
     <li><a href="#send_format">Send Format</a></li>
     <li><a href="#addressing_preferences">Addressing</a></li>
-    <li><a href="#global_junk_settings">Junk Mail</a></li>
+    <li><a href="#junk_and_suspect_preferences">Junk &amp; Suspect Mail</a></li>
     <li><a href="#tags">Tags</a></li>
     <li><a href="#return_receipts_preferences">Return Receipts</a></li>
     <li><a href="#character_encoding">Character Encoding</a></li>
     <li><a href="#network_and_storage_preferences">Network &amp; Storage
       Preferences</a></li>
   </ul>
 </div>
 
@@ -5340,51 +5340,68 @@ to filter unwanted mail, and how phishin
       different addressing options for a specific account, open the Edit menu
       and choose Mail &amp; Newsgroups Account Settings.</p>
   </li>
 </ul>
 
 <p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
   section</a>]</p>
 
-<h2 id="global_junk_settings">Mail &amp; Newsgroups Preferences - 
-  Junk Mail</h2>
-
-<p>This section describes how to use the Junk Mail preferences panel. If
-  you are not currently viewing the Junk Mail panel, follow these steps:</p>
+<h2 id="junk_and_suspect_preferences">Mail &amp; Newsgroups Preferences -
+  Junk &amp; Suspect Mail</h2>
+
+<p>This section describes how to use the Junk &amp; Suspect Mail preferences
+  panel. If you are not currently viewing the Junk &amp; Suspect Mail panel,
+  follow these steps:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
-  <li>Under the Mail &amp; Newsgroups category, select Junk Mail. (If no
-    subcategories are visible, double-click Mail &amp; Newsgroups to expand the
-    list.)</li>
+  <li>Under the Mail &amp; Newsgroups category, select Junk &amp; Suspect Mail.
+    (If no subcategories are visible, double-click Mail &amp; Newsgroups to
+    expand the list.)</li>
 </ol>
 
 <ul>
-  <li><strong>When I manually mark messages as junk</strong>: Choose this to
+  <li><strong>When I mark messages as junk</strong>: Choose this to
     set what you want &brandShortName; to do when you manually mark messages
     as Junk.
     <ul>
       <li><strong>Move them to the account's <q>Junk</q> folder</strong>:
         Choose this to move manually-marked Junk messages to the Junk folder.
       </li>
       <li><strong>Delete them</strong>: Choose this to move manually-marked 
         Junk messages to the trash folder.</li>
     </ul>
   </li>
-  <li><strong>Mark messages determined to be junk as read</strong>: Select this
-    option to mark junk messages as read, so they will not show up as new.</li>
+  <li><strong>Mark messages as read</strong>:
+    <ul>
+      <li><strong>When &brandShortName; determines that they are junk</strong>:
+        Select this option to mark junk messages as read, so they will not show
+        up as new.</li>
+      <li><strong>When I manually mark them as junk</strong>: Select this
+        option to mark messages as read when you manually mark them as junk.
+      </li>
+    </ul>
+  </li>
   <li><strong>Enable junk filter logging</strong>: Select this option to allow
     logging the history of Junk mail detections. Click the <strong>Show log
     </strong> button to open a dialog showing this log.</li>
   <li><strong>Reset training data</strong>: Click this button to clear the
     training data of the adaptive junk filter. Since this will effectively
     destroy your personal junk profile, you will be asked for confirmation.
   </li>
+  <li><strong>Tell me if the message I'm reading is a suspected email
+    scam</strong>: Choose this to make &brandShortName; analyze messages for
+    suspected email scams by looking for common techniques used to deceive
+    people.</li>
+  <li><strong>Allow anti-virus clients to scan incoming messages more
+    easily</strong>: Choose this to let &brandShortName; make it easier for
+    anti-virus software to analyze incoming mail messages for viruses before
+    they are stored locally.</li>
 </ul>
 
 <p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
   section</a>]</p>
 
 
 <h2 id="tags">Mail &amp; Newsgroups Preferences - Tags</h2>
 
--- a/suite/locales/en-US/chrome/common/help/suite-toc.rdf
+++ b/suite/locales/en-US/chrome/common/help/suite-toc.rdf
@@ -156,18 +156,18 @@
         <rdf:li> <rdf:Description ID="mail-doc-address" nc:name="Using Address Books" nc:link="mail_help.xhtml#using_address_books" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-folders" nc:name="Organizing Your Messages" nc:link="mail_help.xhtml#organizing_your_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-junk" nc:name="Controlling Junk Mail" nc:link="mail_help.xhtml#controlling_junk_mail" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-importing-other" nc:name="Importing Mail from Other Programs" nc:link="mail_help.xhtml#importing_mail_from_other_programs" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-news" nc:name="Getting Started With Newsgroups" nc:link="mail_help.xhtml#getting_started_with_newsgroups" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-blogs" nc:name="Getting Started With Blogs &amp; News Feeds" nc:link="mail_help.xhtml#getting_started_with_blogs_and_news_feeds" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-offline" nc:name="Working Offline" nc:link="mail_help.xhtml#working_offline" /> </rdf:li>
         <rdf:li> <rdf:Description ID="sign-encrypt" nc:name="Signing &amp; Encrypting Messages" nc:link="mail_sec_help.xhtml#signing_and_encrypting_messages" /> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-doc-account-settings" nc:name="Mail and Newsgroups Account Settings" nc:link="mail_help.xhtml#mail_and_newsgroups_account_settings" /> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-doc-mailprefs" nc:name="Mail and Newsgroup Preferences" nc:link="mail_help.xhtml#mail_and_newsgroup_preferences" /> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-doc-account-settings" nc:name="Mail &amp; Newsgroups Account Settings" nc:link="mail_help.xhtml#mail_and_newsgroups_account_settings" /> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-doc-mailprefs" nc:name="Mail &amp; Newsgroup Preferences" nc:link="mail_help.xhtml#mail_and_newsgroup_preferences" /> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 
  <rdf:Description about="#mail-doc">
     <nc:subheadings>
       <rdf:Seq>
@@ -498,27 +498,27 @@
         <rdf:li> <rdf:Description ID="mail_security_settings_encrypt" nc:name="Encryption"  nc:link="mail_help.xhtml#encryption"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#mail-doc-mailprefs">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li> <rdf:Description ID="mail_prefs_general" nc:name="Mail and Newsgroups" nc:link="mail_help.xhtml#mail_and_newsgroups"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_prefs_general" nc:name="Mail &amp; Newsgroups" nc:link="mail_help.xhtml#mail_and_newsgroups"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_prefs_display" nc:name="Message Display" nc:link="mail_help.xhtml#message_display"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_prefs_notifications" nc:name="Notifications" nc:link="mail_help.xhtml#notifications"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_prefs_messages" nc:name="Composition" nc:link="mail_help.xhtml#composition"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_prefs_formatting" nc:name="Send Format" nc:link="mail_help.xhtml#send_format"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_prefs_addressing" nc:name="Addressing" nc:link="mail_help.xhtml#addressing_preferences"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-prefs-junk" nc:name="Junk Mail" nc:link="mail_help.xhtml#global_junk_settings"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-prefs-junk" nc:name="Junk &amp; Suspect Mail" nc:link="mail_help.xhtml#junk_and_suspect_preferences"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-prefs-tags" nc:name="Tags" nc:link="mail_help.xhtml#tags"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-prefs-receipts" nc:name="Return Receipts" nc:link="mail_help.xhtml#return_receipts_preferences"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_prefs_character_encoding" nc:name="Character Encoding" nc:link="mail_help.xhtml#character_encoding"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_prefs_offline" nc:name="Network and Storage" nc:link="mail_help.xhtml#network_and_storage_preferences"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_prefs_offline" nc:name="Network &amp; Storage" nc:link="mail_help.xhtml#network_and_storage_preferences"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <!-- COMPOSER HELP SECTION -->
 
 <rdf:Description about="#comp">
     <nc:subheadings>