update help files of suite SEAMONKEY_2_4b1_BUILD1 SEAMONKEY_2_4b1_RELEASE SEAMONKEY_2_4b2_BUILD1 SEAMONKEY_2_4b2_RELEASE SEAMONKEY_2_4b3_BUILD1 SEAMONKEY_2_4b3_RELEASE
authorMasahiko Imanaka <chimantaea_mirabilis@yahoo.co.jp>
Mon, 15 Aug 2011 14:23:43 +0900
changeset 234 58eaf527a4c6d9218482316837d1fe9ebd95e887
parent 233 0b2df66ed514a6e5bf3de82b0f7c4f4c908e8d0e
child 235 898afdc82d025b4f7e4e66e55e0673605f46206c
child 262 f72fd7e2c0c513fba81981027495f3562d76ba2e
child 270 475ef13d0896b342803fa47f9b33565d2601a589
child 278 d8351d8c6ce90a9c0bfdceeec1316116030fba4a
child 280 1cfcfbf3e735084fc8fad603df90ef05f793c9b2
push id43
push usersmalolepszy@mozilla.com
push dateTue, 16 Aug 2011 18:11:53 +0000
update help files of suite
suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
suite/chrome/common/help/customize_help.xhtml
suite/chrome/common/help/help-index1.rdf
suite/chrome/common/help/mailnews_account_settings.xhtml
suite/chrome/common/help/mailnews_getting_started.xhtml
suite/chrome/common/help/mailnews_organizing.xhtml
suite/chrome/common/help/mailnews_preferences.xhtml
suite/chrome/common/help/nav_help.xhtml
suite/chrome/common/help/suite-toc.rdf
suite/chrome/common/help/using_priv_help.xhtml
--- a/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -46,26 +46,22 @@
   you&apos;re not already viewing it, follow these steps:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Click the Advanced category.</li>
 </ol>
 
-<p>The main Advanced preferences panel allows you to enable or disable
-  Java:</p>
+<p class="unix">The main Advanced preferences panel allows you to:</p>
 
 <ul>
-  <li><strong>Enable Java</strong>: Select this to allow &brandShortName; to
-    interpret pages containing Java. Java is used on some Web page to
-    incorporate interactive and multimedia content.</li>
-  <li class="unix"><strong>Use Preferences from System</strong>: Select this to
-    use the already set system preferences, overriding &brandShortName;&apos;
-    ones.
+  <li class="unix"><strong>Use Preferences from System</strong>: Select
+    this to use the already set system preferences, overriding 
+    &brandShortName;&apos; ones.
   </li>
 </ul>
 
 <p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="scripts_and_plugins">Advanced Preferences - Scripts &amp;
   Plugins</h2>
 
@@ -423,97 +419,92 @@
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Advanced category, click Software Installation. (If no
     subcategories are visible, double-click Advanced to expand the list.)</li>
 </ol>
 
-<p>The Software Installation preferences panel is used to enable software
-  installation and update notification:</p>
+<p>The Software Installation preferences panel is used to enable add-on
+  installation and updates. The Add-on Manager allows you to view and manage
+  all your installed extensions and themes.</p>
 
 <ul>
-  <li><strong>Allow websites to install extensions and updates</strong>:
-    Select this if you want to allow websites to install extensions and
-    updates to be used with &brandShortName;. You will be prompted before each
-    installation.</li>
-  <li><strong>Allowed Websites</strong>: Click this to open the Allowed Websites
-    dialog box, where you can view and edit the list of websites that you
-    want to allow to install software:
+  <li><strong>Add-ons</strong>:
     <ul>
