diff --git a/mozilla/extensions/help/resources/locale/en-US/cert_dialog_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/cert_dialog_help.xhtml
index ad6f808d671..3040b868a2b 100644
--- a/mozilla/extensions/help/resources/locale/en-US/cert_dialog_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/cert_dialog_help.xhtml
@@ -175,11 +175,11 @@ were encrypted with your corresponding public key.</p>
 
 <ul>
   <li><strong>View Certificate:</strong> To view the certificate identifying the CA that
-    is requesting the backup copy, click View Certificate.<br/></li>
+    is requesting the backup copy, click View Certificate.</li>
   <li><strong>OK:</strong> If you trust the CA identified by the CA certificate to decrypt
-    encrypted messages that you receive, click OK.<br/><br/>
-    If you are not sure whether to trust the CA that is requesting the backup copy, talk
-    to your system administrator.<br/></li>
+    encrypted messages that you receive, click OK.
+    <p>If you are not sure whether to trust the CA that is requesting the backup copy, talk
+    to your system administrator.</p></li>
 	<li><strong>Cancel:</strong> If you don't trust the CA that is requesting the backup
 	copy, don't request a certificate from it. Click Cancel to stop both the backup
 	procedure and the request for a certificate.</li>
@@ -362,11 +362,10 @@ were encrypted with your corresponding public key.</p>
 
 <ul>
   <li>The server administrator can obtain more information about intermediate CAs from here:
-    <br/><br/>
     <a href="http://kb.verisign.com/esupport/esupport/consumer/esupport.asp?id=vs2119" target="_blank">
-    http://kb.verisign.com/esupport/esupport/consumer/esupport.asp?id=vs2119</a><br/></li>
-  <li>If the server is using a VeriSign certificate, the server administrator can download
-    the appropriate certificate from here: <br/><br/>
+    http://kb.verisign.com/esupport/esupport/consumer/esupport.asp?id=vs2119</a></li>
+  <li>If the server is using a VeriSign certificate, the server administrator can
+    download the appropriate certificate from here:
     <a href="http://www.verisign.com/support/install/index.html" target="_blank">
     http://www.verisign.com/support/install/index.html</a></li>
 
@@ -409,11 +408,11 @@ were encrypted with your corresponding public key.</p>
 
 <ul>
   <li><strong>View Certificate:</strong> To examine information about the certificate,
-    including its validity period, click View Certificate.<br/></li>
+    including its validity period, click View Certificate.</li>
   <li><strong>OK:</strong> If you have reason to believe the certificate's expiration is an
     inadvertent error, you may choose to click OK to accept the certificate anyway for this
-    session, and let the webmaster for the site know about the problem.<br/><br/>
-    Be cautious about any actions you take while you are visiting the site.</li>
+    session, and let the webmaster for the site know about the problem.
+    <p>Be cautious about any actions you take while you are visiting the site.</p></li>
   <li><strong>Cancel:</strong> If you suspect that there may be a significant problem and you
     don't want to risk visiting the site at all, click Cancel (in which case Certificate
     Manager will not connect you to the site).</li>
@@ -440,11 +439,11 @@ were encrypted with your corresponding public key.</p>
 
 <ul>
   <li><strong>View Certificate:</strong> To examine information about the certificate,
-    including its validity period, click View Certificate.<br/></li>
+    including its validity period, click View Certificate.</li>
   <li><strong>OK:</strong> If you have reason to believe the problem is an inadvertent error,
     you may choose to click OK to accept the certificate anyway for this session, and let
-    the webmaster for the site know about the problem.<br/><br/>
-    Be cautious about any actions you take while you are visiting the site.<br/></li>
+    the webmaster for the site know about the problem.
+    <p>Be cautious about any actions you take while you are visiting the site.</p></li>
   <li><strong>Cancel:</strong> If you suspect that there may be a significant problem and you
     don't want to risk visiting the site at all, click Cancel (in which case Certificate
     Manager will not connect you to the site).</li>
@@ -469,9 +468,9 @@ were encrypted with your corresponding public key.</p>
     View Certificate.</li>
   <li><strong>OK:</strong> If you have reason to believe the problem is an inadvertent error,
     you may choose to click OK to accept the certificate anyway for this session, and let the
-    webmaster for the site know about the problem.<br/><br/>
-    Be cautious about any actions you take while you are visiting the site, and treat any
-    information you find there as potentially suspect.</li>
+    webmaster for the site know about the problem.
+    <p>Be cautious about any actions you take while you are visiting the site, and treat any
+    information you find there as potentially suspect.</p></li>
   <li><strong>Cancel:</strong> If you suspect that there may be a significant problem and you
     don't want to risk visiting the site at all, click Cancel (in which case Certificate
     Manager will not connect you to the site).</li>
diff --git a/mozilla/extensions/help/resources/locale/en-US/certs_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/certs_help.xhtml
index 91186b4b950..d5c800f736d 100644
--- a/mozilla/extensions/help/resources/locale/en-US/certs_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/certs_help.xhtml
@@ -10,7 +10,7 @@
 <head>
 <title>Certificate Manager</title>
 <link rel="stylesheet" href="chrome://help/locale/helpFileLayout.css"
