From 45a4e74e3d15dda2c764ea87636c2426af37db1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= <stepnem@gmail.com>
Date: Sat, 20 Nov 2010 15:38:49 +0100
Subject: [PATCH] Unify Control key notation in the documentation.

---
 common/locale/en-US/browsing.xml | 10 +++++-----
 common/locale/en-US/insert.xml   | 28 ++++++++++++++--------------
 common/locale/en-US/message.xml  |  4 ++--
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/common/locale/en-US/browsing.xml b/common/locale/en-US/browsing.xml
index 0d342251..edf82f0d 100644
--- a/common/locale/en-US/browsing.xml
+++ b/common/locale/en-US/browsing.xml
@@ -21,7 +21,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 
 <item>
     <tags><![CDATA[pass-through <C-z> CTRL-Z]]></tags>
-    <spec>CTRL-Z</spec>
+    <spec>&lt;C-z></spec>
     <description>
         <p>
             Pass all keys except for <k name="Esc"/> directly to
@@ -34,7 +34,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 
 <item>
     <tags><![CDATA[send-key <C-v> CTRL-V]]></tags>
-    <spec>CTRL-V</spec>
+    <spec>&lt;C-v></spec>
     <description>
         <p>
             Pass the next key press directly to &dactyl.host;.
@@ -251,7 +251,7 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
     <tags><![CDATA[H <C-o> CTRL-O :ba :back]]></tags>
     <spec>:<oa>count</oa>ba<oa>ck</oa> <oa>url</oa></spec>
     <spec>:ba<oa>ck</oa>!</spec>
-    <spec>CTRL-o</spec>
+    <spec>&lt;C-o></spec>
     <description>
         <p>
             Go <oa>count</oa> pages back in the browser history. If
@@ -263,10 +263,10 @@ want to bypass &dactyl.appName;'s key handling and pass keys directly to
 </item>
 
 <item>
-    <tags><![CDATA[L <C-i> CTRL-i :fo :fw :forward]]></tags>
+    <tags><![CDATA[L <C-i> CTRL-I :fo :fw :forward]]></tags>
     <spec>:<oa>count</oa>fo<oa>rward</oa> <oa>url</oa></spec>
     <spec>:fo<oa>rward</oa>!</spec>
-    <spec>CTRL-i</spec>
+    <spec>&lt;C-i></spec>
     <description>
         <p>
             Go <oa>count</oa> pages forward in the browser history.
diff --git a/common/locale/en-US/insert.xml b/common/locale/en-US/insert.xml
index 594ed56e..af59eecc 100644
--- a/common/locale/en-US/insert.xml
+++ b/common/locale/en-US/insert.xml
@@ -59,8 +59,8 @@
 </item>
 
 <item>
-    <tags><![CDATA[i_<Ctrl-w>]]></tags>
-    <spec>&lt;Ctrl-w></spec>
+    <tags><![CDATA[i_<C-w>]]></tags>
+    <spec>&lt;C-w></spec>
     <description short="true">
         <p>
             Delete the previous word.
@@ -69,8 +69,8 @@
 </item>
 
 <item>
-    <tags><![CDATA[i_<Ctrl-u>]]></tags>
-    <spec>&lt;Ctrl-u></spec>
+    <tags><![CDATA[i_<C-u>]]></tags>
+    <spec>&lt;C-u></spec>
     <description short="true">
         <p>
             Delete until the beginning of the current line.
@@ -79,8 +79,8 @@
 </item>
 
 <item>
-    <tags><![CDATA[i_<Ctrl-k>]]></tags>
-    <spec>&lt;Ctrl-k></spec>
+    <tags><![CDATA[i_<C-k>]]></tags>
+    <spec>&lt;C-k></spec>
     <description short="true">
         <p>
             Delete until the end of the current line.
@@ -89,8 +89,8 @@
 </item>
 
 <item>
-    <tags><![CDATA[i_<Ctrl-a>]]></tags>
-    <spec>&lt;Ctrl-a></spec>
+    <tags><![CDATA[i_<C-a>]]></tags>
+    <spec>&lt;C-a></spec>
     <description short="true">
         <p>
             Move cursor to the beginning of the current line.
@@ -99,8 +99,8 @@
 </item>
 
 <item>
-    <tags><![CDATA[i_<Ctrl-e>]]></tags>
-    <spec>&lt;Ctrl-e></spec>
+    <tags><![CDATA[i_<C-e>]]></tags>
+    <spec>&lt;C-e></spec>
     <description short="true">
         <p>
             Move cursor to the end of the current line.
@@ -109,8 +109,8 @@
 </item>
 
 <item>
-    <tags><![CDATA[i_<Ctrl-h>]]></tags>
-    <spec>&lt;Ctrl-h></spec>
+    <tags><![CDATA[i_<C-h>]]></tags>
+    <spec>&lt;C-h></spec>
     <description short="true">
         <p>
             Delete the character to the left.
@@ -119,8 +119,8 @@
 </item>
 
 <item>
-    <tags><![CDATA[i_<Ctrl-d>]]></tags>
-    <spec>&lt;Ctrl-d></spec>
+    <tags><![CDATA[i_<C-d>]]></tags>
+    <spec>&lt;C-d></spec>
     <description short="true">
         <p>
             Delete the character to the right.
diff --git a/common/locale/en-US/message.xml b/common/locale/en-US/message.xml
index 10dd79a8..0c79a92c 100644
--- a/common/locale/en-US/message.xml
+++ b/common/locale/en-US/message.xml
@@ -76,10 +76,10 @@
     <dt>b or <k name="PageUp"/></dt>                            <dd>back a screen</dd>
     <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>q, <k name="Esc"/> or <k name="C-c"></k></dt> <dd>stop the listing</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>
+    <dt><k name="C-y"/></dt>                          <dd>yank (copy) a modeless selection to the clipboard</dd>
 </dl>
 
 </document>