diff --git a/common/locale/en-US/cmdline.xml b/common/locale/en-US/cmdline.xml
index 4e40f784..019fd28f 100644
--- a/common/locale/en-US/cmdline.xml
+++ b/common/locale/en-US/cmdline.xml
@@ -45,7 +45,7 @@
     </description>
 </item>
 
-<h2 tag="cmdline-editing">Command-line editing</h2>
+<h2 tag="cmdline-editing">Command line editing</h2>
 
 <item>
     <tags><![CDATA[c_<C-c>]]></tags>
@@ -69,7 +69,7 @@
     <spec>&lt;Up></spec>
     <description>
         <p>
-            Recall from command history the previous command-line
+            Recall from command history the previous command line
             which begins with the current input value.
         </p>
     </description>
@@ -81,7 +81,7 @@
     <spec>&lt;Down></spec>
     <description>
         <p>
-            Recall from command history the next command-line
+            Recall from command history the next command line
             which begins with the current input value.
         </p>
     </description>
@@ -215,7 +215,7 @@
     </description>
 </item>
 
-<h3 tag="cmdline-arguments">Ex command-line arguments</h3>
+<h3 tag="cmdline-arguments">Ex command line arguments</h3>
 
 <p>
     Most Ex commands accept a number of options and arguments. Arguments and
diff --git a/common/locale/en-US/developer.xml b/common/locale/en-US/developer.xml
index f1bf3a0b..5114479f 100644
--- a/common/locale/en-US/developer.xml
+++ b/common/locale/en-US/developer.xml
@@ -73,7 +73,7 @@
     <dt>Items</dt><dd/>
     <dt>item</dt>       <dd>A help entry (HelpItem)</dd>
     <dt>&tab;tags</dt>  <dd>See the 'Tagging' section (HelpTags)</dd>
-    <dt>&tab;spec</dt>  <dd>The specification for this item, such as an example command-line. (HelpSpec)</dd>
+    <dt>&tab;spec</dt>  <dd>The specification for this item, such as an example command line. (HelpSpec)</dd>
     <dt>&tab;strut</dt> <dd>A horizontal formatting strut which ensures that all previous &lt;tags> and &lt;spec> elements appear above the ones that follow.</dd>
     <dt>&tab;type</dt>  <dd>For options, the type of the option.
                             <em>number</em>, <em>boolean</em>, <em>string</em>, <em>stringlist</em>, or <em>charlist</em>.
diff --git a/common/locale/en-US/eval.xml b/common/locale/en-US/eval.xml
index 99ea8ac8..b6c0912e 100644
--- a/common/locale/en-US/eval.xml
+++ b/common/locale/en-US/eval.xml
@@ -15,11 +15,11 @@
     Much of the power of &dactyl.appName; lies in its scriptable expression
     evaluation. &dactyl.appName; understands two kinds of expressions: Ex
     commands, and JavaScript. Ex commands are simple, easy to type, and
-    readily accessible from the <t>command-line</t>. They form a core part of
-    the user interface. JavaScript, on the other hand, is much less
-    straightforward, but allows for any number of complex actions to be
-    executed, with full access to all of the internals of &dactyl.appName; and
-    &dactyl.host;. Both expression evaluation methods support sophisticated
+    readily accessible from the <link topic="command-line">command line</link>.
+    They form a core part of the user interface. JavaScript, on the other hand,
+    is much less straightforward, but allows for any number of complex actions
+    to be executed, with full access to all of the internals of &dactyl.appName;
+    and &dactyl.host;. Both expression evaluation methods support sophisticated
     expression completion, including option lists and descriptions thereof,
     along with paren matching and syntax error highlighting.
 </p>
@@ -33,7 +33,7 @@
             string, in which case it is shown in the statusline, or any
             arbitrary JavaScript expression. If the expression results in
             anything other than a string, it is pretty-printed in a multiline
-            frame just above the command-line. The output depends on the type
+            frame just above the command line. The output depends on the type
             of object. Functions display their source, DOM nodes display the
             pretty-printed XML of the top-level node, XML literals are
             rendered as page content, and all other objects display their
diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml
index 4b125a2e..56d4e113 100644
--- a/common/locale/en-US/map.xml
+++ b/common/locale/en-US/map.xml
@@ -40,7 +40,7 @@
 <p>
     causes “<ex>:echo Date()<k name="CR"/></ex>” to be typed out
     whenever <k name="F2"/> is pressed, thus echoing the full date
-    to the command-line.
+    to the command line.
 </p>
 
 <p tag=":map-modes">
@@ -117,7 +117,7 @@
     <dt>-javascript</dt> <dd>Execute <a>rhs</a> as JavaScript rather than keys (short names <em>-js</em>, <em>-j</em>)</dd>
     <dt>-modes</dt> <dd>Create this mapping in the given modes (short names <em>-mode</em>, <em>-m</em>)</dd>
     <dt>-nopersist</dt> <dd>Do not save this mapping to an auto-generated rc file (short name <em>-n</em>)</dd>
-    <dt>-silent</dt> <dd>Do not echo any generated keys to the command-line (short name <em>-s</em>, also <em>&lt;silent></em> for Vim compatibility)</dd>
+    <dt>-silent</dt> <dd>Do not echo any generated keys to the command line (short name <em>-s</em>, also <em>&lt;silent></em> for Vim compatibility)</dd>
 </dl>
 
 <item>
@@ -520,7 +520,7 @@
 <p>
     Defining new commands is perhaps the most straightforward way of
     repeating commonly used actions. User-defined commands may be
