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 0e9f7888c67..28fb3dcda86 100644
--- a/mozilla/extensions/help/resources/locale/en-US/nav_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/nav_help.xhtml
@@ -207,7 +207,7 @@
   the Location Bar.</p>
 
 <p><strong>Tip</strong>: To quickly open the history list, press
-  <kbd class="mac">Cmd</kbd>+<kbd class="mac">Shift</kbd><kbd
+  <span class="mac"><kbd>Cmd</kbd>+<kbd>Shift</kbd></span><kbd
   class="noMac">Ctrl</kbd>+<kbd>H</kbd>.</p>
 
 <p>If you don&apos;t want the Location Bar or history list to display the pages
@@ -219,15 +219,15 @@
 
 <ol>
   <li>Open the
-    <span class="mac">&brandShortName;</span> <span class="noMac">Edit</span>
+    <span class="mac">&brandShortName;</span><span class="noMac">Edit</span>
     menu and choose Preferences.</li>
   <li>Under the Navigator category, click History. (If no subcategories are
     visible, double-click Navigator to expand the list.)</li>
   <li>Click Clear History and Clear Location Bar to remove all previously
     visited web pages from the lists.</li>
-  <li>If you wish to set a limit on how many pages remain in the history list,
-    click the field next to <q>Number of pages in session history</q> and
-    type a number of pages.</li>
+  <li>If you wish to set a limit on how long pages remain in the history list,
+    click the field next to <q>Remember visited pages for the last [__] days
+    </q> and type a number of pages.</li>
 </ol>
 
 <p>To selectively delete pages from the history list, do any of the
@@ -236,7 +236,7 @@
 <ul>
   <li>To delete all pages from a domain, select a page within that domain
     (folder) in the History list, open the Edit menu, and select <q>Delete
-    entire domain <em>[domain name]</em></q>. For example, use this command
+    entire domain <em>*.[domain name]</em></q>. For example, use this command
     if you want to delete all pages that end in <q>mozilla.org</q>.</li>
   <li>To delete pages from a subdomain, select a page within that subdomain in
     the History list, open the Edit menu, and select <q>Delete all from
@@ -402,9 +402,9 @@
   <li>Perform one of these steps:
     <ul>
       <li>Click the Search button.</li>
-      <li>Click <q>Search &brandShortName; Search for <q>baby doll</q></q>
-        at the bottom of the drop-down list in the Location Bar. (Your default
-        search engine may be different.)
+      <li>Click <q>Search Google for <q>baby doll</q></q> at the bottom of the
+        drop-down list in the Location Bar. (Your default search engine may be
+        different.)
 
         <p>The default search engine you choose in
           <a href="cs_nav_prefs_navigator.xhtml#smart_browsing">Preferences</a>
@@ -430,7 +430,7 @@
 
 <ol>
   <li>If it is not already open, open Sidebar by clicking its handle. If the
-    handle is missing, <span class="noMac">press <kbd>F9</kbd> or</span>open
+    handle is missing, <span class="noMac">press <kbd>F9</kbd> or </span>open
     the View menu in Navigator, choose Show/Hide, and then Sidebar from the
     submenu.</li>
   <li>Click the Search tab in Sidebar.</li>
@@ -465,7 +465,7 @@
 
 <ul>
   <li>Click on the Search button <img src="images/search_personal_toolbar.gif"
-    width="66" height="20" alt="search button"/> on the Personal Toolbar.</li>
+    width="66" height="20" alt="search button"/> on the Navigation Toolbar.</li>
   <li>Open the Tools menu and choose Search the Web.</li>
 </ul>
 
@@ -598,7 +598,7 @@
     instance, type <q>san francisco restaurants</q>.</li>
 </ul>
 
-<p><strong>Important:</strong> To use Internet Keywords, you must press
+<p><strong>Important</strong>: To use Internet Keywords, you must press
   <kbd class="mac">Return</kbd><kbd class="noMac">Enter</kbd>
   on your keyboard instead of clicking the Search button.
   Pressing <kbd class="mac">Return</kbd><kbd class="noMac">Enter</kbd>
@@ -644,15 +644,15 @@
   <li>Type the text you want to find.</li>
   <li>Choose from the following search options: 
     <ul>
-      <li><strong>Match upper/lower case:</strong> Choose this to search for a
+      <li><strong>Match upper/lower case</strong>: Choose this to search for a
         word or phrase that matches the word you typed exactly (including
         uppercase and lowercase letters).</li>
-      <li><strong>Wrap around:</strong> Choose this to allow the browser to
+      <li><strong>Wrap around</strong>: Choose this to allow the browser to
         search from the where the cursor is to the bottom of the page and then
         continue searching from the top of the page. Note: Normally, the page
         is searched from the place where you last clicked your mouse to the
         bottom of the page.</li>
