diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml
index ba7c88a7..dab43bc0 100644
--- a/common/locale/en-US/map.xml
+++ b/common/locale/en-US/map.xml
@@ -66,7 +66,7 @@
     prefixed with one of the above letters. For instance,
     <ex>:imap</ex> creates a new key mapping in Insert mode, while
     <ex>:cunmap</ex> removes a key mapping from Command Line mode.
-    Other modes can be specified using the -modes option described below.
+    Other modes can be specified using the <em>-modes</em> option described below.
 </p>
 
 <warning>
@@ -601,7 +601,7 @@
 
         <p>
             By default, user commands accept no arguments. This can be changed by specifying
-            the <tt>-nargs</tt> option.
+            the <em>-nargs</em> option.
         </p>
 
         <p>The valid values are:</p>
@@ -619,7 +619,7 @@
         <p>
             Completion for arguments to user-defined commands is not available by default.
             Completion can be enabled by specifying one of the following arguments to the
-            -complete option when defining the command.
+            <em>-complete</em> option when defining the command.
         </p>
 
         <dl tag=":command-complete-arg-list"/>
@@ -628,7 +628,7 @@
 
         <p>
             Custom completion can be provided by specifying the
-            <str>custom,<a>thing</a></str> argument to <tt>-complete</tt>. If
+            <str>custom,<a>thing</a></str> argument to <em>-complete</em>. If
             <a>thing</a> evaluates to a function (i.e., it is a variable holding
             a function value, or a string containing the definition itself), it
             is called with two arguments: a completion context, and an object
@@ -664,7 +664,7 @@
         <h3 tag="E177 E178 :command-count">Count handling</h3>
 
         <p>
-            By default, user commands do not accept a count. Use the -count option if
+            By default, user commands do not accept a count. Use the <em>-count</em> option if
             you'd like to have a count passed to your user command. This will then be
             available for expansion as &lt;count> in the replacement.
         </p>
@@ -673,14 +673,14 @@
 
         <p>
             By default, a user command does not have a special version, i.e. a version
-            executed with the ! modifier. Providing the -bang option will enable this
+            executed with the ! modifier. Providing the <em>-bang</em> option will enable this
             and &lt;bang> will be available in the replacement.
         </p>
 
         <h3 tag=":command-description">Command description</h3>
 
         <p>
-            The command's description text can be set with -description. Otherwise it will
+            The command's description text can be set with <em>-description</em>. Otherwise it will
             default to "User-defined command".
         </p>
 
diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index 7a37f164..d7dadf5a 100644
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -14,7 +14,7 @@
 
 <p>
     &dactyl.appName; has a number of internal variables and switches which can be set to
-    achieve special effects. These options come in 8 forms:
+    achieve special effects. These options come in the following forms:
 </p>
 
 <dl dt="width: 10em;">
@@ -53,7 +53,7 @@
     <dt/><dd tag="regexpmap"/>
     <dt>regexpmap</dt>
     <dd>
-        A combination of a <em>stringmap</em> and a <em>regexplist</em>. Each key
+        A combination of a <t>stringmap</t> and a <t>regexplist</t>. Each key
         in the <a>key</a>:<a>value</a> pair is a regexp. If the regexp begins with a
         <tt>!</tt>, the sense of the match is negated, such that a non-matching
         expression will be considered a match and <html:i>vice versa</html:i>.
@@ -472,7 +472,7 @@
 
 <item>
     <tags>'cl' 'cookielifetime'</tags>
-    <spec>'cookielifetime'</spec>
+    <spec>'cookielifetime' 'cl'</spec>
     <type>&option.cookielifetime.type;</type>
     <default>&option.cookielifetime.default;</default>
     <description>
@@ -533,7 +533,7 @@
 
 <item>
     <tags>'dls' 'dlsort' 'downloadsort'</tags>
-    <spec>'downloadsort'</spec>
+    <spec>'downloadsort' 'dlsort' 'dls'</spec>
     <type>stringlist</type>
     <default>-active,+filename</default>
     <description>
@@ -993,7 +993,7 @@
 
 <item>
     <tags>'jt' 'jumptags'</tags>
-    <spec>'jumptags'</spec>
+    <spec>'jumptags' 'jt'</spec>
     <type>&option.jumptags.type;</type>
     <default>&option.jumptags.default;</default>
     <description>
@@ -1331,7 +1331,7 @@
 
 <item>
     <tags>'spl' 'spelllang'</tags>
-    <spec>'spelllang'</spec>
+    <spec>'spelllang' 'spl'</spec>
     <type>&option.spelllang.type;</type>
     <default>&option.spelllang.default;</default>
     <description short="true">
diff --git a/common/locale/en-US/repeat.xml b/common/locale/en-US/repeat.xml
index c8696839..e4e7d4da 100644
--- a/common/locale/en-US/repeat.xml
+++ b/common/locale/en-US/repeat.xml
@@ -27,8 +27,7 @@
     <description>
         <p>
             Repeat the last keyboard mapping <oa>count</oa> times. Note that,
-            unlike in Vim, this does not apply solely to editing commands,
-            mainly because &dactyl.appName; doesn't have them.
+            unlike in Vim, this also applies to other than editing commands.
         </p>
     </description>
 </item>
@@ -166,7 +165,7 @@
 
         <dl>
             <dt>builtin</dt> <dd>The default group for builtin items. Can not be modified in any way by scripts.</dd>
-            <dt>default</dt> <dd>The default group for this script.</dd>
+            <dt>default</dt> <dd>The default group for the script containing this <tt>:group</tt> command.</dd>
             <dt>user</dt> <dd>The default group for the command line and <t>&dactyl.name;rc</t>.</dd>
         </dl>
 
diff --git a/pentadactyl/NEWS b/pentadactyl/NEWS
index 2799d229..18427ed5 100644
--- a/pentadactyl/NEWS
+++ b/pentadactyl/NEWS
@@ -82,8 +82,8 @@
       - Added site-specific mapping groups and related command
         changes. [b6]
       - Added 'timeout' and 'timeoutlen' options. [b6]
-      - Added n_{, n_}, n_[, n_], and n_g] mappings. [b7]
-      - Added n_[d and n_]d. [b8]
+      - Added n_{, n_}, n_[ and n_] mappings. [b7]
+      - Added n_g], n_[d and n_]d. [b8]
       - Added <A-b> to execute a builtin mapping. [b6]
       - Added <A-m>l and <A-m>s to aid in the construction of
         macros. [b6]