-      <li><strong>Allow</strong>: Click this to add a typed website to the
-        list of allowed websites.</li>
-      <li><strong>Remove Website</strong>: Click this to remove a selected
-        website.</li>
-      <li><strong>Remove All Websites</strong>: Click this to remove all of the
-        websites in the current list.</li>
-    </ul>
-  </li>
-  <li><strong>Add-on Manager</strong>: Using the Add-on Manager, you can view
-    and manage all your installed extensions and themes.
-    <ul>
+      <li><strong>Allow websites to install add-ons and updates</strong>:
+        Select this if you want to allow websites to install add-ons and
+        updates to be used with &brandShortName;. You will be prompted before
+        each installation.
+        <ul>
+          <li><strong>Allowed Websites</strong>: Click this link to open the
+            Data Manager tab, where you can view and edit the list of websites
+            that you want to allow to install software</li>
+          <li><strong>Automatically check for updates</strong>:Select this to
+            be notified when a new version of one of your installed add-ons is
+            available. Choose whether you want &brandShortName; to do a
+            <strong>daily</strong> or a <strong>weekly</strong> check for new
+            versions.</li>
+          <li><strong>Automatically download and install the update</strong>:
+            Select this if you want &brandShortName; to automatically download
+            and install updates for you when they become available. The download
+            will happen in the background, with low priority. After the download
+            has finished the update to the add-on will be installed
+            automatically the next time you start &brandShortName;.</li>
+        </ul>
+      </li>
       <li><strong>Personalize Add-on recommendations</strong>: Select this to
         be offered suggestions for add-ons in the &quot;Get Add-ons&quot; tab
         of the manager:
         <ul>
           <li>Note that this function involves sending a list of your
             currently installed add-ons to the add-on web site.</li>
           <li>Disabling this option will also suppress contacting the add-on
             site periodically for any new information about installed add-ons,
             but won't affect automated updates.</li>
         </ul>
       </li>
       <li><strong>Manage Add-ons</strong>: Click this link to open the Add-on
         Manager in a new browser tab.</li>
     </ul>
   </li>
-  <li><strong>Automatically check for updates to</strong>:
+  <li><strong>&brandShortName;</strong>:
     <ul>
-      <li><strong>&brandShortName;</strong>: Select this to be notified when
-        new versions of &brandShortName; are available. Your personal
-        information is not shared when verifying your version of
-        &brandShortName;. Choose whether you want &brandShortName; to do a
-        <strong>daily</strong> or a <strong>weekly</strong> check for new
-        versions.</li>
-      <li><strong>Installed Add-ons</strong>: Select this to be notified when a
-        new version of one of your installed add-ons is available. Choose
-        whether you want &brandShortName; to do a <strong>daily</strong> or a
-        <strong>weekly</strong> check for new versions.</li>
+      <li><strong>Automatically check for updates</strong>:Select this to be
+        notified when a new version of &brandShortName; is available. Choose
+        whether you want &brandShortName; to do a <strong>daily</strong> or
+        a <strong>weekly</strong> check for new versions.
+        <ul>
+          <li><strong>Automatically download and install the update</strong>:
+            Select this if you want &brandShortName; to automatically download
+            and install updates for you when they become available. The download
+            will happen in the background, with low priority. After the download
+            has finished the update to &brandShortName; will be installed
+            automatically the next time you start it.</li>
+          <li><strong>Warn me if this will disable any of my add-ons</strong>:
+            Select this to be notified if an automatic update will disable any
+            of your installed add-ons. In that case you will be shown a list
+            of incompatible add-ons and you can choose whether you want to
+            download and install the update or not.</li>
+        </ul>
+        <p><strong>Note</strong>: You can use Check for Updates from the
+          <span class="mac">&brandShortName;</span><span class="noMac">Help</span>
+          menu to manually initiate the search for a &brandShortName; update.
+          <span class="noMac">The label of the menu item will change when an
+          update is being downloaded or ready to be applied.</span></p>
+      </li>
+      <li><strong>Show Update History...</strong>: Click this to open the Update
+        History dialog box which shows a list of &brandShortName; updates that
+        have been installed, including the update type (e.g. Security Update),
+        time of installation and installation status. The Details link next to
+        each update takes you to a web page that contains further information
+        regarding the update.</li>
     </ul>
   </li>
