Bug 287203: document new Options window, using_firefox.xhtml part. r=jeff, a=asa

2005-04-11 10:14:49 +00:00 · 2005-04-11 10:14:49 +00:00 · a6a2b03727
--- a/browser/components/help/locale/en-US/firebird-index1.rdf
+++ b/browser/components/help/locale/en-US/firebird-index1.rdf
@ -351,7 +351,7 @@
            <rdf:Seq>
                <rdf:li><rdf:Description ID="pages-navigating" nc:name="Pages, Navigating" nc:link="using_firebird.xhtml#navigating_web_pages"/></rdf:li>
                <rdf:li><rdf:Description ID="page-style" nc:name="Page Style" nc:link="menu_reference.xhtml#page_style"/></rdf:li>
-                <rdf:li><rdf:Description ID="plugins" nc:name="Plug-ins" nc:link="using_firebird.xhtml#managing_different_file_types"/></rdf:li>
+                <rdf:li><rdf:Description ID="plugins" nc:name="Plugins" nc:link="using_firebird.xhtml#managing_different_file_types"/></rdf:li>
                <rdf:li><rdf:Description ID="popups" nc:name="Popups" nc:link="popup.xhtml"/></rdf:li>
                <rdf:li><rdf:Description ID="printing" nc:name="Printing" nc:link="using_firebird.xhtml#printing_a_page"/></rdf:li>
                <rdf:li><rdf:Description ID="privacy-options" nc:name="Privacy Options" nc:link="prefs.xhtml#privacy_options"/></rdf:li>
--- a/browser/components/help/locale/en-US/firefox_welcome.xhtml
+++ b/browser/components/help/locale/en-US/firefox_welcome.xhtml
@ -49,7 +49,7 @@
      <p><strong><a href="http://plugindoc.mozdev.org/"
         target="_blank">PluginDoc</a></strong></p>

-      <p>Up-to-date information on &brandShortName; plug-ins.</p>
+      <p>Up-to-date information on &brandShortName; Plugins.</p>
    </td>
    <td>&nbsp;</td>
  </tr>
--- a/browser/components/help/locale/en-US/using_firebird.xhtml
+++ b/browser/components/help/locale/en-US/using_firebird.xhtml
@ -8,7 +8,8 @@
 <!--
 Contributors:
  R.J. Keller <rlk@trfenv.com> (original author)
-  Nilson Cain (nilson@gmail.com)
+  Nilson Cain <nilson@gmail.com>
+  Steffen Wilberg <steffen.wilberg@web.de>
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@ -20,7 +21,7 @@ Contributors:
 <body>

 <h1>Using &brandFullName;</h1>
-<p>Welcome to &brandFullName;! &brandFullName; is an Internet browser that
+<p>Welcome to &brandFullName;! &brandShortName; is an Internet browser that
  you can use to visit web pages and search the Web.</p>

 <div class="contentsBox">In this section:
@ -128,7 +129,7 @@ Contributors:
  to visit several different web pages. This frees up space on your desktop.
  You can open, close, and reload web pages conveniently in one place without
  having to switch to another window.</p>
-  
+
 <p>For more info, see <a href="tabbed_browsing.xhtml">Tabbed Browsing</a>.</p>

 <h3 id="using_the_sidebar">Using the Sidebar</h3>
@ -461,47 +462,36 @@ Contributors:
 <h2 id="improving_speed_and_efficiency">Improving Speed and Efficiency</h2>

 <h3 id="managing_different_file_types">Managing Different File Types</h3>
-<p>&brandShortName; can handle many types of files. However, for some files
-  such as movies or music, &brandShortName; needs plug-ins or
-  &quot;helper&quot; applications that can handle those files. If
-  &brandShortName; doesn't have the needed helper application or plug-in, it
-  can still save the file to your hard disk. When saving files, you can keep
-  track of them using the Download Manager.</p>
+<p>&brandShortName; can handle many types of files. However, for some files such
+  as movies or music, &brandShortName; needs Plugins or external applications
+  that can handle those files. If &brandShortName; doesn't have the needed
+  Plugin or doesn't know what application to use to open the file, it can still
+  save the file to your hard disk. When saving files, you can keep track of them
+  using the Download Manager.</p>

-<p><strong>Plug-ins</strong><br/>
-  Plug-ins are helper applications that extend functionality within
-  &brandShortName; and run within it. Plug-ins like Sun Java, Macromedia Flash,
-  and RealNetworks RealPlayer allow &brandShortName; to show multimedia files
-  and run small applications such as movies, animations, and games.</p>
+<p>Plugins extend &brandShortName;'s functionality and run within it.
+  Plugins like Sun Java, Macromedia Flash, and RealNetworks RealPlayer allow
+  &brandShortName; to show multimedia files and run small applications such as
+  movies, animations, and games. You can find common Plugins on the <a href=
+  "https://pfs.mozilla.org/plugins/" target="_blank">Plugins page</a>
+   at Mozilla Update.</p>

