Bug 474525 - Help update for Synchronization & Storage (Disk Space) settings; r=iann_bugzilla
authorrsx11m <rsx11m.pub@gmail.com>
Mon, 08 Jun 2009 17:39:19 +0200
changeset 2802 c64d9a572e6e37352f8885fb2abf1476844152df
parent 2801 5b2668daf4de2bf3a790806be7e24faf57efcaf9
child 2803 4a231a0cac5e305a1816fea6b40ae6a6abc3b828
push idunknown
push userunknown
push dateunknown
reviewersiann_bugzilla
bugs474525
Bug 474525 - Help update for Synchronization & Storage (Disk Space) settings; r=iann_bugzilla
suite/locales/en-US/chrome/common/help/help-index1.rdf
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/help-index1.rdf
+++ b/suite/locales/en-US/chrome/common/help/help-index1.rdf
@@ -1058,19 +1058,19 @@
          nc:link="mail_help.xhtml#creating_a_folder"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:creating_HTML_mail_messages"
          nc:name="creating HTML mail messages"
          nc:link="mail_help.xhtml#creating_html_mail_messages"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="Mail_and_Newsgroups:Disk_Space_settings"
-         nc:name="Disk Space settings"
-         nc:link="mail_help.xhtml#offline_and_disk_space"/>
+       <rdf:Description ID="Mail_and_Newsgroups:disk_space_and_storage_settings"
+         nc:name="disk space and storage settings"
+         nc:link="mail_help.xhtml#synchronization_and_storage"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:filing_messages"
          nc:name="filing messages"
          nc:link="mail_help.xhtml#filing_messages_in_folders"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:forwarding_messages"
@@ -1113,16 +1113,21 @@
          nc:link="mail_help.xhtml#choosing_how_you_view_the_mail_window"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:message_searching"
          nc:name="message searching"
          nc:link="mail_help.xhtml#searching_through_messages"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="Mail_and_Newsgroups:offline_synchronization_settings"
+         nc:name="offline synchronization settings"
+         nc:link="mail_help.xhtml#synchronization_and_storage"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:POP_settings"
          nc:name="POP settings"
          nc:link="mail_help.xhtml#pop_server_settings"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:renaming_folders"
          nc:name="renaming folders"
          nc:link="mail_help.xhtml#renaming_a_folder"/>
--- a/suite/locales/en-US/chrome/common/help/mail_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/mail_help.xhtml
@@ -273,24 +273,24 @@
         templates. For more information, see <a href="#copies_and_folders">Mail
         &amp; Newsgroups Account Settings - Copies &amp; Folders</a>.</li>
       <li><strong>Composition &amp; Addressing</strong>: These settings allow
         you to choose your default format and quoting behavior when composing a
         message. You can also override the global directory server settings
         specified for all address books in the Preferences dialog box. For more
         information, see <a href="#addressing">Mail &amp; Newsgroups Account
         Settings - Composition &amp; Addressing</a>.</li>
-      <li><strong>Offline &amp; Disk Space (IMAP and News accounts
+      <li><strong>Synchronization &amp; Storage (IMAP and News accounts
         only)</strong>: These settings apply when you are working offline
         (disconnected from the Internet) or need to save download time and
         conserve disk space. For more information, see
-        <a href="#offline_and_disk_space_settings_imap">Offline and Disk Space
-        Settings (IMAP)</a> or
-        <a href="#offline_and_disk_space_settings_nntp">Offline and Disk Space
-        Settings (News)</a>.</li>
+        <a href="#synchronization_and_storage_settings_imap">Synchronization
+        &amp; Storage Settings (IMAP)</a> or
+        <a href="#synchronization_and_storage_settings_nntp">Synchronization
+        &amp; Storage Settings (News)</a>.</li>
       <li><strong>Disk Space (POP accounts only)</strong>: This setting
         determines the maximum size of messages that you are willing to
         download to your hard disk. For more information, see
         <a href="#disk_space_settings">Disk Space Settings (POP)</a>.</li>
       <li><strong>Security</strong>: These settings determine which
         <a href="glossary.xhtml#certificate">certificates</a> are used to
         digitally sign and encrypt mail messages that you send. Digital
         signatures allow you to identify yourself reliably to others in
@@ -3007,18 +3007,18 @@ to filter unwanted mail, and how phishin
   section</a>]</p>
 
 <h1 id="working_offline">Working Offline</h1>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#setting_up_mozilla_mail_and_newsgroups_to_work_offline">Setting
       Up &brandShortName; Mail &amp; Newsgroups to Work Offline</a></li>
