Bug 246405 - mail_help.xhtml should be split to several files
authorRicardo Palomares <rpmdisguise-otros@yahoo.es>
Sat, 04 Sep 2010 13:02:36 +0100
changeset 6313 10733fbe5be98940a526a1875348f60700108828
parent 6312 1acfd3ebf2c355a32026404db5cbf0055d5bd8bc
child 6314 e2155ffb330a1fa1567c01d22da33c6fe52bc5d8
push idunknown
push userunknown
push dateunknown
bugs246405
Bug 246405 - mail_help.xhtml should be split to several files Moving "Importing mail from other programs" right after "Getting started with Mail & Newsgroups" r=iann
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/mail_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/mail_help.xhtml
@@ -46,27 +46,27 @@
     <td><strong>Mail &amp; Newsgroups icon</strong></td>
   </tr>
 </table>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#getting_started_with_mozilla_mail_and_newsgroups">Getting
       Started with &brandShortName; Mail &amp; Newsgroups</a></li>
+    <li><a href="#importing_mail_from_other_programs">Importing Mail from Other
+      Programs</a></li>
     <li><a href="#reading_messages">Reading Messages</a></li>
     <li><a href="#sending_messages">Sending Messages</a></li>
     <li><a href="#creating_html_mail_messages">Creating HTML Mail
       Messages</a></li>
     <li><a href="#using_attachments">Using Attachments</a></li>
     <li><a href="#deleting_messages">Deleting Messages</a></li>
     <li><a href="#using_address_books">Using Address Books</a></li>
     <li><a href="#organizing_your_messages">Organizing Your Messages</a></li>
     <li><a href="#controlling_junk_mail">Controlling Junk Mail</a></li>
-    <li><a href="#importing_mail_from_other_programs">Importing Mail from Other
-      Programs</a></li>
     <li><a href="mailnews_newsgroups.xhtml">Getting Started with
       Newsgroups</a></li>
     <li><a href="mailnews_blogs_and_feeds.xhtml">Getting Started
       with Blogs &amp; News Feeds</a></li>
     <li><a href="mailnews_offline.xhtml">Working Offline</a></li>
     <li><a href="mail_sec_help.xhtml">Signing &amp; Encrypting
       Messages</a></li>
     <li><a href="mailnews_account_settings.xhtml">Mail &amp; Newsgroups
@@ -321,16 +321,62 @@
     </ul>
   </li>
   <li>Click OK to save your changes.</li>
 </ol>
 
 <p>[<a href="#getting_started_with_mozilla_mail_and_newsgroups">Return to
   beginning of section</a>]</p>
 
+<h1 id="importing_mail_from_other_programs">Importing Mail from Other
+  Programs</h1>
+
+<p>This section describes how to import mail messages and settings from
+  Netscape Communicator, Outlook, Outlook Express, and Eudora. To import
+  address books from these programs, see
+  <a href="#importing_address_books">Importing Address Books</a>.</p>
+
+<div class="contentsBox">In this section:
+  <ul>
+    <li><a href="#importing_mail_messages">Importing Mail Messages</a></li>
+    <li><a href="#importing_mail_settings">Importing Mail Settings</a></li>
+  </ul>
+</div>
+
+<h2 id="importing_mail_messages">Importing Mail Messages</h2>
+
+<p>To import mail messages from Netscape Communicator, Outlook, Outlook
+  Express, or Eudora, begin from the Mail window:</p>
+
+<ol>
+  <li>Open the Tools menu, and choose Import. You see the Import Wizard.</li>
+  <li>Follow the instructions to import mail messages.</li>
+</ol>
+
+<p>For Netscape Communicator, the wizard imports a copy of all Communicator
+  mail folders included under Local Folders. Imported mail is added as a new
+  folder under Local Folders in the Mail window. (The Communicator mail
+  folders still remain in their original location).</p>
+
+<p>[<a href="#importing_mail_from_other_programs">Return to beginning of
+  section</a>]</p>
+
+<h2 id="importing_mail_settings">Importing Mail Settings</h2>
+
+<p>To import mail settings from Outlook, Outlook Express, or Eudora, begin from
+  the Mail window:</p>
+
+<ol>
+  <li>Open the Tools menu, and choose Import. You see the Import Wizard.</li>
+  <li>Follow the instructions to import mail settings.</li>
+</ol>
+
+<p>[<a href="#importing_mail_from_other_programs">Return to beginning of
+  section</a>]</p>
+
 <h1 id="reading_messages">Reading Messages</h1>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#getting_new_messages">Getting New Messages</a></li>
     <li><a href="#choosing_how_you_view_the_mail_window">Choosing How You View
       the Mail Window</a></li>
     <li><a href="#sorting_and_threading_messages">Sorting and Threading
@@ -2851,56 +2897,10 @@ to filter unwanted mail, and how phishin
 <p><strong>Note</strong>: Phishing detection has a higher precedence than Junk
   Mail detection.</p>
 
 <p>For more technical details on this subject, see the online document
   <a href="http://www.honeynet.org/papers/phishing/">Know your Enemy:
   Phishing</a>.</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>
-
-<p>This section describes how to import mail messages and settings from
-  Netscape Communicator, Outlook, Outlook Express, and Eudora. To import
-  address books from these programs, see
-  <a href="#importing_address_books">Importing Address Books</a>.</p>
-
-<div class="contentsBox">In this section:
-  <ul>
-    <li><a href="#importing_mail_messages">Importing Mail Messages</a></li>
-    <li><a href="#importing_mail_settings">Importing Mail Settings</a></li>
-  </ul>
-</div>
-
-<h2 id="importing_mail_messages">Importing Mail Messages</h2>
-
-<p>To import mail messages from Netscape Communicator, Outlook, Outlook
-  Express, or Eudora, begin from the Mail window:</p>
-
-<ol>
-  <li>Open the Tools menu, and choose Import. You see the Import Wizard.</li>
-  <li>Follow the instructions to import mail messages.</li>
-</ol>
-
-<p>For Netscape Communicator, the wizard imports a copy of all Communicator
-  mail folders included under Local Folders. Imported mail is added as a new
-  folder under Local Folders in the Mail window. (The Communicator mail
-  folders still remain in their original location).</p>
-
-<p>[<a href="#importing_mail_from_other_programs">Return to beginning of
-  section</a>]</p>
-
-<h2 id="importing_mail_settings">Importing Mail Settings</h2>
-
-<p>To import mail settings from Outlook, Outlook Express, or Eudora, begin from
-  the Mail window:</p>
-
-<ol>
-  <li>Open the Tools menu, and choose Import. You see the Import Wizard.</li>
-  <li>Follow the instructions to import mail settings.</li>
-</ol>
-
-<p>[<a href="#importing_mail_from_other_programs">Return to beginning of
-  section</a>]</p>
 </body>
 </html>
--- a/suite/locales/en-US/chrome/common/help/suite-toc.rdf
+++ b/suite/locales/en-US/chrome/common/help/suite-toc.rdf
@@ -135,25 +135,25 @@
 
 
 <!-- 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="mail_help.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="mail_help.xhtml#importing_mail_from_other_programs" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-read"    nc:name="Reading Messages" nc:link="mail_help.xhtml#reading_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-send"    nc:name="Sending Messages" nc:link="mail_help.xhtml#sending_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-html"    nc:name="Creating HTML Mail Messages" nc:link="mail_help.xhtml#creating_html_mail_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-attach"  nc:name="Using Attachments" nc:link="mail_help.xhtml#using_attachments" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-delete" nc:name="Deleting Messages" nc:link="mail_help.xhtml#deleting_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-address" nc:name="Using Address Books" nc:link="mail_help.xhtml#using_address_books" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-folders" nc:name="Organizing Your Messages" nc:link="mail_help.xhtml#organizing_your_messages" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-junk" nc:name="Controlling Junk Mail" nc:link="mail_help.xhtml#controlling_junk_mail" /> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-importing-other" nc:name="Importing Mail from Other Programs" nc:link="mail_help.xhtml#importing_mail_from_other_programs" /> </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="mail_sec_help.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:Seq>
     </nc:subheadings>
