diff --git a/mozilla/extensions/help/resources/locale/en-US/certs_help.html b/mozilla/extensions/help/resources/locale/en-US/certs_help.html
index d23743abeb1..3b80d874334 100644
--- a/mozilla/extensions/help/resources/locale/en-US/certs_help.html
+++ b/mozilla/extensions/help/resources/locale/en-US/certs_help.html
@@ -180,7 +180,7 @@ Here you specify whether you want to trust the selected certificate for identify
 
 <ul>
 
-	<li><b>The certificate &quot;<i>name of certificate</i>&quot; was issued by:</b> Provides information about the <a href="glossary.html#certificate_authority_(CA)">certificate authority</a> that issued this certificate.
+        <li><b>The certificate &quot;<i>name of certificate</i>&quot; was issued by:</b> Provides information about the <a href="glossary.html#certificate_authority">certificate authority</a> that issued this certificate.
 
 	<li><b>Edit certificate trust settings:</b></li>
 
@@ -295,4 +295,4 @@ Here you specify whether you want to trust the selected certificate for identify
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/mozilla/extensions/help/resources/locale/en-US/certs_prefs_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/certs_prefs_help.xhtml
index abcb5b002ef..53bc39a6dc6 100644
--- a/mozilla/extensions/help/resources/locale/en-US/certs_prefs_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/certs_prefs_help.xhtml
@@ -18,14 +18,14 @@
   Certificate Manager, Device Manager, and other dialog boxes related to certificates.</p>
 
 <p>For step-by-step descriptions of various tasks related to certificates, see
-  <a href="#using_certificates">Using Certificates</a>.</p>
+  <a href="using_certs_help.html">Using Certificates</a>.</p>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#privacy_and_security_preferences_certificates">Certificate Preferences</a></li>
     <li><a href="certs_help.html">Certificate Manager</a></li>
     <li><a href="certs_help.html#Security_Devices">Device Manager</a></li>
-    <li><a href="cert_dialog_help.html">Certificate Information and Decisions</a></li>
+    <li><a href="cert_dialog_help.xhtml">Certificate Information and Decisions</a></li>
   </ul>
 </div>
 
diff --git a/mozilla/extensions/help/resources/locale/en-US/forieusers.html b/mozilla/extensions/help/resources/locale/en-US/forieusers.html
index 3ee50f8adfa..3780b419f41 100644
--- a/mozilla/extensions/help/resources/locale/en-US/forieusers.html
+++ b/mozilla/extensions/help/resources/locale/en-US/forieusers.html
@@ -49,7 +49,7 @@ using Mozilla for <a HREF="nav_help.html#browsing_the_web">browsing the web</a>,
 <div align="left">Internet Options
 </td>
 <td bgcolor="#eeeeee"> 
-<div align="left"><a HREF="cs_nav_prefs_navigator.html#default_browser_preferences">Preferences</a>
+<div align="left"><a HREF="cs_nav_prefs_navigator.html">Preferences</a>
 
 </div>
 </td>
@@ -135,7 +135,7 @@ open the Bookmarks menu and choose Imported IE Favorites.</p>
 	<li><strong><a HREF="profiles_help.html#managing_profiles">Profile Manager</a></strong>: Create different profiles, each with its own bookmarks, preferences, 
 	mail settings, and so on. This is useful if you must share Mozilla on the same computer with other people, or if you want to keep your work and personal settings separate.</li>
 
-        <li><strong><a HREF="using_priv_help.html#cookies:aboutIDX">Cookie Manager</a></strong>: Lets you change what Mozilla will do when accepting cookies through it's support for the <a href="using_priv_help.html#P3P_settingsSDX">P3P privacy standard</a>.</li>
+        <li><strong><a HREF="using_priv_help.html">Cookie Manager</a></strong>: Lets you change what Mozilla will do when accepting cookies through it's support for the <a href="using_priv_help.html#P3P_settingsSDX">P3P privacy standard</a>.</li>
         <li><strong><a HREF="using_priv_help.html#managing_images">Image Manager</a></strong>: Enables you to disable images from certain websites, or disable them all together. This is useful if you wish to decrease the amount of time it takes for websites to load.</li>
 </ul>
 </p>
