ongoing help content updates per bugzilla 122806 & ADT, r=oeschger; various privacy feature updates

suite/locales/en-US/chrome/common/help/glossary.xhtml

@@ -215,6 +215,8 @@ Federal Information Processing Standards Publications (FIPS PUBS) 140-1 is a US
 <p><a name="Hypertext_Markup_Language_(HTML)"></a>
 <b>Hypertext Markup Language (HTML).</b>&nbsp; The document format used for Web pages. The HTML standard defines tags, or codes, used to define the text layout, fonts, style, images, and other elements that make up a web page. <p>
 
+<p><a name="implicit_consent"></a><b>implicit consent.</b>&nbsp; Used to describe privacy settings that allow web sites to gather information about you, for example by means of <a href="#cookie">cookies</a> and on-line forms, unless you explicitly choose to withhold your consent by selecting an option on a page that the web site provides for that purpose. Your consent is not requested when the information is actually gathered.<p>
+
 <p><a NAME="IMAP_glossary"></a>
 <b>Internet Message Access Protocol (IMAP).</b>&nbsp;A standard mail server protocol that allows you to store all your messages and any changes to them on the server rather than on your computer's hard disk. Using IMAP rather than <a href="#POP_glossary">POP</a> saves disk space and allows you to acess your entire mailbox, including sent mail, drafts, and custom folders, from any location. Using an IMAP server over a modem is generally faster than using a POP mail server, since you initially download message headers only. Not all ISPs support IMAP. <p>
 
@@ -524,7 +526,7 @@ Confident reliance on a person or other entity. In the context of <a href="gloss
 </p>
 
 <hr>
-<p><i>1 April 2002</i></p>
+<p><i>18 April 2002</i></p>
 <p>Copyright &copy; 1998-2002 Netscape Communications Corporation</p>
 
 <BR>

suite/locales/en-US/chrome/common/help/help-glossary.rdf

@@ -44,6 +44,7 @@
         <rdf:li> <rdf:Description nc:name="foreign cookie" nc:link="glossary.html#foreign_cookie"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="home page" nc:link="glossary.html#home_page"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Hypertext Markup Language (HTML)" nc:link="glossary.html#Hypertext_Markup_Language_(HTML)"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="implicit consent" nc:link="glossary.html#implicit_consent"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Internet Message Access Protocol (IMAP)" nc:link="glossary.html#IMAP_glossary"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Internet" nc:link="glossary.html#Internet"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Internet protocol address (IP address)" nc:link="glossary.html#Internet_protocol_address_(IP_address)"/> </rdf:li>

suite/locales/en-US/chrome/common/help/passwords_help.xhtml

@@ -42,7 +42,7 @@
 
 <ol>
 	<li>Open the Edit menu and choose Preferences.
-	<li>Under the Privacy &amp; Security category, choose Passwords. (If no subcategories are visible, double-click the category to expand the list.)
+	<li>Under the Privacy &amp; Security category, choose Passwords. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 </ol>
 
 <p>&nbsp;
@@ -53,8 +53,8 @@
 
 <p>Password Manager preferences allow you to
 <ul>
-<li><b>Remember passwords for sites that require me to log in:</b> Select this checkbox to turn Password Manager on, so that it automatically stores your user names and passwords and enters them for you as necessary. To turn off Password Manager, deselect the same checkbox.
+<li><b>Remember passwords:</b> Select this checkbox to turn Password Manager on, so that it automatically stores your user names and passwords and enters them for you as necessary. To turn off Password Manager, deselect the same checkbox.
-<li><b>View Stored Passwords:</b> Click this button to view information about your stored passwords and the sites whose user names and passwords you don't want to be stored.
+<li><b>Manage Stored Passwords:</b> Click this button to manage information about your stored passwords and the sites whose user names and passwords you don't want to be stored.
 </ul> 
 
 <p>For detailed information about using Password Manager, including how to override it for individual sites and how to view and manage stored passwords, see <a href="using_priv_help.html#using_password">Using the Password Manager</a>.
@@ -72,7 +72,7 @@
 
 <p>If you have not previously set a <a href="glossary.html#master_password">master password</a>, you will be asked to create one. To do so, follow the instructions as they appear on your screen. 
 
-<p>For more details, see <a href="passwords_help.html#using_encrypt">Encrypting Stored Sensitive Information</a>. 
+<p>For more details, see <a href="using_priv_help.html#using_encrypt">Encrypting Stored Sensitive Information</a>. 
 
 <p>&nbsp;</p>
 <a NAME="password_mgr"></a>
@@ -83,7 +83,7 @@
 <p>This section describes how to use Password Manager dialog box to control your stored passwords. If you are not already viewing it, follow these steps:
 <ol>
 	<li>Open the Edit menu and choose Preferences.
-   	<li>Under the Privacy &amp; Security category, click Passwords. (If no subcategories are visible, double-click the category to expand the list.)
+   	<li>Under the Privacy &amp; Security category, click Passwords. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 	<li>Click Manage Stored Passwords.
 </ol>
 
@@ -127,7 +127,7 @@
 
 <ol>
 	<li>Open the Edit menu and choose Preferences.
-	<li>Under the Privacy &amp; Security category, choose Master Passwords. (If no subcategories are visible, double-click the category to expand the list.)
+	<li>Under the Privacy &amp; Security category, choose Master Passwords. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 </ol>
 
 <p>&nbsp;
@@ -142,15 +142,17 @@
 </td>
 </tr>
 </table>
-<p>&nbsp;
+<p>&nbsp;<p>
 
 
 <a NAME="change_mp_prefs"></a>
 <h3>Change Master Password</h3>
 
-<p>A master password protects a security device, which is a software or hardware device that stores sensitive information associated with your identity, such as keys or certificates. For example, the browser has a built-in Software Security Device, and you can also use external security devices, such as smart cards, if your computer is configured to use them.
+<p>A master password protects a security device, which is a software or hardware device that stores sensitive information associated with your identity, such as keys or certificates. 
 
-<p>The master password for the browser's built-in Software Security Device protects your master key. Your master key is used to encrypt sensitive information such as email passwords, web site passwords, and other data stored by the Password Manager and Form Manager. 
+<p>For example, the browser has a built-in Software Security Device, and you can also use external security devices, such as smart cards, if your computer is configured to use them.
+
+<p>The master password for the browser's built-in Software Security Device also protects your master key. Your master key is used to encrypt sensitive information such as email passwords, web site passwords, and other data stored by the Password Manager and Form Manager. 
 
 <ul><li><p><b>Change Password:</b> Click this button to set or change any of your master passwords. For information about using the Change Master Password dialog box that appears when you click this button, see <a href="#Change_Master_Password">Change Master Password</a>.</ul>
 
