Bug 714588 - Update Help for changes from bug 527173 (new Spelling pref pane). r=IanN
authorJens Hatlak <jh@junetz.de>
Tue, 17 Jan 2012 19:20:07 +0100
changeset 10442 f092cb0bd85c438ecf26c4e10dc6d088677f52e8
parent 10441 d7619adc645ff3326d688d9920c5993b9d71307b
child 10443 1f2265369e5ebbe367316da32b07b6a02fff38d1
push id402
push userbugzilla@standard8.plus.com
push dateTue, 13 Mar 2012 21:17:18 +0000
treeherdercomm-beta@d080a8ebf16a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN
bugs714588, 527173
Bug 714588 - Update Help for changes from bug 527173 (new Spelling pref pane). r=IanN
suite/locales/en-US/chrome/common/help/cs_nav_prefs_appearance.xhtml
suite/locales/en-US/chrome/common/help/cs_nav_prefs_navigator.xhtml
suite/locales/en-US/chrome/common/help/mailnews_preferences.xhtml
suite/locales/en-US/chrome/common/help/mailnews_using_mail.xhtml
suite/locales/en-US/chrome/common/help/suite-toc.rdf
--- a/suite/locales/en-US/chrome/common/help/cs_nav_prefs_appearance.xhtml
+++ b/suite/locales/en-US/chrome/common/help/cs_nav_prefs_appearance.xhtml
@@ -27,16 +27,17 @@
 </ol>
 
 <div class="contentsBox">In this section: 
   <ul>
     <li><a href="#appearance">Appearance</a></li>
     <li><a href="#content">Content</a></li>
     <li><a href="#fonts">Fonts</a></li>
     <li><a href="#colors">Colors</a></li>
+    <li><a href="#spelling">Spelling</a></li>
   </ul>
 </div>
 
 <h2 id="appearance">Appearance Preferences - Appearance</h2>
 
 <p>This section describes how to use the Appearance preferences panels. If
   you&apos;re not already viewing one of these panels, follow these steps:</p>
 
@@ -247,10 +248,49 @@
         image specified</strong>: Allow you to choose displayed colors,
         ignoring the web page colors and background image.</li>
     </ul>
   </li>
 </ul>
 
 <p>[<a href="#appearance_preferences">Return to beginning of section</a>]</p>
 
+<h2 id="spelling">Appearance Preferences - Spelling</h2>
+
+<p>This section describes how to use the Spelling preferences panel. If
+  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>Under the Appearance category, click Spelling. (If no subcategories are
+    visible, double-click Appearance to expand the list.)</li>
+</ol>
+
+<p>The Spelling preferences panel allows you to determine how spelling is
+  handled throughout &brandShortName;:</p>
+
+<ul>
+  <li><strong>General</strong>:
+    <ul>
+      <li><strong>Language</strong>: Use the drop-down list to select the language
+        you want to use to check the spelling in your messages or to download more
+        dictionaries.</li>
+      <li><strong>When typing, check my spelling</strong>: Use the drop-down
+        list to select if and how your typing is spell checked.</li>
+    </ul>
+  </li>
+    <li><strong>Mail &amp; Newsgroups</strong>:
+    <ul>
+      <li><strong>Check spelling before sending</strong>: Select this option to
+        have Mail &amp; Newsgroups always check the spelling of your message before
+        you send it.</li>
+      <li><strong>Check spelling as you type</strong>: Select this option to have
+        Mail &amp; Newsgroups always check the spelling of your message as you type
+        it.</li>
+    </ul>
+  </li>
+</ul>
+
+<p>[<a href="#appearance_preferences">Return to beginning of section</a>]</p>
+
 </body>
 </html>
--- a/suite/locales/en-US/chrome/common/help/cs_nav_prefs_navigator.xhtml
+++ b/suite/locales/en-US/chrome/common/help/cs_nav_prefs_navigator.xhtml
@@ -177,18 +177,17 @@
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Browser category, click Languages. (If no subcategories are
     visible, double-click Browser to expand the list.)</li>
 </ol>
 
 <p>The Languages preferences panel allows you to choose the languages and
-  character encoding for displaying web pages and choose if and how your typing
-  is spell checked:</p>
+  character encoding for displaying web pages:</p>
 
 <ul>
   <li><strong>Languages for Web Pages</strong>:
     <ul>
       <li><strong>Move Up / Move Down</strong>: Click one of these buttons to
         move a selected language up or down, which sets the order of preference
         for the listed languages.</li>
       <li><strong>Add</strong>: Click this to add additional languages for
@@ -206,22 +205,16 @@
   </li>
   <li><strong>Character Encoding</strong>:
     <ul>
       <li><strong>Default Character Encoding</strong>: Use the drop-down list
         to select the character encoding you want for displaying web
         pages.</li>
     </ul>
   </li>
-  <li><strong>Spelling</strong>:
-    <ul>
-      <li><strong>When typing check my spelling</strong>: Use the drop-down
-        list to select if and how your typing is spell checked.</li>
-    </ul>
-  </li>
 </ul>
 
 <p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="helper_applications">Browser Preferences - Helper Applications</h2>
 
 <p>This section describes how to use the Helper Applications preferences panel.
   If you&apos;re not already viewing it, follow these steps:</p>
--- a/suite/locales/en-US/chrome/common/help/mailnews_preferences.xhtml
+++ b/suite/locales/en-US/chrome/common/help/mailnews_preferences.xhtml
@@ -282,25 +282,16 @@
     the message in your Drafts folder.</li>
   <li><strong>Confirm when using keyboard shortcut to send message</strong>:
     Check this option if want to be asked if you&apos;re sure to be ready to
     send the message when you&apos;re pressing Ctrl+Return in message editor.
     This may help you avoid accidentally sending the message if you enter the
     keyboard shortcut by mistake when composing a message.</li>
   <li><strong>Wrap plain text messages at [__] characters</strong>: Enter a
     number to set the right margin for text in the message area.</li>