-  <li><strong>When updates to &brandShortName; are found</strong>:
-    <ul>
-      <li><strong>Ask me what I want to do</strong>: Select this to be notified
-        when new versions of &brandShortName; are available.</li>
-      <li><strong>Automatically download and install the update</strong>: Select
-        this if you want &brandShortName; to automatically download and install
-        updates for you when they become available. The download will happen in
-        the background, with low priority. After the download has finished the
-        update will be installed automatically the next time you start
-        &brandShortName;.</li>
-      <li><strong>Warn me if this will disable any of my add-ons</strong>:
-        Select this to be notified if an automatic update will disable any of
-        your installed add-ons. In that case you will be shown a list of
-        incompatible add-ons and you can choose whether you want to download and
-        install the update or not.</li>
-    </ul>
-
-    <p><strong>Note</strong>: You can use Check for Updates from the
-      <span class="mac">&brandShortName;</span><span class="noMac">Help</span>
-      menu to manually initiate the search for a &brandShortName; update.
-      <span class="noMac">The label of the menu item will change when an update
-      is being downloaded or ready to be applied.</span></p>
-  </li>
-  <li><strong>Show Update History</strong>: Click this to open the Update
-    History dialog box which shows a list of &brandShortName; updates that have
-    been installed, including the update type (e.g. Security Update), time of
-    installation and installation status. The Details link next to each update
-    takes you to a web page that contains further information regarding the
-    update.</li>
 </ul>
 
 <p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="mouse_wheel">Advanced Preferences - Mouse Wheel</h2>
 
 <p>This section describes how to use the Mouse Wheel preferences panel. If
   you&apos;re not already viewing it, follow these steps:</p>
--- a/suite/chrome/common/help/customize_help.xhtml
+++ b/suite/chrome/common/help/customize_help.xhtml
@@ -655,23 +655,16 @@
 <p>The Status Bar is located at the bottom of any &brandShortName; window. It
   includes the following:</p>
 
 <ul>
   <li>Component Bar: Allows you to switch between components. For more
     information, see <a href="#component_bar">Component Bar</a>.</li>
   <li>Status information: Displays information like the web-page URL and load
     status information.</li>
-  <li>Cookie notification icon
-    <img src="chrome://communicator/skin/permissions/taskbar-cookie.gif"
-    alt="cookie notification icon"/>: 
-    Appears when a website has used a cookie in a way that requires you to be
-    notified. For more information, see
-    <a href="using_priv_help.xhtml#cookie_notification">Cookie
-    Notification</a>.</li>
   <li>Work Offline
     <img src="chrome://communicator/skin/icons/offline.png"
     alt="work offline icon"/> or Work Online
     <img src="chrome://communicator/skin/icons/online.png"
     alt="work online icon"/> icon: Click the icon to toggle working
     offline or online. Working offline prevents &brandShortName; from
     attempting to connect to the Internet, for example to load images on web
     pages or automatically check email.</li>
--- a/suite/chrome/common/help/help-index1.rdf
+++ b/suite/chrome/common/help/help-index1.rdf
@@ -564,21 +564,16 @@
          nc:link="privacy_help.xhtml#what_are_third-party_cookies"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="cookies:managing_per_site"
          nc:name="managing cookies per website"
          nc:link="using_priv_help.xhtml#managing_cookies_site-by-site"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="cookies:notification_icon"
-         nc:name="notification icon"
-         nc:link="using_priv_help.xhtml#cookie_notification"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="cookies:preferences"
          nc:name="cookie preferences"
          nc:link="using_priv_help.xhtml#cookies"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="cookies:removing"
          nc:name="removing cookies"
          nc:link="using_priv_help.xhtml#removing_cookies"/>