@@ -167,9 +169,12 @@
 <p>If you are using personal certificates, you can control how often the browser requests your master password. Here are some things you should consider when selecting these options:
 
 <ul>
-	<LI><B>The first time it is needed.</B> If you work in an office with strong physical security measures or if you feel that the consequences of somebody else using your computer to impersonate you are not extreme, click this radio button. This setting causes Certificate Manager to request your master password only the first time it needs access to the private key database after launching. Certificate Manager will not request the master password again until after you exit and relaunch the browser. This setting provides the lowest level of protection.
+	<LI><B>The first time it is needed.</B> If you work in an office with strong physical security measures or if you feel that the consequences of somebody else using your computer to impersonate you are not extreme, click this radio button. 
 
-	<LI><B>Every time it is needed.</B> If you are very concerned about the possibility that somebody else might be able to use your computer to impersonate you, click this radio button. This setting ensures that Certificate Manager will never access the private key database without first requesting your master password. This setting provides the highest level of protection.
+	<p>This setting causes Certificate Manager to request your master password only the first time it needs access to the private key database after launching. Certificate Manager will not request the master password again until after you exit and relaunch the browser. This setting provides the lowest level of protection.
+
+	<LI><B>Every time it is needed.</B> If you are very concerned about the possibility that somebody else might be able to use your computer to impersonate you, click this radio button. 
+	<p>This setting ensures that Certificate Manager will never access the private key database without first requesting your master password. This setting provides the highest level of protection.
 
 	<LI><B>If it has not been used for </B><I>blank</I><B> minutes or longer.</B> If you are somewhat concerned about the possibility that somebody else might be able to use your computer to impersonate you, but not enough to type in your master password at frequent intervals, click this radio button and fill in the box with a value you feel comfortable with. For best protection, this should be a fairly low number of minutes, such as 20. 
 
@@ -184,11 +189,13 @@
 <a NAME="reset_mp_prefs"></a>
 <h3>Reset Master Password</h3>
 
-<p><b>Warning:</b> If you reset your master password, you will permanently erase all the web passwords, email passwords, and form data saved on your behalf by Password Manager and Form Manager. You will also lose all your personal certificates associated with the <a href="glossary.html#software_security_device">Software Security Device</a>. 
+<p><b>Warning:</b> If you reset your master password, you will permanently erase all the encrypted web passwords, email passwords, and form data saved on your behalf by Password Manager and Form Manager. You will also lose all your personal certificates associated with the <a href="glossary.html#software_security_device">Software Security Device</a>. 
+
+<p>Note that encrypted passwords and form data will be lost only if you have turned on encryption for this stored information. For information about turning encryption on or off, see <a href="using_priv_help.html#encrypt_on">Turning Encryption On and Off</a>. 
 
 <p>To change your master password rather than resetting it, click the Change Password button in the Master Passwords preferences panel. 
 
-<p>Note that you must remember your old master password to change it with the Change Password button. Resetting your master password is a last resort that you should use only if you are absolutely sure you've forgotten it.
+<p>You must remember your old master password to change it with the Change Password button. Resetting your master password is a last resort that you should use only if you are absolutely sure you've forgotten it.
 
 <p>If you are really sure that you want to reset your master password:
 
@@ -208,20 +215,22 @@
 
 <ol>
 	<li>Open the Edit menu and choose Preferences.
-	<li>Under the Privacy &amp; Security category, choose Master Passwords. (If no subcategories are visible, double-click the category to expand the list.)
+	<li>Under the Privacy &amp; Security category, choose Master Passwords. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 	<li>Click Change Password.
 </ol>
 
-<p>A master password protects a security device, which is a software or hardware device that stores sensitive information associated with your identity, such as keys or certificates. For example, the browser has a built-in Software Security Device, and you can also use external security devices, such as smart cards, if your computer is configured to use them.
+<p>A master password protects a security device, which is a software or hardware device that stores sensitive information associated with your identity, such as keys or certificates. 
 
-<p>The master password for the browser's built-in Software Security Device protects your master key. Your master key is used to encrypt sensitive information such as email passwords, web site passwords, and other data stored by the Password Manager and Form Manager. 
+<p>For example, the browser has a built-in Software Security Device, and you can also use external security devices, such as smart cards, if your computer is configured to use them.
+
+<p>The master password for the browser's built-in Software Security Device also protects your master key. Your master key is used to encrypt sensitive information such as email passwords, web site passwords, and other data stored by the Password Manager and Form Manager. 
 
 <p>You use the Change Master Password dialog box to provide the following information:
 
 <ul>
 <li><b>Security Device:</b> Each security device requires a separate master password. For example, if you are using one or more smart cards to store some of your certificates, you should set a separate master password for each one. If more than one security device is available, a pop-up menu at the top of the Set Master Password dialog box allows you to choose the device whose password you want to change.</P>
 
-<li><b>Current password:</b> If you are changing an existing master password, you must first type the current password. If you don't type the current password correctly, you will see the message "Incorrect password entered" after you click OK. If this happens, your password has not been changed and you must start all over again.
+<li><b>Current password:</b> If you are changing an existing master password, you must first type the current password. If you don't type the current password correctly, you will see the message "You did not enter  the current correct Master Password" after you click OK. If this happens, you must retype your current password.
 
 <li><b>New password:</b> Type your new password into this field.
 
@@ -241,18 +250,20 @@
 <a NAME="master_password:resettingIDX"></a>
 <a NAME="resetting_master_passwordIDX"></a>
 
-<hr><h3>Reset Master Password</h3>
+<hr><h2>Reset Master Password</h2>
 
 
 <p>This section describes the Reset Master Password dialog box. If you're not already viewing it, follow these steps:
 
 <ol>
 	<li>Open the Edit menu and choose Preferences.
-	<li>Under the Privacy &amp; Security category, choose Master Passwords. (If no subcategories are visible, double-click the category to expand the list.)
+	<li>Under the Privacy &amp; Security category, choose Master Passwords. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 	<li>Click Reset Password.
 </ol>
 
-<p><b>Warning:</b> If you reset your master password, you will permanently erase all the web passwords, email passwords, and form data saved on your behalf by Password Manager and Form Manager. You will also lose all your personal certificates associated with the <a href="glossary.html#software_security_device">software security device</a>. 
+<p><b>Warning:</b> If you reset your master password, you will permanently erase all encrypted web passwords, email passwords, and form data saved on your behalf by Password Manager and Form Manager. You will also lose all your personal certificates associated with the <a href="glossary.html#software_security_device">software security device</a>. 
+
+<p>Note that encrypted passwords and form data will be lost only if you have turned on encryption for this stored information. For information about turning encryption on or off, see <a href="using_priv_help.html#encrypt_on">Turning Encryption On and Off</a>. 
 
 <p>If you remember your master password and decide to change it, you can do so without danger of losing any personal information. If you are viewing the Reset Master Password alert and you decide you want to change your password rather than resetting it, click Cancel to return to the Master Passwords preferences panel, then click Change Password. For details, see <a href="#Change_Master_Password">Change Master Password</a>. 
 
