Bug 461000 - Remove Form Manager documentation from Help. r=IanN.
authorstefanh@inbox.com
Sun, 09 Nov 2008 16:58:16 +0100
changeset 1049 b1de0b0ec60bb839696cad3b7dd36ac4e89c80e2
parent 1048 01c92ff2d3daa7d00fe78eea2852bfe0acc51479
child 1050 66e24480b7efa951a1a0ec9af71b5de14954602a
push idunknown
push userunknown
push dateunknown
reviewersIanN
bugs461000
Bug 461000 - Remove Form Manager documentation from Help. r=IanN.
suite/locales/en-US/chrome/common/help/glossary.xhtml
suite/locales/en-US/chrome/common/help/help-glossary.rdf
suite/locales/en-US/chrome/common/help/help-index1.rdf
suite/locales/en-US/chrome/common/help/passwords_help.xhtml
suite/locales/en-US/chrome/common/help/privacy_help.xhtml
suite/locales/en-US/chrome/common/help/privsec_help.xhtml
suite/locales/en-US/chrome/common/help/suite-toc.rdf
suite/locales/en-US/chrome/common/help/using_priv_help.xhtml
--- a/suite/locales/en-US/chrome/common/help/glossary.xhtml
+++ b/suite/locales/en-US/chrome/common/help/glossary.xhtml
@@ -255,21 +255,16 @@
 <dt id="foreign_cookie">foreign cookie</dt><dd>A <a href="#cookie">cookie</a>
   from one site that gets stored on your computer when you visit a different
   site. Sometimes a <a href="#web_site">website</a> displays content that is
   hosted on another website. That content can be anything from an image to text
   or an advertisement. The second website that hosts such elements also has the
   ability to store a cookie in your browser, even though you don&apos;t visit
   it directly. Also known as <q>third-party cookie</q>.</dd>
 
-<dt id="form_manager">Form Manager</dt><dd>The part of the browser that can
-  help you save the personal data you enter into online forms, such as your
-  name, address, phone, and so on. Then, when a website presents you with a
-  form, Form Manager can fill it in automatically.</dd>
-
 <dt id="frame">frame</dt><dd>Frames are <a href="#web_page">web pages</a>
   contained inside of an all-encompasssing <q>meta</q> page.</dd>
 
 <dt id="ftp">FTP (File Transfer Protocol)</dt><dd>A
   standard that allows users to transfer files from one computer to another
   over a network. You can use your browser to fetch files using FTP.</dd>
 
 <dt id="gopher">Gopher</dt><dd>A protocol used to search and retrieve
--- a/suite/locales/en-US/chrome/common/help/help-glossary.rdf
+++ b/suite/locales/en-US/chrome/common/help/help-glossary.rdf
@@ -38,17 +38,16 @@
         <rdf:li> <rdf:Description nc:name="dual key pairs" nc:link="glossary.xhtml#dual_key_pairs"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="eavesdropping" nc:link="glossary.xhtml#eavesdropping"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="encryption" nc:link="glossary.xhtml#encryption"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="encryption certificate" nc:link="glossary.xhtml#encryption_certificate"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="encryption key" nc:link="glossary.xhtml#encryption_key"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="fingerprint" nc:link="glossary.xhtml#fingerprint"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="FIPS PUBS 140-1" nc:link="glossary.xhtml#fips_pubs_140-1"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="foreign cookie" nc:link="glossary.xhtml#foreign_cookie"/> </rdf:li>
-        <rdf:li> <rdf:Description nc:name="Form Manager" nc:link="glossary.xhtml#form_manager"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="frame" nc:link="glossary.xhtml#frame"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="FTP" nc:link="glossary.xhtml#ftp"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Gopher" nc:link="glossary.xhtml#gopher"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="helper application" nc:link="glossary.xhtml#helper_application"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="home page" nc:link="glossary.xhtml#home_page"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="HTML" nc:link="glossary.xhtml#html"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="HTTP" nc:link="glossary.xhtml#http"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="HTTPS" nc:link="glossary.xhtml#https"/> </rdf:li>
--- a/suite/locales/en-US/chrome/common/help/help-index1.rdf
+++ b/suite/locales/en-US/chrome/common/help/help-index1.rdf
@@ -660,81 +660,16 @@
        <rdf:Description ID="FIPS_mode"
          nc:name="FIPS mode"
          nc:link="using_certs_help.xhtml#enable_fips_mode"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="font_changing_in_composer"
          nc:name="Font changing in Composer"
          nc:link="composer_help.xhtml#changing_text_color_style_and_font"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="Form_Manager"