-    <li><a href="#downloading_your_inbox_for_offline_use">Downloading Your
-      Inbox for Offline Use</a></li>
+    <li><a href="#downloading_all_messages_for_offline_use">Downloading All
+      Messages for Offline Use</a></li>
     <li><a href="#downloading_an_individual_folder_for_offline_use">Downloading
       an Individual Folder for Offline Use</a></li>
     <li><a href="#downloading_selected_or_flagged_messages_for_offline_use">Downloading
       Selected or Flagged Messages for Offline Use</a></li>
     <li><a href="#downloading_directory_entries_for_offline_use">Downloading
       Directory Entries for Offline Use</a></li>
     <li><a href="#setting_up_your_accounts_for_working_offline">Setting Up Your
       Accounts for Working Offline</a></li>
@@ -3062,48 +3062,50 @@ to filter unwanted mail, and how phishin
 <ul>
   <li>Set up one or more of your accounts for offline use.</li>
   <li>Set offline and disk space preferences for each account.</li>
   <li>Select the folders and newsgroups that you want to view offline.</li>
 </ul>
 
 <p>[<a href="#working_offline">Return to beginning of section</a>]</p>
 
-<h2 id="downloading_your_inbox_for_offline_use">Downloading Your Inbox for
+<h2 id="downloading_all_messages_for_offline_use">Downloading All Messages for
   Offline Use</h2>
 
 <p>You can tell &brandShortName; Mail &amp; Newsgroups to automatically
-  download your Inbox messages for offline use. Later, when you go back online,
-  &brandShortName; Mail &amp; Newsgroups automatically synchronizes your Inbox
+  download your messages for offline use. Later, when you go back online,
+  &brandShortName; Mail &amp; Newsgroups automatically synchronizes your
   messages with the server.</p>
 
 <p>Note that the Inbox for POP accounts is downloaded by default, so this
   section does not apply for POP accounts.</p>
 
-<p>To automatically download your Inbox for offline use, begin from the Mail
+<p>To automatically download your messages for offline use, begin from the Mail
   window:</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>In the left side of the dialog box, under the name of the account you
-    want to use offline, select Offline &amp; Disk Space. (This category is not
-    available for POP accounts.)</li>
-  <li>Check the box labeled <q>Make the messages in my Inbox available when I
-    am working offline</q>.</li>
+    want to use offline, select Synchronization &amp; Storage. (This category
+    is not available for POP accounts.)</li>
+  <li>Check the box labeled <q>Keep messages for this account on this
+    computer</q>.</li>
   <li>Click OK.</li>
-  <li>In the folder pane, under the name of the account you want to use
-    offline, click any folder other than the Inbox. For example, click the Sent
-    or the Drafts folder. Then click the Inbox folder to start downloading its
-    messages.</li>
   <li>Once downloading is complete, click the Online/Offline indicator
     <img src="images/online.png" alt=""/> in the lower right corner of the
     Mail window (to the left of the Cookie icon) to go offline.</li>
 </ol>
 
+<p><strong>Note</strong>: This setting also applies to any new folders
+  created. While the per-account setting can be overridden for an
+  <a href="#downloading_an_individual_folder_for_offline_use">individual
+  folder</a>, those per-folder settings are <em>removed</em> when the
+  <q>Keep messages</q> box is toggled.</p>
+
 <p>&brandShortName; Mail &amp; Newsgroups automatically downloads all messages
   in your Inbox so you can read and respond to them while working offline.
   After disconnecting, &brandShortName; Mail &amp; Newsgroups remains open so
   you can continue to work with your messages.</p>
 
 <p>To reconnect to the Internet so you can work online:</p>
 
 <ul>
@@ -3136,17 +3138,17 @@ to filter unwanted mail, and how phishin
 <p>To download a specific folder for offline use, begin from the Mail
   window:</p>
 
 <ol>
   <li>In the left side of the Mail window, select the folder that you want to
     download for offline use.</li>
   <li>Open the Edit menu, and choose Folder Properties. You see the Properties
     dialog box.</li>
-  <li>Click the Offline tab.</li>
+  <li>Click the Synchronization tab.</li>
   <li>Check <q>Select this folder for offline use</q>.</li>
   <li>Click Download Now if you want to immediately begin downloading the
     folder&apos;s messages. Alternatively, you can continue working, and when
     you are ready to go offline, proceed to the next step.</li>
   <li>Click the Online/Offline indicator <img src="images/online.png" alt=""/>
     in the lower right corner of the Mail window to go offline.</li>
   <li>In the Work Offline dialog box, click Download.</li>
 </ol>