--- a/suite/chrome/common/help/mailnews_account_settings.xhtml
+++ b/suite/chrome/common/help/mailnews_account_settings.xhtml
@@ -918,17 +918,17 @@
   </li>
 </ul>
 
 <p>[<a href="#mail_and_newsgroups_account_settings">Return to beginning of
   section</a>]</p>
 
 <h2 id="security">Mail &amp; Newsgroups Account Settings - Security</h2>
 
-<p>This section describes how to configure the Mail &amp; Newsgroup Account
+<p>This section describes how to configure the Mail &amp; Newsgroups Account
   Settings that control mail message security. Before you do so, however, you
   must obtain one or more mail certificates. For details, see
   <a href="mailnews_security.xhtml">Signing &amp; Encrypting
   Messages</a>.</p>
 
 <p>If you are not already viewing the Security settings for your mail account,
   begin from the Mail window:</p>
 
@@ -944,17 +944,17 @@
     <li><a href="#about_certificates">About Certificates</a></li>
     <li><a href="#digital_signing">Digital Signing</a></li>
     <li><a href="#encryption">Encryption</a></li>
   </ul>
 </div>
 
 <h3 id="about_certificates">About Certificates</h3>
 
-<p>The main purpose of the Security panel in Mail &amp; Newsgroup Account
+<p>The main purpose of the Security panel in Mail &amp; Newsgroups Account
   Settings is to select two certificates:</p>
 
 <ul>
   <li>The email certificate you want to use for signing mail messages you send
     to other people.</li>
   <li>The email certificate you want other people to use when they encrypt
     messages they send to you.</li>
 </ul>
@@ -1061,17 +1061,17 @@
 <p>The outgoing server will transport your outgoing mail to the intended
   recipients.</p>
 
 <p>If you are not already viewing the Outgoing Server (SMTP) settings, begin
   from the Mail window:</p>
 
 <ol>
   <li>Click on any Mail window.</li>
-  <li>From the Edit menu, choose Mail &amp; Newsgroup Account Settings.</li>
+  <li>From the Edit menu, choose Mail &amp; Newsgroups Account Settings.</li>
   <li>Select Outgoing Server (SMTP) and either edit an existing server or
       add a new one. If you are not sure which option to choose, check with
       your ISP or system administrator)<br/>
       You can choose from these servers via the Outgoing Server dropdown in
       the <a href="#account_settings">Identity Settings</a>.</li>
 </ol>
 
 <ul>
--- a/suite/chrome/common/help/mailnews_getting_started.xhtml
+++ b/suite/chrome/common/help/mailnews_getting_started.xhtml
@@ -157,16 +157,19 @@
   <li><strong>Server Information</strong>: This window is not available for
     for the Blogs &amp; News Feeds account type.
     <ul>
       <li>Indicate whether you want a POP account or an IMAP account. Not all
         service providers can support both options. For more information, see
         <a href="mailnews_account_settings.xhtml#server_settings">Mail &amp;
         Newsgroups Account Settings - Server Settings</a>.</li>
       <li>Enter the name of your incoming mail server.</li>
+      <li>Check the <q>Leave messages on server</q> checkbox if you want to
+        leave messages on the server so that when you download messages, 
+        SeaMonkey does not remove the messages from the server.</li>
       <li>If you want this account to be a part of the Local Folders Global
         Inbox account, check the <q>Use Global Inbox</q> box. Mail for
         this account will then be stored in your Local Folders. Otherwise, if
         the checkbox is unchecked, mail will be stored in its own
         directory.</li>
       <li>Enter the name of your outgoing mail server (SMTP).
 
         <p><strong>Note</strong>: You need to specify only one outgoing mail
--- a/suite/chrome/common/help/mailnews_organizing.xhtml
+++ b/suite/chrome/common/help/mailnews_organizing.xhtml
@@ -380,25 +380,25 @@
   option from the submenu.</p>
 
 <ul>
   <li><strong>All</strong>: Choose this option to view all messages.</li>
   <li><strong>Unread</strong>: Choose this option to view only unread
     messages.</li>
   <li><strong>Tags</strong>: Choose a <a href="#tagging_messages">tag</a>
     to view tagged messages.</li>
