Bug 574609 - Update Help for new Link Behavior preference panel. r=stefanh
authorJens Hatlak <jh@junetz.de>
Wed, 04 Aug 2010 17:20:16 +0200
changeset 6070 8cfc75dbf1e500eb36ec2ddca73f31765ff3873b
parent 6069 b47b4511c5a8ad8e816cb4cc11527d2cc333262c
child 6071 360dc95e5ae4741bb6dfea7263920e293168163c
push id4696
push userjh@junetz.de
push dateWed, 04 Aug 2010 15:21:59 +0000
treeherdercomm-central@8cfc75dbf1e5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersstefanh
bugs574609
Bug 574609 - Update Help for new Link Behavior preference panel. r=stefanh
suite/locales/en-US/chrome/common/help/cs_nav_prefs_navigator.xhtml
suite/locales/en-US/chrome/common/help/help-index1.rdf
suite/locales/en-US/chrome/common/help/suite-toc.rdf
--- a/suite/locales/en-US/chrome/common/help/cs_nav_prefs_navigator.xhtml
+++ b/suite/locales/en-US/chrome/common/help/cs_nav_prefs_navigator.xhtml
@@ -29,16 +29,17 @@
   <ul>
     <li><a href="#navigator">Browser</a></li>
     <li><a href="#history">History</a></li>
     <li><a href="#languages">Languages</a></li>
     <li><a href="#helper_applications">Helper Applications</a></li>
     <li><a href="#location_bar">Location Bar</a></li>
     <li><a href="#internet_search">Internet Search</a></li>
     <li><a href="#tabbed_browsing">Tabbed Browsing</a></li>
+    <li><a href="#link_behavior">Link Behavior</a></li>
     <li><a href="#downloads">Downloads</a></li>
   </ul>
 </div>
 
 <h2 id="navigator">Browser Preferences - Browser</h2>
 
 <p>This section describes how to use the main browser preferences panel. If
   you&apos;re not already viewing it, follow these steps:</p>
@@ -480,60 +481,80 @@
         <kbd class="mac">Cmd</kbd><kbd class="noMac">Ctrl</kbd>+<kbd
         class="mac">Return</kbd><kbd class="noMac">Enter</kbd> in the Location
         bar</strong>: Select this to open a Web page in a new tab when you type
         the URL of the page in the Location Bar and press
         <kbd class="mac">Cmd</kbd><kbd class="noMac">Ctrl</kbd>+<kbd
         class="mac">Return</kbd><kbd class="noMac">Enter</kbd>.</li>
     </ul>
   </li>
+</ul>
+
+<p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
+
+<h2 id="link_behavior">Browser Preferences - Link Behavior</h2>
+
+<p>This section describes how to use the Link Behavior preferences panel. If
+  you&apos;re 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 Browser category, click Link Behavior. (If no subcategories
+    are visible, double-click Browser to expand the list.)</li>
+</ol>
+
+<p>The Link Behavior preferences panel allows you to configure how links are
+  opened in &brandShortName;:</p>
+
+<ul>
   <li><strong>Link open behavior</strong>: If a webpage is designed so that
     certain links open in a new window by default (either through the target
     attribute in HTML or through embedded JavaScript), you may want to
     override this:
     <ul>
       <li><strong>The current tab/window</strong>: Open the linked page in the
         current tab of the active window.</li>
       <li><strong>A new tab in the current window</strong>: Open the linked
         page in a new tab instead of a new window.</li>
       <li><strong>A new window</strong>: Open the linked page in a new window.
-        (This is the default and does not override the webpage design).</li>
+        (This is the default and does not override the webpage design.)</li>
     </ul>
   </li>
   <li><strong>Links from other applications</strong>: If &brandShortName; is
     called from another application with a webpage address as an argument (like
     a click on a link in an external email program), you can control where the
     page will be loaded:
     <ul>
       <li><strong>The current tab/window</strong>: Open the linked page in the
         current tab of the active window.</li>
       <li><strong>A new tab in the current window</strong>: Open the linked
         page in a new tab instead of a new window.</li>
       <li><strong>A new window</strong>: Open the linked page in a new window.
