Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 15:52:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 335846: Junk Preferences Panel help; r=IanN

Browse Source
This commit is contained in:
mnyromyr%tprac.de 2006-06-16 00:06:42 +00:00
parent 20371b0ec2
commit d5d32240f9
4 changed files with 119 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/help/resources/locale/en-US/help-toc.rdf
View File

@ -441,6 +441,7 @@ nc:link="chrome://help/locale/nav_help.xhtml#plugins_and_downloads"/> </rdf:li>
<rdf:li> <rdf:Description ID="mail_addressing_settings" nc:name="Composition &amp; Addressing" nc:link="mail_help.xhtml#addressing"/> </rdf:li>
<rdf:li> <rdf:Description ID="mail-doc-offline-space" nc:name="Offline and Disk Space" nc:link="mail_help.xhtml#offline_and_disk_space"/> </rdf:li>
<rdf:li> <rdf:Description ID="mail-account-receipts" nc:name="Return Receipts" nc:link="mail_help.xhtml#return_receipts"/> </rdf:li>
<rdf:li> <rdf:Description ID="mail-account-junk" nc:name="Junk Settings" nc:link="mail_help.xhtml#junk_settings"/> </rdf:li>
<rdf:li> <rdf:Description ID="mail_security_settings" nc:name="Security" nc:link="mail_help.xhtml#security"/> </rdf:li>
<rdf:li> <rdf:Description ID="mail_local_folders_settings" nc:name="Local Folders" nc:link="mail_help.xhtml#local_folders"/> </rdf:li>
<rdf:li> <rdf:Description ID="mail_smtp" nc:name="Outgoing Server (SMTP)" nc:link="mail_help.xhtml#outgoing_server"/> </rdf:li>
@ -490,6 +491,7 @@ nc:link="chrome://help/locale/nav_help.xhtml#plugins_and_downloads"/> </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-labels" nc:name="Labels" nc:link="mail_help.xhtml#labels"/> </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>

161
extensions/help/resources/locale/en-US/mail_help.xhtml
View File