-  <li><strong>Custom views</strong>: Choose a custom view. By default you have
-    four preset views: <q>People I Know</q>, <q>Recent Mail</q>, <q>Last 5
-    Days</q>, and <q>Not Junk</q>.</li>
+  <li><strong>Custom Views</strong>: Choose a custom view. By default you have
+    five preset views: <q>People I Know</q>, <q>Recent Mail</q>, <q>Last 5
+    Days</q>, <q>Not Junk</q>, and <q>Has Attachments</q>.</li>
   <li><strong>Customize</strong>: Choose this option to view or modify
-    settings for custom views.</li>
+    settings for custom views or create your own custom view.</li>
 </ul>
 
-<p><strong>Tip</strong>: You can quickly change message view from the View box
-  in the Search Bar. If you do not see the Search Bar, open the View menu,
+<p><strong>Tip</strong>: You can quickly change the message view from the View 
+  box in the Search Bar. If you do not see the Search Bar, open the View menu,
   choose Show/Hide, and then choose Search Bar.</p>
 
 <table>
   <tr>
     <td colspan="2"><img src="images/mail_quicksearch.png" alt=""/></td>
   </tr>
   <tr>
     <td style="width: 80px;"></td>
--- a/suite/chrome/common/help/mailnews_preferences.xhtml
+++ b/suite/chrome/common/help/mailnews_preferences.xhtml
@@ -10,17 +10,17 @@
 <head>
 <title>Mail &amp; Newsgroups Preferences</title>
 <link rel="stylesheet" href="helpFileLayout.css" type="text/css"/>
 <link rel="stylesheet" href="chrome://communicator/skin/smileys.css"
       type="text/css"/>
 </head>
 <body>
 
-<h1 id="mail_and_newsgroup_preferences">Mail &amp; Newsgroup Preferences</h1>
+<h1 id="mail_and_newsgroup_preferences">Mail &amp; Newsgroups Preferences</h1>
 
 <p>The sections listed below describe the Mail &amp; Newsgroups preferences
   that apply to all your mail and newsgroup accounts. To see these
   preferences:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
--- a/suite/chrome/common/help/nav_help.xhtml
+++ b/suite/chrome/common/help/nav_help.xhtml
@@ -577,66 +577,69 @@
 
 <h2 id="searching_within_a_page">Searching Within a Page</h2>
 
 <p>To find text within the page you are currently viewing in the browser:</p>
 
 <ol>
   <li>Open the Edit menu and choose <q>Find in This Page</q>. If the page
     you are viewing contains frames, you may need to click within a frame
-    before you begin your search. You see the <q>Find in this Page</q>
-    dialog box.</li>
+    before you begin your search. You see the <q>Find bar</q>.</li>
   <li>Type the text you want to find.</li>
-  <li>Choose from the following search options: 
-    <ul>
-      <li><strong>Match case</strong>: Choose this to search for a
-        word or phrase that matches the word you typed exactly (including
-        uppercase and lowercase letters).</li>
-      <li><strong>Wrap</strong>: Choose this to allow the browser to
-        search from where the cursor is to the bottom of the page and then
-        continue searching from the top of the page. Note: Normally, the page
-        is searched from the place where you last clicked your mouse to the
-        bottom of the page.</li>
-      <li><strong>Direction</strong>: Choose Up to search from the
-        insertion point backwards to the top of the page. The default
-        is Down.</li>
-    </ul>
-  </li>
-  <li>Click Find Next to begin the search.</li>
+  <li>Click Next to begin the search from where the cursor is forwards
+    to the bottom of the page.</li>
+  <li>Click Previous to begin the search from the cursor backwards to
+    the top of the page.</li>
+  <li>With <strong>Highlight all</strong>, all words or phrases that
+    matched are highlighted on the page.</li>
+  <li>Use <strong>Match case</strong> to limit the search to words or
+    phrases that exactly match what you typed (taking case into
+    account).</li>
 </ol>
 