@@ -3299,32 +3301,32 @@ to filter unwanted mail, and how phishin
   want to work offline. The offline and disk space preferences you can set for
   an account depend on the type of account (IMAP, POP, or Newsgroup).</p>
 
 <p>Here&apos;s a summary of the steps you will follow to set up your accounts
   for offline use:</p>
 
 <ol>
   <li>For each account that you want to work with while offline, use the Mail
-    &amp; Newsgroups Account Settings dialog box to set the Offline &amp; Disk
-    Space preferences for that account. You must select the items (folders and
-    newsgroups) that you want to download for offline use. See
+    &amp; Newsgroups Account Settings dialog box to set the Synchronization
+    &amp; Storage preferences for that account. You must select the items
+    (folders and newsgroups) that you want to download for offline use. See
     <a href="#selecting_items_for_offline_viewing">Selecting Items for Offline
     Viewing</a> for more information.
 
     <p>Once set, you don&apos;t need to change these settings. See the sections
       below for information on setting offline and disk space preferences for
-      <a href="#offline_and_disk_space_settings_imap">IMAP</a>,
+      <a href="#synchronization_and_storage_settings_imap">IMAP</a>,
       <a href="#disk_space_settings">POP</a>, and
-      <a href="#offline_and_disk_space_settings_nntp">Newsgroup</a>
+      <a href="#synchronization_and_storage_settings_nntp">Newsgroup</a>
       accounts.</p>
 
-    <p><strong>Tip</strong>: To set the Offline &amp; Disk Space preferences
-      for the current account, open the File menu, choose Offline, and then
-      choose Offline Settings.</p>
+    <p><strong>Tip</strong>: To set the Synchronization &amp; Storage
+      preferences for the current account, open the File menu, choose Offline,
+      and then choose Offline Settings.</p>
   </li>
   <li>Open the File menu, choose Offline, and then choose Download/Sync Now
     from the submenu.</li>
   <li>Select the type of messages (mail or newsgroup or both) that you want to
     download.
 
     <p><strong>Important</strong>: You must select at least one category (mail
       messages or newsgroup messages) in order for the download to work.</p>
@@ -3351,20 +3353,20 @@ to filter unwanted mail, and how phishin
   download time and disk space used.</p>
 
 <p>To select accounts, folders, and newsgroups for offline viewing, begin from
   the Mail window:</p>
 
 <ol>
   <li>Open the Edit menu, choose Mail &amp; Newsgroups Account Settings. You
     see the Mail &amp; Newsgroups Account Settings dialog box.</li>
-  <li>Choose the Offline &amp; Disk Space category for the account you want to
-    change.</li>
-  <li>Click Select. You see your IMAP accounts, mail folders, and subscribed
-    newsgroups.
+  <li>Choose the Synchronization &amp; Storage category for the account you
+    want to change.</li>
+  <li>Click <q>Advanced</q> to see your IMAP folders, or <q>Select newsgroups
+    for offline use</q> for your subscribed newsgroups.
 
     <p><strong>Note</strong>: You see only the newsgroups and folders that
       you&apos;ve already <a href="#subscribing_to_newsgroups">subscribed</a>
       to. POP accounts and local mail folders don&apos;t appear in the
       list.</p>
   </li>
   <li>Select the items (folders, newsgroups) that you want to make available
     for offline use.</li>
@@ -3440,17 +3442,17 @@ to filter unwanted mail, and how phishin
 </ol>
 
 <p><strong>Note</strong>: Message headers that have been downloaded for reading
   offline display a darker gray envelope or newsgroup icon.</p>
 
 <p><strong>Tip</strong>: To set &brandShortName; Mail &amp; Newsgroups&apos;
   download behavior when going offline, open the
   <span class="mac">&brandShortName;</span> <span class="noMac">Edit</span>
-  menu, choose Preferences, and then click the Offline &amp; Disk Space
+  menu, choose Preferences, and then click the Synchronization &amp; Storage
   category. You can choose to have &brandShortName; Mail &amp; Newsgroups
   prompt you to download messages when going offline, to automatically
   download messages, or to not download any messages.</p>
 
 <p>To reconnect and synchronize your messages:</p>
 
 <ol>
   <li>Click the online/offline indicator <img src="images/offline.png"