@@ -274,7 +285,7 @@
 
 
 <hr>
-<p><i>10 April 2002</i></p>
+<p><i>17 April 2002</i></p>
 <p>Copyright &copy; 1994-2002 Netscape Communications Corporation.</p>
 
 </body>

suite/locales/en-US/chrome/common/help/privsec_help.xhtml

@@ -17,7 +17,7 @@
 <p>The sections listed below describe the Privacy &amp; Security preferences. To see the preference panels, follow these steps:
 <ol>
    <li>Open the Edit menu and choose Preferences.
-   <li>Click the Privacy &amp; Security category. If no subcategories are visible, double-click the category to expand the list, then click the name for the preferences you want to view or change. 
+   <li>Click the Privacy &amp; Security category. If no subcategories are visible, double-click Privacy &amp; Security to expand the list, then click the name for the preferences you want to view or change. 
 </ol>
 
 <p>For help with a panel's settings, click the appropriate link below.
@@ -32,7 +32,7 @@
 <p><a href="using_priv_help.html#cookie_prefs">Cookies</a></p>
 <p><a href="using_priv_help.html#using_images">Images</a></p>
 <p><a href="using_priv_help.html#forms_mgr">Forms</a></p>
-<p><a href="passwords_help.html">Web Passwords</a></p>
+<p><a href="passwords_help.html">Passwords</a></p>
 <p><a href="passwords_help.html#Master_Password_Timeout">Master Passwords</a></p>
 <p><a href="ssl_help.html">SSL</a></p>
 <p><a href="certs_prefs_help.html">Certificates</a></p>
@@ -45,7 +45,7 @@
 
 
 <hr>
-<p><i>30 January 2002</i></p>
+<p><i>18 April 2002</i></p>
 <p>Copyright &copy; 1994-2002 Netscape Communications Corporation.</p>
 
 </body>

suite/locales/en-US/chrome/common/help/using_priv_help.xhtml

@@ -14,7 +14,7 @@
 <a NAME="Cookie_Manager:usingIDX"></a>
 
 
-<hr><h1><a NAME="using_cookies"></a>
+<a NAME="using_cookies"></a><hr><h1>
 Using the Cookie Manager</h1>
 
 <p>A cookie is a small amount of information on your computer that is used by some web sites. For a brief overview, see <a href="privacy_help.html#privacy_cookies">What Are Cookies and How Do They Work?</a>
@@ -42,8 +42,8 @@ Using the Cookie Manager</h1>
 </tr>
 </table>
 
-<a NAME="cookies_manage"></a>
 <p>&nbsp;</p>
+<a NAME="cookies_manage"></a>
 <h2>Enabling &amp; Disabling Cookies</h2>
 
 <p>You can specify how cookies should be handled by setting your cookie preferences.</p>
@@ -51,7 +51,7 @@ Using the Cookie Manager</h1>
 <p>To change your cookie preferences:
 <ol>
 <li>Open the Edit menu and choose Preferences.
-<li>Under the Privacy &amp; Security category, choose Cookies. (If no subcategories are visible, double-click the category to expand the list.)
+<li>Under the Privacy &amp; Security category, choose Cookies. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 <li>Set your cookie preferences.
 </ol>
  
@@ -66,7 +66,7 @@ Using the Cookie Manager</h1>
 <p>To control cookies on a site-by-site basis:
 
 <ol>
-<li>Open the Tasks menu, choose Privacy &amp; Security, and then choose Cookie Manager.</li>
+<li>Open the Tools menu and choose Cookie Manager.</li>
 <li>Choose &quot;Unblock Cookies from this Site&quot; or &quot;Block Cookies from this Site.&quot;</li>
 </ol> 
 
@@ -78,8 +78,8 @@ Using the Cookie Manager</h1>
 
 <p>To stop automatically accepting cookies from a site:
 <ol>
-<li>Open the Tasks menu, choose Privacy &amp; Security, then choose Cookie Manager.</li>
+<li>Open the Tools menu and choose Cookie Manager.</li>
-<li>Choose View Stored Cookies from the submenu. The Cookie Manager window opens with a list of all the cookies stored on your computer.</li>
+<li>Choose Manage Stored Cookies from the submenu. The Cookie Manager window opens with a list of all the cookies stored on your computer.</li>
 <li>Click the Cookie Sites tab. The web sites for which you have allowed or denied cookies are listed.</li>
 <li>Click to select the site from which you no longer want to accept cookies, and then click Remove Cookie. The next time you visit that site, you will be warned if the site attempts to set a cookie.</li>
 </ol>
@@ -88,13 +88,13 @@ Using the Cookie Manager</h1>
 
 <p>&nbsp;</p>
 <a NAME="cookies:viewingIDX"></a>
-<h2><a NAME="cookies_view"></a>Viewing Cookies</h2>
+<a NAME="cookies_view"></a><h2>Viewing Cookies</h2>
 
 <p>To view detailed information about cookies:</p>
 
 <ol>
-<li>Open the Tasks menu, choose Privacy &amp; Security, and then choose Cookie Manager.
+<li>Open the Tools menu and choose Cookie Manager.
-<li>Choose View Stored Cookies from the submenu. The Cookie Manager window opens with a list of all the cookies stored on your computer.</li>
+<li>Choose Manage Stored Cookies from the submenu. The Cookie Manager window opens with a list of all the cookies stored on your computer.</li>
 <li>To see details for a particular cookie, click it. </li>
 </ol>
 
@@ -109,8 +109,8 @@ Using the Cookie Manager</h1>
 
 <p>To remove one or more cookies from your computer:
 <ol>
-<li>Open the Tasks menu, choose Privacy &amp; Security, and then choose Cookie Manager.
+<li>Open the Tools menu and choose Cookie Manager.
-<li>Choose View Stored Cookies from the submenu. The Cookie Manager window opens with a list of all the cookies stored on your computer.</li>
+<li>Choose Manage Stored Cookies from the submenu. The Cookie Manager window opens with a list of all the cookies stored on your computer.</li>
 <li>Select one or more cookies and click Remove Cookie, or click Remove All Cookies.
 </ol>
 
@@ -137,7 +137,7 @@ Using the Cookie Manager</h1>
 
 <ol>
 <li>Open the Edit menu and choose Preferences.
