Import r6976 from upstream hg supporting Firefox up to 25.*

[dactyl.git] / common / locale / en-US / options.xml

diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index af586ab20638fe2757834f1b8282b02919ca1367..eed009c12da3a513b4e2954a9f63144e97bfbcbf 100644 (file)
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -532,9 +532,9 @@
         </p>
 
         <p>
-            The order is important, such that <se opt="complete"><str delim="">bsf</str></se> will
-            list bookmarks followed by matching quick searches and then
-            matching files.
+            The order is important, such that <se opt="complete">
+            <str delim="">bookmark,search,file</str></se> will list bookmarks
+            followed by matching quick searches and then matching files.
         </p>
 
         <note>
@@ -882,7 +882,7 @@
     <description>
         <p>Change the hint matching algorithm used in Hints mode.</p>
 
-        <p>Possible values:</p>
+        <p>Possible values are one of:</p>
 
         <dl>
             <dt>contains</dt>
@@ -916,6 +916,9 @@
                 Delegate to the function
                 <tt>dactyl.plugins.customHintMatcher</tt>.
             </dd>
+        </dl>
+        <p>and optionally:</p>
+        <dl>
             <dt>transliterated</dt>
             <dd>
                 Certain alphanumeric characters are transliterated into their