@@ -3460,17 +3462,17 @@ to filter unwanted mail, and how phishin
 </ol>
 
 <p>&brandShortName; Mail &amp; Newsgroups synchronizes your messages with the
   server by replicating any changes you made while working offline.</p>
 
 <p><strong>Tip</strong>: To set &brandShortName; Mail &amp; Newsgroups&apos;
   behavior when going online, open the
   <span class="mac">&brandShortName;</span> <span class="noMac">Edit</span>
-  menu, choose Preferences, and then choose the Offline &amp; Disk Space
+  menu, choose Preferences, and then choose the Synchronization &amp; Storage
   category. You can choose to have &brandShortName; Mail &amp; Newsgroups
   prompt you to send unsent messages, to automatically send unsent messages,
   or to not send unsent messages.</p>
 
 <p>[<a href="#working_offline">Return to beginning of section</a>]</p>
 
 <h1 id="mail_and_newsgroups_account_settings">Mail &amp; Newsgroups Account
   Settings</h1>
@@ -3492,17 +3494,17 @@ to filter unwanted mail, and how phishin
 </ol>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#account_settings">Account Settings</a></li>
     <li><a href="#server_settings">Server Settings</a></li>
     <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="#synchronization_and_storage">Synchronization &amp; Storage</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>
     <li><a href="#outgoing_server">Outgoing Server (SMTP)</a></li>
   </ul>
 </div>
 
@@ -3963,67 +3965,71 @@ to filter unwanted mail, and how phishin
 
 <p>The directory you select will also be searched for matching certificates
   when you attempt to send an encrypted message to one or more recipients for
   whom you don&apos;t have certificates on file.</p>
 
 <p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
   section</a>]</p>
 
-<h2 id="offline_and_disk_space">Mail &amp; Newsgroups Account Settings -
-  Offline &amp; Disk Space</h2>
-
-<p>Offline &amp; Disk Space settings let you conserve disk space or set up an
-  account so that you can use it while offline (disconnected from the
+<h2 id="synchronization_and_storage">Mail &amp; Newsgroups Account Settings -
+  Synchronization &amp; Storage</h2>
+
+<p>Synchronization &amp; Storage settings let you conserve disk space or set
+  up an account so that you can use it while offline (disconnected from the
   Internet). The settings available depend on the mail server type (IMAP, POP,
   or News) associated with the account.</p>
 
 <div class="contentsBox">
   <ul>
-    <li><a href="#offline_and_disk_space_settings_imap">Offline and Disk Space
-      Settings (IMAP)</a></li>
+    <li><a href="#synchronization_and_storage_settings_imap">Synchronization
+      &amp; Storage Settings (IMAP)</a></li>
     <li><a href="#disk_space_settings">Disk Space Settings (POP)</a></li>
-    <li><a href="#offline_and_disk_space_settings_nntp">Offline and Disk Space
-      Settings (News)</a></li>
+    <li><a href="#synchronization_and_storage_settings_nntp">Synchronization
+      &amp; Storage Settings (News)</a></li>
+    <li><a href="#retention_policy">Common Retention Policy Settings</a></li>
   </ul>
 </div>
 
 <p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
   section</a>]</p>
 
-<h3 id="offline_and_disk_space_settings_imap">Offline and Disk Space Settings
-  (IMAP)</h3>
-
-<p>If you are not already viewing the offline and disk space preferences for an
-  IMAP account, begin from the Mail window:</p>
+<h3 id="synchronization_and_storage_settings_imap">Synchronization &amp;
+  Storage Settings (IMAP)</h3>
+
+<p>If you are not already viewing the synchronization and storage preferences
+  for an IMAP account, begin from the Mail window:</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>Choose the Offline &amp; Disk Space category for an IMAP account.</li>
+  <li>Choose the Synchronization &amp; Storage category for an IMAP
+    account.</li>
 </ol>
 
 <ul>
-  <li><strong>Make the messages in my Inbox available when I am working
-    offline</strong>: Select this option so that messages in your Inbox will be
-    available when you are working offline.</li>
-  <li><strong>When I create new folders, select them for offline use</strong>:
-    Select this option so that new folders you create are automatically
-    selected for offline use. If left unchecked, new folders won&apos;t be
-    automatically selected for offline use. You can manually select folders for
-    offline by choosing the Download/Sync Now command (available from the File
-    menu, under Offline). Click the Select button in the Download/Sync Messages
-    dialog box to select the folders.</li>
-  <li><strong>Select folders for offline use</strong>: Click to select the
+  <li><strong>Keep messages for this account on this computer</strong>: Select
+    this option so that messages in your folders will be available when you
+    are working offline. This setting also applies to any new folders
+    created or subscribed to.</li>
+  <li><strong>Advanced</strong>: Click to open a dialog to select the
     folders that you want to make available for offline use. See
     <a href="#selecting_items_for_offline_viewing">Selecting Items for Offline
