Import 1.0 supporting Firefox up to 14.*

[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 6de3231b5065d8c795fa4698ad07499ad8e14672..b48c5047740270f10e4e5765fba0c3ebe69ff83e 100644 (file)
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -18,7 +18,13 @@
 </p>
 
 <dl dt="width: 10em;">
-    <dt>boolean</dt>       <dd>Can only be <hl key="Boolean">on</hl> or <hl key="Boolean">off</hl></dd>
+    <dt/><dd tag="boolean"/>
+    <dt>boolean</dt>
+    <dd>
+        Can only be <hl key="Boolean">on</hl> (<ex>:set <a>option</a></ex>) or
+        <hl key="Boolean">off</hl> (<ex>:set no<a>option</a></ex>)
+    </dd>
+
     <dt>number</dt>        <dd>A numeric value</dd>
     <dt>string</dt>        <dd>A string value</dd>
 
@@ -688,6 +694,7 @@
     <strut/>
     <type>&option.extendedhinttags.type;</type>
     <default>[asOTvVWy]:':-moz-any-link',area[href],img[src],iframe[src],
+          [A]:[id],a[name],
           [f]:body,
           [F]:body,code,div,html,p,pre,span,
           [iI]:img,
@@ -1047,16 +1054,26 @@
     <tags>'ln' 'linenumbers'</tags>
     <spec>'linenumbers' 'ln'</spec>
     <type>&option.linenumbers.type;</type>
-    <default>&option.linenumbers.default;</default>
+    <default><![CDATA['view-source:*':[id^=line],
+          code.google.com:'#nums [id^="nums_table"] a[href^="#"]',
+          github.com:.line_numbers>*,
+          mxr.mozilla.org:a.l,
+          pastebin.com:#code_frame>div>ol>li,
+          addons.mozilla.org:.gutter>.line>a,
+          bugzilla.mozilla.org:.bz_comment:not(.bz_first_comment):not(.ih_history),
+          *:'/* Hgweb/Gitweb */ .completecodeline a.codeline, a.linenr']]></default>
     <description>
         <p>
             Patterns used to determine line numbers used by <k>G</k>. May be
-            either a selector expression as accepted by <o>hinttags</o>, in
-            which case the first matching element whose text content is equal to
-            the desired line number is used or the <oa>count</oa>th element
-            failing that, or the string <str delim="'">func:</str> followed by a
-            function which, given arguments for the document and desired line
-            number, must return the target element.
+            either a selector expression as accepted by <o>hinttags</o>, or the
+            string <str delim="'">func:</str> followed by a JavaScript
+            expression which evaluates to a function. In the former case, the
+            first matching element whose text content is equal to the desired
+            line number is used. If no such element exists, the <oa>count</oa>th
+            matching element is used. In the latter case, the provided function
+            must accept two arguments, the document in question and the desired
+            line number, and must return the element corresponding to the given
+            line.
         </p>
     </description>
 </item>
@@ -1100,16 +1117,6 @@
     </description>
 </item>
 
-<item>
-    <tags>'ml' 'mapleader'</tags>
-    <spec>'mapleader' 'ml'</spec>
-    <type>&option.mapleader.type;</type>
-    <default>&option.mapleader.default;</default>
-    <description>
-        <p>Defines the replacement keys for the <k name="Leader"/> pseudo-key.</p>
-    </description>
-</item>
-
 <item>
     <tags>'maxitems'</tags>
     <spec>'maxitems'</spec>
@@ -1234,8 +1241,8 @@
     <description>
         <p>
             Pass certain keys through directly for the given URLs.
-            For any page with a URL matching a given regexp, all key
-            events for keys listed in that regexp's value are passed
+            For any page with a URL matching a given <t>site-filter</t>, all key
+            events for keys listed in the corresponding value are passed
             through directly to &dactyl.host;, and are not processed
             by &dactyl.appName; in any way. Key names are separated
             by commas, where the first key name is treated as a list
@@ -1352,7 +1359,6 @@
 
         <ul>
             <li>colors/</li>
-            <li>macros/</li>
             <li>plugins/</li>
         </ul>
 
@@ -1632,8 +1638,9 @@
         <p>
             The regular expression used to split URL lists in commands
             like <ex>:open</ex>. When set to the empty string, URL lists
-            are never split. With the default value, the following will open
-            three URLs in the current tab and two new background tabs,
+            are never split. With the default settings, the following will open
+            three URLs (the first one in the current tab and the latter two in
+            two new background tabs):
         </p>
         <code><ex>:open <str delim="">google Linux</str> | <str delim="">wikipedia Arch Linux</str> | <str delim="">imdb Serenity</str></ex></code>
     </description>