3 files changed, 33 insertions, 5 deletions
diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml
index 7b777129..92b0291a 100644
--- a/common/locale/en-US/map.xml
+++ b/common/locale/en-US/map.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="dactyl://content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "dactyl://content/dtd">
+<!DOCTYPE document SYSTEM "dactyl://content/modes.dtd">
 
 <document
     name="map"
@@ -75,6 +75,15 @@
     saved via the <ex>:mk&dactyl.name;rc</ex> command.
 </warning>
 
+<p tag="modes">
+    The following tree represents all of the modes understood by
+    dactyl. Mappings for a mode also apply to its children and
+    descendants. So a mapping in the BASE mode, for instance, is
+    also active in NORMAL and EX mode.
+</p>
+
+&modes.tree;
+
 <h3 tag=":map-commands">Map commands</h3>
 
 <item>
diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index b130321c..080fe4c1 100644
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -1144,6 +1144,21 @@
 </item>
 
 <item>
+    <tags>'pu' 'passunknown'</tags>
+    <spec>'passunknown' 'pu'</spec>
+    <type>&option.showmode.type;</type>
+    <default>&option.showmode.default;</default>
+    <description>
+        <p>
+            Pass unknown keys through to &dactyl.host; in these
+            <t>modes</t>. The first element matching a currently
+            active mode is the one that takes effect. Modes may be
+            negated by prefixing them with a <tt>!</tt>.
+        </p>
+    </description>
+</item>
+
+<item>
     <tags>'pps' 'popups'</tags>
     <spec>'popups' 'pps'</spec>
     <type>&option.popups.type;</type>
@@ -1330,13 +1345,17 @@
 </item>
 
 <item>
-    <tags>'nosmd' 'noshowmode'</tags>
     <tags>'smd' 'showmode'</tags>
     <spec>'showmode' 'smd'</spec>
     <type>&option.showmode.type;</type>
     <default>&option.showmode.default;</default>
     <description>
-        <p>Show the current mode in the command line if it matches this expression.</p>
+        <p>
+            Show the current mode in the command line if it or any
+            of its parent <t>modes</t> is included in the list.
+            Modes may be negated by prefixing them with a
+            <tt>!</tt>.
+        </p>
     </description>
 </item>
 
diff --git a/common/locale/en-US/tabs.xml b/common/locale/en-US/tabs.xml
index 25e668c8..64138dcb 100644
--- a/common/locale/en-US/tabs.xml
+++ b/common/locale/en-US/tabs.xml
@@ -384,7 +384,7 @@
 <h2 tag="app-tabs application-tabs pinned-tabs">Application Tabs</h2>
 
 <item>
-    <tags>pin pintab</tags>
+    <tags>:pin :pintab</tags>
     <spec><oa>count</oa>pin<oa>tab</oa><oa>!</oa> <oa>arg</oa></spec>
     <description>
         <p>
@@ -396,7 +396,7 @@
 </item>
 
 <item>
-    <tags>unpin unpintab</tags>
+    <tags>:unpin :unpintab</tags>
     <spec><oa>count</oa>pin<oa>tab</oa> <oa>arg</oa></spec>
     <description>
         <p>