-        (This is the default).</li>
+        (This is the default.)</li>
     </ul>
   </li>
 </ul>
 
 <div class="win">
   <p>To ensure that &brandShortName; opens a new window, select the Browser
-    option in <a href= "cs_nav_prefs_appearance.xhtml#appearance">Appearance
+    option in <a href="cs_nav_prefs_appearance.xhtml#appearance">Appearance
     Preferences - Appearance</a>.</p>
 
   <p>If you want &brandShortName; to open a new tab instead of a new window when
     you launch it and it is already running, ensure the following:</p>
 
   <ul>
-    <li>If you launch &brandShortName; by command line, do not use command-line
-      parameters that open windows.</li>
-    <li>Nothing is set in the
-      <a href= "cs_nav_prefs_appearance.xhtml#appearance">Appearance Preferences
+    <li>If &brandShortName; is launched from the command line, no command line
+      parameters that open windows (like <kbd>-new-window</kbd>) are used.</li>
+    <li>No <q>When &brandShortName; starts up, open</q> option is set in
+      <a href="cs_nav_prefs_appearance.xhtml#appearance">Appearance Preferences
       - Appearance</a>.</li>
-    <li>Set <q>Links from other applications</q> preference to <q>A new tab in
-      the current window</q>.</li>
+    <li>The <q>Links from other applications</q> preference is set to <q>A new
+      tab in the current window</q>.</li>
   </ul>
 </div>
 
 <p>[<a href="#navigator_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="downloads">Browser Preferences - Downloads</h2>
 
 <p>This section describes how to use the Downloads preferences panel. If
--- a/suite/locales/en-US/chrome/common/help/help-index1.rdf
+++ b/suite/locales/en-US/chrome/common/help/help-index1.rdf
@@ -1627,16 +1627,21 @@
          nc:link="cs_nav_prefs_advanced.xhtml#keyboard_navigation"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="preferences:languages"
          nc:name="languages preferences"
          nc:link="cs_nav_prefs_navigator.xhtml#languages"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="preferences:Link_Behavior"
+         nc:name="Link Behavior preferences"
+         nc:link="cs_nav_prefs_navigator.xhtml#link_behavior"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="preferences:Navigator"
          nc:name="Browser preferences"
          nc:link="cs_nav_prefs_navigator.xhtml#navigator_preferences"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="preferences:passwords"
          nc:name="passwords preferences"
          nc:link="passwords_help.xhtml#passwords"/>
--- a/suite/locales/en-US/chrome/common/help/suite-toc.rdf
+++ b/suite/locales/en-US/chrome/common/help/suite-toc.rdf
@@ -787,16 +787,17 @@
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="navigator_pref_history" nc:name="History" nc:link="cs_nav_prefs_navigator.xhtml#history"/> </rdf:li>
         <rdf:li><rdf:Description ID="navigator_pref_languages" nc:name="Languages" nc:link="cs_nav_prefs_navigator.xhtml#languages"/> </rdf:li>
         <rdf:li><rdf:Description ID="navigator_pref_helper_applications" nc:name="Helper Applications" nc:link="cs_nav_prefs_navigator.xhtml#helper_applications"/> </rdf:li>
         <rdf:li><rdf:Description ID="navigator_pref_location_bar" nc:name="Location Bar" nc:link="cs_nav_prefs_navigator.xhtml#location_bar"/> </rdf:li>
         <rdf:li><rdf:Description ID="navigator_pref_internet_searching" nc:name="Internet Search" nc:link="cs_nav_prefs_navigator.xhtml#internet_search"/> </rdf:li>
         <rdf:li><rdf:Description ID="navigator_pref_tabbed_browsing" nc:name="Tabbed Browsing" nc:link="cs_nav_prefs_navigator.xhtml#tabbed_browsing"/> </rdf:li>
+        <rdf:li><rdf:Description ID="navigator_pref_link_behavior" nc:name="Link Behavior" nc:link="cs_nav_prefs_navigator.xhtml#link_behavior"/> </rdf:li>
         <rdf:li><rdf:Description ID="navigator_pref_downloads" nc:name="Downloads" nc:link="cs_nav_prefs_navigator.xhtml#downloads"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#advanced_pref_advanced">
     <nc:subheadings>
       <rdf:Seq>