-         nc:name="Form Manager"
-         nc:link="using_priv_help.xhtml#using_the_form_manager"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
-<rdf:Description about="#Form_Manager">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="Form_Manager:encrypting_stored_information"
-         nc:name="encrypting stored information"
-         nc:link="using_priv_help.xhtml#encrypting_stored_sensitive_information"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="Form_Manager:preferences"
-         nc:name="form manager preferences"
-         nc:link="using_priv_help.xhtml#forms"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="Form_Manager:settings"
-         nc:name="form manager settings"
-         nc:link="using_priv_help.xhtml#form_settings"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="Form_Manager:using"
-         nc:name="using the form manager"
-         nc:link="using_priv_help.xhtml#using_the_form_manager"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="forms"
-         nc:name="forms"
-         nc:link="using_priv_help.xhtml#encrypting_stored_sensitive_information"/>
-     </rdf:li></rdf:Seq>
-   </nc:subheadings>
-</rdf:Description>
-
-<rdf:Description about="#forms">
-   <nc:subheadings>
-     <rdf:Seq><rdf:li>
-       <rdf:Description ID="forms:encrypting_stored_information"
-         nc:name="encrypting stored information"
-         nc:link="using_priv_help.xhtml#encrypting_stored_sensitive_information"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="forms:filling_out_automatically"
-         nc:name="filling out automatically"
-         nc:link="using_priv_help.xhtml#filling_out_forms_automatically"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="forms:preferences"
-         nc:name="form preferences"
-         nc:link="using_priv_help.xhtml#forms"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="forms:saving_data"
-         nc:name="saving data from forms"
-         nc:link="using_priv_help.xhtml#saving_form_data"/>
-     </rdf:li>
-     <rdf:li>
-       <rdf:Description ID="forms:storing_data_from"
-         nc:name="storing data from forms"
-         nc:link="using_priv_help.xhtml#managing_stored_form_data"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="help-indexAZ.rdf#g">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="GIF"
@@ -1527,21 +1462,16 @@
          nc:link="cs_nav_prefs_navigator.xhtml#downloads"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="preferences:fonts"
          nc:name="fonts preferences"
          nc:link="cs_nav_prefs_appearance.xhtml#fonts"/>
      </rdf:li>
      <rdf:li>
-       <rdf:Description ID="preferences:forms"
-         nc:name="form preferences"
-         nc:link="using_priv_help.xhtml#forms"/>
-     </rdf:li>
-     <rdf:li>
        <rdf:Description ID="preferences:helper_applications"
          nc:name="helper application preferences"
          nc:link="cs_nav_prefs_navigator.xhtml#helper_applications"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="preferences:history"
          nc:name="history preferences"
          nc:link="cs_nav_prefs_navigator.xhtml#history"/>
--- a/suite/locales/en-US/chrome/common/help/passwords_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/passwords_help.xhtml
@@ -314,18 +314,17 @@
   to someone else. If you forget this password, you may not be able to access
   important information, such as websites that require passwords or
   certificates stored on your computer.</p>
 
 <h2 id="master_password_timeout">Master Password Timeout</h2>
 
 <p>After you first set a new master password, you will be asked to enter it
   only when the newly launched browser first needs it to access personal
-  information, such as a user name and password, saved form data, or personal
-  certificates.</p>
+  information, such as a user name and password or personal certificates.</p>
 
 <p>You can control how often the browser requests your master password:</p>
 
 <ul>
   <li><strong>The first time it is needed</strong>: This setting
     (selected by default) causes the browser to request your master password
     only the first time it needs access to the private key database after
     launching. The browser will not request the master password again until
@@ -339,25 +338,24 @@
     This setting causes the browser to request your master password if it
     needs to access your personal information and the specified interval
     has elapsed since the last time it did so.</li>
 </ul>
 
 <h2 id="reset_master_password">Reset Master Password</h2>
 
 <p><strong>Warning</strong>: 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.xhtml#software_security_device">Software Security
-  Device</a>.</p>
+  permanently erase all the encrypted web and email passwords, saved on your
+  behalf by Password Manager. You will also lose all your personal certificates
+  associated with the <a href="glossary.xhtml#software_security_device">
+  Software Security Device</a>.</p>
 
-<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
+<p>Note that encrypted passwords 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.xhtml#turning_encryption_on_and_off">Turning
   Encryption On and Off</a>.</p>
 
 <p>To change your master password rather than resetting it, click the Change
   Password button in the Master Passwords preferences panel.</p>
 
 <p>This section describes the Reset Master Password dialog box. If you&apos;re
   not already viewing it, follow these steps:</p>
@@ -367,26 +365,25 @@
     <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>Click Reset Password.</li>
 </ol>
 
 <p><strong>Warning</strong>: 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
+  permanently erase all encrypted web and email passwords, saved on your behalf
+  by Password Manager You will also lose all your personal certificates
+  associated with the
   <a href="glossary.xhtml#software_security_device">software security
   device</a>.</p>
 
-<p>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.xhtml#turning_encryption_on_and_off">Turning
+<p>Encrypted passwords 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.xhtml#turning_encryption_on_and_off">Turning
   Encryption On and Off</a>.</p>
 
 <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>.</p>
