Bug 324250: using_priv_help.xhtml file errors; p=<stefanh@bluebottle.com>, r=IanN

extensions/help/resources/locale/en-US/using_priv_help.xhtml

@@ -1182,15 +1182,15 @@
 <p>If you click Yes at least some of the time, Form Manager will soon have
   enough data to begin filling out forms automatically.</p>
 
-<p>Form preferences allow you to</p>
+<p>Form preferences allow you to:</p>
 
 <ul>
   <li><strong>Save form data from web pages when completing forms:</strong>
-    This checkbox determines whether are asked if you want to save form data
-    every time you submit a new form. This option is selected by default. If
-    you deselect it, Form Manager never asks if you want to save form data.
+    This checkbox determines whether you are asked if you want to save form
+    data every time you submit a new form. This option is selected by default.
+    If you deselect it, Form Manager never asks if you want to save form data.
     The only way to save form data is for you open the Edit Menu and choose
-    Fill in Form while viewing a form that you&apos;ve just filled in.
+    Save Form Info while viewing a form that you&apos;ve just filled in.
 
     <p>Note that deselecting this option turns off the notification feature,
       but not Form Manager. The form data it may have already collected is
@@ -1422,8 +1422,8 @@
 
 <p>If you choose to encrypt your stored sensitive information, you&apos;ll need
   a master password. With encryption selected, you&apos;ll be asked for your
-  master password at least once during a browser session in which you access
-  any of your stored sensitive information.</p>
+  master password at least once during a &brandShortName; session in which you
+  access any of your stored sensitive information.</p>
 
 <p>If you choose encryption, but don&apos;t already have a master password,
   you&apos;ll be prompted to create one the first time you try to save or
@@ -1433,12 +1433,13 @@
   time:</p>
 
 <ol>
-  <li>Open the Tools menu, choose Password Manager, and then choose Change
-    Master Password from the submenu (even though you are setting it for the
-    first time, not changing it).
-
-    <p>You see the Set Master Password dialog box.</p>
-  </li>
+  <li>Open the <span class="mac">&brandShortName;</span>
+    <span class="noMac">Edit</span> menu and choose Preferences.</li>
+  <li>Under the Privacy &amp; Security category, click Master Passwords. (If no
+    subcategories are visible, double-click Privacy &amp; Security to expand
+    the list.)</li>
+  <li>In the Change Master Password section, click Change Password... to open
+    the Change Master Password dialog box.</li>
   <li>Enter your desired master password, and retype it to confirm the
     spelling.</li>
   <li>Click OK.</li>
@@ -1457,11 +1458,14 @@
 <p>To change your master password:</p>
 
 <ol>
-  <li>Open the Tools menu, choose Privacy &amp; Security, and then choose
-    Password Manager.</li>
-  <li>Select Change Master Password from the submenu. You see the Set Master
-    Password dialog box.</li>
-  <li>Enter your current master password (if you have previously set one).</li>
+  <li>Open the <span class="mac">&brandShortName;</span>
+    <span class="noMac">Edit</span> menu and choose Preferences.</li> 
+  <li>Under the Privacy &amp; Security category, click Master Passwords. (If no
+    subcategories are visible, double-click Privacy &amp; Security to expand
+    the list.)</li>
+  <li>In the Change Master Password section, click Change Password... to open
+    the Change Master Password dialog box.</li>
+  <li>Enter your current master password.</li>
   <li>Enter your new master password, and retype it to confirm the
     spelling.</li>
   <li>Click OK.</li>
@@ -1478,8 +1482,9 @@
 <h2 id="logging_out_of_your_master_password">Logging Out of Your Master
   Password</h2>
 
-<p>Normally, you are asked for your master password once during each browser
-  session during which you access any of your stored sensitive information.</p>
+<p>Normally, you are asked for your master password once during each
+  &brandShortName; session during which you access any of your stored sensitive
+  information.</p>
 
 <p>It&apos;s also possible to require that your master password be requested
   each time it is needed, or after a certain amount of time has passed. For
@@ -1507,7 +1512,7 @@
   data (see <a href="#encrypting_stored_sensitive_information">Encrypting
   Stored Sensitive Information</a>), you won&apos;t be able to access any of
   the stored password and form data that it protects (assuming you have turned
-  on encryption. Your master password is your most important password. Make
+  on encryption). Your master password is your most important password. Make
   sure you remember it or record it in a safe place.</p>
 
 <p>As a last resort, it&apos;s possible to reset your master password if you
@@ -1546,7 +1551,7 @@
   load.</p>
 
 <p>You can also control how frequently animated images repeat their animation,
-  or turn off animation completely</p>
+  or turn off animation completely.</p>
 
 <p>The next section describes how to control these image settings. The default
   settings allow all images to be accepted and allow them to repeat their
@@ -1595,7 +1600,7 @@
     animation.</li>
 </ul>
 
-<p>Copyright &copy; 2003-2005 The Mozilla Foundation.</p>
+<p>Copyright &copy; 2003-2006 The Mozilla Foundation.</p>
 
 </body>
 </html>