-    Viewing</a> for more information.</li>
+    Viewing</a> for more information.
+
+    <p><strong>Note</strong>: While the default setting can be overridden for
+      an individual folder, those per-folder settings are <em>removed</em>
+      whenever the <q>Keep messages for this account</q> box is toggled.</p>
+  </li>
   <li><strong>Messages larger than [__] KB</strong>: Select this option to
     conserve disk space by preventing large messages from being downloaded.
     Enter the maximum size for downloaded messages.</li>
+  <li>The <a href="#retention_policy">retention settings</a> can be used to
+    free up space by deleting old messages. Note that these settings apply
+    to <em>both</em> local copies and their originals on the server.</li>
 </ul>
 
 <p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
   section</a>]</p>
 
 <h3 id="disk_space_settings">Disk Space Settings (POP)</h3>
 
 <p>Messages from POP accounts are fully downloaded to your local machine unless
@@ -4040,31 +4046,38 @@ to filter unwanted mail, and how phishin
     see the Mail &amp; Newsgroups Account Settings dialog box.</li>
   <li>Click the Disk Space category for a POP account.</li>
 </ol>
 
 <ul>
   <li><strong>Messages larger than [__] KB</strong>: Select this option to
     conserve disk space by preventing large messages from being downloaded.
     Enter the maximum size for downloaded messages.</li>
+  <li>The <a href="#retention_policy">retention settings</a> can be used to
+    free up space by deleting old messages. Note that these settings apply
+    to <em>both</em> local copies and their originals on the server.
+
+    <p><strong>Note</strong>: If your POP account is set up to use a Global
+      Inbox, the retention period settings of the target Inbox apply.</p>
+  </li>
 </ul>
 
 <p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
   section</a>]</p>
 
-<h3 id="offline_and_disk_space_settings_nntp">Offline and Disk Space Settings
-  (News)</h3>
+<h3 id="synchronization_and_storage_settings_nntp">Synchronization &amp;
+  Storage Settings (News)</h3>
 
 <p>If you are not already viewing the offline and disk space settings for a
   News account, begin from the Mail window:</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>Choose the Offline &amp; Disk Space category for a News account.</li>
+  <li>Choose the Synchronization &amp; Storage category for a News account.</li>
 </ol>
 
 <ul>
   <li><strong>Select newsgroups for offline use</strong>: Click to select the
     newsgroups that you want to make available for offline use. See
     <a href="#selecting_items_for_offline_viewing">Selecting Items for Offline
     Viewing</a> for more information.</li>
 </ul>
@@ -4078,42 +4091,57 @@ to filter unwanted mail, and how phishin
   <li><strong>Messages larger than [__] KB</strong>: Select this option to
     conserve disk space by preventing large messages from being downloaded.
     Enter the maximum size for downloaded messages.</li>
   <li><strong>Messages more than [__] days old</strong>: Select this option to
     only download messages that are not older than the number of days you enter
     here.</li>
 </ul>
 
-<p>&brandShortName; can automatically delete newsgroup messages for you. You
+<p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
+  section</a>]</p>
+
+<h3 id="retention_policy">Common Retention Policy Settings</h3>
+
+<p>&brandShortName; can automatically delete old messages for you. You
   can configure this process with the options listed below
-  <strong>Keep</strong>:</p>
+  <strong>To recover disk space, old messages can be permanently
+  deleted</strong>:</p>
 
 <ul>
-  <li><strong>All messages</strong>: Keep all messages. Never delete messages 
-    automatically.</li>
-  <li><strong>The newest [__] messages</strong>: Enter the number of messages
-    to keep. With this setting only messages older than these messages are
-    deleted.</li>
-  <li><strong>Messages which have arrived within the last [__] days</strong>:
+  <li><strong>Don't delete any messages</strong>: Keep all messages. Never
+    delete messages automatically.</li>
+  <li><strong>Delete all but the last [__] messages</strong>: Enter the number
+    of messages to keep. With this setting only messages older than these
+    messages are deleted.</li>
+  <li><strong>Delete messages more than [__] days old </strong>:
     Keep all messages that arrived within the given number of days.</li>
 </ul>
 