-<p>To find the same word or phrase again:</p>
+<p>If the search hits the bottom (or top) of the page, it will continue
+  from the other end and indicate on the Find bar that it wrapped.</p>
+
+<p>To find the same word or phrase again, keep pressing Enter while the
+  focus is on the search field, or use the Find Again shortcuts (see
+  the <q>Using Find-as-you-type</q> section below) when the focus
+  is on the page. In both cases, a forward search will be invoked,
+  no matter whether the Previous button was used the last time.</p>
 
 <ul>
   <li>Open the Edit menu and choose Find Again.</li>
 </ul>
 
 <p>[<a href="#searching_the_web">Return to beginning of section</a>]</p>
 
 <h2 id="using_find_as_you_type">Using Find-as-you-type</h2>
 
-<p>Other than searching text through the Find dialog, you can also search by
+<p>Other than searching text through the Find bar, you can also search by
   typing directly into a Web page.</p>
 
 <ol>
   <li>To search for a link, type several characters into the active browser
       window to navigate to any link with that text in it.
       
       <p>If you repeat the same character, it will start to cycle through all
         the links that begin with that character. However, if it can find a
         match with the exact string you&apos;ve typed, such as
         <q><tt>oo</tt></q> in <q><tt>woods</tt></q>, it will go there
         first.</p>
-
   </li>
   <li>To search for all text (normal text and linked text), type <kbd>/</kbd>
     before your search string. For example, type <q><kbd>/hello</kbd></q> to
     search any text containing the string <q>hello</q>.</li>
   <li>The status bar (at the bottom of your browser window) displays your
-    search string and whether or not the search is successful.</li>
+    search string and whether or not the search was successful. Please note
+    that this happens only if the <q>Show the find toolbar during find as you
+    type</q> checkbox on the <a href="cs_nav_prefs_advanced.xhtml#fayt">Find
+    As You Type preferences panel</a> is not selected. If the checkbox is
+    selected, then the <q>Find bar</q> is used instead of changing the status
+    bar.</li>
   <li>Use the backspace key to undo the last character typed.</li>
   <li>To cancel a find, change focus or scroll, press Escape, or wait for the
     timeout.</li>
   <li>Press
     <kbd class="mac">Cmd</kbd><kbd class="noMac">Ctrl</kbd>+<kbd>G</kbd> or
     <kbd>F3</kbd> to find the same search text again. Press
     <kbd class="mac">Cmd</kbd><kbd
     class="noMac">Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>G</kbd> or
--- a/suite/chrome/common/help/suite-toc.rdf
+++ b/suite/chrome/common/help/suite-toc.rdf
@@ -7,17 +7,17 @@
 
   <rdf:Description about="urn:root">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="welcome" nc:name="Help and Support Center" nc:link="welcome_help.xhtml"/> </rdf:li>
         <rdf:li> <rdf:Description ID="help-help" nc:name="Using the Help Window" nc:link="help_help.xhtml"/> </rdf:li>
         <rdf:li> <rdf:Description ID="ieusers"/> </rdf:li>
         <rdf:li> <rdf:Description ID="nav" nc:name="Browsing the Web" nc:link="nav_help.xhtml"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail" nc:name="Using Mail" nc:link="mailnews_getting_started.xhtml"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail" nc:name="Using Mail &amp; Newsgroups" nc:link="mailnews_getting_started.xhtml"/> </rdf:li>
         <rdf:li> <rdf:Description ID="comp" nc:name="Creating Web Pages"  nc:link="composer_help.xhtml"/> </rdf:li>
         <rdf:li> <rdf:Description ID="cust" nc:name="Customizing &brandShortName;"  nc:link="customize_help.xhtml"/> </rdf:li>
         <rdf:li> <rdf:Description ID="using-priv-help" nc:name="Using Privacy Features" nc:link="privacy_help.xhtml"/> </rdf:li>
         <rdf:li> <rdf:Description ID="using-help-certs" nc:name="Using Certificates" nc:link="using_certs_help.xhtml"/> </rdf:li>
         <rdf:li> <rdf:Description ID="profile-help" nc:name="Managing Profiles" nc:link="profiles_help.xhtml"/> </rdf:li>
         <rdf:li> <rdf:Description ID="shortcuts" nc:name="&brandShortName; Keyboard Shortcuts" nc:link="shortcuts.xhtml"/> </rdf:li>
         <rdf:li> <rdf:Description ID="tools" nc:name="Tools and Development" nc:link="developer_tools.xhtml"/> </rdf:li>
         <rdf:li> <rdf:Description ID="glossary" nc:name="Glossary" nc:link="glossary.xhtml"/> </rdf:li>
