Bug 227077 - No unique anchors for"Addressing" and "Return Receipts" preference panels. r=rlk@trfenv.com, a=asa@mozilla.org. Patch by Hasse (jasajudeju@telia.com).

suite/locales/en-US/chrome/common/help/help-index1.rdf

@@ -1677,7 +1677,7 @@
      <rdf:Seq><rdf:li>
        <rdf:Description ID="LDAP:global_settings"
          nc:name="global settings"
-         nc:link="mail_help.xhtml#addressing"/>
+         nc:link="mail_help.xhtml#addressing_preferences"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -1757,7 +1757,7 @@
      <rdf:Seq><rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:addressing_preferences"
          nc:name="addressing preferences"
-         nc:link="mail_help.xhtml#addressing"/>
+         nc:link="mail_help.xhtml#addressing_preferences"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -2367,7 +2367,7 @@
      <rdf:Seq><rdf:li>
        <rdf:Description ID="Offline:general_preferences"
          nc:name="general preferences"
-         nc:link="mail_help.xhtml#disk_space_preferences"/>
+         nc:link="mail_help.xhtml#offline_and_disk_space_preferences"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
@@ -3138,7 +3138,7 @@
      <rdf:Seq><rdf:li>
        <rdf:Description ID="return_receipts:general_preferences"
          nc:name="general preferences"
-         nc:link="mail_help.xhtml#return_receipts"/>
+         nc:link="mail_help.xhtml#return_receipts_preferences"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>

suite/locales/en-US/chrome/common/help/mail_help.xhtml

@@ -904,7 +904,7 @@ 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 <a href="#return_receipts">Mail
+preferences. See <a href="#return_receipts_preferences">Mail
 &amp; Newsgroups Preferences - Return Receipts</a> for more
 information.</li>
 
@@ -1019,7 +1019,7 @@ send to a newsgroup address will not include a return receipt
 request, since news servers don't support this feature.</p>
 
 <p>To request return receipts for all messages you send, you can
-use the global <a href="#return_receipts">Return
+use the global <a href="#return_receipts_preferences">Return
 Receipt</a> preferences to specify how to manage requests you
 receive for return receipts. You can override these global
 preferences for individual accounts.</p>
@@ -1038,7 +1038,7 @@ from each of your mail accounts:</p>
 <li>Open the Edit menu and choose Preferences.</li>
 
 <li>Under the Mail &amp; Newsgroups category, click <a