-<li>Under the Privacy &amp; Security category, choose Cookies. (If no subcategories are visible, double-click the category to expand the list.)
+<li>Under the Privacy &amp; Security category, choose Cookies. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 <li>Select the option labeled &quot;Enable cookies based on privacy settings.&quot;
 <li>Click View.
 <li>In the Privacy Settings dialog box, select the level of privacy you want, or select &quot;custom&quot; and define your own privacy policy as discussed below.
@@ -156,11 +156,10 @@ Using the Cookie Manager</h1>
 <p>For more details, see <a href="#privacy_levels_window">Privacy Settings</a>.
 
 <p>[&nbsp;<A HREF="#using_cookies">Return to beginning of section</A>&nbsp;]
-
+<p>nbsp;</p>
 
 <a NAME="Cookie_Manager:cookies_stored_byIDX"></a>
-
+<a NAME="cookie_settings"></a><hr><h1>Cookie Manager Settings</h1>
-<hr><h1><a NAME="cookie_settings"></a>Cookie Manager Settings</h1>
 
 <p>This section describes how to set your cookie preferences and control other aspects of cookie handling. 
 
@@ -185,27 +184,29 @@ Using the Cookie Manager</h1>
 
 
 <a NAME="cookies:preferencesIDX"></a>
-<hr><h2><a NAME="cookie_prefs"></a>Privacy &amp; Security Preferences - Cookies</h2>
+<a NAME="cookie_prefs"></a><hr><h2>Privacy &amp; Security Preferences - Cookies</h2>
 
 <p>This section describes how to use the Cookies preferences panel. If you're not already viewing it, follow these steps:
 
 <ol>
 	<li>Open the Edit menu and choose Preferences.
-   	<li>Under the Privacy &amp; Security category, click Cookies. (If no subcategories are visible, double-click the category to expand the list.)
+   	<li>Under the Privacy &amp; Security category, click Cookies. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 </ol>
  
 <p> Cookies help web sites keep track of information for you, such as the contents of your on-line shopping cart or which cities' weather you want to know about. For a brief overview, see <a href="privacy_help.html#privacy_cookies">What Are Cookies and How Do They Work?</a> 
 
-<p>You can choose one of these options:
+<p>You can select one of these options:
 
 <ul>
-<li><p><b>Disable cookies:</b> Choose this to refuse all cookies.
+<li><p><b>Disable cookies:</b> Select this option to refuse all cookies.
 
-<li><b>Enable cookies for the originating web site only:</b> Choose this if you don't want to accept or return <a href="privacy_help.html#privacy_foreign">foreign cookies</a>. Cookies received through email (when the message contains a web page) are treated as foreign cookies.
+<li><b>Enable cookies for the originating web site only:</b> Select this option if you don't want to accept or return <a href="privacy_help.html#privacy_foreign">foreign cookies</a>. Cookies received through email (when the message contains a web page) are treated as foreign cookies.
 
-<li><b>Enable cookies based on privacy settings:</b> Choose this if you handle cookies based on your privacy settings. If you select this option, click the View button to confirm or modify your privacy settings.
+<li><b>Enable cookies based on privacy settings:</b> Select this option if you handle cookies based on your privacy settings. If you select this option, click the View button to confirm or modify your privacy settings.
 
-<li><b>Enable all cookies:</b> Choose this to permit all web sites to set cookies on your computer and receive them back during subsequent visits. <b>Note:</b> If you select this option and later choose to disable all cookies, you may still have old cookies stored on your computer (though no new ones will be set).
+<li><b>Enable all cookies:</b> Select this option to permit all web sites to set cookies on your computer and receive them back during subsequent visits. 
+
+	<p><b>Note:</b> If you select this option and later choose to disable all cookies, you may still have old cookies stored on your computer (though no new ones will be set).
 
 
 </ul>
@@ -234,14 +235,14 @@ Using the Cookie Manager</h1>
 
 <a NAME="Cookie_Manager:cookies_stored_byIDX"></a>
 
-<hr><h2><a NAME="cookies_stored"></a>Stored Cookies</h2>
+<a NAME="cookies_stored"></a><hr><h2>Stored Cookies</h2>
 
 <p>This section describes how to use the Stored Cookies tab of the Cookie Manager. If you're not already viewing it, follow these steps:
 
 
 <ol>
 	<li>Open the Edit menu and choose Preferences.
-   	<li>Under the Privacy &amp; Security category, click Cookies. (If no subcategories are visible, double-click the category to expand the list.)
+   	<li>Under the Privacy &amp; Security category, click Cookies. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 	<li>Click Manage Stored Cookies.
 </ol>
 
@@ -269,7 +270,7 @@ Using the Cookie Manager</h1>
 </tr>
 
 <tr>
-<td valign="top">Host or Domain</td>
+<td valign="top">Host or domain</td>
 <td valign="top">Indicates whether the cookie is a host cookie or a domain cookie and provides information about the host or domain.
 
 <p>A <b>host</b> cookie is sent back, during subsequent visits, only to the server that set it. A server is a computer on the Internet. A web site resides on one or more servers.
@@ -305,14 +306,14 @@ Using the Cookie Manager</h1>
 
 <p>&nbsp;</p>
 
-<hr><h2><a name="cookie_sites"></a>Cookie Sites</h2>
+<a name="cookie_sites"></a><hr><h2>Cookie Sites</h2>
 
 <p>This section describes how to use the Cookie Sites tab of the Cookie Manager. If you're not already viewing it, follow these steps:
 
 <ol>
 	<li>Open the Edit menu and choose Preferences.
-   	<li>Under the Privacy &amp; Security category, click Cookies. (If no subcategories are visible, double-click the category to expand the list.)
+   	<li>Under the Privacy &amp; Security category, click Cookies. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
-	<li>Click View Stored Cookies.
+	<li>Click Manage Stored Cookies.
 	<li>Click the Cookie Sites tab.
 </ol>
 
@@ -325,17 +326,17 @@ Using the Cookie Manager</h1>
 	<li><b>Remove All Cookies:</b> Removes all sites from the list.
 </ul>
 
-<p>Once you've removed a site from this list, Cookie Manager remembers nothing about it. When the &quot;Warn me before storing a cookie&quot; option is selected in the  Cookies preferences panel, you will be again be warned when the web site you removed from this list requests permission to set a cookie.
+<p>Once you've removed a site from this list, Cookie Manager remembers nothing about it. When the &quot;Warn me before storing a cookie&quot; option is selected in the Cookies preferences panel, you will be again be warned when the web site you removed from this list requests permission to set a cookie.
 
 <p>&nbsp;</p>
 
