diff --git a/mozilla/extensions/help/resources/locale/en-US/composer_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/composer_help.xhtml
index 46bfd62ab42..ad1a663d410 100644
--- a/mozilla/extensions/help/resources/locale/en-US/composer_help.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/composer_help.xhtml
@@ -37,7 +37,7 @@
     <li><a href="#starting_a_new_page">Starting a New Page</a></li>
 	<li><a href="#formatting_your_web_pages">Formatting Your Web Pages</a></li>
 	<li><a href="#adding_tables_to_your_web_page">Adding Tables to Your Web Page</a></li>
-	<li><a href="#adding_pictures_to_your_web_page">Adding Pictures (Images) to Your Web Page</a></li>
+	<li><a href="#adding_images_to_your_web_page">Adding Pictures (Images) to Your Web Page</a></li>
 	<li><a href="#setting_page_properties">Setting Page Properties</a></li>
 	<li><a href="#creating_links_in_composer">Creating Links in Composer</a></li>
 	<li><a href="#publishing_your_pages_on_the_web">Publishing Your Pages on the Web</a></li>
@@ -104,7 +104,7 @@
   <li>Open the Window menu and choose Navigator.</li>
   <li>Go to a web page by typing the URL of the page (for example,
     <tt>http://www.mozilla.org</tt>) in the Location Bar and pressing Enter (Return on
-	Macintosh OS).</li>
+	Mac OS).</li>
   <li>Open the File menu and choose Edit Page.</li>
 </ol>
 
@@ -144,7 +144,7 @@
 <p>When you save a page in Composer, all parts of the page (the HTML, images and other
   files, such as sound files and style sheets), are saved locally on your hard drive. If
   you only want to save the HTML part of the page, you must change the Composer preference
-  for saving pages. See <a href="#composer_preferences_composer">Composer Preferences - Composer</a>
+  for saving pages. See <a href="#composer">Composer Preferences - Composer</a>
   for more information on changing Composer's setting for saving pages.</p>
 
 <p>If an image location is absolute (starts with "http://") and you are connected to the
@@ -179,7 +179,7 @@
 
 <div class="contentsBox">In this section:
   <ul>
-    <li><a href="#formatting_paragaphs_headings_and_lists">Formatting Paragraphs, Headings, and Lists</a></li>
+    <li><a href="#formatting_paragraphs_headings_and_lists">Formatting Paragraphs, Headings, and Lists</a></li>
 	<li><a href="#working_with_lists">Working with Lists</a></li>
 	<li><a href="#changing_text_color_style_and_font">Changing Text Color, Style, and Font</a></li>
 	<li><a href="#removing_or_discontinuing_text_styles">Removing or Discontinuing Text Styles</a></li>
@@ -192,7 +192,7 @@
   </ul>
 </div>
 
-<h2 id="formatting_paragaphs_headings_and_lists">Formatting Paragraphs, Headings, and Lists</h2>
+<h2 id="formatting_paragraphs_headings_and_lists">Formatting Paragraphs, Headings, and Lists</h2>
 
 <p>To apply a format to a paragraph, begin from the Composer window:</p>
 
@@ -320,7 +320,7 @@ align text.</p>
 
 <ul>
 <li>Click to place the insertion point at the end of the last list
-item and press Enter (Return on Macintosh OS) twice to end the
+item and press Enter (Return on Mac OS) twice to end the
 list.</li>
 </ul>
 
@@ -642,7 +642,7 @@ dialog box, follow these steps:</p>
       <li><b>Inline Style</b>: Click this tab to view or enter additional CSS
 	    (cascading style sheet) properties through the &lt;style&gt; attribute.
 		For more information on using CSS styles in Composer, see
-		<a href="#composer_preferences_composer">Composer Preferences -Composer</a>.</li>
+		<a href="#composer">Composer Preferences -Composer</a>.</li>
       <li><b>JavaScript Events</b>: Click this tab to view or enter JavaScript events.</li>
         </ul></li>
   <li>To edit a property or attribute in any of the three lists, select the attribute you
