diff --git a/common/locale/en-US/faq.xml b/common/locale/en-US/faq.xml
index 04314844..40aeb2f7 100644
--- a/common/locale/en-US/faq.xml
+++ b/common/locale/en-US/faq.xml
@@ -73,7 +73,7 @@
             <h3 tag="faq-lasttab">How can I prevent <k>d</k> on the last tab from closing the window?</h3>
             <p><ex>:set!</ex> <hl key="HelpOpt">browser.tabs.closeWindowWithLastTab</hl>=<hl key="Boolean">false</hl></p>
 
-            <h3 tag="faq-autocomplete"><strut/>How can I prevent the command line completion list showing until I press <k name="Tab"/>?</h3>
+            <h3 tag="faq-autocomplete"><strut/>How can I prevent the command line completion list showing until I press <k name="Tab" link="c_&lt;Tab>"/>?</h3>
             <p>
                 You can disable it entirely with <se opt="autocomplete"/> or for
                 specific types of command completion by choosing more
diff --git a/common/locale/en-US/hints.xml b/common/locale/en-US/hints.xml
index e44a12a9..769f7da7 100644
--- a/common/locale/en-US/hints.xml
+++ b/common/locale/en-US/hints.xml
@@ -84,8 +84,8 @@
             <t>quick-hints</t>, except that each sub-mode highlights a
             more specialized set of elements, and performs a unique action on
             the selected link. Because of the panoply of extended hint modes
-            available, after pressing <k>;</k>, pressing <k name="Tab"/> brings
-            up the completion list with each hints mode and its description.
+            available, after pressing <k>;</k>, pressing <k name="Tab" link="false"/>
+            brings up the completion list with each hints mode and its description.
         </p>
 
         <p><a>mode</a> may be one of:</p>
diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml
index 039982ee..88780492 100644
--- a/common/locale/en-US/map.xml
+++ b/common/locale/en-US/map.xml
@@ -37,10 +37,10 @@
     For instance,
 </p>
 
-<code><ex>:map <k name="F2" link="false"/></ex> <ex>:styletoggle</ex> <em>-name</em> <k name="A-Tab" link="false"/></code>
+<code><ex>:map <k name="F2" link="false"/></ex> <ex>:styletoggle</ex> <em>-name</em> <k name="A-Tab" link="c_&lt;Tab>"/></code>
 
 <p>
-    causes “<tt><ex>:styletoggle</ex> <em>-name</em> <k name="A-Tab" link="false"/></tt>” to be typed out
+    causes “<tt><ex>:styletoggle</ex> <em>-name</em> <k name="A-Tab" link="c_&lt;Tab"/></tt>” to be typed out
     whenever <k name="F2" link="false"/> is pressed, providing a way to toggle
     a tab-completed named user style.
 </p>
diff --git a/common/locale/en-US/options.xml b/common/locale/en-US/options.xml
index 08047de4..cf4b2535 100644
--- a/common/locale/en-US/options.xml
+++ b/common/locale/en-US/options.xml
@@ -767,7 +767,7 @@
 
         <dl dt="width: 6em;">
             <dt>0</dt>      <dd>Follow the first hint as soon as typed text uniquely identifies it.</dd>
-            <dt>1</dt>      <dd>Follow the selected hint on <k name="CR"/>.</dd>
+            <dt>1</dt>      <dd>Follow the selected hint on <k name="CR" link="false"/>.</dd>
         </dl>
     </description>
 </item>
@@ -951,7 +951,7 @@
             hint. The timeout is measured since the last time a key listed in
             <o>hintkeys</o> was pressed. It has no effect when narrowing hints
             by typing part of their text. Set to 0 (the default) to only follow
-            hints after pressing <k name="CR"/> or when the hint is unique.
+            hints after pressing <k name="CR" link="false"/> or when the hint is unique.
         </p>
     </description>
 </item>