-<p>You can also install plug-ins after you install &brandShortName;. To see the
-  plug-ins for &brandShortName; that are currently installed, select
-  &pref.menuPath;.  Select the <em>Downloads</em> category and click the
-  <em>Plug-Ins...</em> button. You can also enable or disable currently
-  installed plug-ins here.</p>
+<p>When files cannot be opened within &brandShortName;, you can choose to open
+  them with applications outside of &brandShortName;. For example, you can use
+  the media player of your choice to play MP3 files.</p>

-<p>To see a full list of &brandShortName; plug-ins you can install, see the
-  <a href="http://home.netscape.com/plugins/index.html" target="_blank">Browser
-  Plug-ins page</a> at Netscape.com.</p>
+<p>You can specify how &brandShortName; handles files it can't display in the
+  <em>Download Actions</em> dialog. To open this dialog, select &pref.menuPath;,
+  open the <em>Downloads</em> panel, and click the <em>View &amp; Edit
+  Actions...</em> button. You can change the action for a file type or remove it.
+  More information about this dialog is available in the respective section of
+  <a href="prefs.xhtml#download_actions">Download &pref.pluralCaps;</a>.</p>

-<p><strong>Helper Applications</strong><br/>
-  When files cannot be opened within &brandShortName;, you can choose to
-  launch helper applications that open outside of &brandShortName;. For
-  example, to play MP3 files, programs like Winamp can be opened outside of
-  &brandShortName;.</p>
-
-<p>The settings in the <em>Downloads</em> panel in the &pref.pluralCaps; window
-  tell &brandShortName; which helper applications to use on your computer. In
-  the <em>File Types</em> section, you can see how different file types will be
-  handled by &brandShortName;. You can change the action for a file type or
-  remove it. Also, if &brandShortName; doesn't know which helper application to
-  use, it allows you to find helper applications within the download dialog
-  box.</p>
-
-<p>The download dialog box has these choices:</p>
+<p>When you click on a file and &brandShortName; doesn't know how to handle it,
+  an <em>Opening</em> dialog box is displayed, offering these choices:</p>

 <ul>
-  <li><strong>Open using</strong>: &brandShortName; opens the file using the
+  <li><strong>Open with</strong>: &brandShortName; opens the file using the
    default program in your system settings. You can also choose a different
    program by selecting <em>Other...</em> in the drop-down list.</li>
  <li><strong>Save to Disk</strong>: &brandShortName; allows you to select a
@ -514,8 +504,8 @@ Contributors:
 </ul>

 <p><strong>Tip</strong>: You can clear your saved &pref.plural; for <em>Do this
-  automatically for files like this from now on</em> in the <em>Downloads</em>
-  panel of &pref.pluralCaps;.</p>
+  automatically for files like this from now on</em> in the <em>Download
+  Actions</em> dialog.</p>

 <h3 id="making_firebird_your_default_browser">Making &brandShortName; Your
  Default Browser</h3>
@ -527,24 +517,23 @@ Contributors:
  on your computer. To easily open web pages, you can make &brandShortName;
  your default browser.</p>

-<p>To make &brandShortName; your default web browser, select &pref.menuPath;.
-  You can then click on the <em>Set Default Browser</em> button in the General
-  panel of &pref.pluralCaps; to make &brandShortName; your default web browser.</p>
+<p>To make &brandShortName; your default web browser, select &pref.menuPath;
+  and click the <em>Check Now</em> button in the <em>General</em> panel.</p>

 <h3 id="changing_cache_settings">Changing Cache Settings</h3>
 <p>&brandShortName; stores copies of frequently accessed pages in the cache.
  By doing this &brandShortName; doesn't have to retrieve the page from the
  network each time you view the web page.</p>

-<p>To set the size of the cache or to clear it (Windows and Unix only):</p>
+<p>To set the size of the cache or to clear it:</p>

 <ol>
  <li>Select &pref.menuPath;.</li>
-  <li>Under the <em>Privacy</em> category, click <em>Cache</em> to expand the
-    list.</li>
+  <li>Open the <em>Privacy</em> panel and click the <em>Cache</em> tab.</li>
  <li>Enter a number in the <em>Use up to</em> field to specify the size of the
    cache. 50MB to 70MB is a good size. To clear the cache immediately, click
-    the <em>Clear</em> button to the right of the <em>Cache</em> category.</li>
+    the <em>Clear Cache Now</em> button at the bottom of the <em>Cache</em>
+    tab.</li>
 </ol>

 <p><strong>Important</strong>: A larger cache allows more data to be quickly
@ -554,14 +543,11 @@ Contributors:
  maintenance takes longer than you wish, try reducing the size of the disk
  cache.</p>

-<p>To reload a page at any time:</p>
-<ul>
-  <li>Click the <em>Reload</em> button in &brandShortName;'s <em>Navigation
-    Toolbar</em>. The computer checks the Internet to make sure you have the
-    latest version of the page.</li>
-</ul>
+<p>To reload a page at any time, click the <em>Reload</em> button in
+  &brandShortName;'s <em>Navigation Toolbar</em>. &brandShortName; then loads
+  and displays the latest version of the page.</p>