-href="#return_receipts">Return Receipts</a>. (If no
+href="#return_receipts_preferences">Return Receipts</a>. (If no
 subcategories are visible, double-click Mail &amp; Newsgroups to
 expand the list.)</li>
 
@@ -1049,7 +1049,7 @@ receipt."</li>
 </ol>
 
 <p>For more information on setting return receipt preferences, see
-<a href="#return_receipts">Mail &amp; Newsgroups
+<a href="#return_receipts_preferences">Mail &amp; Newsgroups
 Preferences - Return Receipts</a>.</p>
 
 <p>[&nbsp;<a href="#sending_messages">Return to beginning of
@@ -1659,7 +1659,7 @@ from outgoing messages are stored in the Collected Address Book as
 soon as you click Send. The Collected Address Book can also save
 the sender's address in each incoming message. To enable this
 feature, you must change the <a
-href="#addressing">preferences for email
+href="#addressing_preferences">preferences for email
 address collection</a>. The preferences also let you choose which
 types of addresses you want to collect (only addresses from mail
 messages or addresses from both mail and newsgroup messages).</p>
@@ -3401,7 +3401,7 @@ messages that you send while working offline in the Unsent Messages
 folder under Local Folders. To have &brandShortName; Mail &amp; Newsgroups
 automatically send your unsent messages when you reconnect, use the
 Preferences command on the Edit menu to change the <a
-href="#disk_space_preferences">offline preferences</a> for
+href="#offline_and_disk_space_preferences">offline preferences</a> for
 all your accounts.</p>
 
 <p>[&nbsp;<a href="#working_offline">Return to beginning of
@@ -3467,7 +3467,7 @@ Messages from the File menu to send all your saved messages at
 once. To have &brandShortName; Mail &amp; Newsgroups automatically send your
 unsent messages when you reconnect, use the Preferences command on
 the Edit menu to change your <a
-href="#disk_space_preferences">offline preferences</a>.</p>
+href="#offline_and_disk_space_preferences">offline preferences</a>.</p>
 
 <p>[&nbsp;<a href="#working_offline">Return to beginning of
 section</a>&nbsp;]</p>
@@ -3549,7 +3549,7 @@ Messages from the File menu to send all your saved messages at
 once. To have &brandShortName; Mail &amp; Newsgroups automatically send your
 unsent messages when you reconnect, use the Preferences command on
 the Edit menu to change your <a
-href="#disk_space_preferences">offline preferences</a>.</p>
+href="#offline_and_disk_space_preferences">offline preferences</a>.</p>
 
 <p>[&nbsp;<a href="#working_offline">Return to beginning of
 section</a>&nbsp;]</p>
@@ -4267,7 +4267,7 @@ Addressing</h2>
 
 <p>You use Addressing settings to override the global LDAP server
 settings specified for all <a
-href="#addressing">address books</a> in the
+href="#addressing_preferences">address books</a> in the
 Preferences dialog box. LDAP server settings affect the behavior of
 <a href="#address_autocompletion">address autocompletion</a>, and you can
 change these settings for each account if necessary.</p>
@@ -4479,14 +4479,14 @@ settings for outgoing messages from this mail account. You also use
 the Return Receipt settings to specify how to manage requests you
 receive for return receipts. These settings override global return
 receipt preferences you specified using <a
-href="#return_receipts">Mail &amp; Newsgroups
+href="#return_receipts_preferences">Mail &amp; Newsgroups
 Preferences - Return Receipts</a>.</p>
 
 <ul>
 <li><strong>Use my global return receipt preferences for this
 account</strong>: By default, this account uses the return receipt
 preferences specified by <a
-href="#return_receipts">Mail &amp; Newsgroups
+href="#return_receipts_preferences">Mail &amp; Newsgroups
 Preferences - Return Receipts</a>.</li>
 
 <li><strong>Customize return receipts for this account</strong>:
@@ -4756,10 +4756,10 @@ see these preferences:</p>
     <li><a href="#notifications">Notifications</a></li>
     <li><a href="#composition">Composition</a></li>
     <li><a href="#send_format">Send Format</a></li>
-    <li><a href="#addressing">Addressing</a></li>
+    <li><a href="#addressing_preferences">Addressing</a></li>
     <li><a href="#labels">Labels</a></li>
-    <li><a href="#return_receipts">Return Receipts</a></li>
+    <li><a href="#return_receipts_preferences">Return Receipts</a></li>
-    <li><a href="#offline_and_disk_space">Offline &amp; Disk Space Preferences</a></li>
+    <li><a href="#offline_and_disk_space_preferences">Offline &amp; Disk Space Preferences</a></li>
   </ul>
 </div>
 
@@ -5107,7 +5107,7 @@ messages.</p>
 <p>[ <a href="#mail_and_newsgroup_preferences">Return to beginning of
 section</a> ]</p>
 
-<h2 id="addressing">Mail &amp; Newsgroups Preferences -
+<h2 id="addressing_preferences">Mail &amp; Newsgroups Preferences -
 Addressing</h2>
 
 <p>Addressing preferences allow you to control the settings for
@@ -5206,7 +5206,7 @@ text and colors.</li>
 <p>[&nbsp;<a href="#mail_and_newsgroup_preferences">Return to beginning of
 section</a>&nbsp;]</p>
 
-<h2 id="return_receipts">Mail &amp; Newsgroups Preferences - Return
+<h2 id="return_receipts_preferences">Mail &amp; Newsgroups Preferences - Return
 Receipts</h2>
 
 <p>This section describes how to use the Return Receipts
@@ -5262,8 +5262,8 @@ Settings - Return Receipts</a>.</p>
 <p>[&nbsp;<a href="#mail_and_newsgroup_preferences">Return to beginning of
 section</a>&nbsp;]</p>
 
-<h2 id="disk_space_preferences">Offline &amp; Disk Space
+<h2 id="offline_and_disk_space_preferences">Mail &amp; Newsgroups
-Preferences</h2>
+Preferences - Offline &amp; Disk Space</h2>
 
 <p>This section describes how to use the Offline &amp; Disk Space
 preferences panel. If you are not currently viewing the panel,
@@ -5292,7 +5292,7 @@ amount of disk space you enter.</li>
 <p>See <a href="#working_offline">Working Offline</a> for
 information on working offline.</p>
 
-<p>[&nbsp;<a href="#disk_space_preferences">Return to
+<p>[&nbsp;<a href="#mail_and_newsgroup_preferences">Return to
 beginning of section</a>&nbsp;]</p>
 
 <hr />

suite/locales/en-US/chrome/common/help/suite-toc.rdf

@@ -475,10 +475,10 @@
         <rdf:li> <rdf:Description ID="mail_prefs_notifications" nc:name="Notifications" nc:link="chrome://help/locale/mail_help.xhtml#notifications"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_prefs_messages" nc:name="Composition" nc:link="chrome://help/locale/mail_help.xhtml#composition"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_prefs_formatting" nc:name="Send Format" nc:link="chrome://help/locale/mail_help.xhtml#send_format"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_prefs_addressing" nc:name="Addressing" nc:link="chrome://help/locale/mail_help.xhtml#addressing"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_prefs_addressing" nc:name="Addressing" nc:link="chrome://help/locale/mail_help.xhtml#addressing_preferences"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-prefs-labels" nc:name="Labels" nc:link="chrome://help/locale/mail_help.xhtml#labels"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail-prefs-receipts" nc:name="Return Receipts" nc:link="chrome://help/locale/mail_help.xhtml#return_receipts"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail-prefs-receipts" nc:name="Return Receipts" nc:link="chrome://help/locale/mail_help.xhtml#return_receipts_preferences"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_prefs_offline" nc:name="Offline and Disk Space" nc:link="chrome://help/locale/mail_help.xhtml#disk_space_preferences"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_prefs_offline" nc:name="Offline and Disk Space" nc:link="chrome://help/locale/mail_help.xhtml#offline_and_disk_space_preferences"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>