@@ -816,7 +816,7 @@ Insert menu and choose Table.</p>
 	    leave it as transparent.</li>
       </ul></li>
   <li>To apply additional attributes or JavaScript events, click Advanced Edit to display
-    the <a href="#formatting_paragaphs_headings_and_lists">Advanced Property Editor</a>.</li>
+    the <a href="#formatting_paragraphs_headings_and_lists">Advanced Property Editor</a>.</li>
   <li>Click Apply to preview your changes without closing the dialog box, or click OK to
     confirm them.</li>
 </ol>
@@ -887,7 +887,7 @@ table within a table cell.)</li>
 select neighboring cells to delete more than one row at a time. To
 select neighboring cells, drag over the cells you want to select.
 To select individual cells in a table, hold down the Ctrl key
-(Windows and Linux) or the Command key (Macintosh OS) and click on
+(Windows, Linux or Unix) or the Command key (Mac OS) and click on
 the cells you want to select.</li>
 
 <li>Open the Table menu and choose Delete.</li>
@@ -922,7 +922,7 @@ cell into the first of the two cells.</li>
 for information on how to select non-adjacent cells, rows, and
 columns.</p>
 
-<h3 id="changing_the_default_table_table_editing_behavior">Changing the Default Table Editing Behavior</h3>
+<h3 id="changing_the_default_table_editing_behavior">Changing the Default Table Editing Behavior</h3>
 
 <p>By default, when you delete one or more cells, Composer
 preserves the table's structure by adding cells at the end of a
@@ -951,7 +951,7 @@ irregularly shaped table.</li>
 <li>Click OK.</li>
 </ol>
 
-<p>See also <a href="#composer_preferences_composer">Setting General Composer Preferences</a>.</p>
+<p>See also <a href="#composer">Setting General Composer Preferences</a>.</p>
 
 <p class="returnToSection">[ <a href="#adding_tables_to_your_web_page">Return to beginning of section</a> ]</p>
 
@@ -973,9 +973,9 @@ Select, and then choose Table.</li>
 drag to select the cells you want. Drag the mouse left or right to
 select a row; up or down to select a column.</li>
 
-<li>To select non-adjacent cells: press Ctrl (Windows or Linux) or
-Command (Macintosh OS) and then click inside a cell. Keep pressing
-Ctrl (Windows or Linux) or Command (Macintosh OS) as you click to
+<li>To select non-adjacent cells: press Ctrl (Windows, Linux or Unix) or
+Command (Mac OS) and then click inside a cell. Keep pressing
+Ctrl (Windows, Linux or Unix) or Command (Mac OS) as you click to
 select additional cells.</li>
 
 <li>To extend a selection to include adjacent cells: click inside a
@@ -1042,7 +1042,7 @@ selected text is converted to a table.</p>
 
 <p class="returnToSection">[ <a href="#adding_tables_to_your_web_page">Return to beginning of section</a> ]</p>
 
-<h1 id="adding_pictures_to_your_web_page">Adding Pictures (Images) to Your Web Page</h1>
+<h1 id="adding_images_to_your_web_page">Adding Pictures (Images) to Your Web Page</h1>
 
 <div class="contentsBox">In this section:
   <ul>
@@ -1098,7 +1098,7 @@ your page.</p>
 <p><b>Tip</b>: To insert a line break after all images in a
 paragraph, choose Break Below Images from the Insert menu.</p>
 
-<p class="returnToSection">[ <a href="#adding_pictures_to_your_web_page">Return to beginning of section</a> ]</p>
+<p class="returnToSection">[ <a href="#adding_images_to_your_web_page">Return to beginning of section</a> ]</p>
 
 <h2 id="editing_image_properties">Editing Image Properties</h2>
 
@@ -1180,7 +1180,7 @@ paragraph, choose Break Below Images from the Insert menu.</p>
   <li>Click OK to confirm your changes.</li>
 </ol>
 
-<p class="returnToSection">[ <a href="#adding_pictures_to_your_web_page">Return to beginning of section</a> ]</p>
+<p class="returnToSection">[ <a href="#adding_images_to_your_web_page">Return to beginning of section</a> ]</p>
 
 <h1 id="setting_page_properties">Setting Page Properties</h1>
 