-      <li><strong>Search backwards:</strong> Choose this to search from the
+      <li><strong>Search backwards</strong>: Choose this to search from the
         insertion point backwards to the top of the page.</li>
     </ul>
   </li>
@@ -720,8 +720,8 @@
   <li>Use the drop-down lists to select options to define your search. Choose
     from the following search options:
     <ul>
-      <li>Choose <q>name</q>, <q>description</q>, or <q>keyword</q> to
-        choose where you would like to search.</li>
+      <li>Choose <q>name</q>, <q>location</q>, <q>description</q>, or
+        <q>keyword</q> to choose where you would like to search.</li>
       <li>Choose <q>contains</q>, <q>starts with</q>, or <q>ends
         with</q> if you know only part of the word or phrase for which
         you&apos;re searching.</li>
@@ -729,11 +729,10 @@
         for.</li>
       <li>Choose <q>is not</q> or <q>doesn&apos;t contain</q> to
         exclude pages.</li>
-      <li>Click in the field and type all or part of word or URL (web address)
-        for the bookmarks that you want to find or exclude.</li>
+      <li>Click in the field and type all or part of search word or URL (web
+        address) for the bookmarks that you want to find or exclude.</li>
     </ul>
   </li>
-  <li>Type a search word.</li>
   <li>Click Find. Bookmarks that match your search criteria are displayed in
     the Search Results-Bookmarks window.</li>
 </ol>
@@ -884,7 +883,7 @@
   <li>Type a file name for the page and click Save.</li>
 </ol>
 
-<p><strong>Important:</strong> Some links automatically download and save files
+<p><strong>Important</strong>: Some links automatically download and save files
   to your hard drive after you click them. The URLs for these links often begin
   with <q>ftp</q> or end with a file-type extension such as <q>au</q>
   or <q>mpeg</q>. These links might transmit software, sound, or movie
@@ -925,14 +924,17 @@
   printed, you can use Print Preview. Begin from the Navigator window:</p>
 
 <ul>
-  <li>From Navigator, open the File menu and choose Print Preview.</li>
+  <li>Open the File menu and choose Print Preview.</li>
 </ul>
 
-<p>In Print Preview, you can do the following with pages you want
-  to print:</p>
+<p>In Print Preview, you have the following options:</p>
 
 <ul>
-  <li><strong>View a preview of each page</strong>: Click the First
+  <li class="win"><strong>Print</strong>: Click this to print pages.</li>
+  <li class="win"><strong>Page Setup</strong>: Click to further customize pages
+    you want to print.</li>
+  <li><strong>Page [__] of X</strong>: Enter a page number (less than X) to
+    jump to its preview. Click the First
     <img src="chrome://navigator/skin/btn1/first.gif" alt="first button"/>,
     Previous <img src="chrome://navigator/skin/btn1/previous.gif"
     alt="previous button"/>, Next
@@ -940,26 +942,23 @@
     or Last
     <img src="chrome://navigator/skin/btn1/last.gif" alt="last button"/> button
     to move between pages.</li>
-  <li><strong>Change the scale (size) of pages</strong>: In the Scale field,
-    type in a percentage of the original size and Press
-    <kbd class="mac">Return</kbd><kbd class="noMac">Enter</kbd>. For
-    example, type <q>50</q> and press <kbd class="mac">Return</kbd>
-    <kbd class="noMac">Enter</kbd> to make each page half the size of the
-    original page. Click the Up
-    <img src="chrome://global/skin/arrow/arrow-up-sharp.gif" alt="up button"/>
-    or Down <img src="chrome://global/skin/arrow/arrow-dn-sharp.gif"
-    alt="down button"/> button to resize up or down by an increment of one,
-    respectively.</li>
-  <li><strong>Change the direction of the page</strong>: Choose Portrait
-    <img src="chrome://communicator/skin/icons/pg-portrait-small.gif"
-    alt="portrait button"/> to position the page normally, with the shorter
-    side facing up. Choose Landscape
-    <img src="chrome://communicator/skin/icons/pg-landscape-small.gif"
-    alt="landscape button"/> to position the page sideways, with the longer
-    side facing up.</li>
-  <li><strong>Go to Page Setup</strong>: Click Page Setup to further customize
-    pages you want to print.</li>
-  <li><strong>Go to Print</strong>: Click Print to print pages.</li>
+  <li class="win"><strong>Scale</strong>: Changes the scale (size) of pages,
+    using the dropdown list. You can choose between a fixed percentage of the
+    original page and two special options:
+    <ul>
+      <li><strong>Shrink To Fit Page Width</strong>: Select this to
+        automatically resize the page to the width of the paper.</li>
+      <li><strong>Custom</strong>: Type in the percentage of the original size
+        and press Enter. For example, type <q>50</q> and press Enter to make
+        each page half the size of the original page.</li>
+    </ul>
+  </li>
+  <li class="win"><strong>Portrait</strong>: Click on this to position the page
+    normally, with the shorter side facing up.</li>
+  <li class="win"><strong>Landscape</strong>: Click on this to position the
+    page sideways, with the longer side facing up.</li>
+  <li><strong>Close</strong>: Click on this to close the print preview
+    dialog.</li>
 </ul>
 
 </div>
