diff --git a/mozilla/extensions/help/resources/locale/en-US/helpFileLayout.css b/mozilla/extensions/help/resources/locale/en-US/helpFileLayout.css index 78acbbc3712..b732a1fd049 100644 --- a/mozilla/extensions/help/resources/locale/en-US/helpFileLayout.css +++ b/mozilla/extensions/help/resources/locale/en-US/helpFileLayout.css @@ -75,8 +75,6 @@ p:first-child { padding-top: 0; margin-top: 0; } .separate > li { margin-bottom: 0.5em; } -.ui { background-color: #B7F5C7 } - .contentsBox { margin-top: 12px; background-color: #cccccc; 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 db8d48b295d..6681246765b 100644 --- a/mozilla/extensions/help/resources/locale/en-US/mail_help.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/mail_help.xhtml @@ -37,12 +37,12 @@ of the &brandShortName; Navigator window. - - +
  Mail & Newsgroups icon
@@ -82,22 +82,20 @@ Started with &brandShortName; Mail & Newsgroups Setup Wizard

To set up a mail or newsgroup account, first open the Window -menu and choose Mail & Newsgroups. If you haven't already set +menu and choose Mail & Newsgroups. If you haven't already set up an account, the Account Wizard appears automatically, enabling you to set up an account.

The Account Wizard guides you through the process of creating a -new account. If you don't know a setting, click Cancel and ask your +new account. If you don't know a setting, click Cancel and ask your Internet service provider (ISP) or help desk.

-

If an account already exists, the Account Wizard doesn't appear +

If an account already exists, the Account Wizard doesn't appear automatically when the Mail window opens. Instead, after opening the Mail window, open the File menu and choose New, then Account. For more details, see Setting Up Additional Mail & News Accounts.

-

 

-

Setting Up Mail Accounts with an ISP or Email Provider

@@ -139,8 +137,8 @@ box.

The information requested by the Account Wizard depends on the type of new account you specify in its first window. The boldface -headings that follow correspond to the windows you'll see when -you're setting up an ISP or email provider account.

+headings that follow correspond to the windows you'll see when +you're setting up an ISP or email provider account.

  • New Account Setup: Choose the type of account @@ -177,7 +175,7 @@ use to refer to this account, then click Next.
  • Congratulations! Verify that the information you entered is correct. If necessary, verify the information you entered with your ISP or system administrator. When you are sure -that it's correct, click Finish to set up your account.
  • +that it's correct, click Finish to set up your account.
  • You see your new account listed in the left side of the Mail & Newsgroups Account Settings dialog box. Click OK to start @@ -243,7 +241,7 @@ more information.
  • -
  • Click headings under any account's name and modify the +
  • Click headings under any account's name and modify the corresponding settings in the panel on the right.
  • Click OK to save your changes.
  • @@ -269,9 +267,8 @@ your email address and signature file, in the right side of the dialog box.
  • Click any of these items beneath the name of an account to see -the corresponding settings:
  • +the corresponding settings: -
  • [Return to beginning of @@ -5226,7 +5052,7 @@ this setting, you must exit and restart Mail & Newsgroups to have your changes take effect.

  • When opening messages, display them in: Here you can choose -if you want to reuse a message window for the next mail or if want to +if you want to reuse a message window for the next mail or if you want to open a new one for each.
  • @@ -5256,7 +5082,7 @@ Newsgroups to expand the list.) for viewing plain-text messages: fixed width or variable width. Choosing a font style, size, and color for quoted plain-text messages can help you more easily distinguish quoted text (usually -a message that's been forwarded to you or by you). +a message that's been forwarded to you or by you).
  • Wrap text to fit window width: Select this so that incoming messages are word-wrapped to fit the width of your @@ -5267,9 +5093,6 @@ that when you receive messages that contain emoticons (also called smiley faces) Mail & Newsgroups can convert them to graphics, for example: -


    -

    - @@ -5312,7 +5135,7 @@ for example:

    Character Encodings: Click the Character Encoding drop-down list to select the character encoding you want Mail & Newsgroups to use as the default for incoming mail and newsgroup messages. This is -recommended if it's likely you might receive messages in which the +recommended if it's likely you might receive messages in which the character encoding (MIME charset) is not indicated, such as when reading messages in international newsgroups.

    @@ -5334,7 +5157,7 @@ section]

    Notifications

    Notification preferences allow you to select different methods -for informing you on arrival of a new message. So you don't have to +for informing you on arrival of a new message. So you don't have to always look in the folders.

      @@ -5347,47 +5170,59 @@ expand the list.)
      -
    • -

      Show an alert: Select this if you want &brandShortName; -Mail & Newsgroups to display a sliding alert above your system tray -in the lower right corner of your screen when new messages arrive. -The sliding alert only appears once when new messages arrive, and -won't appear again until you bring the Mail & Newsgroups window -to the front.

      +
    • Show an alert: Select this if you want +&brandShortName; Mail & Newsgroups to display a sliding alert above +your system tray in the lower right corner of your screen when new +messages arrive. The sliding alert only appears once when new messages +arrive, and won't appear again until you bring the Mail & +Newsgroups window to the front.
    This:
    - - - + + + - - - - + + + +
     Sliding new mail alert
    Sliding new mail alert

    When the alert appears, clicking the link displayed in the alert -will take you to the first folder that has new mail.

    +will take you to the first folder that has new mail. If no &brandShortName; +applications are running, Quick Launch must be enabled in order to +display the new message alert.

    + +

    If any &brandShortName; application is running, then Quick Launch does +not need to be enabled in order to display the new message alert. +For information on using Quick Launch, see +Using Quick Launch.

    Once &brandShortName; Mail has been started, the new message alert will continue to work even after you close the Mail window (as long as another &brandShortName; application is running).

    - -

    Note: This feature is not available on Mac OS, Linux or Unix.

  • -
  • -

    Play a sound: Select this if you want &brandShortName; Mail & -Newsgroups to play a sound when new messages arrive.
    +

  • Play a sound: Select this if you want &brandShortName; +Mail & Newsgroups to play a sound when new messages arrive. You can choose between the default system sound and a custom sound in WAV format. If you choose the latter you have to enter the path to the sound file or use the Browse button to select in in the file locator. -Click on Preview button to preview the choosen sound file.

    +Click on the Preview button to preview the choosen sound file.

    Once &brandShortName; Mail has been started, the new messages sound will continue to work even after you close the Mail window (as long as another &brandShortName; application is running).

    + +

    If no &brandShortName; applications are running, Quick +Launch must be enabled in order to play a sound when new messages +arrive.

    + +

    If any &brandShortName; application is running, then Quick +Launch does not need to be enabled in order to play a sound when new +messages arrive. For information on using Quick Launch, see Using Quick Launch.

  • @@ -5423,8 +5258,8 @@ printable" MIME encoding when sending regular messages that use an 8-bit character encoding (for example, Latin ISO-8859-3).
  • Confirm when using keyboard shortcut to send message: -Check this option if want to be asked if you're sure to be ready to send the -message when you're pressing Ctrl+Return in message editor. This may help you +Check this option if want to be asked if you're sure to be ready to send the +message when you're pressing Ctrl+Return in message editor. This may help you avoid accidentally sending the message if you enter the keyboard shortcut by mistake when composing a message.
  • @@ -5477,9 +5312,8 @@ this option, keep in mind that some mail programs may have trouble displaying the message.
  • Send the message in both plain text and HTML: -This option uses more disk space.
  • +This option uses more disk space. -
  • You can always override these preferences for an individual message by using the Options menu in the Mail Compose window.

  • @@ -5492,7 +5326,7 @@ and which domains can only display plain text.

    For example, if you typically send mail to multiple recipients that have the same domain name (for example, your colleagues all -have email addresses that end in "netscape.net"), and you know that +have email addresses that end in netscape.net), and you know that this domain name is capable of displaying HTML messages, then you can add the netscape.net domain to the list of HTML Domains so that Mail & Newsgroups will automatically send messages in HTML @@ -5543,17 +5377,16 @@ Newsgroups to expand the list.)

    See Working Offline for