@@ -399,22 +396,19 @@
 <p>Resetting your master password does not create a new password. Instead, it
   removes all the data your old master password protects. You will be asked to
   specify a new master password the next time the browser needs to store
   personal information.</p>
 
 <p>After you reset your master password, you may also want to re-save personal
   information that you want to have prefilled in the future. For example, as
   you browse you may want Password Manager to save website and email passwords
-  again.</p>
-
-<p>You will also need to enter data by hand until Form Manager accumulates
-  enough data to fill in forms automatically. In addition, any personal
-  certificates associated with the software security device will be permanently
-  erased and you will need to apply for new ones.</p>
+  again.In addition, any personal certificates associated with the software
+  security device will be permanently erased and you will need to apply for new
+  ones.</p>
 
 <p><strong>Note for smart card users</strong>: Each smart card has its own
   master password. The master password for a smart card protects only the data
   on that smart card (such as personal certificates). You can normally change
   the master password for a smart card (assuming that you remember it), but you
   cannot reset it.</p>
 
 <h2 id="choosing_a_good_password">Choosing a Good Password</h2>
--- a/suite/locales/en-US/chrome/common/help/privacy_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/privacy_help.xhtml
@@ -13,32 +13,30 @@
   type="text/css"/>
 </head>
 <body>
 
 <h1 id="using_privacy_features">Using Privacy Features</h1>
 
 <p>Your browser includes features you can use to enhance the privacy and
   security of your personal information. The sections that follow describe how
-  your browser can help you control cookies, passwords, forms, and images while
-  you are surfing the Internet.</p>
+  your browser can help you control cookies, passwords, and images while you
+  are surfing the Internet.</p>
 
 <p>For information about related &brandShortName; security features, see
   <a href="mail_sec_help.xhtml">Signing &amp; Encrypting Messages</a> and
   <a href="using_certs_help.xhtml">Using Certificates</a>.</p>
 
 <div class="contentsBox">Privacy topics:
   <ul>
     <li><a href="#privacy_on_the_internet">Privacy on the Internet</a></li>
     <li><a href="using_priv_help.xhtml#using_the_cookie_manager">Using the
       Cookie Manager</a></li>
     <li><a href="using_priv_help.xhtml#using_the_password_manager">Using the
       Password Manager</a></li>
-    <li><a href="using_priv_help.xhtml#using_the_form_manager">Using the Form
-      Manager</a></li>
     <li><a href="using_priv_help.xhtml#encrypting_stored_sensitive_information">Encrypting
       Stored Sensitive Information</a></li>
     <li><a href="using_priv_help.xhtml#managing_images">Managing Images</a></li>
     <li><a href="cs_priv_prefs_popup.xhtml#controlling_popups">Controlling Popups</a></li>
     <li><a href="privsec_help.xhtml">Privacy &amp; Security Preferences</a></li>
   </ul>
 </div>
 
--- a/suite/locales/en-US/chrome/common/help/privsec_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/privsec_help.xhtml
@@ -28,17 +28,16 @@
 </ol>
 
 <p>For help with a panel&apos;s settings, click the appropriate link below.</p>
 
 <div class="contentsBox">Related sections:
   <ul>
     <li><a href="using_priv_help.xhtml#cookies">Cookies</a></li>
     <li><a href="using_priv_help.xhtml#images">Images</a></li>
-    <li><a href="using_priv_help.xhtml#forms">Forms</a></li>
     <li><a href="passwords_help.xhtml">Passwords</a></li>
     <li><a href="passwords_help.xhtml#master_passwords">Master Passwords</a></li>
     <li><a href="ssl_help.xhtml">SSL</a></li>
     <li><a href="certs_prefs_help.xhtml">Certificates</a></li>
     <li><a href="validation_help.xhtml">Validation</a></li>
   </ul>
 </div>
 
--- a/suite/locales/en-US/chrome/common/help/suite-toc.rdf
+++ b/suite/locales/en-US/chrome/common/help/suite-toc.rdf
@@ -783,17 +783,16 @@
 
 <!-- USING PRIVACY FEATURES CONTENT -->
 <rdf:Description about="#using-priv-help">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="privacy-doc" nc:name="Privacy on the Internet" nc:link="privacy_help.xhtml#privacy_on_the_internet"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-cookies" nc:name="Using the Cookie Manager" nc:link="using_priv_help.xhtml#using_the_cookie_manager"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-password" nc:name="Using the Password Manager" nc:link="using_priv_help.xhtml#using_the_password_manager"/> </rdf:li>