@@ -1196,7 +1196,7 @@ paragraph, choose Break Below Images from the Insert menu.</p>
 <p>Use the Page Properties dialog box to enter properties such as
 the title, author, and description of the document you're currently
 working on. This information is useful if you plan to use the page
-on a web site, since search engines use this type of information to
+on a website, since search engines use this type of information to
 index your page. You can view this information from the browser
 window by opening the View menu and choosing Page Info.</p>
 
@@ -1218,7 +1218,7 @@ document by using a web search tool to search on name.
 
 <blockquote>
 <p><b>Tip</b>: If you enter the Author name in Composer's
-<a href="#composer_preferences_new_page_settings">preferences</a>,
+<a href="#new_page_settings">preferences</a>,
 then you won't have to enter it each time you create a new page.</p>
 </blockquote>
 </li>
@@ -1290,7 +1290,7 @@ order to enable this checkbox.</p>
 <p><b>Note</b>: To apply additional attributes or JavaScript events, click Advanced Edit
 to display the <a href="#using_the_advanced_property_editor">Advanced Property Editor</a>.</p>
 
-<p>You can also set the <a href="#composer_preferences_new_page_settings">default page
+<p>You can also set the <a href="#new_page_settings">default page
 background and colors</a> for every new page you create in Composer.</p>
 
 <p class="returnToSection">[ <a href="#setting_page_properties">Return to beginning of section</a> ]</p>
@@ -1399,7 +1399,7 @@ them.</p>
 the link from another window and then dropping it onto your page.
 For example, you can click and drag a link from a web page,
 bookmark, or Mail window and drop it onto your page. You can also
-right-click (Control+click on Macintosh OS) a link on a web page
+right-click (Control+click on Mac OS) a link on a web page
 and choose Copy Link Location from the menu. Then you can paste the
 link location into the Link Location field in the Link Properties
 dialog box.</p>
@@ -1474,7 +1474,7 @@ ask your ISP, help desk, or system administrator.</p>
 	<li><a href="#updating_a_published_document">Updating a Published Document</a></li>
 	<li><a href="#changing_the_filename_or_publishing_location">Changing the Filename or Publishing Location</a></li>
 	<li><a href="#creating_a_new_publishing_site">Creating a New Publishing Site</a></li>
-	<li><a href="#changing_the_default_publishing_site">Changing the Default Publishing Site</a></li>
+	<li><a href="#choosing_the_default_publishing_site">Choosing the Default Publishing Site</a></li>
 	<li><a href="#deleting_a_publishing_site">Deleting a Publishing Site</a></li>
 	<li><a href="#solving_common_publishing_problems">Solving Common Publishing Problems</a></li>
 	<li><a href="#publishing_settings">Publishing Settings</a></li>
@@ -1521,7 +1521,7 @@ location on your hard disk for the document.</p>
 
 <p class="returnToSection">[ <a href="#publishing_your_pages_on_the_web">Return to beginning of section</a> ]</p>
 
-<h3 id="avoiding_broken_links_or_images">Tips for Avoiding Broken Links or Missing Images</h3>
+<h3 id="tips_for_avoiding_broken_links_or_missing_images">Tips for Avoiding Broken Links or Missing Images</h3>
 
 <ul>
 <li>Make sure your Composer filenames end with the .html or .htm
@@ -1565,7 +1565,7 @@ program. You also must use an FTP program if you want to create
 subdirectories or to rename files on the web server. Ask your
 service provider if they recommend a particular FTP program. You
 can usually find information on FTP programs in the Help or Support
-sections of your service provider's web site. FTP programs are also
+sections of your service provider's website. FTP programs are also
 available from shareware sites such as ZDNet Downloads.</p>
 
 <p class="returnToSection">[ <a href="#publishing_your_pages_on_the_web">Return to beginning of section</a> ]</p>
@@ -1652,7 +1652,7 @@ publish pages at this site.</li>
 
 <p class="returnToSection">[ <a href="#publishing_your_pages_on_the_web">Return to beginning of section</a> ]</p>
 
