From 1b3ac166777edb8b3a29e3d4cb908a134eac2966 Mon Sep 17 00:00:00 2001 From: "jwalden%mit.edu" Date: Thu, 14 Apr 2005 13:49:55 +0000 Subject: [PATCH] Syncing trunk Help with branch Help... --- .../locales/en-US/chrome/help/cookies.xhtml | 18 ++++---- .../en-US/chrome/help/download_manager.xhtml | 8 ++-- .../en-US/chrome/help/firebird-index1.rdf | 1 + .../en-US/chrome/help/firebird-toc.rdf | 13 +++++- .../en-US/chrome/help/menu_reference.xhtml | 27 +++++++----- browser/locales/en-US/chrome/help/popup.xhtml | 4 +- browser/locales/en-US/chrome/help/prefs.xhtml | 44 +++++++++---------- .../en-US/chrome/help/using_firebird.xhtml | 44 +++++++++---------- 8 files changed, 87 insertions(+), 72 deletions(-) diff --git a/browser/locales/en-US/chrome/help/cookies.xhtml b/browser/locales/en-US/chrome/help/cookies.xhtml index 7bde97bc268..50ed6ca2bb6 100644 --- a/browser/locales/en-US/chrome/help/cookies.xhtml +++ b/browser/locales/en-US/chrome/help/cookies.xhtml @@ -64,8 +64,8 @@ what cookies are stored, follow these instructions:

Keep Cookies combo box. -

+

After this is done, you may decide exactly which cookies should and should not be saved.

@@ -123,8 +123,8 @@ what cookies are stored, follow these instructions:

Assuming that you've enabled the cookie rules explained above, you'll see a dialog whenever a site tries to save a cookie on your computer:

-

+

Allowing a Cookie
@@ -151,8 +151,8 @@ what cookies are stored, follow these instructions:

-

+

The Cookie Manager dialog lists all cookies currently stored on your computer. You can select them to display more information about them. Use the @@ -174,8 +174,8 @@ or the sites will not be added to the list of blocked sites.

The Site List

-

+

This is the list of sites that are either allowed or not allowed to store cookies on your computer. In the Status column, you can see if a site is @@ -191,7 +191,7 @@ or the sites will not be added to the list of blocked sites.

clear the list completely, click Remove All Sites. This will reset the cookie rules and you will see dialogs for each cookie again.

-
18 July 2004
+
16 September 2004

Copyright © 2003-2004 Contributors to the Mozilla Help Viewer Project.

diff --git a/browser/locales/en-US/chrome/help/download_manager.xhtml b/browser/locales/en-US/chrome/help/download_manager.xhtml index 2f06b262a5d..c99e98d12b1 100644 --- a/browser/locales/en-US/chrome/help/download_manager.xhtml +++ b/browser/locales/en-US/chrome/help/download_manager.xhtml @@ -26,8 +26,8 @@ Contributors:

What is the Download Manager?

-

Download Manager Dialog

+

Download Manager Dialog

The Download Manager is a feature of &brandShortName; that allows you to track and manage your past and current file downloads. It is a convenient way to escape the @@ -80,7 +80,7 @@ Contributors:

Download Manager Options

-

Downloads Options Dialog

The options for the Download Manager are accessible by clicking the @@ -90,7 +90,7 @@ Contributors: options is available in the Options page.

-
01 January 2004
+
16 September 2004

Copyright © 2003-2004 Contributors to the Mozilla Help Viewer Project.

diff --git a/browser/locales/en-US/chrome/help/firebird-index1.rdf b/browser/locales/en-US/chrome/help/firebird-index1.rdf index f1266fa9c13..9488eddb6b4 100644 --- a/browser/locales/en-US/chrome/help/firebird-index1.rdf +++ b/browser/locales/en-US/chrome/help/firebird-index1.rdf @@ -474,6 +474,7 @@ + diff --git a/browser/locales/en-US/chrome/help/firebird-toc.rdf b/browser/locales/en-US/chrome/help/firebird-toc.rdf index 616b6af2368..feccd514d25 100644 --- a/browser/locales/en-US/chrome/help/firebird-toc.rdf +++ b/browser/locales/en-US/chrome/help/firebird-toc.rdf @@ -292,8 +292,7 @@ - - + @@ -320,6 +319,16 @@ + + + + + + + + + + diff --git a/browser/locales/en-US/chrome/help/menu_reference.xhtml b/browser/locales/en-US/chrome/help/menu_reference.xhtml index 00f27d1336b..5ce6615e666 100644 --- a/browser/locales/en-US/chrome/help/menu_reference.xhtml +++ b/browser/locales/en-US/chrome/help/menu_reference.xhtml @@ -186,17 +186,22 @@ Contributors:

Gets the most up-to-date version of the current page. This is the same as clicking the Reload button on the toolbar.

-

Increase Text Size

-

Displays the text one size larger on the web page. You can also do this - with the mouse by holding down the Ctrl key while using the - scroll wheel or by pressing + or - to increase or - decrease the text size. To restore the text size to the default, press - Ctrl+0.