-  <li><strong>Check spelling before sending</strong>: Select this option to
-    have Mail &amp; Newsgroups always check the spelling of your message before
-    you send it.</li>
-  <li><strong>Check spelling as you type</strong>: Select this option to have
-    Mail &amp; Newsgroups always check the spelling of your message as you type
-    it.</li>
-  <li><strong>Language</strong>: Use the drop-down list to select the language
-    you want to use to check the spelling in your messages or to download more
-    dictionaries.</li>
   <li><strong>Defaults for HTML Messages</strong>: Here you can define what the
     defaults are for font, size, text and background color if you choose to
     send mails in HTML format.</li>
 </ul>
 
 <p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
   section</a>]</p>
 
--- a/suite/locales/en-US/chrome/common/help/mailnews_using_mail.xhtml
+++ b/suite/locales/en-US/chrome/common/help/mailnews_using_mail.xhtml
@@ -513,20 +513,16 @@
 
 <ul>
   <li><strong>Select Addresses</strong>: The Select Addresses option lets you
     choose the recipient&apos;s email address from your Address Books or a
     remote directory. To look up an address in an address book or directory,
     enter the first few letters of the recipient&apos;s first or last name to
     start the search. Select an address and then click To:, Cc:, or Bcc: to
     address your message.</li>
-  <li><strong>Check Spelling</strong>: Checks the spelling of the message text
-    before you send it. You can also click Spell.</li>
-  <li><strong>Spellcheck As You Type</strong>: Choose this option to have the
-    spelling of the message text checked as you type.</li>
   <li><strong>Quote Message</strong>: Choose this option to have the selection
     of the message text shown as quoted text.</li>
   <li><strong>Return Receipt</strong>: Choose this option to request a
     confirmation message when the recipient displays (opens) the message. Keep
     in mind that the recipient may choose not to send you a return receipt.
     This option lets you enable or disable return receipt requests on a
     per-message basis. To automatically request return receipts for all
     messages you send, use the return receipts preferences. See
@@ -541,21 +537,24 @@
     <span class="noMac">Edit</span> menu.</li>
   <li><strong>Priority</strong>: Choose a priority to indicate whether the
     message has lowest, low, normal, high, or highest priority.</li>
   <li><strong>Character Encoding</strong>: Choose a character encoding used for
     this message.</li>
   <li><strong>Send a Copy To</strong>: Choose this if you want to file an
     additional copy of the sent message in a different folder than your default
     Sent folder. Then select the folder you want.</li>
-  <li><strong>Security</strong>: Choose this to change the default security
-    options for this message.</li>
+  <li><strong>Encrypt This Message</strong>: Choose this to have &brandShortName;
+    encrypt this message (without changing the default).</li>
+  <li><strong>Digitally Sign This Message</strong>: Choose this to have
+    &brandShortName; digitally sign this message (without changing the
+    default).</li>
 </ul>
 
-<p>An additional message formatting option is available from the Edit menu:</p>
+<p>Additionally, the following options are available from the Edit menu:</p>
 
 <ul>
   <li><strong>Rewrap</strong>: If you are composing a message using the
     plain-text editor, you can use the Rewrap command to rewrap long lines of
     quoted text to fit the Compose window. This command rewraps selected quoted
     text to the number of characters specified by the
     <a href="mailnews_preferences.xhtml#composition">Composition</a>
     preferences. This command is primarily useful when you are replying to a
@@ -566,16 +565,20 @@
       menu to specify that you want to use the plain-text editor for composing
       messages. Select the Composition &amp; Addressing panel of the account
       and uncheck <q>Compose messages in HTML format</q> to use the plain-text
       editor for all messages. If you only want to use the plain-text editor
       occasionally, you can hold down the Shift key while clicking the Compose
       or the Reply button to use the plain-text editor on an as-needed
       basis.</p>
   </li>
+  <li><strong>Check Spelling</strong>: Checks the spelling of the message text
+    before you send it. You can also click Spell.</li>
+  <li><strong>Spellcheck As You Type</strong>: Choose this option to have the
+    spelling of the message text checked as you type.</li>
 </ul>
 
 <p>[<a href="#sending_messages">Return to beginning of section</a>]</p>
 
 <h2 id="replying_to_a_message">Replying to a Message</h2>
 
 <p>To reply to a mail message:</p>
 
--- a/suite/locales/en-US/chrome/common/help/suite-toc.rdf
+++ b/suite/locales/en-US/chrome/common/help/suite-toc.rdf
@@ -775,16 +775,17 @@
   </rdf:Description>
 
 <rdf:Description about="#appearance_pref">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="appearance_pref_content" nc:name="Content" nc:link="cs_nav_prefs_appearance.xhtml#content"/> </rdf:li>
         <rdf:li> <rdf:Description ID="appearance_pref_fonts" nc:name="Fonts" nc:link="cs_nav_prefs_appearance.xhtml#fonts"/> </rdf:li>
         <rdf:li> <rdf:Description ID="appearance_pref_colors" nc:name="Colors" nc:link="cs_nav_prefs_appearance.xhtml#colors"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="appearance_pref_spelling" nc:name="Spelling" nc:link="cs_nav_prefs_appearance.xhtml#spelling"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#navigator_pref_navigator">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="navigator_pref_history" nc:name="History" nc:link="cs_nav_prefs_navigator.xhtml#history"/> </rdf:li>