-  type="text/css"></link>
+  type="text/css"/>
 </head>
 <body>
 
diff --git a/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_advanced.xhtml b/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_advanced.xhtml
index 1c1fe07a086..07625a80142 100644
--- a/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_advanced.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_advanced.xhtml
@@ -302,11 +302,12 @@ you&apos;re not already viewing it, follow these steps:</p>
 	cache expiration and replacement policies.</li>
       <li><strong>Enable Keep-Alive</strong>: Select this to keep a connection
         open to make additional HTTP requests, increasing speed.</li>
-      <li><strong>Enable Pipelining</strong>: <strong></strong>Select this to
+      <li><strong>Enable Pipelining</strong>: Select this to
         enable pipelining, which allows for more than one HTTP request to be
 	sent to the server at once, reducing delays loading web
-	pages.<br></br>
-        <strong>Note</strong>: Pipelining is only available with HTTP 1.1.</li>
+	pages.
+        <p><strong>Note</strong>: Pipelining is only available with 
+	HTTP 1.1.</p></li>
     </ul>
   </li>
 </ul>
diff --git a/mozilla/extensions/help/resources/locale/en-US/cs_priv_prefs_popup.xhtml b/mozilla/extensions/help/resources/locale/en-US/cs_priv_prefs_popup.xhtml
index 6d1e916ffcb..cafc90ec78d 100644
--- a/mozilla/extensions/help/resources/locale/en-US/cs_priv_prefs_popup.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/cs_priv_prefs_popup.xhtml
@@ -10,7 +10,7 @@
 <head>
 <title>&brandShortName; Popup Blocking Help</title>
 <link rel="stylesheet" href="chrome://help/locale/helpFileLayout.css"
-  type="text/css"></link>
+  type="text/css"/>
 </head>
 <body>
 
@@ -38,7 +38,7 @@
 <p>When blocking a popup, &brandShortName; can be set up to play a sound, as
   well as display an icon
   <img src="chrome://navigator/skin/icons/popup-blocked.png" alt="Popup control
-  icon"></img> in the status bar. You can use this icon to add a website
+  icon"/> in the status bar. You can use this icon to add a website
   you're viewing to an exceptions list so that the site is allowed to again
   display popups.</p>
 
@@ -105,17 +105,17 @@
   </ul></li>
 <li><strong>Display an icon in the Navigator status bar</strong>: Select this
   to display an icon <img src="chrome://navigator/skin/icons/popup-blocked.png"
-  alt="Popup control icon"></img> in the Navigator status bar to indicate that
+  alt="Popup control icon"/> in the Navigator status bar to indicate that
   a popup is blocked. <strong>Note</strong>: After the popup control icon
   <img src="chrome://navigator/skin/icons/popup-blocked.png" alt="Popup control
-  icon"></img> appears, it remains visible until you visit another website.
+  icon"/> appears, it remains visible until you visit another website.
   </li></ul>
 
 <p><strong>Using the popup control icon to add allowed websites</strong>: You
   can use the popup control icon to quickly add a website to the list of
   allowed websites. Click the icon
   <img src="chrome://navigator/skin/icons/popup-blocked.png" alt="Popup control
-  icon"></img> to open the list of allowed websites. The current website is
+  icon"/> to open the list of allowed websites. The current website is
   already filled in. Click Add and then click OK to confirm your addition.</p>
 
 <p><strong>Note</strong>: Blocking popups may not always work and may interfere
diff --git a/mozilla/extensions/help/resources/locale/en-US/customize_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/customize_help.xhtml
index e3ca9c7a6b9..1c09590f0cb 100644
--- a/mozilla/extensions/help/resources/locale/en-US/customize_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/customize_help.xhtml
@@ -225,7 +225,7 @@
       handle"/></td>
     <td style="vertical-align: middle;">
 
-      <p><strong>Sidebar <br/>Handle</strong></p>
+      <p><strong>Sidebar<br/>Handle</strong></p>
 
     </td>
   </tr>
@@ -345,10 +345,10 @@
   <li><strong>From the Location Bar</strong>: Type a web page location in the
     Location Bar and press <span class="noMac">Ctrl</span>
     <span class="mac">Cmd</span>+Enter.<br/>
-    <strong>Note</strong>: You must set your Tabbed Browsing preferences
+    <p><strong>Note</strong>: You must set your Tabbed Browsing preferences
     to open a Navigator tab from the Location Bar. See
     <a href="cs_nav_prefs_navigator.xhtml#tabbed_browsing">Navigator
-    Preferences - Tabbed Browsing</a> for more information.</li>
+    Preferences - Tabbed Browsing</a> for more information.</p></li>
 </ul>
 
 <p><strong>Tips</strong>:</p>
@@ -432,7 +432,7 @@
   <li><a href="#changing_the_default_fonts">Changing the Default Fonts</a></li>
   <li><a href="#changing_the_default_colors">Changing the Default
     Colors</a></li>
-  <li><a href="#changing_the_themes">Changing the Theme</a></li>
+  <li><a href="#changing_the_theme">Changing the Theme</a></li>
 </ul>
 </div>
 
@@ -472,7 +472,7 @@
   resolution by measuring how long a line appears on your screen. Increased
   screen resolution may will improve text readability on some screens.</p>
 