@@ -134,32 +134,32 @@
   </rdf:Description>
 
 
 <!-- MAIL HELP SECTION -->
 
 <rdf:Description about="#mail">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li> <rdf:Description ID="mail-doc" nc:name="Getting Started with Mail" nc:link="mailnews_getting_started.xhtml#getting_started_with_mozilla_mail_and_newsgroups" /> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-doc" nc:name="Getting Started with Mail &amp; Newsgroups" nc:link="mailnews_getting_started.xhtml#getting_started_with_mozilla_mail_and_newsgroups" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-importing-other" nc:name="Importing Mail from Other Programs" nc:link="mailnews_getting_started.xhtml#importing_mail_from_other_programs" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-read"    nc:name="Reading Messages" nc:link="mailnews_using_mail.xhtml#reading_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-send"    nc:name="Sending Messages" nc:link="mailnews_using_mail.xhtml#sending_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-html"    nc:name="Creating HTML Mail Messages" nc:link="mailnews_using_mail.xhtml#creating_html_mail_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-attach"  nc:name="Using Attachments" nc:link="mailnews_using_mail.xhtml#using_attachments" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-delete" nc:name="Deleting Messages" nc:link="mailnews_using_mail.xhtml#deleting_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-address" nc:name="Using Address Books" nc:link="mailnews_addressbooks.xhtml#using_address_books" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-folders" nc:name="Organizing Your Messages" nc:link="mailnews_organizing.xhtml#organizing_your_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-junk" nc:name="Controlling Junk Mail" nc:link="mailnews_organizing.xhtml#controlling_junk_mail" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-news" nc:name="Getting Started With Newsgroups" nc:link="mailnews_newsgroups.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="mailnews_blogs_and_feeds.xhtml#getting_started_with_blogs_and_news_feeds" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-offline" nc:name="Working Offline" nc:link="mailnews_offline.xhtml#working_offline" /> </rdf:li>
         <rdf:li> <rdf:Description ID="sign-encrypt" nc:name="Signing &amp; Encrypting Messages" nc:link="mailnews_security.xhtml#signing_and_encrypting_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-account-settings" nc:name="Mail &amp; Newsgroups Account Settings" nc:link="mailnews_account_settings.xhtml#mail_and_newsgroups_account_settings" /> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-doc-mailprefs" nc:name="Mail &amp; Newsgroup Preferences" nc:link="mailnews_preferences.xhtml#mail_and_newsgroup_preferences" /> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-doc-mailprefs" nc:name="Mail &amp; Newsgroups Preferences" nc:link="mailnews_preferences.xhtml#mail_and_newsgroup_preferences" /> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 
  <rdf:Description about="#mail-doc">
     <nc:subheadings>
       <rdf:Seq>