-<hr><h2><a name="privacy_levels_window"></a>Privacy Settings</h2>
+<a name="privacy_levels_window"></a><hr><h2>Privacy Settings</h2>
 
 <p>This section describes how to use the Privacy Settings window. If you're not already viewing it, follow these steps:
 
 <ol>
 	<li>Open the Edit menu and choose Preferences.
-   	<li>Under the Privacy &amp; Security category, click Cookies. (If no subcategories are visible, double-click the category to expand the list.)
+   	<li>Under the Privacy &amp; Security category, click Cookies. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 	<li>Select the radio button labeled &quot;Enable cookies based on privacy settings.&quot; 
 	<li>Click View.
 </ol>
@@ -356,24 +357,33 @@ Using the Cookie Manager</h1>
 <a name="level_of_privacy"></a>
 <h3>Level of Privacy</h3>
 
-<p>The level of privacy you set here determines how your browser treats cookies according to privacy policies published by some web sites and the settings displayed under Cookie Acceptance Policy for first party and third party cookies. 
+<p>The level of privacy you set here determines how your browser treats cookies according to privacy policies published by some web sites and the settings displayed under Cookie Acceptance Policy for first-party and third-party cookies. 
 
-<p>"First party cookies" are cookies set by the site you are visiting. &quot;Third party cookies,&quot; also known as <a href="privacy_help.html#privacy_foreign">foreign cookies</a>, are set by a site other than the one you are viewing, and are considered more dangerous than first party cookies.
+<p>&quot;First-party cookies&quot; are cookies set by the site you are visiting. &quot;Third-party cookies,&quot; also known as <a href="privacy_help.html#privacy_foreign">foreign cookies</a>, are set by a site other than the one you are viewing, and are considered more dangerous than first party cookies.
 
 <p>You can select one of the following privacy levels:
 <ul>
-	<li><b>low:</b> Select this if you're not too concerned about cookies. When this setting is selected, the Cookie Manager accepts all first party cookies permanently, without regard for a site's privacy policy. It also accepts all third party cookies&mdash;but, in the case of sites that may be collecting information without your consent, only until you exit the browser.
+	<li><b>low:</b> Select this if you're not too concerned about cookies. When this setting is selected, the Cookie Manager accepts all first party cookies permanently, without regard for a site's privacy policy. 
-	<li><b>medium:</b> Select this if you don't want to accept third party cookies set by sites that may be collecting personally identifiable information without your consent.
+
-	<li><b>high:</b> Select this if you want to accept only cookies set by sites that explicitly ask for your consent when they collect personally identifiable information.
+	<p>It also accepts all third-party cookies. However, in the case of sites that may be collecting information without your consent, the Cookie Manager also <b>flags</b> the third-party cookie&mdash;that is, displays the cookie notification icon near the lower-right corner of the browser window. You can click the cookie notification icon to see more detailed information about the flagged cookies.
-	<li><b>custom:</b> Select this only if you want to set your own custom Cookie Acceptance Policy. The default settings for &quot;custom&quot; are the same as for &quot;high.&quot; You can modify them by selecting from the drop-down menus in the bottom portion of the dialog box.
+	<li><b>medium:</b> Select this if you want to accept and flag both first-party and third-party cookies set by sites that may be collecting personally identifiable information without your consent.
+	<li><b>high:</b> Select this if you want the same settings as medium, with the following differences:</li>
+	<ul>
+		<li>Accept and flag, for the current session only, third-party cookies that don't ask for your consent at all.
+		<li>Accept and flag third-party cookies from web sites that provide a web page where you can withhold your consent, but don't ask explicitly for it each time.
+	</ul>
+	<li><b>custom:</b> Select this only if you want to set your own custom Cookie Acceptance Policy. The default settings for &quot;custom&quot; are the same as for &quot;high.&quot; You can modify them by selecting from the drop-down menus in the Cookie Acceptance Policy portion of the dialog box.
 </ul>
+<p>To see the exact effect of each privacy level setting, select it and then examine the Cookie Acceptance Policy settings.
+
+
 <p>&nbsp;</p>
 
 
 <a name="cookie_acceptance"></a>
 <h3>Cookie Acceptance Policy</h3>
 
-<p>If you select the &quot;custom&quot; level of privacy in the top portion of the Privacy Settings dialog box, you can choose one of four settings from the drop-down list in each of the eight categories shown in the bottom portion. These settings cause Cookie Manager to perform the following actions: 
+<p>If you select the <b>custom</b> option in the top portion of the Privacy Settings dialog box, you can choose one of four settings from the drop-down list in each of the eight categories shown in the bottom portion. These settings cause Cookie Manager to perform the following actions: 
 
 <ul>
 	<li><b>Accept:</b> Permanently accept all cookies in the category.
@@ -382,20 +392,20 @@ Using the Cookie Manager</h1>
 	<li><b>Flag:</b> Accept all cookies in the category, but display the cookie notifiation icon each time it does so.
 </ul>
 
-<p>The cookie notification icon appears near the lower-right corner of the browser window whenever a web site in the category sets a cookie. When this icon is displayed, you can click it to get information about the affected cookies or modify your privacy settings.
+<p>The cookie notification icon 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>There are four categories for each of the two types of cookies shown:
+<p>There are four categories for each of the two types of cookies:
 
 <ul>
-	<li><b>Site has no privacy policy:</b> This kind of site does not publish any kind of privacy policy. There is  no way of knowing what kinds of information such sites collect or what they do with it. In general, it's safest to reject cookies set by such sites, especially third-party cookies.
+	<li><b>Site has no privacy policy:</b> Site does not publish any kind of privacy policy. There is  no way of knowing what kinds of information such sites collect or what they do with it. In general, it's safest to reject cookies set by such sites, especially third-party cookies.
-	<li><b>Site collects personally identifiable information without your consent:</b> This kind of site publishes a privacy policy, but does not ask your permission when they collect information about your online activities. If you are concerned about such information being collected without your knowledge, you should reject cookies from such sites, especially third-party cookies.
+	<li><b>Site collects personally identifiable information without your consent:</b> Site publishes a privacy policy, but does not ask your permission when it collects information about your online activities. If you are concerned about such information being collected without your knowledge, you should reject cookies from such sites, especially third-party cookies.
-	<li><b>Site collects personally identifiable information with only your implicit consent:</b> This kind of site collects information about you based on your privacy level settings, but without asking you explicitly each time it does so
+	<li><b>Site collects personally identifiable information with only your implicit consent:</b> Site collects information about you unless you go to a web page and explicitly withhold your consent.
 	<li><b>Site does not collect personally identifiable information without your explicit consent:</b> This kind of site is relatively less dangerous, since you are warned, and given a chance to reject the request, each time such a site attempts to collect information about you. As for the other types of sites, third-party cookies are considered more dangerous than first party cookies.
 </ul>
 
 