-<p>[<a href="changing_fonts_colors_and_themes">Return to beginning of
+<p>[<a href="#changing_fonts_colors_and_themes">Return to beginning of
   section</a>]</p>
 
 <h3 id="changing_the_default_colors">Changing the Default Colors</h3>
@@ -523,7 +523,7 @@
 <p><strong>Shortcut</strong>: You can also change themes by opening the View
   menu, choosing Apply Theme, and then choosing the theme you want to use.</p>
 
-<p>[<a href="changing_fonts_colors_and_themes">Return to beginning of
+<p>[<a href="#changing_fonts_colors_and_themes">Return to beginning of
   section</a>]</p>
 
 <h2 id="toolbars">Toolbars</h2>
@@ -669,7 +669,7 @@
 </ol>
 
 <p><strong>Note: </strong>Standard buttons on the Personal Toolbar such as
-  Search and Home Page cannot be rearranged, but they can be
+  Home and Bookmarks cannot be rearranged, but they can be
   <a href="#turning_buttons_on_and_off">turned off and on</a>.</p>
 
 <p><strong>Tip: </strong>To move a bookmark placed on the Personal Toolbar
@@ -919,9 +919,9 @@
 
 <ul>
   <li>Open the View menu and select how you want the list sorted (such as Sort
-    by Name or Sort by Location).<br/>
-    <strong>Tip</strong>: To add more columns, open the View menu, open
-    &quot;Show columns,&quot; and select a column header in the list.</li>
+    by Name or Sort by Location).
+    <p><strong>Tip</strong>: To add more columns, open the View menu, open
+    &quot;Show columns,&quot; and select a column header in the list.</p></li>
 </ul>
 
 <h4>Designating a New Bookmark Folder</h4>
diff --git a/mozilla/extensions/help/resources/locale/en-US/forieusers.xhtml b/mozilla/extensions/help/resources/locale/en-US/forieusers.xhtml
index fbb27a881f3..c288f469a4c 100644
--- a/mozilla/extensions/help/resources/locale/en-US/forieusers.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/forieusers.xhtml
@@ -10,7 +10,7 @@
 <head>
 <title>For Microsoft Internet Explorer Users</title>
 <link rel="stylesheet" href="chrome://help/locale/helpFileLayout.css"
-  type="text/css"></link>
+  type="text/css"/>
 </head>
 <body>
 
diff --git a/mozilla/extensions/help/resources/locale/en-US/glossary.xhtml b/mozilla/extensions/help/resources/locale/en-US/glossary.xhtml
index 74ffa425c91..fff00516ecd 100644
--- a/mozilla/extensions/help/resources/locale/en-US/glossary.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/glossary.xhtml
@@ -9,7 +9,7 @@
 <head>
 <title>Glossary</title>
 <link rel="stylesheet" href="chrome://help/locale/helpFileLayout.css"
-  type="text/css"></link>
+  type="text/css"/>
 </head>
 <body>
 
@@ -709,8 +709,6 @@
   
 </dl>
 
-<p>[<a href="#glossary">Return to beginning of Glossary</a>]</p>
-
 <p>Copyright &copy; 2003-2004 The Mozilla Foundation.</p>
 
 </body>
diff --git a/mozilla/extensions/help/resources/locale/en-US/help-glossary.rdf b/mozilla/extensions/help/resources/locale/en-US/help-glossary.rdf
index df9e6f41178..81d5ce5c3c9 100755
--- a/mozilla/extensions/help/resources/locale/en-US/help-glossary.rdf
+++ b/mozilla/extensions/help/resources/locale/en-US/help-glossary.rdf
@@ -105,10 +105,11 @@
         <rdf:li> <rdf:Description nc:name="subordinate CA" nc:link="glossary.xhtml#subordinate_ca"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="symmetric encryption" nc:link="glossary.xhtml#symmetric_encryption"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="tamper detection" nc:link="glossary.xhtml#tamper_detection"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="TCP" nc:link="glossary.xhtml#tcp"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="TCP/IP (Transmission Control Protocol/Internet Protocol)" nc:link="glossary.xhtml#transmission_control_protocol_internet_protocol"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="third-party cookie" nc:link="glossary.xhtml#third-party_cookie"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="TLS" nc:link="glossary.xhtml#tls"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="token" nc:link="glossary.xhtml#token"/> </rdf:li>
-        <rdf:li> <rdf:Description nc:name="TCP/IP (Transmission Control Protocol/Internet Protocol)" nc:link="glossary.xhtml#tcp"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="trust" nc:link="glossary.xhtml#trust"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Uniform Resource Locator (URL)" nc:link="glossary.xhtml#uniform_resource_locator"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="web page" nc:link="glossary.xhtml#web_page"/> </rdf:li>
diff --git a/mozilla/extensions/help/resources/locale/en-US/help-toc.rdf b/mozilla/extensions/help/resources/locale/en-US/help-toc.rdf
index 81d92ee2a9d..b4ef9368e8d 100644
--- a/mozilla/extensions/help/resources/locale/en-US/help-toc.rdf
+++ b/mozilla/extensions/help/resources/locale/en-US/help-toc.rdf
@@ -14,7 +14,6 @@
         <rdf:li> <rdf:Description ID="comp" nc:name="Creating Web Pages"  nc:link="chrome://help/locale/composer_help.xhtml"/> </rdf:li>
         <rdf:li> <rdf:Description ID="cust" nc:name="Customizing Mozilla"  nc:link="chrome://help/locale/customize_help.xhtml"/> </rdf:li>
         <rdf:li> <rdf:Description ID="using-priv-help" nc:name="Using Privacy Features" nc:link="chrome://help/locale/privacy_help.xhtml"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="privacy-doc" nc:name="Privacy on the Internet" nc:link="chrome://help/locale/privacy_help.xhtml#privacy_on_the_internet"/> </rdf:li>
         <rdf:li> <rdf:Description ID="using-help-certs" nc:name="Using Certificates" nc:link="chrome://help/locale/using_certs_help.xhtml"/> </rdf:li>
         <rdf:li> <rdf:Description ID="profile-help" nc:name="Managing Profiles" nc:link="chrome://help/locale/profiles_help.xhtml"/> </rdf:li>
         <rdf:li> <rdf:Description ID="shortcuts" nc:name="Mozilla Keyboard Shortcuts" nc:link="chrome://help/locale/shortcuts.xhtml"/> </rdf:li>
@@ -669,7 +668,7 @@
         <rdf:li> <rdf:Description ID="cust-sidebar-define" nc:name="What is Sidebar?"  nc:link="chrome://help/locale/customize_help.xhtml#what_is_sidebar"/> </rdf:li>
         <rdf:li> <rdf:Description ID="cust-sidebar-using" nc:name="Using Sidebar"  nc:link="chrome://help/locale/customize_help.xhtml#using_sidebar"/> </rdf:li>
         <rdf:li> <rdf:Description ID="cust-sidebar-adding" nc:name="Adding Sidebar Tabs"  nc:link="chrome://help/locale/customize_help.xhtml#adding_sidebar_tabs"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="cust-sidebar-indiv" nc:name="Customizing Individual Sidebar Tabs"  nc:link="chrome://help/locale/customize_help.xhtml#cust_individual_sidebar_tabs"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="cust-sidebar-indiv" nc:name="Customizing Individual Sidebar Tabs"  nc:link="chrome://help/locale/customize_help.xhtml#customizing_individual_sidebar_tabs"/> </rdf:li>
         <rdf:li> <rdf:Description ID="cust-sidebar-reorg" nc:name="Reorganizing Sidebar Tabs"  nc:link="chrome://help/locale/customize_help.xhtml#reorganizing_sidebar_tabs"/> </rdf:li>
         <rdf:li> <rdf:Description ID="cust-sidebar-removing" nc:name="Removing Sidebar Tabs"  nc:link="chrome://help/locale/customize_help.xhtml#removing_sidebar_tabs"/> </rdf:li>
         <rdf:li> <rdf:Description ID="cust-sidebar-openclose" nc:name="Opening, Closing, and Resizing"  nc:link="chrome://help/locale/customize_help.xhtml#opening_closing_and_resizing_sidebar"/> </rdf:li>
@@ -796,20 +795,10 @@
 
 
 <!-- USING PRIVACY FEATURES CONTENT -->
-<rdf:Description about="#privacy-doc">
-    <nc:subheadings>
-      <rdf:Seq>
-        <rdf:li><rdf:Description ID="privacy-doc-visit" nc:name="What Information Does My Browser Give to a Website?"  		nc:link="chrome://help/locale/privacy_help.xhtml#what_information_does_my_browser_give_to_a_web_site"/> </rdf:li>
-        <rdf:li><rdf:Description ID="privacy-doc-cookies" nc:name="What Are Cookies, and How Do They Work?"  		nc:link="chrome://help/locale/privacy_help.xhtml#what_are_cookies_and_how_do_they_work"/> </rdf:li>
-        <rdf:li><rdf:Description ID="privacy-doc-email" nc:name="How Can I Control Web Pages in Email Messages?"  		nc:link="chrome://help/locale/privacy_help.xhtml#how_can_i_control_web_pages_in_email_messages"/> </rdf:li>
-        <rdf:li><rdf:Description ID="privacy-doc-unauth" nc:name="How Do I Make Sure Unauthorized People Don't Use Information About Me?"  		nc:link="chrome://help/locale/privacy_help.xhtml#how_do_i_make_sure_unauthorized_people_dont_use_information_about_me"/> </rdf:li>
-      </rdf:Seq>
-    </nc:subheadings>
-  </rdf:Description>
-
 <rdf:Description about="#using-priv-help">
     <nc:subheadings>
       <rdf:Seq>
+        <rdf:li><rdf:Description ID="privacy-doc" nc:name="Privacy on the Internet" nc:link="chrome://help/locale/privacy_help.xhtml#privacy_on_the_internet"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-cookies" nc:name="Using the Cookie Manager" nc:link="chrome://help/locale/using_priv_help.xhtml#using_the_cookie_manager"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-password" nc:name="Using the Password Manager" nc:link="chrome://help/locale/using_priv_help.xhtml#using_the_password_manager"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-forms" nc:name="Using the Form Manager" nc:link="chrome://help/locale/using_priv_help.xhtml#using_the_form_manager"/> </rdf:li>
@@ -821,6 +810,17 @@
     </nc:subheadings>
   </rdf:Description>
 
+<rdf:Description about="#privacy-doc">
+    <nc:subheadings>
+      <rdf:Seq>
+        <rdf:li><rdf:Description ID="privacy-doc-visit" nc:name="What Information Does My Browser Give to a Website?"  		nc:link="chrome://help/locale/privacy_help.xhtml#what_information_does_my_browser_give_to_a_web_site"/> </rdf:li>
+        <rdf:li><rdf:Description ID="privacy-doc-cookies" nc:name="What Are Cookies, and How Do They Work?"  		nc:link="chrome://help/locale/privacy_help.xhtml#what_are_cookies_and_how_do_they_work"/> </rdf:li>
+        <rdf:li><rdf:Description ID="privacy-doc-email" nc:name="How Can I Control Web Pages in Email Messages?"  		nc:link="chrome://help/locale/privacy_help.xhtml#how_can_i_control_web_pages_in_email_messages"/> </rdf:li>
+        <rdf:li><rdf:Description ID="privacy-doc-unauth" nc:name="How Do I Make Sure Unauthorized People Don't Use Information About Me?"  		nc:link="chrome://help/locale/privacy_help.xhtml#how_do_i_make_sure_unauthorized_people_dont_use_information_about_me"/> </rdf:li>
+      </rdf:Seq>
+    </nc:subheadings>
+  </rdf:Description>
+
 <rdf:Description about="#using-priv-help-cookies">
     <nc:subheadings>
       <rdf:Seq>
diff --git a/mozilla/extensions/help/resources/locale/en-US/help_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/help_help.xhtml
index 2c42a8ecb1d..3033e0574f2 100644
--- a/mozilla/extensions/help/resources/locale/en-US/help_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/help_help.xhtml
@@ -40,7 +40,7 @@
 		  Click a topic to read about it. Double-click to see its subtopics.</li>
 		 <li><strong>Search</strong> lets you search the Help files.<br/>
 		  Type a word or phrase and press Enter to see related topics. Then click
-		  the topic you want to read about.<br/><br/>
+		  the topic you want to read about.<br/>
 		  If your search doesn't return any topics, try typing fewer words or a
 		  different combination of words.</li>
 		 <li><strong>Index</strong> lists topics alphabetically.<br/>Click an index entry
diff --git a/mozilla/extensions/help/resources/locale/en-US/mail_sec_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/mail_sec_help.xhtml
index a813331891a..de996307fbe 100644
--- a/mozilla/extensions/help/resources/locale/en-US/mail_sec_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/mail_sec_help.xhtml
@@ -10,7 +10,7 @@
 <head>
 <title>Signing &amp; Encrypting Messages</title>
 <link rel="stylesheet" href="chrome://help/locale/helpFileLayout.css"
-  type="text/css"></link>
+  type="text/css"/>
 </head>
 <body>
 
@@ -59,11 +59,12 @@
   <a href="using_certs_help.xhtml#getting_your_own_certificate">Getting Your
   Own Certificate</a>.</li>
 <li>Configure the security settings for your email account. For details, see
-  <a href="#config_account">Configuring Your Security Settings</a>.</li>
+  <a href="mail_help.xhtml#security">Configuring Your Security Settings</a>.</li>
 </ol>
 
 <p>Once you have completed these steps, you can complete the instructions in
-  <a href="#signing">Signing &amp; Encrypting a New Message</a>.</p>
+  <a href="#signing_and_encrypting_a_new_message">Signing &amp; Encrypting a 
+  New Message</a>.</p>
 
 <p>The sections that follow provide a brief overview of how digital signatures
   and encryption work. For more technical details on this subject, see the
@@ -245,13 +246,13 @@
 <table>
   <tr>
     <td><img src="chrome://messenger/skin/smime/icons/hdrSignOk.gif"
-      alt="digital signature icon"></img></td><td>The message will be digitally
+      alt="digital signature icon"/></td><td>The message will be digitally
       signed (assuming you have a valid email certificate that
       identifies you).</td>
   </tr>
   <tr>
     <td><img src="chrome://messenger/skin/smime/icons/hdrCryptoOk.gif"
-      alt="encryption icon"></img></td><td>The message will be encrypted
+      alt="encryption icon"/></td><td>The message will be encrypted
       (assuming you have valid certificates for all recipients).</td>
   </tr>
 </table>
@@ -294,20 +295,20 @@
 <table>
   <tr>
     <td><img src="chrome://messenger/skin/smime/icons/hdrSignOk.gif"
-      alt="digital signature icon"></img></td><td>The message is digitally
+      alt="digital signature icon"/></td><td>The message is digitally
       signed and has been validated. If there is a problem with the signature,
       the pen is broken.</td>
   </tr>
   <tr>
     <td><img src="chrome://messenger/skin/smime/icons/hdrSignUnknown.gif"
-      alt="unknown icon"></img></td><td>The message is signed, but it has a
+      alt="unknown icon"/></td><td>The message is signed, but it has a
       large attachment that has not yet been downloaded from the IMAP server.
       As a result, the signature cannot be validated. Click the icon to
       download the attachment and validate the signature.</td>
   </tr>
   <tr>
     <td><img src="chrome://messenger/skin/smime/icons/hdrCryptoOk.gif"
-      alt="encryption icon"></img></td><td>The message is encrypted. If there
+      alt="encryption icon"/></td><td>The message is encrypted. If there
       is a problem with the encryption, the key is broken.</td>
   </tr>
 </table>
diff --git a/mozilla/extensions/help/resources/locale/en-US/nav_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/nav_help.xhtml
index 853a39ffabe..831b264f44c 100644
--- a/mozilla/extensions/help/resources/locale/en-US/nav_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/nav_help.xhtml
@@ -403,12 +403,12 @@ search, and save web pages.</p>
       <li>Click the Search button.</li>
       <li>Click &quot;Search &brandShortName; Search for &quot;baby doll&quot;
         at the bottom of the drop-down list in the Location Bar. (Your default
-	search engine may be different.)<br/>
+	search engine may be different.)<p>
         The default search engine you choose in
         <a href="cs_nav_prefs_navigator.xhtml#smart_browsing">Preferences</a>
 	is used. Search results for &quot;baby doll&quot; appear in both the
 	browser window and in Sidebar. Click the links to visit web pages about