diff --git a/mozilla/extensions/help/resources/locale/en-US/mail_sec_help.html b/mozilla/extensions/help/resources/locale/en-US/mail_sec_help.html
index c9d54b817de..926c46dd8a1 100644
--- a/mozilla/extensions/help/resources/locale/en-US/mail_sec_help.html
+++ b/mozilla/extensions/help/resources/locale/en-US/mail_sec_help.html
@@ -205,7 +205,7 @@ How Encryption Works</h3>
 	<tr><td>&nbsp;</td><td><img src="chrome://messenger/skin/smime/icons/hdrCryptoOk.gif" alt="encryption icon"></td><td>The message is encrypted. If there is a problem with the encryption, the key is broken.</td></tr>
 	</table>
 
-<p>For information about certificate validation, see <a href="using_certs_help.html#Controlling_Validation">Controlling Validation</a>.
+<p>For information about certificate validation, see <a href="using_certs_help.html#using_certs_validation">Controlling Validation</a>.
 
 
 <p>To see more detailed information about the message's security, click the key or lock icon, or follow the instructions in <a href="#received_security">Message Security - Received Message</a>.
diff --git a/mozilla/extensions/help/resources/locale/en-US/nav_help.html b/mozilla/extensions/help/resources/locale/en-US/nav_help.html
index 30fc1c351a9..3f88a23be24 100644
--- a/mozilla/extensions/help/resources/locale/en-US/nav_help.html
+++ b/mozilla/extensions/help/resources/locale/en-US/nav_help.html
@@ -393,7 +393,7 @@ Sidebar from the submenu.</p>
 of the drop-down list in the Location Bar. (Your default search engine may be 
 different.)<br>
 
-The default search engine you choose in <a href="#Smart">Preferences</a> is used. 
+The default search engine you choose in <a href="cs_nav_prefs_navigator.html#Smart">Preferences</a> is used. 
 Search results for "baby doll" appear in both the browser window and in Sidebar. 
 Click the links to visit web pages about baby dolls. </li>
 </ul>
@@ -576,7 +576,7 @@ search engines.
     list of links related to Apple Computer's iMac models. 
 </ol>
 <p>If typing Internet Keywords into the Location Bar is not working for you, check 
-  your <a href="cs_nav_prefs_navigator.html#nav_smartbrowse">Smart Browsing preferences</a> to be sure the 
+  your <a href="cs_nav_prefs_navigator.html#Smart">Smart Browsing preferences</a> to be sure the 
   Internet Keywords feature is enabled.</p>
 <p>&nbsp;</p>
 <h3>Quick Stock Quotes</h3>
@@ -982,7 +982,7 @@ codes to print specific information:
 </ul>
 </ul>
 </ul>
-<p><b>Tip</b>: To see a preview of changes made to Page Setup, use <a href="#print_preview">Print 
+<p><b>Tip</b>: To see a preview of changes made to Page Setup, use <a href="#print_previewSDX">Print 
 Preview</a>.</p>
 <p>[&nbsp;<a href="#nav_printsave">Return to beginning of section</a>&nbsp;] 
 </p>
@@ -1342,7 +1342,7 @@ and protocols include the following:</p>
 <p><b>Internet Document and Language Files</b>: </p>
 <ul>
 <li> 
-<p><a href="glossary.html#Hypertext_Markup_Language_(HTML)">HTML</a>, XML, XHTML, 
+<p><a href="glossary.html#Hypertext_Markup_Language">HTML</a>, XML, XHTML, 
 and XUL</p>
 </li>
 </ul>
@@ -1351,7 +1351,7 @@ and XUL</p>
 <p><b>Internet Protocols</b>: </p>
 <ul>
 <li> 
-<p>HTTP, HTTPS, <a href="glossary.html#File_Transfer_Protocol_(FTP)">FTP</a>, 
+<p>HTTP, HTTPS, <a href="glossary.html#File_Transfer_Protocol">FTP</a>, 
 Chrome, Gopher<br>
 </p>
 </li>
diff --git a/mozilla/extensions/help/resources/locale/en-US/page_info_help.html b/mozilla/extensions/help/resources/locale/en-US/page_info_help.html
index 2788765766f..4134f68024b 100644
--- a/mozilla/extensions/help/resources/locale/en-US/page_info_help.html
+++ b/mozilla/extensions/help/resources/locale/en-US/page_info_help.html
@@ -48,7 +48,7 @@
 
 <p>The top portion displays the the name of the page (if it has one) and the following information:
 <ul>