-        <rdf:li><rdf:Description ID="using-priv-help-forms" nc:name="Using the Form Manager" nc:link="using_priv_help.xhtml#using_the_form_manager"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-encrypt" nc:name="Encrypting Stored Sensitive Information" nc:link="using_priv_help.xhtml#encrypting_stored_sensitive_information"/> </rdf:li>
         <rdf:li><rdf:Description ID="images-help-managing" nc:name="Managing Images" nc:link="using_priv_help.xhtml#managing_images"/> </rdf:li>
         <rdf:li><rdf:Description ID="pop_up_blocking" nc:name="Controlling Popups" nc:link="cs_priv_prefs_popup.xhtml"/> </rdf:li>
         <rdf:li><rdf:Description ID="sec_gen" nc:name="Privacy &amp; Security Preferences" nc:link="privsec_help.xhtml"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
@@ -862,40 +861,16 @@
         <rdf:li><rdf:Description ID="master-prefs-change" nc:name="Change Master Password" nc:link="passwords_help.xhtml#change_master_password"/> </rdf:li>
         <rdf:li><rdf:Description ID="master-prefs-timeout" nc:name="Master Password Timeout" nc:link="passwords_help.xhtml#master_password_timeout"/> </rdf:li>
         <rdf:li><rdf:Description ID="master-prefs-reset" nc:name="Reset Master Password" nc:link="passwords_help.xhtml#reset_master_password"/> </rdf:li>
         <rdf:li><rdf:Description ID="choosing-good-password" nc:name="Choosing a Good Password" nc:link="passwords_help.xhtml#choosing_a_good_password"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
-<rdf:Description about="#using-priv-help-forms">
-    <nc:subheadings>
-      <rdf:Seq>
-        <rdf:li><rdf:Description ID="using-priv-help-forms-saveinfo" nc:name="Saving Form Data" nc:link="using_priv_help.xhtml#saving_form_data"/> </rdf:li>
-        <rdf:li><rdf:Description ID="using-priv-help-forms-auto" nc:name="Filling Out Forms Automatically" nc:link="using_priv_help.xhtml#filling_out_forms_automatically"/> </rdf:li>
-        <rdf:li><rdf:Description ID="using-priv-help-forms-notify" nc:name="Turning off Form Manager Notification" nc:link="using_priv_help.xhtml#turning_off_form_manager_notification"/> </rdf:li>
-        <rdf:li><rdf:Description ID="using-priv-help-forms-view-edit" nc:name="Managing Stored Form Data" nc:link="using_priv_help.xhtml#managing_stored_form_data"/> </rdf:li>
-        <rdf:li><rdf:Description ID="using-priv-help-sites-view-edit" nc:name="Editing Stored Site Information" nc:link="using_priv_help.xhtml#editing_stored_site_information"/> </rdf:li>
-        <rdf:li><rdf:Description ID="form_settings" nc:name="Form Settings" nc:link="using_priv_help.xhtml#form_settings"/> </rdf:li>
-      </rdf:Seq>
-    </nc:subheadings>
-  </rdf:Description>
-
-<rdf:Description about="#form_settings">
-    <nc:subheadings>
-      <rdf:Seq>
-        <rdf:li><rdf:Description ID="forms_prefs" nc:name="Form Preferences" nc:link="using_priv_help.xhtml#forms"/> </rdf:li>
-        <rdf:li><rdf:Description ID="forms_data" nc:name="Form Manager - Data" nc:link="using_priv_help.xhtml#form_manager_data"/> </rdf:li>
-        <rdf:li><rdf:Description ID="forms_sites" nc:name="Form Manager - Sites" nc:link="using_priv_help.xhtml#form_manager_sites"/> </rdf:li>
-        <rdf:li><rdf:Description ID="forms_prefill" nc:name="Prefill Form Data" nc:link="using_priv_help.xhtml#prefill_form_data"/> </rdf:li>
-      </rdf:Seq>
-    </nc:subheadings>
-  </rdf:Description>
-
 <rdf:Description about="#using-priv-help-encrypt">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="using-priv-help-encrypt-on" nc:name="Turning Encryption On and Off" nc:link="using_priv_help.xhtml#turning_encryption_on_and_off"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-encrypt-master" nc:name="Setting a Master Password" nc:link="using_priv_help.xhtml#setting_a_master_password"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-encrypt-change" nc:name="Changing Your Master Password" nc:link="using_priv_help.xhtml#changing_your_master_password"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-encrypt-logout" nc:name="Logging Out of Your Master Password" nc:link="using_priv_help.xhtml#logging_out_of_your_master_password"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-priv-help-encrypt-forget" nc:name="What to Do If You Forget Your Master Password" nc:link="using_priv_help.xhtml#what_to_do_if_you_forget_your_master_password"/> </rdf:li>
--- a/suite/locales/en-US/chrome/common/help/using_priv_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/using_priv_help.xhtml
@@ -579,487 +579,22 @@
     time you log into the site, you can use the stored user name and
     password (if available) or indicate that you want Password Manager to save
     the information for that site.</li>
 </ul>
 
 <p>[<a href="#using_the_password_manager">Return to beginning of
   section</a>]</p>
 