-	baby dolls.</li>
+	baby dolls.</p></li>
     </ul>
   </li>
 </ol>
@@ -829,7 +829,7 @@ search, and save web pages.</p>
       <li><strong>Text file</strong>: Save the original page as a text file.
         This option will not preserve the original HTML link structure, but
 	will allow you to see a text version of the web page in any text
-	editor.<br/>
+	editor.
       </li>
     </ul>
   </li>
@@ -903,7 +903,7 @@ search, and save web pages.</p>
 
 <div class="noMac">
 
-<h3>Using Print Preview</h3>
+<h3 id="print_preview">Using Print Preview</h3>
 
 <p>To have an early look at how a page will look before it is
   printed, you can use Print Preview. Begin from the Navigator window:</p>
@@ -1024,14 +1024,10 @@ search, and save web pages.</p>
 	    of the following codes to print specific information: 
             <ul>
               <li><strong>&amp;PT</strong>: Page Number with Total (Example:
-	        &quot;3 of 5&quot;)<br/>
-              </li>
-              <li><strong>&amp;P</strong>: Page Number<br/>
-              </li>
-              <li><strong>&amp;D</strong>: Date<br/>
-              </li>
-              <li><strong>&amp;U</strong>: URL<br/>
-              </li>
+	        &quot;3 of 5&quot;)</li>
+              <li><strong>&amp;P</strong>: Page Number</li>
+              <li><strong>&amp;D</strong>: Date</li>
+              <li><strong>&amp;U</strong>: URL</li>
               <li><strong>&amp;T</strong>: Page Title</li>
             </ul>
           </li>