-<div class="contentsBox"><em>05 November 2004</em></div>
+<div class="contentsBox"><em>10 April 2005</em></div>
 <p>Copyright &copy; 2003-2005 Contributors to the Mozilla Help Viewer Project.</p>

 </body>
--- a/toolkit/components/help/helpOnHelp/locale/en-US/firebird-glossary.rdf
+++ b/toolkit/components/help/helpOnHelp/locale/en-US/firebird-glossary.rdf
@ -23,7 +23,6 @@
        <rdf:li> <rdf:Description nc:name="feed" nc:link="glossary.xhtml#feed"/> </rdf:li>
        <rdf:li> <rdf:Description nc:name="File Transfer Protocol (FTP)" nc:link="glossary.xhtml#File_Transfer_Protocol"/> </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="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="Hypertext Markup Language (HTML)" nc:link="glossary.xhtml#Hypertext_Markup_Language"/> </rdf:li>
        <rdf:li> <rdf:Description nc:name="Internet" nc:link="glossary.xhtml#Internet"/> </rdf:li>
@ -36,7 +35,7 @@
        <rdf:li> <rdf:Description nc:name="Navigation Toolbar" nc:link="glossary.xhtml#navigation_toolbar"/> </rdf:li>
        <rdf:li> <rdf:Description nc:name="Password Manager" nc:link="glossary.xhtml#Password_Manager"/> </rdf:li>
        <rdf:li> <rdf:Description nc:name="PKCS #11" nc:link="glossary.xhtml#PKCS_11"/> </rdf:li>
-        <rdf:li> <rdf:Description nc:name="plug-in" nc:link="glossary.xhtml#plug-in"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="Plugin" nc:link="glossary.xhtml#Plugin"/> </rdf:li>
        <rdf:li> <rdf:Description nc:name="private key" nc:link="glossary.xhtml#private_key"/> </rdf:li>
        <rdf:li> <rdf:Description nc:name="proxy" nc:link="glossary.xhtml#proxy"/> </rdf:li>
        <rdf:li> <rdf:Description nc:name="search engine" nc:link="glossary.xhtml#search_engine"/> </rdf:li>
--- a/toolkit/components/help/helpOnHelp/locale/en-US/glossary.xhtml
+++ b/toolkit/components/help/helpOnHelp/locale/en-US/glossary.xhtml
@ -118,15 +118,6 @@
  Many products sold to the US government must comply with one or more of the
  FIPS standards.</dd>

-<dt id="helper_application">helper application</dt>
-<dd>Any application that is used to open or view a file downloaded by &brandShortName;.
-  A <a href="#plug-in">plug-in</a> is a special kind of helper application that
-  installs itself into the Plugins directory of the main &brandShortName; installation
-  directory and can typically be opened within &brandShortName; itself. Microsoft Word,
-  Adobe Photoshop, and other external applications are considered helper applications
-  but not plug-ins, because they don't install themselves into the browser directory
-  but can be opened from the download dialog box.</dd>
-
 <dt id="home_page">home page</dt>
 <dd>The page &brandShortName; is set to display every time you launch it or when you
  click the <em>Home</em> button. Also used to refer to the main page for a
@ -197,15 +188,14 @@
 <dd>The public-key cryptography standard that governs security devices such
  as smart cards.</dd>

-<dt id="plug-in">plug-in</dt>
-<dd>A type of <a href="#helper_application">helper application</a> that
-  adds new capabilities to &brandShortName;, such as the ability to play audio
-  or video clips. Unlike other kinds of helper applications, a plug-in
-  application installs itself into the Plugins directory within the main
+<dt id="Plugin">Plugin</dt>
+<dd>Plugins add new capabilities to &brandShortName;, such as the ability to
+  play audio or video clips. Unlike other kinds of helper applications, a Plugin
+  installs itself into the Plugins directory within the main
  &brandShortName; installation directory and typically can be opened within
-  &brandShortName; itself (internally). For example, an audio plug-in lets you
+  &brandShortName; itself (internally). For example, an audio Plugin lets you
  listen to audio files on a web page or in an e-mail message. Macromedia
-  Flash Player and Java are both examples of plug-in applications.</dd>
+  Flash Player and Java are both examples of Plugin applications.</dd>

 <dt id="private_key">private key</dt>
 <dd>One of a pair of keys used in public-key cryptography. The private key is 
@ -297,7 +287,7 @@ corresponding public key.</dd>
 [&nbsp;<a href="#glossary">Return to beginning of Glossary</a>&nbsp;]
 </p>

-<div class="contentsBox"><em>08 October 2004</em></div>
+<div class="contentsBox"><em>07 April 2005</em></div>
 <p>Copyright &copy; 2003-2005 Contributors to the Mozilla Help Viewer Project.</p>

 </body>