From e0067872b8d3965699f8ba57ed7c89759ebe966e Mon Sep 17 00:00:00 2001
From: Olivier Mehani <shtrom@ssji.net>
Date: Mon, 30 Nov 2009 21:50:50 +0100
Subject: [PATCH 1/3] Renamed us dvorak-intl to dvorak-alt-intl, following the same logics as regular
 qwerty with respect to dead keys.

---
 rules/base.xml.in |    4 ++--
 symbols/us        |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 680323e..f5fd58f 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1245,8 +1245,8 @@
         </variant>
         <variant>
           <configItem>
-            <name>dvorak-intl</name>
-            <_description>Dvorak international</_description>
+            <name>dvorak-alt-intl</name>
+            <_description>Dvorak alternative international (no dead keys; former dvorak-intl)</_description>
           </configItem>
         </variant>
         <variant>
diff --git a/symbols/us b/symbols/us
index c732de6..a33e8f0 100644
--- a/symbols/us
+++ b/symbols/us
@@ -253,7 +253,7 @@ xkb_symbols "dvorak" {
     key <BKSL> { [  backslash,  bar             ]       };
 };
 
-// Dvorak international
+// Dvorak international without dead keys
 // Stephane Magnenat (stephane at magnenat dot net, http://stephane.magnenat.net)
 // Based on information from http://www.poupinou.org/dvorak/index.html
 //
@@ -270,9 +270,9 @@ xkb_symbols "dvorak" {
 //      â   ö   è   ù   ï
 
 partial alphanumeric_keys
-xkb_symbols "dvorak-intl" {
+xkb_symbols "dvorak-alt-intl" {
 
-    name[Group1]= "USA - Dvorak international";
+    name[Group1]= "USA - Dvorak alternative international (no dead keys; former dvorak-intl)";
 
     include "us(dvorak)"
 
-- 
1.6.4.4