X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common%2Flocale%2Fen-US%2Fbrowsing.xml;fp=common%2Flocale%2Fen-US%2Fbrowsing.xml;h=0e0c4075e05244a8ea4e32a137cc3504273cd61a;hb=70740024f9c028c1fd63e1a1850ab062ff956054;hp=cbb31f100b4dc8ab7d1d409f954cf725f373fbd5;hpb=718c614c183350706466e22939d0101ca4c87efe;p=dactyl.git

diff --git a/common/locale/en-US/browsing.xml b/common/locale/en-US/browsing.xml
index cbb31f1..0e0c407 100644
--- a/common/locale/en-US/browsing.xml
+++ b/common/locale/en-US/browsing.xml
@@ -17,10 +17,10 @@
 &dactyl.appName; overrides nearly all &dactyl.host; keys in order to
 make browsing more pleasant for Vim users. On the occasions when you
 want to bypass &dactyl.appName;'s key handling and pass keys directly to
-&dactyl.host; or to a web page, you have two options:
+&dactyl.host; or to a web page, you have several options:
 
 <item>
-    <tags><![CDATA[<A-b>]]></tags>
+    <tags><![CDATA[<pass-next-key-builtin> <A-b>]]></tags>
     <spec><![CDATA[<A-b>]]></spec>
     <description>
         <p>
@@ -53,6 +53,11 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
     </description>
 </item>
 
+<p>
+    See also <o>passkeys</o> and <o>passunknown</o> for ways to permanently pass
+    all or particular keys under certain conditions.
+</p>
+
 <h2 tag="opening">Opening web pages</h2>
 
 <item>
@@ -101,7 +106,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
                 <example><ex>:open Linus Torvalds</ex></example>
            </li>
            <li>
-               Any other value is passed directly &dactyl.host; and
+               Any other value is passed directly to &dactyl.host; and
                must be a valid URL or hostname.
            </li>
         </ol>
@@ -223,7 +228,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 </item>
 
 <item>
-    <tags><![CDATA[<C-x>]]></tags>
+    <tags><![CDATA[<decrement-url-path> <C-x>]]></tags>
     <strut/>
     <spec><oa>count</oa>&lt;C-x></spec>
     <description>
@@ -237,7 +242,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 </item>
 
 <item>
-    <tags><![CDATA[<C-a>]]></tags>
+    <tags><![CDATA[<increment-url-path> <C-a>]]></tags>
     <strut/>
     <spec><oa>count</oa>&lt;C-a></spec>
     <description>
@@ -249,7 +254,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 </item>
 
 <item>
-    <tags>~</tags>
+    <tags><![CDATA[<open-home-directory> ~]]></tags>
     <spec>~</spec>
     <description short="true">
         <p>Open home directory. Equivalent to <ex>:open ~/</ex></p>
@@ -296,14 +301,14 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 
         <p>
             Current history position is marked with <em>></em>.
-            Jump numbers may be used as counts for with
+            Jump numbers may be used as counts for
             <ex>:back</ex> or <ex>:forward</ex>.
         </p>
     </description>
 </item>
 
 <item>
-    <tags>gh</tags>
+    <tags><![CDATA[<open-homepage> gh]]></tags>
     <spec>gh</spec>
     <description short="true">
         <p>Go home. Opens the homepage in the current tab.</p>
@@ -311,7 +316,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 </item>
 
 <item>
-    <tags>gH</tags>
+    <tags><![CDATA[<tab-open-homepage> gH]]></tags>
     <strut/>
     <spec>gH</spec>
     <description>
@@ -324,7 +329,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 </item>
 
 <item>
-    <tags>gu</tags>
+    <tags><![CDATA[<open-parent-path> gu]]></tags>
     <spec><oa>count</oa>gu</spec>
     <description short="true">
         <p>Go to <oa>count</oa>th parent directory.</p>
@@ -338,7 +343,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 </item>
 
 <item>
-    <tags>gU</tags>
+    <tags><![CDATA[<open-root-path> gU]]></tags>
     <spec>gU</spec>
     <description short="true">
         <p>Go to the root of the web site.</p>
@@ -369,28 +374,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
     </description>
 </item>
 
-<item>
-    <tags>:reh :rehash</tags>
-    <spec>:reh<oa>ash</oa> <oa>arg</oa> …</spec>
-    <description>
-        <p>
-            Reload the &dactyl.appName; add-on, including all code, plugins,
-            and configuration. For users running directly from the development
-            repository, this is a good way to update to the latest version or
-            to test your changes.
-        </p>
-        <p>
-            Any arguments supplied are parsed as command-line arguments as
-            specified in <t>startup-options</t>.
-        </p>
-        <warning>
-            Not all plugins are designed to cleanly un-apply during a rehash.
-            While official plugins are safe, beware of possible instability
-            if you rehash while running third-party plugins.
-        </warning>
-    </description>
-</item>
-
 <item>
     <tags>:re :reload</tags>
     <spec>:re<oa>load</oa><oa>!</oa></spec>
@@ -416,7 +399,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 <h2 tag="stopping">Stopping</h2>
 
 <item>
-    <tags><![CDATA[<C-c> :st :stop]]></tags>
+    <tags><![CDATA[<stop-load> <C-c> :st :stop]]></tags>
     <spec>&lt;C-c></spec>
     <strut/>
     <spec>:st<oa>op</oa></spec>
@@ -471,6 +454,18 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 
 <h2 tag="quitting save-session">Quitting</h2>
 
+<item>
+    <tags>ZQ :x :exit</tags>
+    <strut/>
+    <spec>:exit<oa>!</oa></spec>
+    <description>
+        <p>
+            Quit &dactyl.appName;, no matter how many tabs/windows are open.
+            The session is not stored. Use <oa>!</oa> to forcibly quit.
+        </p>
+    </description>
+</item>
+
 <item>
     <tags>:q :quit</tags>
     <strut/>
@@ -489,8 +484,8 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
     <spec>:quita<oa>ll</oa></spec>
     <description>
         <p>
-            Quit &dactyl.appName;, no matter how many tabs/windows
-            are open. The session is not stored.
+            Close the current &dactyl.appName; window, no matter how
+            many tabs are open.
         </p>
     </description>
 </item>
@@ -512,7 +507,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 </item>
 
 <item>
-    <tags>:xa :xall :wq :wqa :wqall</tags>
+    <tags>ZZ :xa :xall :wq :wqa :wqall</tags>
     <spec>:wqa<oa>ll</oa></spec>
     <strut/>
     <spec>:xa<oa>ll</oa></spec>
@@ -525,25 +520,6 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
     </description>
 </item>
 
-<item>
-    <tags>ZQ</tags>
-    <spec>ZQ</spec>
-    <description short="true">
-        <p>Quit and don't save the session. Works like <ex>:qall</ex>.</p>
-    </description>
-</item>
-
-<item>
-    <tags>ZZ</tags>
-    <spec>ZZ</spec>
-    <description short="true">
-        <p>
-            Quit &dactyl.appName; and save the session. Works like
-            <ex>:xall</ex>.
-        </p>
-    </description>
-</item>
-
 <h2 tag="current-directory">The current directory</h2>
 
 <item>