Bug 623903 - Update Help for |Bug 568283 - Add checkbox for accessibility.browsewithcaret (F7-by-default mode)|. r=stefanh
authorJens Hatlak <jh@junetz.de>
Fri, 04 Mar 2011 17:47:09 +0100
changeset 7252 3f9ac1aeea35b4040debe060a5bd35685b48f0e2
parent 7251 33614283e6756b057b026a322b34dfbaa12db5e2
child 7253 f2f42e0e284dd1013b2f0db1379344dd9714d210
push idunknown
push userunknown
push dateunknown
reviewersstefanh
bugs623903, 568283
Bug 623903 - Update Help for |Bug 568283 - Add checkbox for accessibility.browsewithcaret (F7-by-default mode)|. r=stefanh
suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml
suite/locales/en-US/chrome/common/help/glossary.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_advanced.xhtml
+++ b/suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -25,16 +25,17 @@
   <li>Click the Advanced category.</li>
 </ol>
 
 <div class="contentsBox">In this section:
   <ul>
     <li><a href="#advanced">Advanced</a></li>
     <li><a href="#scripts_and_plugins">Scripts &amp; Plugins</a></li>
     <li><a href="#keyboard_navigation">Keyboard Navigation</a></li>
+    <li><a href="#fayt">Find As You Type</a></li>
     <li><a href="#cache">Cache</a></li>
     <li><a href="#proxies">Proxies</a></li>
     <li><a href="#http_networking">HTTP Networking</a></li>
     <li><a href="#software_installation">Software Installation</a></li>
     <li><a href="#mouse_wheel">Mouse Wheel</a></li>
     <li><a href="#dom_inspector">DOM Inspector</a></li>
   </ul>
 </div>
@@ -142,38 +143,83 @@
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Under the Advanced category, click Keyboard Navigation. (If no
     subcategories are visible, double-click Advanced to expand the list.)</li>
 </ol>
 
 <p>The Keyboard Navigation preferences panel allows you to control how you use
-  the keyboard to <span class="noMac">navigate and </span>search for text in
-  web pages:</p>
+  the keyboard to navigate in web pages:</p>
 
 <ul>
-  <li class="noMac"><strong>Links</strong>: If checked, pressing <kbd>Tab</kbd>
-    or <kbd>Shift</kbd>+<kbd>Tab</kbd> moves between links.</li>
-  <li class="noMac"><strong>Buttons, radio buttons, check boxes, and selection
-    lists</strong>: If checked, pressing <kbd>Tab</kbd> or
-    <kbd>Shift</kbd>+<kbd>Tab</kbd> moves between buttons, radio buttons, check
-    boxes, and selection lists.</li>
+  <li class="noMac"><strong>Tab Key Navigation</strong>: Select which elements
+    should be taken into account when using the Tab key on a page:
+    <ul>
+      <li><strong>Links</strong>: If checked, pressing <kbd>Tab</kbd> or
+        <kbd>Shift</kbd>+<kbd>Tab</kbd> moves between links.</li>
+      <li><strong>Buttons, radio buttons, checkboxes, and selection
+        lists</strong>: If checked, pressing <kbd>Tab</kbd> or
+        <kbd>Shift</kbd>+<kbd>Tab</kbd> moves between buttons, radio buttons,
+        check boxes, and selection lists.</li>
+    </ul>
+  </li>
+  <li><strong>Browse With Caret</strong>: Select if and how <a
+    href="glossary.xhtml#caret_browsing">caret browsing</a> should be used:
+    <ul>
+      <li><strong>Use caret browsing</strong>: If checked, caret browsing will
+        be enabled by default when you load a web page.</li>
+      <li><strong>Use the F7 shortcut to toggle caret browsing</strong>: If
+        checked, the F7 shortcut will toggle caret browsing on or off. Otherwise
+        &brandShortName; will not use the shortcut and the below option will
+        have no effect.</li>
+      <li><strong>Warn me before turning on caret browsing</strong>: If checked,
+        &brandShortName; will issue a warning dialog if the caret browsing mode
+        is about to be entered, allowing you to choose whether to proceed or
+        not. (There is no warning when leaving caret browsing mode.)</li>
+    </ul>
+  </li>
+</ul>
+
+<p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
+
+<h2 id="fayt">Advanced Preferences - Find As You Type</h2>
+
+<p>This section describes how to use the Find As You Type references
+  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 Advanced category, click Find As You Type. (If no
+    subcategories are visible, double-click Advanced to expand the list.)</li>
+</ol>
+
+<p>The Find As You Type preferences panel allows you to control how you use
+  the keyboard to search for text in web pages:</p>
+
+<ul>
   <li><strong>Find automatically when typing within a web page</strong>: If
     checked, typing text in a web page automatically activates Find As You Type
     and locates the text you typed (if it exists in the page). Choose whether
     you want typing to find any text in the page or links only. If unchecked,
     you must choose Find Links As You Type or Find Text As You Type from the
     Edit menu before typing the text you want to find.</li>
   <li><strong>Play a sound when typed text isn&apos;t found</strong>: If
     checked, Find As You Type plays a sound when the typed text isn&apos;t
     found in the web page.</li>
   <li><strong>Clear the current search after a few seconds of