-<h1 id="using_the_form_manager">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>
-
-<p>Form Manager can save the personal data you enter into online forms, such as
-  your name, address, phone, credit card numbers, and so on. This information
-  is stored on your hard drive. Then, when a site presents you with a form,
-  Form Manager can fill it in automatically.</p>
-
-<div class="contentsBox">In this section:
-  <ul>
-    <li><a href="#saving_form_data">Saving Form Data</a></li>
-    <li><a href="#filling_out_forms_automatically">Filling Out Forms
-      Automatically</a></li>
-    <li><a href="#turning_off_form_manager_notification">Turning Off Form
-      Manager Notification</a></li>
-    <li><a href="#managing_stored_form_data">Managing Stored Form Data</a></li>
-    <li><a href="#editing_stored_site_information">Editing Stored Site
-      Information</a></li>
-    <li><a href="#form_settings">Form Settings</a></li>
-  </ul>
-</div>
-
-<h2 id="saving_form_data">Saving Form Data</h2>
-
-<p>By default, when you fill out an online form and click Submit, Form Manager
-  detects the form and displays a dialog box asking if you want to save the
-  personal data you just entered. Soon, Form Manager will have enough data to
-  begin filling out forms automatically.</p>
-
-<p>There are two ways to save personal data:</p>
-
-<ul>
-  <li>Each time you submit an online form that includes certain kinds of
-    information, such as your name and address, 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. (This feature is turned on by default.) For
-      details, see <a href="#turning_off_form_manager_notification">Turning Off
-      Form Manager Notification</a>.</p>
-  </li>
-  <li>After you fill out a form (but before you submit it), open the Edit menu
-    and choose Save Form Info.</li>
-</ul>
-
-<p>When Form Manager asks if you want to save values that you&apos;ve entered
-  in a form (the first method described above), it gives you three options:</p>
-
-<ul>
-  <li><strong>Yes</strong>: Click this button to save the information you
-    entered. In the future, you can automatically fill in a form that requests
-    the same information.</li>
-  <li><strong>Never for this site</strong>: Click this button to ensure that
-    Form Manager will not ask in the future if you want to save information
-    that you enter in forms at this site. 
-
-    <p>You may want to do this if you want to ensure that you&apos;ll always
-      have to enter sensitive information manually at a particular site. You
-      can change your mind later if you like; for details, see
-      <a href="#editing_stored_site_information">Editing Stored Site
-      Information</a>.</p>
-  </li>
-  <li><strong>No</strong>: Form Manager won&apos;t save the information you
-    entered, but will ask again the next time you enter form information at
-    this site.</li>
-</ul>
-
-<p>Form Manager stores your personal data on your own computer in a file
-  that&apos;s difficult, but not impossible, for an intruder to read. See
-  <a href="#encrypting_stored_sensitive_information">Encrypting Stored
-  Sensitive Information</a> for information on protecting your information with
-  encryption technology.</p>
-
-<p>[<a href="#using_the_form_manager">Return to beginning of section</a>]</p>
-
-<h2 id="filling_out_forms_automatically">Filling Out Forms Automatically</h2>
-
-<p>You can use the Form Manager to fill out forms automatically in two ways:
-  either one field at a time, or multiple fields at once. In both cases, the
-  information is not actually sent to the site until you click the Submit
-  button or perform some similar action.</p>
-
-<p>To fill out a single field automatically in an online form, double-click in
-  the field. If Form Manager has stored the data for that field, it will fill
-  it in. You can edit the filled-in data if necessary.</p>
-
-<p>To fill out multiple fields in an online form all at once:</p>
-
-<ol>
-  <li>Go to the online form you want to fill out.</li>
-  <li>Open the Edit menu and choose Fill in Form. 
-
-    <p>Note that the Fill in Form menu item won&apos;t be accessible if the
-      Form Manager hasn&apos;t yet stored any relevant information.</p>
-  </li>
-  <li>A dialog box called Prefill Form Data appears (unless you have previously
-    chosen to bypass it for this site). This shows exactly what information
-    Form Manager is about to fill in. You can use this dialog box as follows:
-    <ul>
-      <li>To prevent a field from being filled in automatically, deselect the
-        checkbox beside it.</li>
-      <li>To prevent any fields from being filled in automatically, click
-        Cancel.</li>
-    </ul>
-
-    <p><strong>Important</strong>: You can also choose to bypass this dialog
-      box in the future. However, if you bypass this screen, you risk filling
-      in personal information (such as your credit card number) inadvertently.
-      For details, see below.</p>
-  </li>
-  <li>Click OK to confirm your choices. Form Manager then fills in the form as
-    you specified.
-
-    <p>The form is now filled in with the saved information. You may still need
-      to provide some additional information that the Form Manager does not
-      have available. The information is not actually sent to the site until
-      you click Submit or perform some similar action.</p>
-  </li>
-</ol>
-
-<p>In addition to providing a convenient way to confirm saved data and fill in
-  a form all at once, the Prefill Form Data dialog box is useful for two
-  reasons:</p>
-
-<ul>
-  <li>Prefill Form Data can help you prevent malicious sites from collecting
-    data you are not aware of. 
-
-    <p>For example, it&apos;s possible for a site to hide a field on a form
-      where you can&apos;t see it and specify that field to be a credit card
-      number. If you prefill the form without first examining the information
-      displayed in the Prefill Form Data dialog box, you may end up providing
-      your credit card number to such a site without realizing it. Prefill
-      Form Data lets you see every value that will be provided to the site,
-      allowing you to detect such tricks.</p>
-  </li>
-  <li>Prefill Form Data allows you to select which of several saved values for
-    a given field you want to use for a particular site.</li>
-</ul>
-
-<p>For a detailed description of the Prefill Form Data dialog box, see
-  <a href="#prefill_form_data">Prefill Form Data</a>.</p>
-
-<p>[<a href="#using_the_form_manager">Return to beginning of section</a>]</p>
-
-<h2 id="turning_off_form_manager_notification">Turning Off Form Manager
-  Notification</h2>
-
-<p>Form Manager is set to prompt you to save information whenever you submit an
-  online form that includes certain kinds of information, such as your name and
-  address. To stop these messages from appearing on your screen:</p>
-
-<ol>
-  <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 Forms. (If no
-    subcategories are visible, double-click Privacy &amp; Security to expand
-    the list.)</li>
-  <li>In the Form Manager section, deselect <q>Save form data from web pages
-    when completing forms</q>.</li>
-</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>
-
-<p>You can still open the Edit menu and choose Save Form Info any time you want
-  to save information from a form you&apos;ve just filled in, or choose Fill in
-  Form (or double-click each field) to fill in a form automatically.</p>
-
-<p>[<a href="#using_the_form_manager">Return to beginning of section</a>]</p>
-
-<h2 id="managing_stored_form_data">Managing Stored Form Data</h2>
-
-<p>To examine or edit personal data that Form Manager has saved:</p>
-
-<ol>
-  <li>Open the <span class="mac">&brandShortName;</span>
-    <span class="noMac">Edit</span> menu and choose Preferences.</li>
-  <li>From the Privacy &amp; Security category, click Forms. (If no
-    subcategories are visible, double-click Privacy &amp; Security to expand
-    the list.)</li>
-  <li>Click Manage Stored Form Data.</li>
-</ol>
-
-<p>The Form Manager dialog box for editing data appears. Click the
-  subcategories on the left to view or edit the corresponding data in the panel
-  on the right. To view subcategories that aren&apos;t visible, double-click a
-  category to expand the list.</p>
-
-<p>To add information not currently included in one of the drop down lists on
-  the right, select the blank item and start typing. Similarly, select existing
-  text to edit or delete it.</p>
-
-<p>The last category on the left side, Other Saved Information, includes panels
-  for two special kinds of data:</p>
-
-<ul>
-  <li><strong>Concatenations</strong> lists data stored as a single element
-    that would normally be stored as two or more elements. For example, data
-    stored from a single Full Name field that includes both your first and last
-    names would be stored here together rather than separately in those
-    individual categories.</li>
-  <li><strong>URL-Specific</strong> lists fields and the values to use for each
-    of them that are applicable only for the site where you entered
-    them.</li>
-</ul>
-
-<p>[<a href="#using_the_form_manager">Return to beginning of section</a>]</p>
-
-<h2 id="editing_stored_site_information">Editing Stored Site Information</h2>
-
-<p>As explained in <a href="#saving_form_data">Saving Form Data</a>, you can
-  choose <q>Never for this site</q> when Form Manager prompts you to save
-  data you&apos;ve entered in a form. Similarly, you can choose not to display
-  the Prefill Form Data dialog box on a site-by-site basis.</p>
-
-<p>Form Manager lets you change your mind about these decisions at any time. To
-  view site-specific information about your saved form data:</p>
-
-<ol>
-  <li>Open the <span class="mac">&brandShortName;</span>
-    <span class="noMac">Edit</span> menu and choose Preferences.</li>
-  <li>From the Privacy and Security category, click Forms. (If no subcategories
-    are visible, double-click Privacy &amp; Security to expand the list.)</li>
-  <li>Click Manage Sites.</li>
-</ol>
-
-<p>The Form Manager dialog box for managing sites appears:</p>
-
-<ul>
-  <li>The Forms Never Previewed tab lists the sites for which you&apos;ve
-    decided not to display the Prefill Form Data dialog box.</li>
-  <li>The Forms Never Saved tab lists the sites for which you&apos;ve asked not
-    to be prompted to save form data.</li>
-</ul>
-
-<p>To remove a site from either list and thus restore the default behavior,
-  select the site and click Remove. For more details, see
-  <a href="#form_manager_sites">Form Manager - Sites</a>.</p>
-
-<p>[<a href="#using_the_form_manager">Return to beginning of section</a>]</p>
-
-<h1 id="form_settings">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.</p>
-
-<p>This section describes the preferences and other settings that control the
-  way Form Manager works.</p>
-
-<p>For step-by-step instructions on using these settings, see
-  <a href="#using_the_form_manager">Using the Form Manager</a>.</p>
-
-<div class="contentsBox">In this section:
-  <ul>
-    <li><a href="#forms">Privacy &amp; Security Preferences - Forms</a></li>
-    <li><a href="#form_manager_data">Form Manager - Data</a></li>
-    <li><a href="#form_manager_sites">Form Manager - Sites</a></li>
-    <li><a href="#prefill_form_data">Prefill Form Data</a></li>
-  </ul>
-</div>
-
-<h2 id="forms">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:</p>
-
-<ol>
-  <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 Forms. (If no
-    subcategories are visible, double-click Privacy &amp; Security to expand
-    the list.)</li>
-</ol>
-
-<h3 id="form_manager">Form Manager</h3>
-
-<p>When you fill out an online form and click Submit, Form Manager displays a
-  dialog box that asks if you want it to save the form data you just entered
-  (but only some of the filled-in fields include standard ones such as name and
-  address).</p>
-
-<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>
-
-<ul>
-  <li><strong>Save form data from web pages when completing forms</strong>:
-    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
-    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
-      still available. You can still open the Edit Menu and choose Fill in Form
-      or Save Form Info.</p>
-  </li>
-  <li><strong>Manage Stored Form Data</strong>: Click this button to examine or
-    edit personal data that Form Manager has saved. For details, see
-    <a href="#form_manager_data">Form Manager - Data</a>.</li>
-  <li><strong>Manage Sites</strong>: Click this button to view site-specific
-    information about your saved form data. For details, see
-    <a href="#form_manager_sites">Form Manager - Sites</a>.</li>
-</ul>
-
-<h2 id="form_manager_data">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:</p>
-
-<ol>
-  <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 Forms. (If no
-    subcategories are visible, double-click Privacy &amp; Security to expand
-    the list.)</li>
-  <li>Click Manage Stored Form Data.</li>
-</ol>
-
-<p>The Form Manager window for managing stored form data allows you to perform
-  two tasks:</p>
-
-<ul>
-  <li><strong>Category</strong>: Double-click a category in the Category column
-    to view its subcategories, and click a subcategory to view its data on the
-    right side of the window. To edit or add to the displayed data, click in a
-    field and type.
-
-    <p>To add information not currently included in one of the drop down lists
-      on the right, select the blank item and start typing. Similarly, select
-      existing text to edit or delete it.</p>
-  </li>
-  <li><strong>Remove All Saved Data</strong>: Click this button to remove all
-    the saved data at once.</li>
-</ul>
-
-<p>The last category on the left side, Other Saved Information, includes panels
-  for two special kinds of data:</p>
-
-<ul>
-  <li><strong>Concatenations</strong>: The Form Manager typically captures and
-    prefills individual elements, such as first and last name, and combines
-    them when necessary. If it encounters a page that asks for a full name, for
-    example, it prefills it with the first and last name it has stored
-    previously.
-
-    <p>However, if the Form Manager hasn&apos;t yet stored your first and last
-      name, it saves the full name (if you ask it to) as a single element in
-      the Concatenations panel.</p>
-  </li>
-  <li><strong>URL-Specific</strong>: This panel lists URL-specific fields and
-    the values to use for each of them at each URL for which you have entered
-    such information.</li>
-</ul>
-
-<p>For step-by-step instructions on using the Form Manager, see
-  <a href="#using_the_form_manager">Using the Form Manager</a>.</p>
-
-<h2 id="form_manager_sites">Form Manager - Sites</h2>
-
-<p>This section describes how to use the dialog box that allows you to edit
-  site information saved on your behalf by Form Manager. If you are not already
-  viewing it, follow these steps:</p>
-
-<ol>
-  <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 Forms. (If no
-    subcategories are visible, double-click Privacy &amp; Security to expand
-    the list.)</li>
-  <li>Click Manage Sites.</li>
-</ol>
-
-<p>The Form Manager window for managing sites has two tabs:</p>
-
-<ul>
-  <li><strong>Forms Never Previewed</strong>: Click this tab to view the list
-    of sites for which you selected <q>Bypass this screen when prefilling
-    this form in the future</q> after choosing Fill in Form from the Edit
-    menu.
-
-    <p>If you remove an entry from this list, Form Manager will again give you
-      an opportunity to review form data for that site before filling it
-      in.</p>
-  </li>
-  <li><strong>Forms Never Saved</strong>: Click this tab to view the list of
-    sites for which you selected <q>Never for this site</q> in response to
-    the Form Manager&apos;s request to store form data.
-
-    <p>If you remove an entry from this list, Form Manager will again ask
-      whether to store form data when you submit forms at that site (assuming
-      that the main Form Manager notification option has been selected in
-      <a href= "#forms">Privacy &amp; Security Preferences - Forms</a>).</p>
-  </li>
-</ul>
-
-<p>Regardless of which tab you are viewing, you can remove entries from the
-  list as follows:</p>
-
-<ul>
-  <li><strong>Remove</strong>: Select one or more entries that you want to
-    remove, then click this button to remove them.</li>
-  <li><strong>Remove All</strong>: Click this button to remove all the entries
-    for the tab you are viewing.</li>
-</ul>
-
-<p>See the descriptions of each tab above for the consequences of removing
-  entries.</p>
-
-<p>For step-by-step instructions on working with form data, see
-  <a href="#using_the_form_manager">Using the Form Manager</a>.</p>
-
-<h2 id="prefill_form_data">Prefill Form Data</h2>
-
-<p>This section describes the window that normally appears when you open the
-  Edit menu and choose Fill In Form.</p>
-
-<p>However, the Fill in Form menu item is enabled only if you have previously
-  used Form Manager to save some form data and are now viewing a web page that
-  is requesting some of the same data. For step-by-step instructions on working
-  with form data, see <a href="#using_the_form_manager">Using the Form
-  Manager</a>.</p>
-
-<p>The Prefill Form Data window allows you to perform these actions:</p>
-
-<ul>
-  <li><strong>Click in a field to edit the displayed data</strong>: Any changes
-    you make here will be reflected in the data used to fill in this form, but
-    won&apos;t change your stored data.</li>
-  <li><strong>Select alternate data</strong>: Click the arrow on the right side
-    of any field to display a drop-down menu for that field. If you have
-    previously used Form Manager to save alternate information (for example, a
-    different mailing address), the available alternates are listed in the
-    menu.</li>
-  <li><strong>Check the items that you would like to have prefilled</strong>:
-    Only the items with checkmarks beside them will be filled in automatically.
-    When you first open the window, all the items are checked. Click to
-    deselect any that you don&apos;t want filled in automatically.</li>
-  <li><strong>Bypass this screen when prefilling this form in the
-    future</strong>: Select this checkbox to avoid seeing this window the next
-    time you visit this site. This can be convenient; for example, if you
-    frequently need to enter the same data at the same site.
-
-    <p><strong>Important</strong>: If you bypass this screen, you risk filling
-      in personal information (such as your credit card number) inadvertently.
-      For details, see <a href="#filling_out_forms_automatically">Filling Out
-      Forms Automatically</a>.</p>
-
-    <p>If you change your mind about this decision, you can restore the
-      Prefill Form Data window for this site. For details, see
-      <a href="#form_manager_sites">Form Manager - Sites</a>.</p>
-  </li>
-  <li><strong>View Stored Form Data</strong>: Click this button to examine or
-    edit all personal data that Form Manager has saved. For details, see
-    <a href="#form_manager_data">Form Manager - Data</a>.</li>
-</ul>
-
 <h1 id="encrypting_stored_sensitive_information">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&apos;s difficult, but not impossible, for an intruder to read.</p>