@@ -1154,8 +1150,7 @@ search, and save web pages.</p>
 <p>To adjust the readability of fonts, select from the drop-down list the dots
   per inch (dpi) for displaying Web pages. Select &quot;Other&quot; to open the
   Calibrate Resolution dialog box, which allows you to calibrate your
-  resolution by measuring how long a line appears on your screen.<br/>
-</p>
+  resolution by measuring how long a line appears on your screen.</p>
 
 <p>[<a href="#using_languages_and_international_content">Return to beginning of
   section</a>]</p>
@@ -1336,7 +1331,7 @@ search, and save web pages.</p>
   <li>Under the Navigator category, click Helper Applications. (If no
     subcategories are visible, double-click the Navigator to expand the
     list.)</li>
-  <li>Perform any of the following procedures:<br/> 
+  <li>Perform any of the following procedures:<br/>
     
     <p id="adding_a_new_helper_application">To add a new helper application
       to the list:</p>
@@ -1347,9 +1342,9 @@ search, and save web pages.</p>
 	  for instance, &quot;movies&quot; or &quot;sound files.&quot;</li>
         <li>Type the MIME type. MIME types consist of two words separated by
 	  a slash. For instance, a TIFF image file&apos;s MIME type is
-          &quot;image/tiff&quot;.<br/>
-          <strong>Note:</strong> When you download a file, &brandShortName;
-	  will show you the MIME type on the download dialog box.</li>
+          &quot;image/tiff&quot;.
+          <p><strong>Note:</strong> When you download a file, &brandShortName;
+	  will show you the MIME type on the download dialog box.</p></li>
         <li>Type the file extension (suffix) used by this file type. If this
 	  type of file uses more than one extension, type them all, separated
 	  by spaces.</li>
