From d248d872d8f3be8f656278a4a7f9597805db3783 Mon Sep 17 00:00:00 2001 From: "mnyromyr%tprac.de" Date: Thu, 27 Jul 2006 14:38:41 +0000 Subject: [PATCH] Bug 335846: Junk Preferences Panel help; r=IanN --- .../en-US/chrome/common/help/mail_help.xhtml | 161 +++++++++++++----- .../en-US/chrome/common/help/suite-toc.rdf | 2 + 2 files changed, 117 insertions(+), 46 deletions(-) diff --git a/suite/locales/en-US/chrome/common/help/mail_help.xhtml b/suite/locales/en-US/chrome/common/help/mail_help.xhtml index 8c723964634d..075bbf3fc710 100644 --- a/suite/locales/en-US/chrome/common/help/mail_help.xhtml +++ b/suite/locales/en-US/chrome/common/help/mail_help.xhtml @@ -2605,6 +2605,8 @@

[Return to beginning of section]

+ +

Controlling Junk Mail

This section describes how to use &brandShortName;'s Junk Mail Controls @@ -2619,6 +2621,7 @@ to filter unwanted mail.

+

Using Junk Mail Controls

&brandShortName;'s Junk Mail Controls feature can evaluate your @@ -2651,10 +2654,16 @@ to filter unwanted mail.

in the Junk status column to indicate the junk status of the selected message.

-
  • Open the Tools menu and choose Junk Mail Controls.... Enable the - feature for your mail account, and &brandShortName; will automatically - classify incoming messages. (See - Junk Mail Controls Options.)
    • + +
  • Open the Edit menu, and choose Mail & Newsgroups Account Settings. + You see the Mail & Newsgroups Account Settings dialog box.
    • +
  • Click the Junk Settings category for your mail account.
    • +
  • Enable the feature and &brandShortName; will automatically classify + incoming messages. (See + Junk Mail Controls Options. + Details on the other settings there can be found in the + Junk Settings preference panel description.) +
  • If you have trained it on virus mail, consider disabling the white listing (many mail viruses send bulk messages to people in the address book of the infected computer).
    • @@ -2671,53 +2680,18 @@ to filter unwanted mail.

    [Return to beginning of section]

    +

    Junk Mail Controls Options

    -

    To fine-tune how Junk Mail Controls work, open the Tools menu and choose - Junk Mail Controls...:

    - - +

    To fine-tune how Junk Mail Controls work, use the + global Junk Mail preference panel for + account-independent settings and the account manager's + Junk Settings for settings of a specific mail + account.

    [Return to beginning of section]

    +

    Junk Mail Controls and Filters

    Junk Mail Controls run after mail filters and apply only to the Inbox folder @@ -2728,6 +2702,8 @@ to filter unwanted mail.

    [Return to beginning of section]

    + +

    Importing Mail from Other Programs

    @@ -3444,6 +3420,7 @@ to filter unwanted mail.

  • Copies & Folders
  • Composition & Addressing
  • Offline & Disk Space
    • +
  • Junk Settings
  • Return Receipts
  • Security
  • Local Folders
    • @@ -4028,6 +4005,55 @@ to filter unwanted mail.

    [Return to beginning of section]

    + +

    Mail & Newsgroups Account Settings - Junk + Settings

    + +

    This section describes how to use the account junk settings. If + you are not currently viewing the Junk Settings, follow these steps:

    + +
      +
    1. Open the Edit menu, and choose Mail & Newsgroups Account Settings. + You see the Mail & Newsgroups Account Settings dialog box.
      2. +
    2. Click the Junk Settings category for your mail account.
      3. +
    + +

    You use the Junk Settings panel to define your account-specific settings + for the adaptive mail filter. Global junk settings are changed under + Mail & Newsgroups Preferences - + Junk Mail.

    + + + +

    [Return to beginning of + section]

    + +

    Mail & Newsgroups Account Settings - Return Receipts

    @@ -4287,6 +4313,7 @@ to filter unwanted mail.

  • Composition
  • Send Format
  • Addressing
    • +
  • Junk Mail
  • Labels
  • Return Receipts
  • Character Encoding
    • @@ -4682,6 +4709,48 @@ to filter unwanted mail.

    [Return to beginning of section]

    + +

    Mail & Newsgroups Preferences - + Junk Mail

    + +

    This section describes how to use the Junk Mail preferences panel. If + you are not currently viewing the Junk Mail panel, follow these steps:

    + +
      +
    1. Open the &brandShortName; + Edit menu and choose Preferences.
      2. +
    2. Under the Mail & Newsgroups category, select Junk Mail. (If no + subcategories are visible, double-click Mail & Newsgroups to expand the + list.)
      3. +
    + + + +

    [Return to beginning of + section]

    + +

    Mail & Newsgroups Preferences - Labels

    This section describes how to use the Labels preferences panel. You use the diff --git a/suite/locales/en-US/chrome/common/help/suite-toc.rdf b/suite/locales/en-US/chrome/common/help/suite-toc.rdf index dafa7e102e42..57530cf369d5 100644 --- a/suite/locales/en-US/chrome/common/help/suite-toc.rdf +++ b/suite/locales/en-US/chrome/common/help/suite-toc.rdf @@ -441,6 +441,7 @@ nc:link="chrome://help/locale/nav_help.xhtml#plugins_and_downloads"/> + @@ -490,6 +491,7 @@ nc:link="chrome://help/locale/nav_help.xhtml#plugins_and_downloads"/> +