small mend on earlier check-in for 76761, a=chofmann, r=oeschger, patch=r.j.keller, sr=jag

extensions/help/resources/locale/en-US/help-index1.rdf

@@ -18,7 +18,7 @@
      <rdf:Seq><rdf:li>
        <rdf:Description ID="bookmarks"
          nc:name="bookmarks"
-	 nc:link="nav_help.html#bookmarks:boomarking_search_resultsIDX"/>
+	 nc:link="nav_help.html#bookmarks:bookmarking_search_resultsIDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -353,16 +353,6 @@
    </nc:subheadings>
 </rdf:Description>
 
-<rdf:Description about="#Composer">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="Composer:keyboard_shortcuts"
-         nc:name="keyboard shortcuts"
-	 nc:link="chrome://help/locale/shortcuts.html#composer"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
 <rdf:Description about="#Composer">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -498,12 +488,12 @@
      <rdf:Seq><rdf:li>
        <rdf:Description ID="IMAP"
          nc:name="IMAP"
-	 nc:link="mail_help.html#IMAP:Mail_settingsIDX"/>
+	 nc:link="mail_help.html#IMAP:advanced_mail_settingsIDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
-<rdf:Description about="#IMAP">
+<rdf:Description about="help-indexAZ.rdf#i">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="ieusers"
@@ -613,6 +603,8 @@
    </nc:subheadings>
 </rdf:Description>
 
+<<<<<<< help-index1.rdf
+=======
 <rdf:Description about="help-indexAZ.rdf#k">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
@@ -693,12 +685,13 @@
    </nc:subheadings>
 </rdf:Description>
 
+>>>>>>> 1.5
 <rdf:Description about="help-indexAZ.rdf#l">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="Labels"
          nc:name="Labels"
-	 nc:link="mail_help.html#Labels:general_preferencesIDX"/>
+	 nc:link="mail_help.html#labels:general_preferencesIDX"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -1153,16 +1146,6 @@
    </nc:subheadings>
 </rdf:Description>
 
-<rdf:Description about="#Mail_and_Newsgroups">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="Mail_and_Newsgroups:using_mailing_addresses"
-         nc:name="using mailing addresses"
-	 nc:link="mail_help.html#Mail_and_Newsgroups:using_mailing_addressesIDX"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
 <rdf:Description about="#Mail_and_Newsgroups">
    <nc:subheadings>
      <rdf:Seq><rdf:li>