+<p>If you use Password Manager to save passwords, then this sensitive
+  information is stored on your computer in a file that&apos;s difficult, but
+  not impossible, for an intruder to read.</p>
 
 <p>For example, if your computer is in an area where unauthorized people have
   access to it, it&apos;s possible for a determined person to read the file
   containing your sensitive information.</p>
 
 <p>For a greater degree of security, you may want to protect the file with
   encryption. Encryption makes it much harder for an unauthorized person to
   view your stored sensitive information.</p>
@@ -1196,25 +731,25 @@
   section</a>]</p>
 
 <h2 id="what_to_do_if_you_forget_your_master_password">What to Do If You Forget
   Your Master Password</h2>
 
 <p>If you forget your master password and you have chosen to encrypt sensitive
   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
-  sure you remember it or record it in a safe place.</p>
+  the stored password it protects (assuming you have turned 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
   are sure you can&apos;t remember it. However, resetting your master password
-  permanently erases 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
+  permanently erases all the web and email passwords, saved on your behalf by
+  Password Manager. You will also lose all your personal certificates
+  associated with the
   <a href="glossary.xhtml#software_security_device">Software Security
   Device</a>.</p>
 
 <p>Before taking this drastic step, read
   <a href="passwords_help.xhtml#reset_master_password">Reset Master
   Password</a>.</p>
 
 <p>If you are sure you can&apos;t remember or retrieve your master password,