+

Text Size

+

If the text on a web page is too small or too large, you can change it to + a more comfortable size.

-

Decrease Text Size

-

Makes the text smaller on the web page. You can also do this with the - mouse (see Increase Text Size for instructions). To restore the text size, - press Ctrl+0.

+

Increase

+

Displays the text on the web page one size larger. You can also do this + with the mouse (see Mouse Shortcuts + for instructions).

+ +

Decrease

+

Displays the text on the web page one size smaller. You can also do this + with the mouse (see Mouse Shortcuts + for instructions).

+ +

Normal

+

Displays the text on the web page at its normal size.

Character Encoding

Allows you to manually change the character encoding on a web page. @@ -313,7 +318,7 @@ Contributors:

Displays a dialog box with information about &brandShortName;, including the current version and a brief list of credits.

-
31 July 2004
+
25 August 2004

Copyright © 2003-2004 Contributors to the Mozilla Help Viewer Project.

diff --git a/browser/locales/en-US/chrome/help/popup.xhtml b/browser/locales/en-US/chrome/help/popup.xhtml index 4698087b39e..052165f7d7b 100644 --- a/browser/locales/en-US/chrome/help/popup.xhtml +++ b/browser/locales/en-US/chrome/help/popup.xhtml @@ -40,7 +40,7 @@ Popup blocking is turned on by default, so you don't have to worry about enablin to prevent popups from appearing in &brandShortName;.

When blocking a popup, &brandShortName; displays an -icon in the +icon in the status bar. You can use this icon to add a web site you're viewing to an exceptions list so that the site is allowed to display popups.

@@ -94,7 +94,7 @@ Click Unblock Site to add the web site to the list of allowed web sites some web sites. For more information about blocking popups, see What are Popups.

-
17 August 2003
+
16 September 2004

Copyright © 2003-2004 Contributors to the Mozilla Help Viewer Project.

diff --git a/browser/locales/en-US/chrome/help/prefs.xhtml b/browser/locales/en-US/chrome/help/prefs.xhtml index 0b91cfc64d2..19efba16512 100644 --- a/browser/locales/en-US/chrome/help/prefs.xhtml +++ b/browser/locales/en-US/chrome/help/prefs.xhtml @@ -37,8 +37,8 @@ Contributors:

General Options

-

General Options Dialog

+

General Options Dialog

Home Page

Here you are able to specify the page (or tab group) that &brandShortName; will show when you launch it or press the Home button. @@ -58,7 +58,7 @@ Contributors:

Fonts & Colors

Fonts and Colors Dialog

+ src="http://mozilla.org/projects/firefox/help/1.0/opt_fontsandcolors.png"/>

Click the Fonts & Colors... button to change the default fonts and colors used by &brandShortName;.

@@ -114,7 +114,7 @@ Contributors:

Languages

Languages Options Dialog

+ src="http://mozilla.org/projects/firefox/help/1.0/opt_languages.png"/>

Some web pages are offered in more than one language. Click the Languages button to specify your preferred languages.

@@ -132,16 +132,16 @@ Contributors: The character encoding selected here will be used to display pages that do not specify which encoding to use.

-

Default Browser

-

You can set &brandShortName; as the default +

Default Browser

+

You can set &brandShortName; as the default browser by clicking Set Default Browser. This will ensure &brandShortName; is used whenever an application is trying to display a web page or when you open an HTML file.

Connection Settings

-

General Options Dialog

+

Connection Options Dialog

Many organizations block access from the Internet to their networks. This prevents outside parties from gaining access to sensitive @@ -172,8 +172,8 @@ Contributors:

Privacy Options

-

Privacy Options Dialog

+

Privacy Options Dialog

The Privacy panel contains options related to your privacy. As you browse the web, information on where you have been, what pages you have visited, @@ -239,7 +239,7 @@ Contributors:

Web Features Options

Web Features Options Dialog

+ src="http://mozilla.org/projects/firefox/help/1.0/opt_webfeatures.png"/>

Block Popup Windows
By default, &brandShortName; blocks annoying popup windows on web sites. Unchecking this option will disable @@ -274,8 +274,8 @@ Contributors: loaded. -

Exceptions Dialog

+

Images Exceptions Dialog

Depending on if you enable images, you can change which sites are blocked or which sites can load images by clicking Exceptions. @@ -300,8 +300,8 @@ Contributors: some functions that you may want to disable. Click the Advanced... button to display these options.

-

JavaScript Options Dialog

+

JavaScript Options Dialog

Allow scripts to:

@@ -333,8 +333,8 @@ Contributors:

Downloads Options

Downloads Options Dialog

+ src="http://mozilla.org/projects/firefox/help/1.0/opt_downloads.png" + width="425" height="353" alt="Downloads Options Dialog"/>

This panel controls how &brandShortName; handles different file types such as applications, compressed files, and multimedia files.

@@ -366,7 +366,7 @@ Contributors: asking where you want each media file to be saved.

Change Action Dialog