-	<li><b>URL:</b>&nbsp; The <a href="glossary.html#Uniform_Resource_Locator_(URL)">Uniform Resource Locator</a> for the page&mdash;that is, the standardized address that appears in the Location Bar near the top of the browser window.
+        <li><b>URL:</b>&nbsp; The <a href="glossary.html#Uniform_Resource_Locator">Uniform Resource Locator</a> for the page&mdash;that is, the standardized address that appears in the Location Bar near the top of the browser window.
 	<li><b>Render mode:</b>&nbsp; Indicates whether the browser is using <b>quirks mode</b> or <b>standards compliance mode</b> to lay out the page. Quirks mode takes account of nonstandard behavior that may be used by some older web pages designed for older versions of web browsers that are not fully standards compliant. Standards compliance mode adheres strictly to standards specifications. Your browser chooses the render mode automatically according to information contained in the web page itself.
 	<li><b>Source:</b>&nbsp; Indicates whether the source code for this page has been cached.
 	<li><b>Encoding:</b>&nbsp; The character set encoding used for this HTML document.
diff --git a/mozilla/extensions/help/resources/locale/en-US/using_certs_help.html b/mozilla/extensions/help/resources/locale/en-US/using_certs_help.html
index 81797e6ab68..5c919ede884 100644
--- a/mozilla/extensions/help/resources/locale/en-US/using_certs_help.html
+++ b/mozilla/extensions/help/resources/locale/en-US/using_certs_help.html
@@ -33,7 +33,6 @@
 <p><a href="#using_certs_devices">Managing Smart Cards and Other Security Devices</a></p>
 <p><a href="#using_certs_ssl">Managing SSL Warnings and Settings</a></p>
 <p><a href="#using_certs_validation">Controlling Validation</a></p>
-<p><a href="#using_certs_settings">Certificate Settings</a></p>
 </td>
 </tr>
 </table>
@@ -206,7 +205,7 @@
 <a NAME="using_certs_cas"></a><a NAME="certificates:certificate_authorityIDX"></a>
 <H2>Managing Certificates that Identify Certificate Authorities</H2>
 
-<p>Like other commonly used forms of ID, a certificate is issued by an organization with recognized authority to issue such identification. An organization that issues certificates is called a <a href="glossary.html#certificate_authority_(CA)">certificate authority (CA)</a>. A certificate that identifies a CA is called a CA certificate.
+<p>Like other commonly used forms of ID, a certificate is issued by an organization with recognized authority to issue such identification. An organization that issues certificates is called a <a href="glossary.html#certificate_authority">certificate authority (CA)</a>. A certificate that identifies a CA is called a CA certificate.
 
 <p> Certificate Manager typically has many CA certificates on file. These CA certificates permit Certificate Manager to recognize and work with certificates issued by the corresponding CAs. However, the presence of a CA certificate in this list does <i>not</i> guarantee that the certificates it issues can be trusted. You or your system administrator must make decisions about what kinds of certificates to trust depending on your security needs.  
 
@@ -404,7 +403,7 @@
 <p><a href="#How_Certificate_Validation_Works">How Validation Works</a></p>
 <p><a href="#Managing_CRLs">Managing CRLs</a></p>
 <p><a href="#Configuring_Certificate_Manager_for_OCSP">Configuring OCSP</a></p>
-<p><a href="#validation_help.html">Validation Settings</a></p>
+<p><a href="validation_help.html">Validation Settings</a></p>
 </td>
 </tr>
 </table>
@@ -435,7 +434,7 @@
 <p>&nbsp;</p>
 <a name="Managing_CRLs"></a><h2>Managing CRLs</h2>
 
-<p>A certificate revocation list (CRL) is list of revoked certificates.  A <a href="glossary.html#certificate_authority (CA)">certificate authority (CA)</a> might revoke a certificate, for example, if it has been compromised in some way&mdash;much the way a credit card company might revoke your credit card if you report that it's been stolen.
+<p>A certificate revocation list (CRL) is list of revoked certificates.  A <a href="glossary.html#certificate_authority">certificate authority (CA)</a> might revoke a certificate, for example, if it has been compromised in some way&mdash;much the way a credit card company might revoke your credit card if you report that it's been stolen.
 </p>
 
 <p>This section describes how to import and manage CRLs. <p>For background information, see <a href="#How_Certificate_Validation_Works">How Validation Works</a>. 