@ -2605,6 +2605,8 @@
<p>[<a href="#organizing_your_messages">Return to beginning of section</a>]</p>
<h1 id="controlling_junk_mail">Controlling Junk Mail</h1>
<p>This section describes how to use &brandShortName;&apos;s Junk Mail Controls
@ -2619,6 +2621,7 @@ to filter unwanted mail.</p>
</ul>
</div>
<h2 id="using_junk_mail_controls">Using Junk Mail Controls</h2>
<p>&brandShortName;&apos;s Junk Mail Controls feature can evaluate your
@ -2651,10 +2654,16 @@ to filter unwanted mail.</p>
in the Junk status column to indicate the junk status of the selected
message.</p>
</li>
<li>Open the Tools menu and choose <q>Junk Mail Controls...</q>. Enable the
feature for your mail account, and &brandShortName; will automatically
classify incoming messages. (See
<a href="#junk_controls_options">Junk Mail Controls Options</a>.)</li>
<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>
<li>Enable the feature and &brandShortName; will automatically classify
incoming messages. (See
<a href="#junk_controls_options">Junk Mail Controls Options</a>.
Details on the other settings there can be found in the
<a href="#junk_settings">Junk Settings</a> preference panel description.)
</li>
<li>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).</li>
@ -2671,53 +2680,18 @@ to filter unwanted mail.</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, open the Tools menu and choose
<q>Junk Mail Controls...</q>:</p>
<ul>
<li><strong>Account</strong>: Choose a mail account to change the Junk Mail
Controls settings for that account. (Note: all accounts share the same Junk
training database.)</li>
<li><strong>Junk Mail Log</strong>: Click the button to open a dialog showing
you the history of Junk mail detections. You can disable Junk Mail Log from
the dialog.</li>
<li><strong>Enable Junk Mail Controls</strong>: Toggle this option to
activate or deactivate junk mail classification.</li>
<li><strong>Do not mark messages as junk mail if the sender is in my address
book</strong>: Choose this option to prevent messages from people you know
inadvertently classified as junk mail.</li>
<li><strong>Move incoming messages determined to be junk mail to</strong>:
Check this option to automatically move messages flagged as Junk to a
special folder.
<ul>
<li><strong><q>Junk</q> folder on [account]</strong>: select this to use
the default Junk folder.</li>
<li><strong>Other: [account]</strong>: select this to choose your own
custom-named junk folder.</li>
<li><strong>Automatically delete junk messages older than __ days from
this folder</strong>: If you are confident old messages classified as
junk are indeed junk mail, check this option to automatically delete
old junk messages after a grace period.</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>When I manually 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 <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>
</ul>
<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_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
@ -2728,6 +2702,8 @@ to filter unwanted mail.</p>
<p>[<a href="#controlling_junk_mail">Return to beginning of section</a>]</p>
<h1 id="importing_mail_from_other_programs">Importing Mail from Other
Programs</h1>
@ -3444,6 +3420,7 @@ to filter unwanted mail.</p>
<li><a href="#copies_and_folders">Copies &amp; Folders</a></li>
<li><a href="#addressing">Composition &amp; Addressing</a></li>
<li><a href="#offline_and_disk_space">Offline &amp; Disk Space</a></li>
<li><a href="#junk_settings">Junk Settings</a></li>
<li><a href="#return_receipts">Return Receipts</a></li>
<li><a href="#security">Security</a></li>
<li><a href="#local_folders">Local Folders</a></li>
@ -4028,6 +4005,55 @@ to filter unwanted mail.</p>
<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
section</a>]</p>
<h2 id="junk_settings">Mail &amp; Newsgroups Account Settings - Junk
Settings</h2>
<p>This section describes how to use the account junk settings. If
you are not currently viewing the Junk Settings, follow these steps:</p>
<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>
<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
classified as junk mail.</li>
<li><strong>Trust junk mail headers set by [an external junk filter
like Spam Assassin or Spam Pal]</strong>: Choose this option if you want to
trust the junk classification of external filter programs.</li>
<li><strong>Move new junk messages to</strong>:
Check this option to automatically move messages flagged as Junk to a
special folder.
<ul>
<li><strong><q>Junk</q> folder on [account]</strong>: Select this to use
the default Junk folder.</li>
<li><strong>Other: [account]</strong>: Select this to choose your own
custom-named junk folder.</li>
<li><strong>Automatically delete junk messages older than [__] days from
this folder</strong>: If you are confident old messages classified as
junk are indeed junk mail, check this option to automatically delete
old junk messages after a grace period.</li>
</ul>
</li>
</ul>
<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
section</a>]</p>
<h2 id="return_receipts">Mail &amp; Newsgroups Account Settings - Return
Receipts</h2>
@ -4287,6 +4313,7 @@ to filter unwanted mail.</p>
<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="#labels">Labels</a></li>
<li><a href="#return_receipts_preferences">Return Receipts</a></li>
<li><a href="#character_encoding">Character Encoding</a></li>
@ -4682,6 +4709,48 @@ to filter unwanted mail.</p>
<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>
<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>
</ol>
<ul>
<li><strong>When I manually 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>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>
</ul>
<p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
section</a>]</p>
<h2 id="labels">Mail &amp; Newsgroups Preferences - Labels</h2>
<p>This section describes how to use the Labels preferences panel. You use the

1
mailnews/base/prefs/resources/content/am-help.js
View File

@ -48,6 +48,7 @@ var pageTagPairs = {
"chrome://messenger/content/am-server.xul": "mail",
"chrome://messenger/content/am-copies.xul": "mail_copies",
"chrome://messenger/content/am-addressing.xul": "mail_addressing_settings",
"chrome://messenger/content/am-junk.xul": "mail-account-junk",
"chrome://messenger/content/am-offline.xul": "mail-offline-accounts",
"chrome://messenger/content/am-smtp.xul": "mail_smtp",
"chrome://messenger/content/am-smime.xul": "mail_security_settings",

1
suite/common/pref/pref-help.js
View File

@ -23,6 +23,7 @@ var fm = {
"chrome://messenger/content/messengercompose/pref-formatting.xul": "mail_prefs_formatting",
"chrome://messenger/content/addressbook/pref-addressing.xul": "mail_prefs_addressing",
"chrome://messenger/content/pref-offline.xul": "mail_prefs_offline",
"chrome://messenger/content/pref-junk.xul": "mail-prefs-junk",
"chrome://messenger/content/pref-labels.xul": "mail-prefs-labels",
"chrome://messenger/content/pref-receipts.xul": "mail-prefs-receipts",
"chrome://editor/content/pref-composer.xul": "composer_prefs_general",