Imported Upstream version 1.1+hg7904

[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 b48c5047740270f10e4e5765fba0c3ebe69ff83e..64de86061dd013ed0054758fff61923a97911b58 100644 (file)
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -133,7 +133,7 @@
 </item>
 
 <item>
-    <spec>:se<oa>t</oa> <a>option</a> <oa>...</oa></spec>
+    <spec>:se<oa>t</oa> <a>option</a> <oa>…</oa></spec>
     <description>
         <p>
             For boolean options, turn them on. For all other types,
@@ -143,7 +143,7 @@
 </item>
 
 <item>
-    <spec>:se<oa>t</oa> no<a>option</a> <oa>...</oa></spec>
+    <spec>:se<oa>t</oa> no<a>option</a> <oa>…</oa></spec>
     <description>
         <p>
             For boolean options, turn them off. For all other types,
@@ -153,8 +153,8 @@
 </item>
 
 <item>
-    <spec>:se<oa>t</oa> <a>option</a>! <oa>...</oa></spec>
-    <spec>:se<oa>t</oa> inv<a>option</a> <oa>...</oa></spec>
+    <spec>:se<oa>t</oa> <a>option</a>! <oa>…</oa></spec>
+    <spec>:se<oa>t</oa> inv<a>option</a> <oa>…</oa></spec>
     <description>
         <p>
             For boolean options, invert their value. For all other types,
@@ -165,8 +165,8 @@
 
 <item>
     <tags>:set!=</tags>
-    <spec>:se<oa>t</oa> inv<a>option</a>=<a>value</a> <oa>...</oa></spec>
-    <spec>:se<oa>t</oa> <a>option</a>!=<a>value</a> <oa>...</oa></spec>
+    <spec>:se<oa>t</oa> inv<a>option</a>=<a>value</a> <oa>…</oa></spec>
+    <spec>:se<oa>t</oa> <a>option</a>!=<a>value</a> <oa>…</oa></spec>
     <description>
         <p>For list options, toggle the specified values.</p>
 
@@ -189,7 +189,7 @@
 
 <item>
     <tags>:set-default</tags>
-    <spec>:se<oa>t</oa> <a>option</a>&amp; <oa>...</oa></spec>
+    <spec>:se<oa>t</oa> <a>option</a>&amp; <oa>…</oa></spec>
     <description>
         <p>Reset option to its default value.</p>
     </description>
@@ -205,7 +205,7 @@
 
 <item>
     <tags>:set-args E487 E521</tags>
-    <spec>:se<oa>t</oa> <a>option</a>=<a>value</a> <oa>...</oa></spec>
+    <spec>:se<oa>t</oa> <a>option</a>=<a>value</a> <oa>…</oa></spec>
     <description>
         <p>
             Set string or number option to <a>value</a>.
@@ -217,7 +217,7 @@
 
 <item>
     <tags>:set+=</tags>
-    <spec>:se<oa>t</oa> <a>option</a>+=<a>value</a> <oa>...</oa></spec>
+    <spec>:se<oa>t</oa> <a>option</a>+=<a>value</a> <oa>…</oa></spec>
     <description>
         <p>
             Add the <a>value</a> to a number option, or append the <a>value</a>
@@ -231,7 +231,7 @@
 
 <item>
     <tags>:set^=</tags>
-    <spec>:se<oa>t</oa> <a>option</a>^=<a>value</a> <oa>...</oa></spec>
+    <spec>:se<oa>t</oa> <a>option</a>^=<a>value</a> <oa>…</oa></spec>
     <description>
         <p>
             Multiply the <a>value</a> to a number option, or prepend the
@@ -243,7 +243,7 @@
 
 <item>
     <tags>:set-=</tags>
-    <spec>:se<oa>t</oa> <a>option</a>-=<a>value</a> <oa>...</oa></spec>
+    <spec>:se<oa>t</oa> <a>option</a>-=<a>value</a> <oa>…</oa></spec>
     <description>
         <p>
             Subtract the <a>value</a> from a number option, or remove the
@@ -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>
@@ -596,6 +596,9 @@
             <dt>time</dt>     <dd>Time remaining</dd>
             <dt>url</dt>      <dd>Source URL</dd>
         </dl>
+        <note>
+            This option is currently unavailable in &dactyl.host; 26 and greater.
+        </note>
     </description>
 </item>
 
@@ -882,7 +885,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 +919,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
@@ -931,7 +937,8 @@
     <strut/>
     <spec>'hinttags' 'ht'</spec>
     <type>&option.hinttags.type;</type>
-    <default>:-moz-any-link,area,button,iframe,input:not([type=hidden]),select,textarea,
+    <default>:-moz-any-link,area,button,iframe,input:not([type=hidden]),
+          label[for],select,textarea,
           [onclick],[onmouseover],[onmousedown],[onmouseup],[oncommand],
           [tabindex],[role=link],[role=button],[contenteditable=true]</default>
     <description>
@@ -1266,8 +1273,8 @@
 <item>
     <tags>'pu' 'passunknown'</tags>
     <spec>'passunknown' 'pu'</spec>
-    <type>&option.showmode.type;</type>
-    <default>&option.showmode.default;</default>
+    <type>&option.passunknown.type;</type>
+    <default>&option.passunknown.default;</default>
     <description>
         <p>
             Pass unknown keys through to &dactyl.host; in these
@@ -1329,23 +1336,6 @@
     </description>
 </item>
 
-<item>
-    <tags>'noprivate' 'private'</tags>
-    <spec>'private'</spec>
-    <type>&option.private.type;</type>
-    <default>&option.private.default;</default>
-    <description>
-        <p>
-            Set the <str>private browsing</str> option. In private browsing mode
-            history, cache files, cookies, form data, passwords, download list
-            entries, local and URL <t>marks</t>, <t>command-line</t> history
-            and macros are available only for the duration of the private
-            browsing session and deleted when returning to normal browsing
-            mode. See also <t>privacy</t>.
-        </p>
-    </description>
-</item>
-
 <item>
     <tags>$&dactyl.idName;_RUNTIME</tags>
     <tags>'rtp' 'runtimepath'</tags>