-    inactivity</strong>: If checked, cancels the search after a few seconds of
-    keyboard inactivity.</li>
+    inactivity</strong>: If checked, the search will be cancelled after a few
+    seconds of keyboard inactivity.</li>
+  <li><strong>Show the find toolbar during find as you type</strong>: If
+    checked, the find toolbar will open when Find As You Type is activated and
+    what you type will be entered into the toolbar search field. If unchecked,
+    the find toolbar will not be opened and the search string will be displayed
+    in the status bar. Note that international text entry will not work in this
+    mode.</li>
 </ul>
 
 <p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="cache">Advanced Preferences - Cache</h2>
 
 <p>This section describes how to use the Cache preferences panel. If
   you&apos;re not already viewing it, follow these steps:</p>
--- a/suite/locales/en-US/chrome/common/help/glossary.xhtml
+++ b/suite/locales/en-US/chrome/common/help/glossary.xhtml
@@ -59,18 +59,19 @@
   cache already contains a copy, the browser compares the cached copy to the
   original. If there have been no changes, the browser uses the cached copy
   rather than refetching the original, saving processing and download
   time.</dd>
 
 <dt id="caret_browsing">caret browsing</dt><dd>A &brandShortName; feature that
   allows you to navigate through text in Web pages and e-mail messages (or this
   Help window) with a caret. Using your keyboard, you can navigate and select
-  text like you do in a text editor. You turn caret browsing mode on and off by
-  pressing the <kbd>F7</kbd> key.</dd>
+  text like you do in a text editor. You can turn caret browsing mode on or off
+  by pressing the <kbd>F7</kbd> key. Caret browsing mode can also be enabled or
+  disabled in Advanced Preferences - Keyboard Navigation.</dd>
 
 <dt id="certificate">certificate</dt><dd>The digital equivalent of an ID card.
   A certificate specifies the name of an individual, company, or other entity
   and certifies that a public key, which is included in the certificate,
   belongs to that entity. When you digitally sign a message or other data, the
   digital signature for that message is created with the aid of the private key
   that corresponds to the public key in your certificate. A certificate is
   issued and digitally signed by a <a href="#certificate_authority">certificate
--- a/suite/locales/en-US/chrome/common/help/help-index1.rdf
+++ b/suite/locales/en-US/chrome/common/help/help-index1.rdf
@@ -299,16 +299,21 @@
 <rdf:Description about="help-indexAZ.rdf#c">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="cache"
          nc:name="cache"
          nc:link="nav_help.xhtml#changing_cache_settings"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="caret_browsing"