-<hr><h2><a name="cookie_notify"></a>Cookie Notification</h2>
+<a name="cookie_notify"></a><hr><h2>Cookie Notification</h2>
 
 <p>The cookie notification icon is located in the status bar near the lower-right corner of the browser window. It appears when a web site has used a cookie in a way that requires you to be notified according to your current <a href="#privacy_levels_window">Privacy Settings</a>.
 
@@ -413,8 +423,8 @@ Using the Cookie Manager</h1>
 <p>&nbsp;</p>
 <a NAME="Password_Manager:usingIDX"></a>
 <a NAME="passwords:remembering_automaticallyIDX"></a>
-
+<a NAME="using_password"></a>
-<hr><h1><a NAME="using_password"></a>Using the Password Manager</h1>
+<hr><h1>Using the Password Manager</h1>
 
 <p>Many web sites require you to type a user name and password before you can enter the site. For instance, personalized pages and web sites containing your financial information require you to log in.</p>
 
@@ -442,7 +452,7 @@ Using the Cookie Manager</h1>
 <a NAME="passwords_manage"></a>
 <h2>Using Password Manager to Remember User Names and Passwords</h2>
 
-<p>When Password Manager is turned on, it gives you an opportunity to save usernames and passwords that you enter while using the Internet. 
+<p>When Password Manager is turned on, it gives you an opportunity to save user names and passwords that you enter while using the Internet. 
 
 <p>For example, when you log onto your email account or a web site that requries a password, a dialog box appears asking, &quot;Do you want Password Manager to remember this logon?&quot; When you see this dialog box, you can click one of the following buttons:</p>
 
@@ -456,7 +466,7 @@ Using the Cookie Manager</h1>
 
 <p>Password Manager saves your user names and passwords on your own computer in a file that's difficult, but not impossible, for an intruder to read. See <a href="#using_encrypt">Encrypting Stored Sensitive Information</a> for information on protecting your stored user names and passwords with encryption technology.
 
-<p>If the Password Manager dialog box described above does not appear when you click Submit after typing your username and password, Password Manager may be turned off. To turn it on, follow the instructions at <a href="#passwords_onoff">Turning Password Manager On and Off</a>. 
+<p>If the Password Manager dialog box described above does not appear when you click Submit after typing your user name and password, Password Manager may be turned off. To turn it on, follow the instructions at <a href="#passwords_onoff">Turning Password Manager On and Off</a>. 
 
 <p>&nbsp;</p>
 <a NAME="passwords_auto"></a>
@@ -472,7 +482,7 @@ Using the Cookie Manager</h1>
 
 <ol>
 <li>Open the Edit menu and choose Preferences.
-<li>Under the Privacy &amp; Security category, choose Passwords. (If no subcategories are visible, double-click the category to expand the list.)
+<li>Under the Privacy &amp; Security category, choose Passwords. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 <li>In the Password Manager section, deselect &quot;Remember passwords for sites that require me to log in&quot; to turn Password Manager off.
 </ol>
 
@@ -485,9 +495,9 @@ Using the Cookie Manager</h1>
 <p>To see a list of the user names and passwords you have stored:</p>
 
 <ol>
-<li>Open the Tasks menu, choose Privacy &amp; Security, and then choose Password Manager.
+<li>Open the Tools menu, choose Privacy &amp; Security, and then choose Password Manager.
-<li>Select View Stored Passwords from the submenu. You see the Password Manager window.</li>
+<li>Select Manage Stored Passwords from the submenu. You see the Password Manager window.</li>
-<li>Click the Passwords Saved tab. You see a list of all the stored user names. (Passwords are not listed.)</li> 
+<li>Click the Passwords Saved tab. You see a list of all the stored sites and user names. (Passwords are not listed.)</li> 
 <ul>
 	<li>To remove a user name, click it and then click Remove. The next time you visit the web site, you will be asked to enter your password.</li>
 	<li>Click the Passwords Never Saved tab to see a list of the web sites for which you instructed Password Manager never to store user names. To remove a web site from this list, click it and then click Remove. The next time you visit the web site, you will be asked if you want Password Manager to save the user name and password for that site.</li>
@@ -503,7 +513,7 @@ Using the Cookie Manager</h1>
 <a NAME="Form_Manager:usingIDX"></a>
 <a NAME="forms:filling_out_automaticallyIDX"></a>
 
-<hr><h1><a NAME="using_forms"></a>Using the Form Manager</h1>
+<a NAME="using_forms"></a><hr><h1>Using the Form Manager</h1>
 
 <p>Many web pages contain forms for you to fill out&mdash;order forms for online shopping, information databases, and so forth.</p>
 
@@ -519,7 +529,7 @@ Using the Cookie Manager</h1>
 <p><a href="#form_data_view_edit">Managing Stored Form Data</a></p>
 <p><a href="#form_sites_view_edit">Editing Stored Site Information</a></p>
 
-<p><a href="#form_forms">How Do Web Sites Use My Personal Information?</a></p>
+<p><a href="#form_forms">Controlling Your Privacy</a></p>
 <p><a href="#form_settings">Form Settings</a></p>
 </td>
 </tr>
@@ -536,9 +546,9 @@ Using the Cookie Manager</h1>
 <ul>
 <li>Each time you submit an online form that you've filled out, Form Manager asks if you want the information saved. Click Yes. 
 
-<p>Note that Form Manager prompts you only if its automatic notification feature is turned on. For details, see <a href="#form_notify">Form Manager's Automatic Notification Feature</a>.
+<p>Note that Form Manager prompts you only if its automatic notification feature is turned on. For details, see <a href="#form_notify">Turning Off Form Manager Notification</a>.
 
-<li>After you fill out a form (but before you submit it), open the Edit menu and choose Save Form Data.
+<li>After you fill out a form (but before you submit it), open the Edit menu and choose Save Form Info.
 
 </ul>
 
@@ -569,7 +579,7 @@ Using the Cookie Manager</h1>
 
 <ol>
 <li>Go to the online form you want to fill out.
-<li>Open the Edit menu and choose Prefill Form. 
+<li>Open the Edit menu and choose Fill in Form. 
 
 <p>Note that the Prefill Form menu item won't be accessible if the Form Manager hasn't yet stored any relevant information.
 
@@ -602,13 +612,13 @@ Using the Cookie Manager</h1>
 
 <ol>
 <li>Open the Edit menu and choose Preferences.