diff --git a/mozilla/extensions/help/resources/locale/en-US/page_info_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/page_info_help.xhtml
index 3c575b1bf51..7467b9ba3f0 100644
--- a/mozilla/extensions/help/resources/locale/en-US/page_info_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/page_info_help.xhtml
@@ -10,7 +10,7 @@
 <head>
 <title>Viewing Page Info</title>
 <link rel="stylesheet" href="chrome://help/locale/helpFileLayout.css"
-  type="text/css"></link>
+  type="text/css"/>
 </head>
 <body>
 
@@ -192,7 +192,7 @@
   messages:</p>
 
 <ul>
-  <li><b>Connection Not Encrypted.</b> It is possible that other people can
+  <li><strong>Connection Not Encrypted.</strong> It is possible that other people can
     view information sent from your computer to the website or information
     sent by the website to your computer, but it is unlikely that someone is
     actually doing so.</li>
@@ -206,11 +206,11 @@
     ways:</p>
 
   <ul>
-    <li><b>High-grade encryption.</b> Strongest encryption available, using
+    <li><strong>High-grade encryption.</strong> Strongest encryption available, using
       128-bit keys at a minimum.</li>
-    <li><b>Medium-grade encryption.</b> Somewhat stronger than low-grade
+    <li><strong>Medium-grade encryption.</strong> Somewhat stronger than low-grade
       encryption, using 56- or 64-bit keys.</li>