+ src="http://mozilla.org/projects/firefox/help/1.0/opt_downloadaction.png"/>

  • Open them in the Default application:
    Select this option @@ -387,7 +387,7 @@ Contributors: Plug-Ins window:

    Plug-Ins Dialog

    + src="http://mozilla.org/projects/firefox/help/1.0/opt_plugins.png"/>

    From this window, you can control which plug-ins for &brandShortName; can run. For example, if you don't like Flash animations in general but still @@ -397,8 +397,8 @@ Contributors:

    Advanced Options

    -

    Advanced Options window

    +

    Advanced Options Dialog

    The advanced panel contains many options that are less likely to be used by most people, but still useful and sometimes critical options for some @@ -531,7 +531,7 @@ Contributors: you can do so here. You will most likely only need to change this if your Internet environment requires it.

    -
    14 August 2004
    +
    20 September 2004

    Copyright © 2003-2004 Contributors to the Mozilla Help Viewer Project.

    diff --git a/browser/locales/en-US/chrome/help/using_firebird.xhtml b/browser/locales/en-US/chrome/help/using_firebird.xhtml index a92320ed0fa..2a1f8ea0bb2 100644 --- a/browser/locales/en-US/chrome/help/using_firebird.xhtml +++ b/browser/locales/en-US/chrome/help/using_firebird.xhtml @@ -65,8 +65,8 @@ Contributors:

    Tip: To quickly select the URL of the Location Bar, press Ctrl+L.

    -

    +

    Don't know a URL? Try typing a general word (such as "gifts" or "flowers") into the Search bar and hit enter. @@ -94,7 +94,7 @@ Contributors: the Back and Forward buttons. You'll see a list of pages you've recently visited; to return to a page, choose it from the list.

    -

  • @@ -102,8 +102,8 @@ Contributors: arrow at the right end of the Location Bar. To view a page, choose it from the list.

    -
    +
  • To choose from pages you've visited during the current session, open the Go menu and use the list in the bottom section of the menu.
  • @@ -147,8 +147,8 @@ Contributors:

    Searching for web pages on a particular topic is as easy as typing a few words into &brandShortName;'s Search Bar as pictured below:
    -

    +

    For example, if you want to find information about baby dolls:

      @@ -292,14 +292,14 @@ Contributors: nonformatted page that isn't intended for viewing):

        -
      1. Position the mouse pointer over the page's link.
      2. -
      3. Right-click the hyperlink on the page +
      4. Position the mouse pointer over a link to the page.
      5. +
      6. Right-click the link Press Ctrl and click the mouse button to display a popup menu.
      7. Select Save Link to Disk. You will see the Save As dialog box.
      8. -
      9. Choose a location for the saved image.
      10. -
      11. Type a file name for the image and click Save.
      12. +
      13. Choose a location for the saved page.
      14. +
      15. Type a file name for the page and click Save.

      Important: Some links automatically download and save files @@ -345,13 +345,13 @@ Contributors:

      In Print Preview, you can do the following with pages you want to print:

      • View a preview of each page: Click the Next , Previous + src="http://mozilla.org/projects/firefox/help/1.0/next.png"/>, Previous , + src="http://mozilla.org/projects/firefox/help/1.0/previous.png"/>, First , + src="http://mozilla.org/projects/firefox/help/1.0/first.png"/>, or Last button to + src="http://mozilla.org/projects/firefox/help/1.0/last.png"/> button to move between pages.
      • Change the scale (size) of pages: In the Scale drop-down menu, choose "50%" to make each page half the size of @@ -360,10 +360,10 @@ Contributors: own percentage by choosing "Custom...".
      • Change the orientation of the page: Choose Portrait + src="http://mozilla.org/projects/firefox/help/1.0/pg-portrait-small.png"/> to position the page with the shorter side facing up. Choose Landscape + src="http://mozilla.org/projects/firefox/help/1.0/pg-landscape-small.png"/> to position the page sideways with the longer side facing up.
      • Go to Page Setup: Click Page Setup to further customize pages you want to print.
      • @@ -394,10 +394,10 @@ Contributors:
      • Orientation:
        • Portrait: Choose this portrait button + src="http://mozilla.org/projects/firefox/help/1.0/pg-portrait-small.png"/> to position the page normally, with the shorter side facing up.
        • Landscape: Choose this landscape button + src="http://mozilla.org/projects/firefox/help/1.0/pg-landscape-small.png"/> to position the page sideways, with the longer side facing up.
      • @@ -421,8 +421,8 @@ Contributors:
    1. Margins:
        -
      • Top, Bottom, Left, Right: Type a margin in inches for - the top, bottom, left, and right margins.
      • +
      • Top, Bottom, Left, Right: Type a margin in the given + units for the top, bottom, left, and right margins.
    2. Headers & Footers: Each drop-down list represents @@ -562,7 +562,7 @@ Contributors: latest version of the page.
-
12 July 2004
+
16 September 2004

Copyright © 2003-2004 Contributors to the Mozilla Help Viewer Project.