diff --git a/mozilla/extensions/help/resources/locale/en-US/validation_help.html b/mozilla/extensions/help/resources/locale/en-US/validation_help.html
index 8f74228a086..f34fbdf43af 100644
--- a/mozilla/extensions/help/resources/locale/en-US/validation_help.html
+++ b/mozilla/extensions/help/resources/locale/en-US/validation_help.html
@@ -60,7 +60,7 @@
 <a NAME="CRL"></a>
 <h3>CRL</h3>
 
-<p>A certificate revocation list (CRL) is a list of revoked certificates that is generated and signed by a <a href="glossary.html#certificate_authority_(CA)">certificate authority (CA)</a>. It's possible to download a CRL to your browser, which can check it to ensure that certificates are still valid before permitting their use for authentication. <P>
+<p>A certificate revocation list (CRL) is a list of revoked certificates that is generated and signed by a <a href="glossary.html#certificate_authority">certificate authority (CA)</a>. It's possible to download a CRL to your browser, which can check it to ensure that certificates are still valid before permitting their use for authentication. <P>
 
 <p>Click Manage CRLs to see a list of the CRLs available to Certificate Manager. 
 
@@ -76,7 +76,7 @@
 <p>To specify how Certificate Manager uses OCSP, choose one of these settings in the OCSP section of  Validation Settings:</P>
 
 <ul>
-	<LI><B>Do not use OCSP for certificate verification.</B> Select this setting if you don't want Certificate Manager to perform an online status check each time it verifies a certificate. Instead, whenever Certificate Manager performs <a href="glossary.html#1025527">certificate verification</a>, it only confirms the certificate's validity period and that it is correctly signed by a CA whose own CA certificate is both listed under the CA Certificates tab (in the main Certificate Manager window) and marked as trusted for issuing that kind of certificate.</LI>
+        <LI><B>Do not use OCSP for certificate verification.</B> Select this setting if you don't want Certificate Manager to perform an online status check each time it verifies a certificate. Instead, whenever Certificate Manager performs <a href="glossary.html#certificate_verification">certificate verification</a>, it only confirms the certificate's validity period and that it is correctly signed by a CA whose own CA certificate is both listed under the CA Certificates tab (in the main Certificate Manager window) and marked as trusted for issuing that kind of certificate.</LI>
 	<LI><B>Use OCSP to verify only certificates that specify an OCSP service URL.</B> Select this setting if you want Certificate Manager perform an online status check each time it verifies a certificate that specifies a URL for the purpose of performing such a check. If a URL is specified by the certificate, Certificate Manager makes sure that the certificate is listed there as valid and checks the validity period and trust settings.</LI>
 	<LI><B>Use OCSP to verify all certificates, using the URL and signer specified here.</B> Select this setting if you want Certificate Manager to perform an online status check each time it verifies any certificate. If you select this setting, you should also choose the certificate from the Response Signer pop-up menu that identifies the signer of the OCSP responses. With this setting, the only certificates Certificate Manager recognizes are those that can be verified by an OCSP response signed with the Response Signer certificate (or signed using a certificate that chains to it).
 
@@ -97,7 +97,7 @@
    <li>Click Manage CRLs.
 </ol>
 
-<p>This dialog box displays a list of the <a href="glossary.html#certificate_revocation_list_(CRL)">CRLs</a> that you have downloaded for use by your browser. Typically, you download a CRL by clicking a URL. FOr information about how CRLs work, see <a href="using_certs_help.html#Managing_CRLs">Managing CRLs</a>.
+<p>This dialog box displays a list of the <a href="glossary.html#certificate_revocation_list">CRLs</a> that you have downloaded for use by your browser. Typically, you download a CRL by clicking a URL. FOr information about how CRLs work, see <a href="using_certs_help.html#Managing_CRLs">Managing CRLs</a>.
 
 <p>To select a CRL, click it. You can then perform any of these actions: