diff --git a/mozilla/extensions/help/resources/content/help.xul b/mozilla/extensions/help/resources/content/help.xul
index 71880bb5434..a1fcabd47b9 100644
--- a/mozilla/extensions/help/resources/content/help.xul
+++ b/mozilla/extensions/help/resources/content/help.xul
@@ -165,7 +165,7 @@
@@ -212,7 +212,7 @@
@@ -259,7 +259,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mozilla/extensions/help/resources/locale/en-US/help-index1.rdf b/mozilla/extensions/help/resources/locale/en-US/help-index1.rdf
index 2f37e0bc8d8..5f4ff9fabe8 100644
--- a/mozilla/extensions/help/resources/locale/en-US/help-index1.rdf
+++ b/mozilla/extensions/help/resources/locale/en-US/help-index1.rdf
@@ -2,142 +2,23 @@
-
+
+ nc:link="mail_help.html#Account_SettingsIDX"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ nc:link="nav_help.html#bookmarks:boomarking_search_resultsIDX"/>
@@ -147,7 +28,7 @@
+ nc:link="nav_help.html#bookmarks:boomarking_search_resultsIDX"/>
@@ -157,7 +38,7 @@
+ nc:link="customize_help.html#bookmarks:changing_bookmarksIDX"/>
@@ -167,7 +48,7 @@
+ nc:link="customize_help.html#bookmarks:creating_bookmarksIDX"/>
@@ -177,7 +58,7 @@
+ nc:link="customize_help.html#bookmarks:exporting_bookmarksIDX"/>
@@ -187,7 +68,7 @@
+ nc:link="customize_help.html#bookmarks:organizing_bookmarksIDX"/>
@@ -197,7 +78,7 @@
+ nc:link="customize_help.html#bookmarks:searching_bookmarksIDX"/>
@@ -207,7 +88,7 @@
+ nc:link="customize_help.html#bookmarks:using_bookmarksIDX"/>
@@ -217,7 +98,7 @@
+ nc:link="nav_help.html#bookmarks:visitingIDX"/>
@@ -227,17 +108,17 @@
+ nc:link="customize_help.html#bookmarks:what_are_bookmarksIDX"/>
-
+
+ nc:link="customize_help.html#browser:start_up_componentsIDX"/>
@@ -247,87 +128,27 @@
+ nc:link="customize_help.html#browser:start_up_componentsIDX"/>
-
+
+ nc:link="privacy_help.html#browsing_anonymouslyIDX"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ nc:link="nav_help.html#cache:changing_settingsIDX"/>
@@ -337,27 +158,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ nc:link="nav_help.html#cache:changing_settingsIDX"/>
@@ -367,17 +168,17 @@
+ nc:link="customize_help.html#colors:customizing_web_pageIDX"/>
-
+
+ nc:link="composer_help.html#Composer:adding_tablesIDX"/>
@@ -387,7 +188,7 @@
+ nc:link="composer_help.html#Composer:adding_tablesIDX"/>
@@ -397,7 +198,7 @@
+ nc:link="composer_help.html#Composer:Advanced_Property_EditorIDX"/>
@@ -407,7 +208,7 @@
+ nc:link="composer_help.html#Composer:changing_text_colorIDX"/>
@@ -417,7 +218,7 @@
+ nc:link="composer_help.html#Composer:changing_text_fontIDX"/>
@@ -427,7 +228,7 @@
+ nc:link="composer_help.html#Composer:checking_htmlIDX"/>
@@ -437,7 +238,7 @@
+ nc:link="composer_help.html#Composer:checking_spellingIDX"/>
@@ -447,7 +248,7 @@
+ nc:link="composer_help.html#Composer:creating_linksIDX"/>
@@ -457,7 +258,7 @@
+ nc:link="composer_help.html#Composer:creating_new_pagesIDX"/>
@@ -467,7 +268,7 @@
+ nc:link="composer_help.html#Composer:editing_image_propertiesIDX"/>
@@ -477,7 +278,7 @@
+ nc:link="composer_help.html#Composer:editing_modesIDX"/>
@@ -487,7 +288,7 @@
+ nc:link="composer_help.html#Composer:finding_replacing_textIDX"/>
@@ -497,7 +298,7 @@
+ nc:link="composer_help.html#Composer:formatting_listsIDX"/>
@@ -507,7 +308,7 @@
+ nc:link="composer_help.html#Composer:formatting_paragraphsIDX"/>
@@ -517,7 +318,7 @@
+ nc:link="composer_help.html#Composer:general_preferencesIDX"/>
@@ -527,7 +328,7 @@
+ nc:link="composer_help.html#Composer:HTML_Element_and_AttributesIDX"/>
@@ -537,7 +338,7 @@
+ nc:link="composer_help.html#Composer:inserting_horizontal_linesIDX"/>
@@ -547,7 +348,7 @@
+ nc:link="composer_help.html#Composer:inserting_imagesIDX"/>
@@ -557,7 +358,7 @@
+ nc:link="composer_help.html#Composer:removing_text_stylesIDX"/>
@@ -567,7 +368,7 @@
+ nc:link="composer_help.html#Composer:saving_pagesIDX"/>
@@ -577,7 +378,7 @@
+ nc:link="composer_help.html#Composer:setting_page_colorsIDX"/>
@@ -587,7 +388,7 @@
+ nc:link="composer_help.html#Composer:setting_page_propertiesIDX"/>
@@ -597,7 +398,7 @@
+ nc:link="composer_help.html#Composer:special_charactersIDX"/>
@@ -607,17 +408,17 @@
+ nc:link="composer_help.html#Composer:working_with_listsIDX"/>
-
+
+ nc:link="privacy_help.html#cookies:aboutIDX"/>
@@ -627,7 +428,7 @@
+ nc:link="privacy_help.html#cookies:aboutIDX"/>
@@ -637,87 +438,27 @@
+ nc:link="privacy_help.html#cookies:foreignIDX"/>
-
+
+ nc:link="customize_help.html#Customizing FontsIDX"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ nc:link="nav_help.html#file_types:managingIDX"/>
@@ -727,7 +468,7 @@
+ nc:link="nav_help.html#file_types:managingIDX"/>
@@ -737,77 +478,17 @@
+ nc:link="nav_help.html#file_types:openingIDX"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ nc:link="mail_help.html#IMAP:Mail_settingsIDX"/>
@@ -817,267 +498,17 @@
+ nc:link="mail_help.html#IMAP:Mail_settingsIDX"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ nc:link="nav_help.html#Internet_Keywords:using_Internet_KeywordsIDX"/>
@@ -1087,27 +518,17 @@
+ nc:link="nav_help.html#Internet_Keywords:using_Internet_KeywordsIDX"/>
-
-
-
-
-
-
-
-
-
+
+ nc:link="nav_help.html#Java_and_JavaScript:enablingIDX"/>
@@ -1117,17 +538,17 @@
+ nc:link="nav_help.html#Java_and_JavaScript:enablingIDX"/>
-
+
+ nc:link="mail_help.html#Labels:general_preferencesIDX"/>
@@ -1137,17 +558,17 @@
+ nc:link="mail_help.html#Labels:general_preferencesIDX"/>
-
+
+ nc:link="mail_help.html#LDAP:global_settingsIDX"/>
@@ -1157,37 +578,17 @@
+ nc:link="mail_help.html#LDAP:global_settingsIDX"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ nc:link="mail_help.html#Mail_and_Newsgroups:Account_Setup_WizardIDX"/>
@@ -1197,7 +598,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:Account_Setup_WizardIDX"/>
@@ -1207,7 +608,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:adding_accountsIDX"/>
@@ -1217,7 +618,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:address_autocompletionIDX"/>
@@ -1227,7 +628,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:addressing_messagesIDX"/>
@@ -1237,7 +638,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:addressing_preferencesIDX"/>
@@ -1247,7 +648,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:Advanced_IMAP_settingsIDX"/>
@@ -1257,7 +658,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:AOL_Mail_and_Webmail_syncingIDX"/>
@@ -1267,7 +668,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:attaching_filesIDX"/>
@@ -1277,7 +678,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:changing_account_settingsIDX"/>
@@ -1287,7 +688,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:Compose_windowIDX"/>
@@ -1297,7 +698,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:composing_messagesIDX"/>
@@ -1307,7 +708,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:copies_and_folder_settingsIDX"/>
@@ -1317,7 +718,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:copying_foldersIDX"/>
@@ -1327,7 +728,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:creating_filtersIDX"/>
@@ -1337,7 +738,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:creating_foldersIDX"/>
@@ -1347,7 +748,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:creating_HTML_mail_messagesIDX"/>
@@ -1357,7 +758,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:Disk_Space_settingsIDX"/>
@@ -1367,7 +768,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:filing_messagesIDX"/>
@@ -1377,7 +778,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:forwarding_messagesIDX"/>
@@ -1387,7 +788,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:general_preferencesIDX"/>
@@ -1397,7 +798,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:getting_new_messagesIDX"/>
@@ -1407,7 +808,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:HTML_mail_recipientsIDX"/>
@@ -1417,7 +818,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:HTML_mail_sending_optionsIDX"/>
@@ -1427,7 +828,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:HTML_Message_SourceIDX"/>
@@ -1437,7 +838,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:identity_settingsIDX"/>
@@ -1447,7 +848,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:importing_address_booksIDX"/>
@@ -1457,7 +858,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:importing_mail_messagesIDX"/>
@@ -1467,7 +868,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:mail_window_layoutIDX"/>
@@ -1477,7 +878,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:message_searchingIDX"/>
@@ -1487,7 +888,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:POP_settingsIDX"/>
@@ -1497,7 +898,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:renaming_foldersIDX"/>
@@ -1507,7 +908,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:replying_to_messagesIDX"/>
@@ -1517,7 +918,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:saving_and_printing_messagesIDX"/>
@@ -1527,7 +928,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:saving_attachmentsIDX"/>
@@ -1537,7 +938,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:saving_messages_draftsIDX"/>
@@ -1547,7 +948,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:sending_messagesIDX"/>
@@ -1557,7 +958,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:sending_optionsIDX"/>
@@ -1567,7 +968,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:SMTP_settingsIDX"/>
@@ -1577,7 +978,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:sorting_and_threading_messagesIDX"/>
@@ -1587,7 +988,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:using_address_booksIDX"/>
@@ -1597,7 +998,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:using_attachmentsIDX"/>
@@ -1607,7 +1008,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:using_HTML_in_messagesIDX"/>
@@ -1617,7 +1018,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:using_mailing_addressesIDX"/>
@@ -1627,7 +1028,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:using_templatesIDX"/>
@@ -1637,7 +1038,7 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:viewing_attachmentsIDX"/>
@@ -1647,17 +1048,17 @@
+ nc:link="mail_help.html#Mail_and_Newsgroups:working_offlineIDX"/>
-
+
+ nc:link="nav_help.html#mouse_wheel:usingIDX"/>
@@ -1667,17 +1068,17 @@
+ nc:link="nav_help.html#mouse_wheel:usingIDX"/>
-
+
+ nc:link="customize_help.html#My_Sidebar:adding_tabsIDX"/>
@@ -1687,7 +1088,7 @@
+ nc:link="customize_help.html#My_Sidebar:adding_tabsIDX"/>
@@ -1697,7 +1098,7 @@
+ nc:link="customize_help.html#My_Sidebar:customizing_tabsIDX"/>
@@ -1707,7 +1108,7 @@
+ nc:link="customize_help.html#My_Sidebar:descriptionIDX"/>
@@ -1717,7 +1118,7 @@
+ nc:link="customize_help.html#My_Sidebar:removing_tabsIDX"/>
@@ -1727,7 +1128,7 @@
+ nc:link="customize_help.html#My_Sidebar:reorganizing_tabsIDX"/>
@@ -1737,7 +1138,7 @@
+ nc:link="nav_help.html#My_Sidebar:search_categoriesIDX"/>
@@ -1747,7 +1148,7 @@
+ nc:link="nav_help.html#My_Sidebar:searching_fromIDX"/>
@@ -1757,17 +1158,17 @@
+ nc:link="customize_help.html#My_Sidebar:usingIDX"/>
-
+
+ nc:link="customize_help.html#Navigator:changing_your_home_pageIDX"/>
@@ -1777,7 +1178,7 @@
+ nc:link="customize_help.html#Navigator:changing_your_home_pageIDX"/>
@@ -1787,17 +1188,17 @@
+ nc:link="customize_help.html#Navigator:start_pageIDX"/>
-
+
+ nc:link="mail_help.html#Netscape_WebMail:setting_upIDX"/>
@@ -1807,17 +1208,17 @@
+ nc:link="mail_help.html#Netscape_WebMail:setting_upIDX"/>
-
+
+ nc:link="mail_help.html#Newsgroups:getting_startedIDX"/>
@@ -1827,7 +1228,7 @@
+ nc:link="mail_help.html#Newsgroups:getting_startedIDX"/>
@@ -1837,17 +1238,17 @@
+ nc:link="mail_help.html#Newsgroups:server_settingsIDX"/>
-
+
+ nc:link="mail_help.html#Offline:general_preferencesIDX"/>
@@ -1857,7 +1258,7 @@
+ nc:link="mail_help.html#Offline:general_preferencesIDX"/>
@@ -1867,7 +1268,7 @@
+ nc:link="mail_help.html#Offline:Mail_and_NewsgroupsIDX"/>
@@ -1877,37 +1278,17 @@
+ nc:link="mail_help.html#Offline:Mail_settingsIDX"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ nc:link="nav_help.html#print:web_pagesIDX"/>
@@ -1917,17 +1298,17 @@
+ nc:link="nav_help.html#print:web_pagesIDX"/>
-
+
+ nc:link="privacy_help.html#privacy:aboutIDX"/>
@@ -1937,7 +1318,7 @@
+ nc:link="privacy_help.html#privacy:aboutIDX"/>
@@ -1947,7 +1328,7 @@
+ nc:link="privacy_help.html#privacy:cookies_andIDX"/>
@@ -1957,7 +1338,7 @@
+ nc:link="privacy_help.html#privacy:IP_addressIDX"/>
@@ -1967,7 +1348,7 @@
+ nc:link="privsec_help.html#privacy:preferencesIDX"/>
@@ -1977,17 +1358,17 @@
+ nc:link="privacy_help.html#privacy:protectingIDX"/>
-
+
+ nc:link="nav_help.html#proxies:settingIDX"/>
@@ -1997,17 +1378,17 @@
+ nc:link="nav_help.html#proxies:settingIDX"/>
-
+
+ nc:link="nav_help.html#Quick_Launch:usingIDX"/>
@@ -2017,47 +1398,17 @@
+ nc:link="nav_help.html#Quick_Launch:usingIDX"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ nc:link="nav_help.html#search:Advanced_modeIDX"/>
@@ -2067,7 +1418,7 @@
+ nc:link="nav_help.html#search:Advanced_modeIDX"/>
@@ -2077,7 +1428,7 @@
+ nc:link="nav_help.html#search:bookmarksIDX"/>
@@ -2087,7 +1438,7 @@
+ nc:link="nav_help.html#search:setting_preferencesIDX"/>
@@ -2097,17 +1448,17 @@
+ nc:link="nav_help.html#search:using_the_Search_buttonIDX"/>
-
+
+ nc:link="privsec_help.html#security:preferencesIDX"/>
@@ -2117,147 +1468,17 @@
+ nc:link="privsec_help.html#security:preferencesIDX"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ nc:link="customize_help.html#themes:changingIDX"/>
@@ -2267,17 +1488,17 @@
+ nc:link="customize_help.html#themes:changingIDX"/>
-
+
+ nc:link="customize_help.html#toolbar:hiding_a_toolbarIDX"/>
@@ -2287,7 +1508,7 @@
+ nc:link="customize_help.html#toolbar:hiding_a_toolbarIDX"/>
@@ -2297,7 +1518,7 @@
+ nc:link="customize_help.html#toolbar:navigation_toolbarIDX"/>
@@ -2307,47 +1528,17 @@
+ nc:link="customize_help.html#toolbar:personal_toolbarIDX"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ nc:link="nav_help.html#web_pages:copyingIDX"/>
@@ -2357,7 +1548,7 @@
+ nc:link="nav_help.html#web_pages:copyingIDX"/>
@@ -2367,7 +1558,7 @@
+ nc:link="customize_help.html#web_pages:customizing_fontsIDX"/>
@@ -2377,7 +1568,7 @@
+ nc:link="nav_help.html#web_pages:finding_relatedIDX"/>
@@ -2387,7 +1578,7 @@
+ nc:link="nav_help.html#web_pages:finding_withinIDX"/>
@@ -2397,7 +1588,7 @@
+ nc:link="nav_help.html#web_pages:historyIDX"/>
@@ -2407,7 +1598,7 @@
+ nc:link="nav_help.html#web_pages:navigatingIDX"/>
@@ -2417,7 +1608,7 @@
+ nc:link="nav_help.html#web_pages:searchingIDX"/>
@@ -2427,7 +1618,7 @@
+ nc:link="nav_help.html#web_pages:stoppingIDX"/>
@@ -2437,7 +1628,7 @@
+ nc:link="nav_help.html#web_pages:translatingIDX"/>