+         nc:name="caret browsing"
+         nc:link="cs_nav_prefs_advanced.xhtml#keyboard_navigation"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="Certificates"
          nc:name="Certificates"
          nc:link="using_certs_help.xhtml#using_certificates"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Composer"
          nc:name="Composer"
          nc:link="composer_help.xhtml"/>
@@ -317,17 +322,18 @@
        <rdf:Description ID="Cookie_Manager"
          nc:name="Cookie Manager"
          nc:link="using_priv_help.xhtml#using_the_cookie_manager"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="cookies"
          nc:name="cookies"
          nc:link="using_priv_help.xhtml#using_the_cookie_manager"/>
-     </rdf:li><rdf:li>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="copy web pages"
          nc:name="copy"
          nc:link="nav_help.xhtml#copying_saving_and_printing_pages"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="CRLs"
          nc:name="CRLs"
          nc:link="using_certs_help.xhtml#how_validation_works"/>
@@ -734,22 +740,22 @@
      <rdf:li>
        <rdf:Description ID="Filing_messages"
          nc:name="Filing messages"
          nc:link="mailnews_organizing.xhtml#filing_messages_in_folders"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Find_Links_As_You_Type"
          nc:name="Find Links As You Type"
-         nc:link="cs_nav_prefs_advanced.xhtml#keyboard_navigation"/>
+         nc:link="cs_nav_prefs_advanced.xhtml#fayt"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Find_Text_As_You_Type"
          nc:name="Find Text As You Type"
-         nc:link="cs_nav_prefs_advanced.xhtml#keyboard_navigation"/>
+         nc:link="cs_nav_prefs_advanced.xhtml#fayt"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="FIPS_mode"
          nc:name="FIPS mode"
          nc:link="using_certs_help.xhtml#enable_fips_mode"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="font_changing_in_composer"
--- a/suite/locales/en-US/chrome/common/help/suite-toc.rdf
+++ b/suite/locales/en-US/chrome/common/help/suite-toc.rdf
@@ -798,16 +798,17 @@
     </nc:subheadings>
   </rdf:Description>
 
 <rdf:Description about="#advanced_pref_advanced">
     <nc:subheadings>
       <rdf:Seq>
         <rdf:li><rdf:Description ID="advanced_pref_scripts" nc:name="Scripts &amp; Plugins" nc:link="cs_nav_prefs_advanced.xhtml#scripts_and_plugins"/> </rdf:li>
         <rdf:li><rdf:Description ID="advanced_pref_keyboard_nav" nc:name="Keyboard Navigation" nc:link="cs_nav_prefs_advanced.xhtml#keyboard_navigation"/> </rdf:li>
+        <rdf:li><rdf:Description ID="advanced_pref_find_as_you_type" nc:name="Find As You Type" nc:link="cs_nav_prefs_advanced.xhtml#fayt"/> </rdf:li>
         <rdf:li><rdf:Description ID="advanced_pref_cache" nc:name="Cache" nc:link="cs_nav_prefs_advanced.xhtml#cache"/> </rdf:li>
         <rdf:li><rdf:Description ID="advanced_pref_proxies" nc:name="Proxies" nc:link="cs_nav_prefs_advanced.xhtml#proxies"/> </rdf:li>
         <rdf:li><rdf:Description ID="advanced_http_networking" nc:name="HTTP Networking" nc:link="cs_nav_prefs_advanced.xhtml#http_networking"/> </rdf:li>
         <rdf:li><rdf:Description ID="advanced_pref_installation" nc:name="Software Installation" nc:link="cs_nav_prefs_advanced.xhtml#software_installation"/> </rdf:li>
         <rdf:li><rdf:Description ID="advanced_pref_mouse_wheel" nc:name="Mouse Wheel" nc:link="cs_nav_prefs_advanced.xhtml#mouse_wheel"/> </rdf:li>
         <rdf:li><rdf:Description ID="advanced_pref_dom_inspector" nc:name="DOM Inspector" nc:link="cs_nav_prefs_advanced.xhtml#dom_inspector"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>