-    <li><b>Low-grade encryption.</b> Weakest encryption available, using 40-bit
+    <li><strong>Low-grade encryption.</strong> Weakest encryption available, using 40-bit
       keys.</li>
   </ul>
 
diff --git a/mozilla/extensions/help/resources/locale/en-US/passwords_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/passwords_help.xhtml
index 1570e611360..622c9969829 100644
--- a/mozilla/extensions/help/resources/locale/en-US/passwords_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/passwords_help.xhtml
@@ -10,7 +10,7 @@
 <head>
 <title>Password Settings</title>
 <link rel="stylesheet" href="chrome://help/locale/helpFileLayout.css"
-  type="text/css"></link>
+  type="text/css"/>
 </head>
 <body>
 
diff --git a/mozilla/extensions/help/resources/locale/en-US/privacy_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/privacy_help.xhtml
index 6f018b71928..479fd6905ca 100644
--- a/mozilla/extensions/help/resources/locale/en-US/privacy_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/privacy_help.xhtml
@@ -10,7 +10,7 @@
 <head>
 <title>Privacy on the Internet</title>
 <link rel="stylesheet" href="chrome://help/locale/helpFileLayout.css"
-  type="text/css"></link>
+  type="text/css"/>
 </head>
 <body>
 
diff --git a/mozilla/extensions/help/resources/locale/en-US/privsec_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/privsec_help.xhtml
index 95d06e5b187..74c17d5a9e7 100644
--- a/mozilla/extensions/help/resources/locale/en-US/privsec_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/privsec_help.xhtml
@@ -10,7 +10,7 @@
 <head>
 <title>Privacy &amp; Security Preferences</title>
 <link rel="stylesheet" href="chrome://help/locale/helpFileLayout.css"
-  type="text/css"></link>
+  type="text/css"/>
 </head>
 
 <body>
diff --git a/mozilla/extensions/help/resources/locale/en-US/profiles_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/profiles_help.xhtml
index cbc091e0366..062a93ec098 100644
--- a/mozilla/extensions/help/resources/locale/en-US/profiles_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/profiles_help.xhtml
@@ -10,7 +10,7 @@
 <head>
 <title>Managing Profiles</title>
 <link rel="stylesheet" href="chrome://help/locale/helpFileLayout.css"
-  type="text/css"></link>
+  type="text/css"/>
 </head>
 <body>
 
diff --git a/mozilla/extensions/help/resources/locale/en-US/shortcuts-composer.xhtml b/mozilla/extensions/help/resources/locale/en-US/shortcuts-composer.xhtml
index 4cae52fe087..671ef55fe0b 100644
--- a/mozilla/extensions/help/resources/locale/en-US/shortcuts-composer.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/shortcuts-composer.xhtml
@@ -7,7 +7,7 @@
 <head>
 <title>Composer Shortcuts</title>
 <link rel="stylesheet" href="chrome://help/locale/helpFileLayout.css"
-  type="text/css"></link>
+  type="text/css"/>
 </head>
 <body>
 
diff --git a/mozilla/extensions/help/resources/locale/en-US/shortcuts-mailnews.xhtml b/mozilla/extensions/help/resources/locale/en-US/shortcuts-mailnews.xhtml
index e7820be885c..d18b328e856 100644
--- a/mozilla/extensions/help/resources/locale/en-US/shortcuts-mailnews.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/shortcuts-mailnews.xhtml
@@ -7,7 +7,7 @@
 <head>
 <title>Mail &amp; Newsgroups Shortcuts</title>
 <link rel="stylesheet" href="chrome://help/locale/helpFileLayout.css"
-  type="text/css"></link>
+  type="text/css"/>
 </head>
 <body>
 
diff --git a/mozilla/extensions/help/resources/locale/en-US/shortcuts-navigator.xhtml b/mozilla/extensions/help/resources/locale/en-US/shortcuts-navigator.xhtml
index 73a25a2b6e5..41babbb36e6 100644
--- a/mozilla/extensions/help/resources/locale/en-US/shortcuts-navigator.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/shortcuts-navigator.xhtml
@@ -7,7 +7,7 @@
 <head>
   <title>Navigator Shortcuts</title>
 <link rel="stylesheet" href="chrome://help/locale/helpFileLayout.css"
-  type="text/css"></link>
+  type="text/css"/>
 </head>
 <body>
 