-<p>With the last two settings you can further constrain the three options to
+<p>With the following settings you can further constrain the three options to
   delete messages automatically. This is especially useful in combination with
   the option to keep all messages.</p> 
 
 <ul>
-  <li><strong>Only unread messages</strong>: Select this option to deny
-    &brandShortName; the deletion of unread messages.</li>
+  <li><strong>Always delete read messages</strong>: Select this option to
+    remove read messages.</li>
+  <li><strong>Always keep flagged messages</strong>: Use this option to deny
+    &brandShortName; to delete any messages you have flagged.</li>
   <li><strong>Only message bodies less than [__] days old</strong>: Select this
     option to deny &brandShortName; the deletion of messages that are newer
-    than the number of days you specify here.</li>
+    than the number of days you specify here (news accounts only).</li>
 </ul>
 
+<p>This policy can be overridden for an individual folder in the Folder
+  Properties, Retention Policy tab.</p>
+
+<p><strong>Note:</strong> If message synchronization is enabled (for IMAP), or
+  messages are left on the server for POP accounts), the settings apply to
+  <em>both</em> local copies and their originals on the server.</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>
--- a/suite/locales/en-US/chrome/common/help/suite-toc.rdf
+++ b/suite/locales/en-US/chrome/common/help/suite-toc.rdf
@@ -379,17 +379,17 @@
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#mail-doc-offline">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="mail-offline-setup" nc:name="Setting Up Mail to Work Offline" nc:link="mail_help.xhtml#setting_up_mozilla_mail_and_newsgroups_to_work_offline"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-offline-inbox" nc:name="Downloading Your Inbox" nc:link="mail_help.xhtml#downloading_your_inbox_for_offline_use"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-offline-inbox" nc:name="Downloading All Messages for Offline Use" nc:link="mail_help.xhtml#downloading_all_messages_for_offline_use"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-offline-folder" nc:name="Downloading an Individual Folder" nc:link="mail_help.xhtml#downloading_an_individual_folder_for_offline_use"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-offline-flagged" nc:name="Downloading Selected or Flagged Messages" nc:link="mail_help.xhtml#downloading_selected_or_flagged_messages_for_offline_use"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-offline-directory" nc:name="Downloading Directory Entries" nc:link="mail_help.xhtml#downloading_directory_entries_for_offline_use"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-offline-accounts" nc:name="Setting Up Your Accounts for Working Offline" nc:link="mail_help.xhtml#setting_up_your_accounts_for_working_offline"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-offline-items" nc:name="Selecting Items for Offline Viewing" nc:link="mail_help.xhtml#selecting_items_for_offline_viewing"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-offline-sync" nc:name="Downloading and Synchronizing Your Messages" nc:link="mail_help.xhtml#downloading_and_synchronizing_your_messages"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-offline-go" nc:name="Working Offline and Reconnecting Later" nc:link="mail_help.xhtml#working_offline_and_reconnecting_later"/> </rdf:li>
       </rdf:Seq>
@@ -422,17 +422,17 @@
 
 <rdf:Description about="#mail-doc-account-settings">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="mail_account_identity" nc:name="Account Settings"  nc:link="mail_help.xhtml#account_settings"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-choose" nc:name="Server Settings"  nc:link="mail_help.xhtml#server_settings"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_copies" nc:name="Copies &amp; Folders"  nc:link="mail_help.xhtml#copies_and_folders"/> </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-doc-offline-space" nc:name="Synchronization &amp; Storage"  nc:link="mail_help.xhtml#synchronization_and_storage"/> </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>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
@@ -448,19 +448,19 @@
         <rdf:li> <rdf:Description ID="mail_server_nntp" nc:name="News Server Settings"  nc:link="mail_help.xhtml#news_server_settings"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#mail-doc-offline-space">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li> <rdf:Description ID="mail_offline_imap" nc:name="IMAP"  nc:link="mail_help.xhtml#offline_and_disk_space_settings_imap"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_offline_imap" nc:name="IMAP"  nc:link="mail_help.xhtml#synchronization_and_storage_settings_imap"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_offline_pop3" nc:name="POP"  nc:link="mail_help.xhtml#disk_space_settings"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_offline_nntp" nc:name="News"  nc:link="mail_help.xhtml#offline_and_disk_space_settings_nntp"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_offline_nntp" nc:name="News"  nc:link="mail_help.xhtml#synchronization_and_storage_settings_nntp"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#mail_security_settings">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="mail_security_settings_certs" nc:name="About Certificates"  nc:link="mail_help.xhtml#about_certificates"/> </rdf:li>