Add &tag.command-line; and &tag.status-line; entities.

common/content/help.dtd

@@ -0,0 +1,6 @@
+<!ENTITY % dactylMain SYSTEM "chrome://dactyl/content/dactyl.dtd">
+%dactylMain;
+
+<!ENTITY tag.command-line '<link topic="command-line">command line</link>'>
+<!ENTITY tag.status-line  '<link topic="status-line">status line</link>'>
+

common/locale/en-US/all.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="all"

common/locale/en-US/autocommands.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="autocommands"

common/locale/en-US/browsing.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="browsing"

common/locale/en-US/buffer.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="buffer"

common/locale/en-US/cmdline.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="cmdline"

common/locale/en-US/developer.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd" [
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd" [
     <!ENTITY tab "&#xa0;&#xa0;&#xa0;">
 ]>
 

common/locale/en-US/eval.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="eval"
@@ -15,7 +15,7 @@
     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 <link topic="command-line">command line</link>.
+    readily accessible from the &tag.command-line;.
     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;

common/locale/en-US/gui.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="gui"

common/locale/en-US/hints.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="hints"

common/locale/en-US/index.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="index"

common/locale/en-US/insert.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="insert"

common/locale/en-US/map.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="map"

common/locale/en-US/marks.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="marks"

common/locale/en-US/message.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="message"

common/locale/en-US/options.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd" [
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd" [
   <!ENTITY hinttags "//*[@onclick or @onmouseover or @onmousedown or
                @onmouseup or @oncommand or @role='link'] |
            //input[not(@type='hidden')] | //a | //area |
@@ -366,7 +366,7 @@
             Enables automatic completion for completion groups matching the
             given regular expressions. When automatic completion is enabled,
             the completion list is automatically opened when the
-            <link topic="command-line">command line</link> is focused.
+            &tag.command-line; 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.
@@ -1317,8 +1317,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 <link topic="status-line">status line</link></dd>
+            <dt>1</dt> <dd>Show the link's destination in the &tag.status-line;</dd>
-            <dt>2</dt> <dd>Show the link's destination in the <link topic="command-line">command line</link></dd>
+            <dt>2</dt> <dd>Show the link's destination in the &tag.command-line;</dd>
         </dl>
     </description>
 </item>

common/locale/en-US/pattern.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="pattern"

common/locale/en-US/print.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="print"

common/locale/en-US/repeat.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="repeat"
@@ -162,9 +162,9 @@
 
         <p>
             Ex command files are executed as if each line were entered into
-            the <link topic="command-line">command line</link> individually.
+            the &tag.command-line; 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>.
+            syntax supported by most Unix shells and by the &tag.command-line;.
             So, to execute a JavaScript statement which does not comfortably fit
             on a single line, you can use
         </p>
@@ -234,7 +234,7 @@
 
 <p>
     Ex command scripts are similar to both entering commands on the
-    <link topic="command-line">command line</link> and to Vim
+    &tag.command-line; and to Vim
     scripts, but with some notable differences.
 </p>
 

common/locale/en-US/starting.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="starting"

common/locale/en-US/styling.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="styling"
@@ -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 <link topic="command-line">command line</link></dd>
+            <dt>Preview</dt>           <dd>The completion preview displayed in the &tag.command-line;</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>

common/locale/en-US/tabs.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="tabs"

common/locale/en-US/various.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="chrome://dactyl/content/help.xsl"?>
 
-<!DOCTYPE document SYSTEM "chrome://dactyl/content/dactyl.dtd">
+<!DOCTYPE document SYSTEM "chrome://dactyl/content/help.dtd">
 
 <document
     name="various"