@@ -399,17 +399,17 @@
         <rdf:li> <rdf:Description ID="mail-blogs-moving-feeds" nc:name="Moving a feed to another folder" nc:link="mailnews_blogs_and_feeds.xhtml#moving_a_feed_to_another_folder"/> </rdf:li>
       </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="mailnews_offline.xhtml#setting_up_mozilla_mail_and_newsgroups_to_work_offline"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-offline-setup" nc:name="Setting Up Mail &amp; Newsgroups to Work Offline" nc:link="mailnews_offline.xhtml#setting_up_mozilla_mail_and_newsgroups_to_work_offline"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-offline-inbox" nc:name="Downloading All Messages for Offline Use" nc:link="mailnews_offline.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="mailnews_offline.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="mailnews_offline.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="mailnews_offline.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="mailnews_offline.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="mailnews_offline.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="mailnews_offline.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="mailnews_offline.xhtml#working_offline_and_reconnecting_later"/> </rdf:li>
@@ -856,18 +856,16 @@
   </rdf:Description>
 
 <rdf:Description about="#using-priv-help-cookies-settings">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="cookies_prefs" nc:name="Cookie Preferences" nc:link="using_priv_help.xhtml#cookies"/> </rdf:li>
         <rdf:li><rdf:Description ID="cookies_stored" nc:name="Stored Cookies" nc:link="using_priv_help.xhtml#stored_cookies"/> </rdf:li>
         <rdf:li><rdf:Description ID="cookie_sites" nc:name="Cookie Websites" nc:link="using_priv_help.xhtml#cookie_sites"/> </rdf:li>
-        <rdf:li><rdf:Description ID="cookie_notify" nc:name="Cookie Notification" nc:link="using_priv_help.xhtml#cookie_notification"/> </rdf:li>
-
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#using-priv-help-password">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="using-priv-help-password-manage" nc:name="Remembering User Names and Passwords" nc:link="using_priv_help.xhtml#using_password_manager_to_remember_user_names_and_passwords"/> </rdf:li>
@@ -1157,16 +1155,16 @@
         <rdf:li><rdf:Description ID="shortcuts_navigator_forms" nc:name="Forms Shortcuts" nc:link="shortcuts_navigator.xhtml#forms_shortcuts"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#shortcuts_mail">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li><rdf:Description ID="shortcuts_mail_general" nc:name="General Mail Shortcuts" nc:link="shortcuts_mailnews.xhtml#general_mail_and_newsgroups_shortcuts"/> </rdf:li>
+        <rdf:li><rdf:Description ID="shortcuts_mail_general" nc:name="General Mail &amp; Newsgroups Shortcuts" nc:link="shortcuts_mailnews.xhtml#general_mail_and_newsgroups_shortcuts"/> </rdf:li>
         <rdf:li><rdf:Description ID="shortcuts_mail_message_list" nc:name="Message List Shortcuts" nc:link="shortcuts_mailnews.xhtml#message_list_shortcuts"/> </rdf:li>
         <rdf:li><rdf:Description ID="shortcuts_mail_message_compose" nc:name="Message Compose Shortcuts" nc:link="shortcuts_mailnews.xhtml#message_compose_shortcuts"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 </rdf:RDF>
--- a/suite/chrome/common/help/using_priv_help.xhtml
+++ b/suite/chrome/common/help/using_priv_help.xhtml
@@ -180,17 +180,16 @@
   <a href="#using_the_cookie_manager">Using the Cookie Manager</a>.</p>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#cookies">Privacy &amp; Security Preferences -
       Cookies</a></li>
     <li><a href="#stored_cookies">Stored Cookies</a></li>
     <li><a href="#cookie_sites">Cookie Websites</a></li>
-    <li><a href="#cookie_notification">Cookie Notification</a></li>
   </ul>
 </div>
 
 <h2 id="cookies">Privacy &amp; Security Preferences - Cookies</h2>
 
 <p>Your browser is set by default to accept all cookies. This section describes
   how to use the Cookies preferences panel to change that setting. If
   you&apos;re not already viewing it, follow these steps:</p>