-<li>Under the Privacy &amp; Security category, choose Forms. (If no subcategories are visible, double-click the category to expand the list.)
+<li>Under the Privacy &amp; Security category, choose Forms. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 <li>In the Form Manager section, deselect &quot;Save form data from web pages when completing forms.&quot;
 </ol>
 
 <p>Note that deselecting this option turns off the notification feature, but not Form Manager. The form data it may have already collected is still available. 
 
-<p>You can still pull down the Edit menu and choose Save Form Data any time you want to save information from a form you've just filled in, or choose Prefill Form to fill in a form automatically.
+<p>You can still pull down the Edit menu and choose Save Form Info any time you want to save information from a form you've just filled in, or choose Prefill Form to fill in a form automatically.
 <p>
 [&nbsp;<A HREF="#using_forms">Return to beginning of section</A>&nbsp;]
 </p>
@@ -622,7 +632,7 @@ Using the Cookie Manager</h1>
 <p>To examine or edit personal data that Form Manager has saved:
 <ol>
 	<li>Open the Edit menu and choose Preferences.
-	<li>From the Privacy &amp; Security category, choose Forms. (If no subcategories are visible, double-click the category to expand the list.)
+	<li>From the Privacy &amp; Security category, choose Forms. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 	<li>Click Manage Stored Form Data. 
 </ol>	
 
@@ -643,7 +653,7 @@ Using the Cookie Manager</h1>
 <p>Form Manager lets you change your mind about these decisions at any time. To view site-specific information about your saved form data:
 <ol>
 	<li>Open the Edit menu and choose Preferences.
-	<li>From the Privacy and Security category, choose Forms. (If no subcategories are visible, double-click the category to expand the list.)
+	<li>From the Privacy and Security category, choose Forms. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 	<li>Click Manage Sites.
 </ol>
 
@@ -664,13 +674,39 @@ Using the Cookie Manager</h1>
 
 <p>&nbsp;</p>
 <a NAME="form_forms"></a>
-<h2>How Do Web Sites Use My Personal Information?</h2>
+<h2>Controlling Your Privacy</h2>
 
-<p>If you provide personal information such as your name, phone number, or email address to a web site, it is free to store that information in its database and use it later. A web site might use this information to improve its service to you or target advertising to your interests. A web site could sell the information it has gathered to other companies.
+<p>If you provide personal information such as your name, phone number, or email address to a web site, it is free to store that information and use it later. A web site might use your information to improve its service to you or target advertising to your interests. Or it could sell your information to other companies.
 
-<p>One way to find out how a web site uses the information it gathers is to check its <a href="privacy_help.html#privacy_unauth">privacy policy</a>.
+<p>Before providing personal information on an online form, you must decide whether or not you trust the web site&mdash;just as you judge whether or not you trust a catalog company before you provide your credit card number on the company's order form.
 
-<p>Before providing personal information on an online form, you must decide whether or not you trust the company&mdash;just as you judge whether or not you trust a catalog company before you provide your credit card number on the company's order form.
+<p>One way to evaluate a web site's trustworthiness is to examine its published privacy policy. Many web sites publish such policies according to the Platform for Privacy Preferences (P3P) standard. 
+
+<p>A web site's privacy policy describes what kind of information the site collects, to whom it gives that information, and how it uses the information. Web sites publish privacy policies in both human-readable form and as an XML file that can be interpreted by the browser according to your <a href="#privacy_levels_window">Privacy Settings</a>.
+
+<p>To check a web site's privacy policy, browse to the site and follow these steps: 
+
+<ul>
+	<li>Open the View menu and choose Page info.
+	<li>Click the Privacy tab.
+	<li>Click these buttons to see the corresponding information:</li>
+	<ul>
+		<li><b>Policy:</b> Click this button to view the site's published privacy policy on the web.
+		<li><b>Summary:</b> Click this button to view a summary of the site's built-in XML policy file, which defines the site's policies in detail.
+		<li><b>Options:</b> Click this button to view a web page provided by the site where you can choose to withhold or grant your consent to certain kinds of information gathering.
+	</ul>
+</ul>
+
+<p>Many web pages are made up of a variety of text, images, advertisements, and other elements, some of which may be controlled by different companies. 
+
+<p>To view the same information for any individual element of the web page: 
+<ol>
+	<li>Double-click the categories to see addresses for individual components.
+	<li>Select the component whose privacy policy you want to examine
+	<li>Click the buttons as described above.
+</ol>
+
+<p>For more information on controlling your privacy, see <a href="#privacy_levels">Setting Privacy Levels</a>.
 
 <p>
 [&nbsp;<A HREF="#using_forms">Return to beginning of section</A>&nbsp;]
@@ -683,7 +719,7 @@ Using the Cookie Manager</h1>
 <a NAME="Form_Manager:encrypting_stored_informationIDX"></a>
 <a NAME="forms:encrypting_stored_informationIDX"></a>
 
-<hr><h1><a NAME="using_encrypt"></a>Encrypting Stored Sensitive Information</h1>
+<a NAME="using_encrypt"></a><hr><h1>Encrypting Stored Sensitive Information</h1>
 
 <p>If you use Password Manager or Form Manager to save passwords and personal data, then this sensitive information is stored on your computer in a file that's difficult, but not impossible, for an intruder to read.</p>
 
@@ -695,7 +731,7 @@ Using the Cookie Manager</h1>
 <tr>
 <td class="inthissections">
 <p>In this section:</p>
-<p><a href="#encrypt_on">Encrypting Stored Sensitive Information</a></p>
+<p><a href="#encrypt_on">Turning Encryption On and Off</a></p>
 <p><a href="#encrypt_master">Setting a Master Password</a></p>
 <p><a href="#encrypt_change">Changing Your Master Password</a></p>
 <p><a href="#encrypt_logout">Logging Out of Your Master Password</a></p>
@@ -707,17 +743,20 @@ Using the Cookie Manager</h1>
 
 <p>&nbsp;</p>
 <a NAME="encrypt_on"></a>
-<h2>Turning on Encryption</h2>
+<h2>Turning Encryption On and Off</h2>
 
 <p>To turn on encryption for your stored sensitive information:</p>
 
 <ol>
 <li>Open the Edit menu and choose Preferences.
-<li>Under the Privacy &amp; Security category, choose Passwords. (If no subcategories are visible, double-click the category to expand the list.)
+<li>Under the Privacy &amp; Security category, choose Passwords. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 <li>In the Encrypting versus Obscuring section, select &quot;Use encryption when storing sensitive data.&quot; 
 <li>Click OK. If you haven't previously set a master password, a new dialog box appears and leads you through the process of setting it. 
 </ol>
 
+<p>To turn encryption off, deselect &quot;Use encryption when storing sensitive data.&quot; 
+
+<p>You must supply your master password when you turn encryption on or off.
 
 <p>&nbsp;</p>
 <a NAME="encrypt_master"></a>