-<h2 id="changing_the_default_publishing_site">Changing the Default Publishing Site</h2>
+<h2 id="choosing_the_default_publishing_site">Choosing the Default Publishing Site</h2>
 
 <p>If you have set up more than one publishing site, but you
 typically use only one site for most of your publishing needs, you
@@ -1885,7 +1885,7 @@ determine what went wrong and what to do to fix the problem.</p>
   <li>Use a separate FTP program if you want to create, rename, or delete subdirectories at
     the publishing site. Ask your service provider if they recommend a particular FTP
 	program. You can usually find information on FTP programs in the Help or Support
-	sections of your service provider's web site. FTP programs are also available from
+	sections of your service provider's website. FTP programs are also available from
 	shareware sites such as ZDNet Downloads.</li>
   <li>Don't use subdirectory names that end with ".html" or ".htm". Only your Composer
     filenames should end with ".html" or ".htm".</li>
@@ -1924,8 +1924,8 @@ determine what went wrong and what to do to fix the problem.</p>
 	<tt>http://www.mozilla.org</tt>.</li>
   <li>If your Internet connection is not working, verify that all hardware, telephone
     connections, modems, and network connections are functioning properly.</li>
-  <li>Use the Navigator browser to try to view a page at the web site you are attempting
-    to publish to. If you can successfully view other web sites but cannot view a page at
+  <li>Use the Navigator browser to try to view a page at the website you are attempting
+    to publish to. If you can successfully view other websites but cannot view a page at
 	the publishing site, your ISP or web hosting service may be experiencing technical
 	problems.</li>
  <li>Try publishing again later. Your ISP, web hosting service, or the web server may be
@@ -1972,13 +1972,13 @@ determine what went wrong and what to do to fix the problem.</p>
 
 <p>Verify that your Internet connection is currently offline by looking at the online/offline
   icon in the lower right corner of any &brandShortName; window. If you are currently offline, the
-  icon appears as <img src="images/offline.gif" width="32" height="21" alt="" />.</p>
+  icon appears as <img src="images/offline.png" width="32" height="21" alt="" />.</p>
 
 <p><strong>Possible Solutions:</strong></p>
 
 <ul>
   <li>Click the online/offline icon to go online. In the online state, the icon should look
-    like this: <img src="images/online.gif" width="32" height="20" alt="" />.</li>
+    like this: <img src="images/online.png" width="32" height="20" alt="" />.</li>
   <li>Make sure your Internet connection is working by attempting to view a web page using
     the Navigator browser. For example, confirm that you can successfully view the page
     <tt>http://www.mozilla.org</tt>.</li>
@@ -2002,7 +2002,7 @@ determine what went wrong and what to do to fix the problem.</p>
   <li>Use a separate FTP program to delete unnecessary files at your publishing site. Ask
     your service provider if they recommend a particular FTP program. You can usually find
 	information on FTP programs in the Help or Support sections of your service provider's
-    web site. FTP programs are also available from shareware sites such as ZDNet
+    website. FTP programs are also available from shareware sites such as ZDNet
 	Downloads.</li>
   <li>Find out from your ISP or web hosting service about increasing your disk space
     allocation, or switch to a different service that can satisfy your needs.</li>
@@ -2111,7 +2111,7 @@ published pages or images, you must use an FTP (File Transfer
 Protocol) program. Ask your service provider if they recommend a
 particular FTP program. You can usually find information on FTP
 programs in the Help or Support sections of your service provider's
-web site. FTP programs are also available from shareware sites such
+website. FTP programs are also available from shareware sites such
 as ZDNet Downloads.</p>
 
 <p class="returnToSection">[ <a href="#publishing_your_pages_on_the_web">Return to beginning of section</a> ]</p>
@@ -2132,7 +2132,7 @@ as ZDNet Downloads.</p>
 <ul>
   <li><b>Site Name</b>: Specifies the nickname you want to use for this publishing site.
     Enter a short name that will help you identify this publishing site.</li>
-  <li id="host_name_for_publishingSDX"><b>Publishing address</b>: Specifies the complete
+  <li><b>Publishing address</b>: Specifies the complete
     URL provided to you by your ISP or system administrator. This URL should begin with
 	either <tt>ftp://</tt> or <tt>http://</tt>. This name is often referred to as the
 	"host name" or the "host server name".</li>