diff --git a/mozilla/extensions/help/resources/locale/en-US/shortcuts.xhtml b/mozilla/extensions/help/resources/locale/en-US/shortcuts.xhtml
index 4ce81d1a21e..ab6e28bc199 100644
--- a/mozilla/extensions/help/resources/locale/en-US/shortcuts.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/shortcuts.xhtml
@@ -10,7 +10,7 @@
 <head>
 <title>&brandShortName; Keyboard Shortcuts</title>
 <link rel="stylesheet" href="chrome://help/locale/helpFileLayout.css"
-  type="text/css"></link>
+  type="text/css"/>
 </head>
 <body>
 
diff --git a/mozilla/extensions/help/resources/locale/en-US/using_certs_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/using_certs_help.xhtml
index d1eb3cbccdd..a306dc35680 100644
--- a/mozilla/extensions/help/resources/locale/en-US/using_certs_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/using_certs_help.xhtml
@@ -10,7 +10,7 @@
 <head>
 <title>Using Certificates</title>
 <link rel="stylesheet" href="chrome://help/locale/helpFileLayout.css"
-  type="text/css"></link>
+  type="text/css"/>
 </head>
 <body>
 
@@ -98,19 +98,19 @@
 <table summary="lock icons">
   <tr>
     <td><img alt="closed lock icon"
-      src="chrome://communicator/skin/icons/lock-secure.gif"></img></td>
+      src="chrome://communicator/skin/icons/lock-secure.gif"/></td>
     <td>A closed lock means that the page was protected by encryption when it
       was received.</td>
   </tr>
   <tr>
     <td><img alt="open lock icon"
-      src="chrome://communicator/skin/icons/lock-insecure.gif"></img></td>
+      src="chrome://communicator/skin/icons/lock-insecure.gif"/></td>
     <td>An open lock means the page was not protected by encryption when it was
       received.</td>
   </tr>
   <tr>
     <td><img alt="broken lock icon"
-      src="chrome://communicator/skin/icons/lock-broken.gif"></img></td>
+      src="chrome://communicator/skin/icons/lock-broken.gif"/></td>
     <td>A broken lock means that some or all of the elements within the page
       were not protected by encryption when the page was received, even though
       the outermost HTML page was encrypted.</td>
diff --git a/mozilla/extensions/help/resources/locale/en-US/using_priv_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/using_priv_help.xhtml
index 319a590eb0a..fc83672a8fc 100644
--- a/mozilla/extensions/help/resources/locale/en-US/using_priv_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/using_priv_help.xhtml
@@ -10,7 +10,7 @@
 <head>
 <title>Using Privacy Features</title>
 <link rel="stylesheet" href="chrome://help/locale/helpFileLayout.css"
-  type="text/css"></link>
+  type="text/css"/>
 </head>
 <body>
 
@@ -210,7 +210,7 @@
 <p>If you choose Reject, Flag, or Session for a given category of cookies, the
   Cookie Manager displays the cookie notification icon
   (<img alt="cookie notification icon"
-  src="chrome://cookie/content/taskbar-cookie.gif"></img>)
+  src="chrome://cookie/content/taskbar-cookie.gif"/>)
   near the lower-right corner of the browser window whenever a website that
   fits the category sets a cookie. When this icon is displayed, you can click
   it to get information about the affected cookies.</p>
@@ -519,7 +519,7 @@
 
     <p>When a cookie is first flagged, the Cookie Manager displays the cookie
       notification icon (<img alt="cookie notification icon"
-      src="chrome://cookie/content/taskbar-cookie.gif"></img>) near the
+      src="chrome://cookie/content/taskbar-cookie.gif"/>) near the
       lower-right corner of the browser window (if it&apos;s not already
       present). You can click the cookie notification icon to see more detailed
       information about the flagged cookies.</p>
@@ -569,7 +569,7 @@
 </ul>
 
 <p>The cookie notification icon (<img alt="cookie notification icon"
-  src="chrome://cookie/content/taskbar-cookie.gif"></img>) appears near the
+  src="chrome://cookie/content/taskbar-cookie.gif"/>) appears near the
   lower-right corner of the browser window. You can click it to get information
   about the affected cookies or modify your privacy settings.</p>
 
@@ -595,7 +595,7 @@
 <h2 id="cookie_notification">Cookie Notification</h2>
 
 <p>The cookie notification icon (<img alt="cookie notification icon"
-  src="chrome://cookie/content/taskbar-cookie.gif"></img>) is displayed in the
+  src="chrome://cookie/content/taskbar-cookie.gif"/>) is displayed in the
   status bar near the lower-right corner of the browser window. It appears when
   a website has used a cookie in a way that requires you to be notified
   according to your current <a href="#privacy_settings">Privacy
diff --git a/mozilla/extensions/help/resources/locale/en-US/validation_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/validation_help.xhtml
index 9803b24b79d..9dca633ba18 100644
--- a/mozilla/extensions/help/resources/locale/en-US/validation_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/validation_help.xhtml
@@ -10,7 +10,7 @@
 <head>
 <title>Validation Settings</title>
 <link rel="stylesheet" href="chrome://help/locale/helpFileLayout.css"
-  type="text/css"></link>
+  type="text/css"/>
 </head>
 <body>