@@ -982,11 +981,11 @@
       <li><strong>Orientation</strong>: 
         <ul>
           <li><strong>Portrait</strong>: Choose this
-            <img src="chrome://communicator/skin/icons/pg-portrait-small.gif"
+            <img src="chrome://global/skin/icons/pg-portrait-small.gif"
             alt="portrait button"/> to position the page normally, with the
             shorter side facing up.</li>
           <li><strong>Landscape</strong>: Choose this
-            <img src="chrome://communicator/skin/icons/pg-landscape-small.gif"
+            <img src="chrome://global/skin/icons/pg-landscape-small.gif"
             alt="landscape button"/> to position the page sideways, with the
             longer side facing up.</li>
         </ul>
@@ -1011,7 +1010,7 @@
   <li><strong>Margins &amp; Header/Footer</strong>: Click this tab to set up
     margins, headers, and footers:
     <ul>
-      <li><strong>Margins:</strong> 
+      <li><strong>Margins</strong>: 
         <ul>
           <li><strong>Top, Bottom, Left, Right</strong>: Type a margin in
             inches for the top, bottom, left, and right margin.</li>
@@ -1029,8 +1028,7 @@
             start with <q>http://</q>).</li>
           <li><strong>Date/Time</strong>: Show the date and time when the web
             page is printed.</li>
-          <li><strong>Page #</strong>: Show the page number of each page. For
-            example,</li>
+          <li><strong>Page #</strong>: Show the page number of each page.</li>
           <li><strong>Page # of #</strong>: Show the page number along with the
             total number of pages. For example, if you print a five page web
             page, <q>3 of 5</q> would be shown on the third page.</li>
@@ -1230,7 +1228,7 @@
   <li>Click OK.</li>
 </ol>
 
-<p><strong>Note:</strong> Two-letter codes enclosed in brackets appear next to
+<p><strong>Note</strong>: Two-letter codes enclosed in brackets appear next to
   each language in the list. These are standard abbreviations for languages.
   For a complete list, see the online document,
   <a href="http://www.loc.gov/standards/iso639-2/langcodes.html">Codes for the
@@ -1243,9 +1241,9 @@
   own language</h2>
 
 <p>If you're looking for a version of &brandShortName; in a language other than
-  American English, you can download it from
-  <a href="http://www.mozilla.org/projects/l10n/">Mozilla Localization
-    Project</a>.</p>
+  American English, you can download it from the
+  <a href="http://www.mozilla.org/projects/seamonkey/releases/">SeaMonkey 
+  Project Releases</a> page.</p>
 
 <p>[<a href="#using_languages_and_international_content">Return to beginning of
   section</a>]</p>
@@ -1350,7 +1348,7 @@
         a slash. For instance, a TIFF image file&apos;s MIME type is
         <q>image/tiff</q>.
 
-        <p><strong>Note:</strong> When you download a file, &brandShortName;
+        <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
@@ -1535,7 +1533,7 @@
     is sufficient. To clear the cache immediately, click Clear Cache.</li>
 </ol>
 
-<p><strong>Important:</strong> A larger disk cache allows more pages to be
+<p><strong>Important</strong>: A larger disk cache allows more pages to be
   quickly retrieved, but more of your hard disk space is used.</p>
 
 <p>When you quit &brandShortName;, it performs cache maintenance. If
@@ -1698,7 +1696,7 @@
       </tr>
     </table>
 
-    <p><strong>Tip:</strong> To quickly start components (such as Composer,
+    <p><strong>Tip</strong>: To quickly start components (such as Composer,
       Mail &amp; Newsgroups, and the Address Book window), right-click the
       &brandShortName; logo icon and select the component in the pop-up
       menu.</p>
@@ -1722,7 +1720,7 @@
         Launch.</li>
       <li>Click OK.
 
-        <p><strong>Tip:</strong> To easily disable Quick Launch, right-click on
+        <p><strong>Tip</strong>: To easily disable Quick Launch, right-click on
           the &brandShortName; logo in the system tray (near the time) and
           select <q>Disable Quick Launch</q> in the pop-up menu.</p>
       </li>