diff --git a/common/locale/en-US/pattern.xml b/common/locale/en-US/pattern.xml
index 5f8f5322..f1bc4e92 100644
--- a/common/locale/en-US/pattern.xml
+++ b/common/locale/en-US/pattern.xml
@@ -43,7 +43,7 @@
 
 <item>
     <tags><![CDATA[<find-forward> /]]></tags>
-    <spec>/<a>pattern</a><k name="CR"/></spec>
+    <spec>/<a>pattern</a><k name="CR" link="false"/></spec>
     <description>
         <p>Find <a>pattern</a> starting at the current caret position.</p>
 
@@ -66,7 +66,7 @@
 
 <item>
     <tags><![CDATA[<find-backward> ?]]></tags>
-    <spec>?<a>pattern</a><k name="CR"/></spec>
+    <spec>?<a>pattern</a><k name="CR" link="false"/></spec>
     <description>
         <p>
             Find a pattern backward of the current caret position in exactly the
diff --git a/common/locale/en-US/privacy.xml b/common/locale/en-US/privacy.xml
index 10284abc..db936e49 100644
--- a/common/locale/en-US/privacy.xml
+++ b/common/locale/en-US/privacy.xml
@@ -137,7 +137,7 @@
             If no <oa>action</oa> is given, the value of <o>cookies</o> is used.
         </p>
 
-        <example><ex>:map -b</ex> <k link="false">c</k> <ex>:cookies</ex> <k name="A-Tab" link="false"/></example>
+        <example><ex>:map -b</ex> <k link="false">c</k> <ex>:cookies</ex> <k name="A-Tab" link="c_&lt;Tab>"/></example>
     </description>
 </item>
 
diff --git a/common/locale/en-US/styling.xml b/common/locale/en-US/styling.xml
index 0ff26336..d93cfb0d 100644
--- a/common/locale/en-US/styling.xml
+++ b/common/locale/en-US/styling.xml
@@ -199,7 +199,7 @@
             <dt>HelpXMLTagStart</dt>            <dd></dd>
             <dt>HelpXMLText</dt>                <dd></dd>
             <dt>Hint</dt>                       <dd></dd>
-            <dt>HintActive</dt>                 <dd>The hint element of link which will be followed by <k name="CR"/></dd>
+            <dt>HintActive</dt>                 <dd>The hint element of link which will be followed by <k name="CR" link="false"/></dd>
             <dt>HintElem</dt>                   <dd>The hintable element</dd>
             <dt>HintImage</dt>                  <dd>The indicator which floats above hinted images</dd>
             <dt>Hint[active]</dt>               <dd></dd>
diff --git a/common/skin/global-styles.css b/common/skin/global-styles.css
index 4f9c1464..ef99b86c 100644
--- a/common/skin/global-styles.css
+++ b/common/skin/global-styles.css
@@ -256,7 +256,7 @@ Hint[active];;*  background: rgba(255, 253, 208, .8);
 Hint::after;;*   content: attr(text) !important;
 HintElem;;*      /* The hintable element */ \
                  background-color: yellow  !important; color: black !important;
-HintActive;;*    /* The hint element of link which will be followed by <k name="CR"/> */ \
+HintActive;;*    /* The hint element of link which will be followed by <k name="CR" link="false"/> */ \
                  background-color: #88FF00 !important; color: black !important;
 HintImage;;*     /* The indicator which floats above hinted images */ \
                  opacity: .5 !important;
diff --git a/pentadactyl/locale/en-US/tutorial.xml b/pentadactyl/locale/en-US/tutorial.xml
index 9e9d8378..01f07520 100644
--- a/pentadactyl/locale/en-US/tutorial.xml
+++ b/pentadactyl/locale/en-US/tutorial.xml
@@ -229,7 +229,7 @@
 
 <p>
     Whichever way you choose to indicate your target link, once &dactyl.appName; has
-    highlighted the link you want, simply hit <k name="CR"/> to open it.
+    highlighted the link you want, simply hit <k name="CR" link="false"/> to open it.
 </p>
 
 <p>