diff --git a/mozilla/extensions/help/resources/locale/en-US/help-toc.rdf b/mozilla/extensions/help/resources/locale/en-US/help-toc.rdf index 57530cf369d..1689e711e86 100644 --- a/mozilla/extensions/help/resources/locale/en-US/help-toc.rdf +++ b/mozilla/extensions/help/resources/locale/en-US/help-toc.rdf @@ -835,7 +835,7 @@ nc:link="chrome://help/locale/nav_help.xhtml#plugins_and_downloads"/> - + diff --git a/mozilla/extensions/help/resources/locale/en-US/mail_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/mail_help.xhtml index 46846ad99a7..164eee3fe69 100644 --- a/mozilla/extensions/help/resources/locale/en-US/mail_help.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/mail_help.xhtml @@ -553,13 +553,15 @@ no subcategories are visible, double-click Mail & Newsgroups to expand the list.)
  • In the General section, do one of the following: - - - +
  • Click OK to have your change take affect.
    • @@ -573,10 +575,12 @@
  • Under the Advanced category, click Scripts & Plug-ins. (If no subcategories are visible, double-click Advanced to expand the list.) - - +
  • Click OK to have your changes take affect.
    • @@ -4005,7 +4009,6 @@ to filter unwanted mail.

    [Return to beginning of section]

    -

    Mail & Newsgroups Account Settings - Junk Settings

    @@ -4052,7 +4055,6 @@ to filter unwanted mail.

    [Return to beginning of section]

    -

    Mail & Newsgroups Account Settings - Return Receipts

    @@ -4712,7 +4714,6 @@ to filter unwanted mail.

    [Return to beginning of section]

    -

    Mail & Newsgroups Preferences - Junk Mail

    @@ -4753,7 +4754,6 @@ to filter unwanted mail.

    [Return to beginning of section]

    -

    Mail & Newsgroups Preferences - Labels

    This section describes how to use the Labels preferences panel. You use the diff --git a/mozilla/extensions/help/resources/locale/en-US/passwords_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/passwords_help.xhtml index 3f610902e56..0877b7ac4ff 100644 --- a/mozilla/extensions/help/resources/locale/en-US/passwords_help.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/passwords_help.xhtml @@ -30,7 +30,8 @@

  • Password Manager
  • Privacy & Security Preferences - Master Passwords
    • -
  • Change Master Password
    • +
  • Change Master Passwords
    • +
  • Master Password Timeout
  • Reset Master Password
    • @@ -99,8 +100,8 @@ periodically, which can be inconvenient. (For information about controlling how often it is requested, see the discussion of the Master Password timeout at - Privacy & - Security Preferences - Master Passwords.) + Privacy & Security Preferences - Master + Passwords.)
  • If you use obscuring, you may not have to set a master password at all (unless you're using certificates for identification purposes), but it may be easier for a stranger who has access to your computer to steal your @@ -182,8 +183,8 @@ "using_priv_help.xhtml#using_the_password_manager">Using the Password Manager.

    -

    Privacy & - Security Preferences - Master Passwords

    +

    Privacy & Security Preferences - Master + Passwords

    This section describes the Master Passwords preferences panel. If you are not already viewing it, follow these steps:

    @@ -196,8 +197,6 @@ the list.)
    • -

    Change Master Password

    -

    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.

    @@ -211,65 +210,32 @@ passwords, and other data stored by the Password Manager and Form Manager.

    +

    Each security device, whether it is software or hardware, has its own + separate Master Password.

    + - -

    Master Password Timeout

    - -

    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.

    - -

    You can control how often the browser requests your master password:

    - - - -

    Reset Master Password

    - -

    Warning: 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 - Software - Security Device.

    - -

    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 - Turning - Encryption On and Off.

    - -

    To change your master password rather than resetting it, click the Change - Password button in the Master Passwords preferences panel.

    - -

    You must remember your old master password to change it with the Change - Password button.

    - -

    If you are really sure that you want to reset your master password and - permanently erase all your encrypted personal information and - certificates:

    - - @@ -99,8 +100,8 @@ periodically, which can be inconvenient. (For information about controlling how often it is requested, see the discussion of the Master Password timeout at - Privacy & - Security Preferences - Master Passwords.) + Privacy & Security Preferences - Master + Passwords.)
  • If you use obscuring, you may not have to set a master password at all (unless you're using certificates for identification purposes), but it may be easier for a stranger who has access to your computer to steal your @@ -182,8 +183,8 @@ "using_priv_help.xhtml#using_the_password_manager">Using the Password Manager.

    -

    Privacy & - Security Preferences - Master Passwords

    +

    Privacy & Security Preferences - Master + Passwords

    This section describes the Master Passwords preferences panel. If you are not already viewing it, follow these steps:

    @@ -196,8 +197,6 @@ the list.)
    • -

    Change Master Password

    -

    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.

    @@ -211,65 +210,32 @@ passwords, and other data stored by the Password Manager and Form Manager.

    +

    Each security device, whether it is software or hardware, has its own + separate Master Password.

    + - -

    Master Password Timeout

    - -

    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.

    - -

    You can control how often the browser requests your master password:

    - - - -

    Reset Master Password

    - -

    Warning: 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 - Software - Security Device.

    - -

    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 - Turning - Encryption On and Off.

    - -

    To change your master password rather than resetting it, click the Change - Password button in the Master Passwords preferences panel.

    - -

    You must remember your old master password to change it with the Change - Password button.

    - -

    If you are really sure that you want to reset your master password and - permanently erase all your encrypted personal information and - certificates:

    - -