From fbb91754dae0d9df3e1f79de598627566acd2381 Mon Sep 17 00:00:00 2001
From: svu <svu>
Date: Sat, 18 Sep 2004 00:00:44 +0000
Subject: [PATCH] David noticed small glitches in base.xml.in

---
 BUGS              |  3 +++
 rules/base.xml.in | 23 ++++++++---------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/BUGS b/BUGS
index 1b152caa..cb48ff63 100644
--- a/BUGS
+++ b/BUGS
@@ -59,6 +59,9 @@ http://freedesktop.org/bugzilla/show_bug.cgi?id=744
 
 	DONE: Model a4techKB21 added
 
+http://freedesktop.org/bugzilla/show_bug.cgi?id=926
+
+	TODO:
 -- GNOME
 
 http://bugzilla.gnome.org/show_bug.cgi?id=144646
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 493601a4..302942f3 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -2139,6 +2139,12 @@
           <_description>Both Win-keys switch group while pressed.</_description>
         </configItem>
       </option>
+      <option>
+        <configItem>
+          <name>grp:rctrl_switch</name>
+          <_description>Right Ctrl key switches group while pressed.</_description>
+        </configItem>
+      </option>
       <option>
         <configItem>
           <name>grp:toggle</name>
@@ -2241,12 +2247,6 @@
           <_description>Right Ctrl key changes group.</_description>
         </configItem>
       </option>
-      <option>
-        <configItem>
-          <name>grp:caps</name>
-          <_description>CapsLock key changes group.</_description>
-        </configItem>
-      </option>
     </group>
     <group allowMultipleSelection="true">
       <configItem>
@@ -2409,13 +2409,6 @@
           <_description>CapsLock toggles Shift so all keys are affected.</_description>
         </configItem>
       </option>
-      <option>
-        <configItem>
-          <!-- use the grp name so the LED rule is used too-->
-          <name>grp:caps_toggle</name>
-          <_description>CapsLock toggles group.</_description>
-        </configItem>
-      </option>
     </group>
     <group allowMultipleSelection="false">
       <configItem>
@@ -2448,13 +2441,13 @@
       </option>
       <option>
         <configItem>
-          <name>altwin:meta_super</name>
+          <name>altwin:super_win</name>
           <_description>Super is mapped to the Win-keys (default).</_description>
         </configItem>
       </option>
       <option>
         <configItem>
-          <name>altwin:meta_hyper</name>
+          <name>altwin:hyper_win</name>
           <_description>Hyper is mapped to the Win-keys.</_description>
         </configItem>
       </option>