@@ -731,7 +770,7 @@ Using the Cookie Manager</h1>
 <p>If your master password has not previously been set, you can set it yourself:
 
 <ol>
-<li>Open the Tasks menu, choose Privacy &amp; Security, and then choose Password Manager.</li>
+<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>Enter your new master password, and retype it to confirm the spelling.</li>
 <li>Click OK.
@@ -747,7 +786,7 @@ Using the Cookie Manager</h1>
 
 <p>To change your master password:
 <ol>
-<li>Open the Tasks menu, choose Privacy &amp; Security, and then choose Password Manager.</li>
+<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>Enter your current master password (if you have previously set one). </li>
 <li>Enter your new master password, and retype it to confirm the spelling.</li>
@@ -767,7 +806,7 @@ Using the Cookie Manager</h1>
 <p>To log out of your master password:</p>
 
 <ol>
-<li>Open the Tasks menu, choose Privacy &amp; Security, and then choose Password Manager.
+<li>Open the Tools menu, choose Privacy &amp; Security, and then choose Password Manager.
 <li>Select Log Out from the submenu.</li>
 </ol>
 
@@ -787,7 +826,7 @@ Using the Cookie Manager</h1>
 
 <ol>
 	<li>Open the Edit menu and choose Preferences.
-	<li>Under the Privacy &amp; Security category, choose Master Passwords. (If no subcategories are visible, double-click the category to expand the list.)
+	<li>Under the Privacy &amp; Security category, choose Master Passwords. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 	<li>Click Reset Master Password.
 	<li>In the Reset Master Password dialog box, click Reset.
 </ol>
@@ -797,10 +836,6 @@ Using the Cookie Manager</h1>
 </p>
 
 
-
-<p>For more information about the Cookie Manager, see <a href="#using_cookies">Using the Cookie Manager</a>.
-
-
 <p>&nbsp;</p>
 <a NAME="managing_images"></a>
 <a NAME="images:managingIDX"></a>
@@ -817,14 +852,15 @@ Using the Cookie Manager</h1>
 
 <p>&nbsp;</p>
 <a NAME="images:preferencesIDX"></a>
-<hr><h2><a NAME="using_images"></a>
+<a NAME="using_images"></a>
+<hr><h2>
 Privacy &amp; Security Preferences - Images</h2>
 
 <p>This section describes how to set preferences for images. To view the preference settings for images:
 
 <ol>
 	<li> Open the Edit menu and choose Preferences.
-   	<li>Under the Privacy &amp; Security category, click Images. (If no subcategories are visible, double-click the category to expand the list.)
+   	<li>Under the Privacy &amp; Security category, click Images. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 </ol>
  
 
@@ -853,7 +889,8 @@ Privacy &amp; Security Preferences - Images</h2>
 <p>&nbsp;</p>
 <a NAME="Form_Manager:settingsIDX">
 <a NAME="forms:settings forIDX"></a>
-<hr><h1></a><a NAME="form_settings"></a>Form Settings</h1>
+</a><a NAME="form_settings"></a>
+<hr><h1>Form Settings</h1>
 
 <p>When you fill out an online form, Form Manager normally detects the form and, when you click Submit, gives you an opportunity to save the data you entered. 
 
@@ -880,12 +917,13 @@ Privacy &amp; Security Preferences - Images</h2>
 
 <a NAME="Form_Manager:preferencesIDX"></a>
 <a NAME="forms:preferencesIDX"></a>
-<hr><h2><a NAME="forms_prefs"></a>Privacy &amp; Security Preferences - Forms</h2>
+<a NAME="forms_prefs"></a>
+<hr><h2>Privacy &amp; Security Preferences - Forms</h2>
 
 <p>This section describes how to use the Forms preferences panel. If you are not already viewing it, follow these steps:
 <ol>
 	<li>Open the Edit menu and choose Preferences.
-   	<li>Under the Privacy &amp; Security category, click Forms. (If no subcategories are visible, double-click the category to expand the list.)</li>
+   	<li>Under the Privacy &amp; Security category, click Forms. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)</li>
 </ol>
 
 <br>&nbsp;
@@ -912,12 +950,13 @@ Privacy &amp; Security Preferences - Images</h2>
 </ul>
 
 <p>&nbsp;</p>
-<hr><h2><a NAME="forms_data"></a>Form Manager - Data</h2>
+<a NAME="forms_data"></a>
+<hr><h2>Form Manager - Data</h2>
 
 <p>This section describes how to use the window that allows you to edit data saved on your behalf by the Form Manager. If you are not already viewing this window, follow these steps:
 <ol>
 	<li>Open the Edit menu and choose Preferences.
-   	<li>Under the Privacy &amp; Security category, click Forms. (If no subcategories are visible, double-click the category to expand the list.)
+   	<li>Under the Privacy &amp; Security category, click Forms. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 	<li>Click Manage Stored Form Data.
 </ol>
 
@@ -931,12 +970,13 @@ Privacy &amp; Security Preferences - Images</h2>
 
 
 <p>&nbsp;</p>
-<hr><h2><a NAME="forms_sites"></a>Form Manager - Sites</h2>
+<a NAME="forms_sites"></a>
+<hr><h2>Form Manager - Sites</h2>
 
 <p>This section describes how to use the dialog box that allows you to edit data saved on your behalf by Form Manager. If you are not already viewing it, follow these steps:
 <ol>
 	<li>Open the Edit menu and choose Preferences.
-   	<li>Under the Privacy &amp; Security category, click Forms. (If no subcategories are visible, double-click the category to expand the list.)
+   	<li>Under the Privacy &amp; Security category, click Forms. (If no subcategories are visible, double-click Privacy &amp; Security to expand the list.)
 	<li>Click Manage Sites.
 </ol>
 
@@ -967,7 +1007,8 @@ site&quot; in response to the Form Manager's request to store form data.
 <p>For step-by-step instructions on working with form data, see <a href="#using_forms">Using the Form Manager</a>.
 
 <p>&nbsp;</p>
-<hr><h2><a NAME="forms_prefill"></a>Prefill Form Data</h2>
+<a NAME="forms_prefill"></a>
+<hr><h2>Prefill Form Data</h2>
 
 <p>This section describes the window that normally appears when you open the Edit menu and choose Prefill Form Data. 
 
@@ -991,7 +1032,7 @@ site&quot; in response to the Form Manager's request to store form data.
 
 <hr>
 
-<p><i>26 March 2002</i></p>
+<p><i>18 April 2002</i></p>
 
 <hr>
 <p>Copyright &copy; 1994-2002 Netscape Communications Corporation.</p>