@@ -2141,7 +2141,7 @@ as ZDNet Downloads.</p>
 	  at this site. If you are not sure what to enter, ask your ISP or system administrator.
 	  </p></li>
   <li><b>HTTP address of your home page</b>: Specifies the complete address of your publishing
-    home directory. This is the web address of the home page at your web site. Do not include
+    home directory. This is the web address of the home page at your website. Do not include
 	a filename or subdirectory as part of the URL.</li>
   <li style="list-style-type: none; list-style-position: outside; list-style-image: none;">
     <p>This URL must always begin with <tt>http://</tt>. In some cases, this URL is the same
@@ -2234,8 +2234,7 @@ panel. If you are not currently viewing the panel, follow these
 steps:</p>
 
 <ol>
-  <li>Open the Edit menu and choose Preferences.
-    <p>(Mac OS X) Open the &brandShortName; menu and choose Preferences.</p></li>
+  <li>Open the Edit menu (&brandShortName; menu on Mac OS X) and choose Preferences.</li>
   <li>Double-click the Composer category to expand the list.</li>
 </ol>
 
@@ -2244,12 +2243,12 @@ steps:</p>
 
 <div class="contentsBox">In this section:
   <ul>
-    <li><a href="#composer_preferences_composer">Composer</a></li>
-	<li><a href="#composer_preferences_new_page_settings">New Page Settings</a></li>
+    <li><a href="#composer">Composer</a></li>
+	<li><a href="#new_page_settings">New Page Settings</a></li>
   </ul>
 </div>
 
-<h2 id="composer_preferences_composer">Composer Preferences - Composer</h2>
+<h2 id="composer">Composer Preferences - Composer</h2>
 
 <p>Composer preferences allow you to specify settings for saving
 files and for table editing. These settings apply to every document
@@ -2259,7 +2258,7 @@ you create.</p>
 these steps:</p>
 
 <ol>
-<li>Open the Edit menu and choose Preferences.</li>
+<li>Open the Edit menu (&brandShortName; menu on Mac OS X) and choose Preferences.</li>
 
 <li>Click the Composer category.</li>
 </ol>
@@ -2308,7 +2307,7 @@ more cells, Composer removes the cell border as well, which can
 result in a table with empty spaces, or an outline that appears
 irregular due to an uneven number of cells.</li>
 
-<li id="use_css_syles" style="list-style-type: none; list-style-position: outside; list-style-image: none;"> 
+<li id="use_css_styles" style="list-style-type: none; list-style-position: outside; list-style-image: none;"> 
 <strong>Use CSS styles instead of HTML elements and
 attributes</strong>: Enables the use of Cascading Style Sheet (CSS)
 formatting in your Composer documents. With this preference
@@ -2336,7 +2335,7 @@ preference is not enabled.)</p>
 
 <p class="returnToSection">[ <a href="#composer_preferences">Return to beginning of section</a> ]</p>
 
-<h2 id="composer_preferences_new_page_settings">Composer Preferences - New Page Settings</h2>
+<h2 id="new_page_settings">Composer Preferences - New Page Settings</h2>
 
 <p>New page preferences allow you to specify settings for colors
 and background images that apply to every document you create.</p>
@@ -2344,7 +2343,7 @@ and background images that apply to every document you create.</p>
 <p>If you are not already viewing the New Page Settings, follow these steps:</p>
 
 <ol>
-<li>Open the Edit menu and choose Preferences.</li>
+<li>Open the Edit menu (&brandShortName; menu on Mac OS X) and choose Preferences.</li>
 
 <li>Double-click the Composer category and click New Page
 Settings.</li>
@@ -2380,7 +2379,7 @@ Background.</p>
 
 <p class="returnToSection">[ <a href="#composer_preferences">Return to beginning of section</a> ]</p>
 
-<p>Copyright &copy; 1998-2003 The &brandShortName; Foundation.</p>
+<p>Copyright &copy; 2003-2004 The Mozilla Foundation.</p>
 
 </body>
 </html>