@@ -165,16 +165,25 @@
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="mail-doc-setup" nc:name="Using the Mail Account Setup Wizard"  nc:link="mail_help.xhtml#using_the_mail_account_setup_wizard"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-add" nc:name="Setting Up Additional Accounts"  nc:link="mail_help.xhtml#setting_up_additional_mail_and_news_accounts"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-change" nc:name="Changing the Settings for an Account"  nc:link="mail_help.xhtml#changing_the_settings_for_an_account"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
+ <rdf:Description about="#mail-importing-other">
+    <nc:subheadings>
+      <rdf:Seq>
+        <rdf:li> <rdf:Description ID="mail-importing-mail-messages" nc:name="Importing Mail Messages" nc:link="mail_help.xhtml#importing_mail_messages" /> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-importing-mail-settings" nc:name="Importing Mail Settings" nc:link="mail_help.xhtml#importing_mail_settings" /> </rdf:li>
+      </rdf:Seq>
+    </nc:subheadings>
+  </rdf:Description>
+
  <rdf:Description about="#mail-doc-read">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="mail-doc-notify" nc:name="Getting New Messages"  nc:link="mail_help.xhtml#getting_new_messages"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-view" nc:name="Choosing How You View the Mail Window"  nc:link="mail_help.xhtml#choosing_how_you_view_the_mail_window"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-thread" nc:name="Sorting and Threading Messages"  nc:link="mail_help.xhtml#sorting_and_threading_messages"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-printsave" nc:name="Saving and Printing Messages"  nc:link="mail_help.xhtml#saving_and_printing_messages"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-doc-scripts" nc:name="Controlling Images, Scripts, and Plugins"  nc:link="mail_help.xhtml#controlling_images_scripts_and_plugins"/> </rdf:li>
@@ -345,25 +354,16 @@
         <rdf:li> <rdf:Description ID="mail-junk-controls" nc:name="Using Junk Mail Controls" nc:link="mail_help.xhtml#using_junk_mail_controls" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-junk-options" nc:name="Junk Mail Controls Options" nc:link="mail_help.xhtml#junk_controls_options" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-junk-filters" nc:name="Junk Mail Controls and Filters" nc:link="mail_help.xhtml#junk_controls_and_filters" /> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-junk-phishing" nc:name="Phishing Detection" nc:link="mail_help.xhtml#phishing_detection" /> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
-<rdf:Description about="#mail-importing-other">
-    <nc:subheadings>
-      <rdf:Seq>
-        <rdf:li> <rdf:Description ID="mail-importing-mail-messages" nc:name="Importing Mail Messages" nc:link="mail_help.xhtml#importing_mail_messages" /> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-importing-mail-settings" nc:name="Importing Mail Settings" nc:link="mail_help.xhtml#importing_mail_settings" /> </rdf:li>
-      </rdf:Seq>
-    </nc:subheadings>
-  </rdf:Description>
-
   <rdf:Description about="#mail-doc-news">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li> <rdf:Description ID="mail-subscribe" nc:name="Subscribing to Newsgroups" nc:link="mailnews_newsgroups.xhtml#subscribing_to_newsgroups"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-reading-news" nc:name="Reading Newsgroup Messages" nc:link="mailnews_newsgroups.xhtml#reading_newsgroup_messages"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-posting" nc:name="Posting Newsgroup Messages" nc:link="mailnews_newsgroups.xhtml#posting_newsgroup_messages"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-replying-news" nc:name="Contributing to Ongoing Discussions" nc:link="mailnews_newsgroups.xhtml#contributing_to_ongoing_discussions"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-monitoring" nc:name="Monitoring Threads" nc:link="mailnews_newsgroups.xhtml#monitoring_threads"/> </rdf:li>