-    entered from the command-line or scripts exactly like standard
+    entered from the command line or scripts exactly like standard
     commands, and may similarly accept arguments, options, counts,
     and <oa>!</oa>s, as well as provide command-line completion.
     These commands may be defined as either ordinary,
diff --git a/common/locale/en-US/message.xml b/common/locale/en-US/message.xml
index 43f16308..d19c04da 100644
--- a/common/locale/en-US/message.xml
+++ b/common/locale/en-US/message.xml
@@ -76,7 +76,7 @@
     <dt>g</dt>                                        <dd>back to the start</dd>
     <dt/><dd/>
     <dt>q, <k name="Esc"/> or CTRL-C</dt>             <dd>stop the listing</dd>
-    <dt>:</dt>                                        <dd>stop the listing and enter a command-line</dd>
+    <dt>:</dt>                                        <dd>stop the listing and enter a command line</dd>
     <dt>;</dt>                                        <dd>start an <t>extended-hints</t> command</dd>
     <dt><k name="C-Y"/></dt>                          <dd>yank (copy) a modeless selection to the clipboard</dd>
 </dl>
diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index 8821be64..bee682ed 100644
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -367,12 +367,13 @@
             Enables automatic completion for completion groups matching the
             given regular expressions. When automatic completion is enabled,
             the completion list is automatically opened when the
-            <t>command-line</t> is focused.  Thereafter, any key press
-            triggers a completion update for the matching groups (hereafter
-            ‘contexts’). Non-matching contexts will only be updated when the
-            <k name="Tab" mode="c"/> key is pressed. This option is useful for
-            disabling auto-completion for computationally intensive contexts
-            that don't perform well when your system is under load.
+            <link topic="command-line">command line</link> is focused.
+            Thereafter, any key press triggers a completion update for the
+            matching groups (hereafter ‘contexts’). Non-matching contexts will
+            only be updated when the <k name="Tab" mode="c"/> key is pressed.
+            This option is useful for disabling auto-completion for
+            computationally intensive contexts that don't perform well when
+            your system is under load.
         </p>
 
         <example>
@@ -632,12 +633,12 @@
 
         <dl dt="width: 6em;">
             <dt>B</dt>      <dd>Bookmark bar</dd>
-            <dt>C</dt>      <dd>Always show the command-line outside of the status line</dd>
+            <dt>C</dt>      <dd>Always show the command line outside of the status line</dd>
             <dt>M</dt>      <dd>Always show messages outside of the status line</dd>
             <dt>N</dt>      <dd>Tab number over image</dd>
             <dt>T</dt>      <dd>Toolbar</dd>
             <dt>b</dt>      <dd>Bottom scrollbar</dd>
-            <dt>c</dt>      <dd>Always show the command-line, even when empty</dd>
+            <dt>c</dt>      <dd>Always show the command line, even when empty</dd>
             <dt>l</dt>      <dd>Left scrollbar (<em>l</em> and <em>r</em> are mutually exclusive)</dd>
             <dt>m</dt>      <dd>Menu bar</dd>
             <dt>n</dt>      <dd>Tab number</dd>
@@ -1261,8 +1262,8 @@
 
         <dl dt="width: 6em;">
             <dt>0</dt> <dd>Don't show link destination</dd>
-            <dt>1</dt> <dd>Show the link's destination in the <t>status-line</t></dd>
-            <dt>2</dt> <dd>Show the link's destination in the <t>command-line</t></dd>
+            <dt>1</dt> <dd>Show the link's destination in the <link topic="status-line">status line</link></dd>
+            <dt>2</dt> <dd>Show the link's destination in the <link topic="command-line">command line</link></dd>
         </dl>
     </description>
 </item>
diff --git a/common/locale/en-US/repeat.xml b/common/locale/en-US/repeat.xml
index 89c67569..8875b65e 100644
--- a/common/locale/en-US/repeat.xml
+++ b/common/locale/en-US/repeat.xml
@@ -162,11 +162,11 @@
 
         <p>
             Ex command files are executed as if each line were entered into
-            the <t>command-line</t> individually. Additionally, certain
-            commands support the same ‘here document’ syntax supported by most
-            Unix shells and by the <t>command-line</t>. So, to execute a
-            JavaScript statement which does not comfortably fit on a single
-            line, you can use,
+            the <link topic="command-line">command line</link> individually.
+            Additionally, certain commands support the same ‘here document’
+            syntax supported by most Unix shells and by the <link topic="command-line">command line</link>.
+            So, to execute a JavaScript statement which does not comfortably fit
+            on a single line, you can use
         </p>
 
         <code><ex>:js</ex> &lt;&lt;<em>EOF</em>
diff --git a/common/locale/en-US/styling.xml b/common/locale/en-US/styling.xml
index f5320164..a6ce6fb2 100644
--- a/common/locale/en-US/styling.xml
+++ b/common/locale/en-US/styling.xml
@@ -94,7 +94,7 @@
             <dt>Null</dt>              <dd>A JavaScript Null object</dd>
             <dt>Number</dt>            <dd>A JavaScript Number object</dd>
             <dt>Object</dt>            <dd>A JavaScript Object</dd>
-            <dt>Preview</dt>           <dd>The completion preview displayed in the <t>command-line</t></dd>
+            <dt>Preview</dt>           <dd>The completion preview displayed in the <link topic="command-line">command line</link></dd>
             <dt>Question</dt>          <dd>A prompt for a decision</dd>
             <dt>Search</dt>            <dd>Highlighted search results in a web page</dd>
             <dt>StatusLine</dt>        <dd>The status bar</dd>