svn merge ^/branches/released .

42 files changed, 2121 insertions, 2213 deletions

diff --git a/xorg-server/xkeyboard-config/keymap/amiga b/xorg-server/xkeyboard-config/keymap/amiga
index d697a986b..10a7142a6 100644
--- a/xorg-server/xkeyboard-config/keymap/amiga
+++ b/xorg-server/xkeyboard-config/keymap/amiga
@@ -1,22 +1,15 @@
-// $Xorg: amiga,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-
-
-
-
-// $XFree86: xc/programs/xkbcomp/keymap/amiga,v 3.2 1997/10/26 13:25:36 dawes Exp $
-
-default xkb_keymap "usa1" {
-    xkb_keycodes	{ include "amiga(usa1)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "amiga(usa1)"		};
-    xkb_geometry	{ include "amiga(usa1)"		};
-};
-
-xkb_keymap "de" {
-    xkb_keycodes	{ include "amiga(de)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "amiga(de)"		};
-    xkb_geometry	{ include "amiga(de)"		};
-};
+default xkb_keymap "usa1" {

+    xkb_keycodes	{ include "amiga(usa1)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "amiga(usa1)"		};

+    xkb_geometry	{ include "amiga(usa1)"		};

+};

+

+xkb_keymap "de" {

+    xkb_keycodes	{ include "amiga(de)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "amiga(de)"		};

+    xkb_geometry	{ include "amiga(de)"		};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/ataritt b/xorg-server/xkeyboard-config/keymap/ataritt
index b801ac291..1f8449131 100644
--- a/xorg-server/xkeyboard-config/keymap/ataritt
+++ b/xorg-server/xkeyboard-config/keymap/ataritt
@@ -1,21 +1,14 @@
-// $Xorg: ataritt,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-
-
-
-
-// $XFree86: xc/programs/xkbcomp/keymap/ataritt,v 3.1 1997/10/26 13:25:37 dawes Exp $
-
-default xkb_keymap "us" {
-    xkb_keycodes	{ include "ataritt(us)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "ataritt(us)"		};
-    xkb_geometry	{ include "ataritt(us)"		};
-};
-xkb_keymap "de" {
-    xkb_keycodes	{ include "ataritt(de)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "ataritt(de)"		};
-    xkb_geometry	{ include "ataritt(de)"		};
-};
+default xkb_keymap "us" {

+    xkb_keycodes	{ include "ataritt(us)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "ataritt(us)"		};

+    xkb_geometry	{ include "ataritt(us)"		};

+};

+xkb_keymap "de" {

+    xkb_keycodes	{ include "ataritt(de)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "ataritt(de)"		};

+    xkb_geometry	{ include "ataritt(de)"		};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/digital_vndr/us b/xorg-server/xkeyboard-config/keymap/digital_vndr/us
index 7f5180e2c..8a600fc2e 100644
--- a/xorg-server/xkeyboard-config/keymap/digital_vndr/us
+++ b/xorg-server/xkeyboard-config/keymap/digital_vndr/us
@@ -1,188 +1,187 @@
-// $Xorg: us,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-//
-//Copyright (c) 1996  Digital Equipment Corporation
-//
-//Permission is hereby granted, free of charge, to any person obtaining
-//a copy of this software and associated documentation files (the
-//"Software"), to deal in the Software without restriction, including
-//without limitation the rights to use, copy, modify, merge, publish,
-//distribute, sublicense, and sell copies of the Software, and to
-//permit persons to whom the Software is furnished to do so, subject to
-//the following conditions:
-//
-//The above copyright notice and this permission notice shall be included
-//in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,
-//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-//THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of the Digital Equipment 
-//Corporation shall not be used in advertising or otherwise to promote
-//the sale, use or other dealings in this Software without prior written
-//authorization from Digital Equipment Corporation.
-//
-// HISTORY
-// Log: us,v 
-// Revision 1.3  1996/06/18  09:14:51  erik
-// use flags correctly, assorted cleanups and consortium fixes
-//
-// Revision 1.1.6.2  1995/10/25  21:00:53  William_Walker
-// 	Add pc104-key support
-// 	[1995/10/23  15:46:24  William_Walker]
-//
-// Revision 1.1.2.6  1995/06/27  12:18:05  William_Walker
-// 	Add LK201 and LK450 support as well as TW and DP variants.
-// 	[1995/06/26  20:26:19  William_Walker]
-// 
-// Revision 1.1.2.5  1995/06/05  19:23:12  William_Walker
-// 	New file.  I love keymaps.
-// 	[1995/06/05  18:14:04  William_Walker]
-// 
-// EndLog
-// 
-// @(#)RCSfile: us,v  Revision: 1.3  (DEC) Date: 1996/02/02 14:21:15
-// 
-
-// **************************************************************
-// *								*
-// * Keymaps for en_US.ISO8859-1 - English for U.S.		*
-// *								*
-// **************************************************************
-
-xkb_keymap "lk201" {
-    xkb_keycodes        { include "digital_vndr/lk(lk201)" 		};
-    xkb_types           { include "default"    	        	};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(vt105)"		};
-    xkb_geometry	{ description = "Digital US LK201";
-			  include "digital_vndr/lk(lk201)"		};
-};
-
-xkb_keymap "lk401" {
-    xkb_keycodes        { include "digital_vndr/lk(lk401)" 		};
-    xkb_types           { include "default"    	        	};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(vt108)"		};
-    xkb_geometry	{ description = "Digital US LK401";
-			  include "digital_vndr/lk(lk401)"		};
-};
-
-xkb_keymap "lk411" {
-    xkb_keycodes        { include "digital_vndr/pc(lk411)" 		};
-    xkb_types           { include "default"    	        	};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(vt108)"		};
-    xkb_geometry	{ description = "Digital US LK411";
-			  include "digital_vndr/lk(lk401)"		};
-};
-
-xkb_keymap "lk421" {
-    xkb_keycodes        { include "digital_vndr/lk(lk421)"		};
-    xkb_types           { include "default"    	        	};
-    xkb_compatibility   { include "default"	        	};
-    xkb_symbols         { include "digital_vndr/us(unix)"		};
-    xkb_geometry	{ description = "Digital US LK421";
-			  include "digital_vndr/unix(unix)"		};
-};
-
-xkb_keymap "lk441" {
-    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};
-    xkb_types           { include "default"    	        	};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(lk44x)"		};
-    xkb_geometry	{ description = "Digital US LK441";
-			  include "digital_vndr/pc(pc101)"
-			  include "digital_vndr/pc(leds_alone)"	};
-};
-
-xkb_keymap "lk443" {
-    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};
-    xkb_types           { include "default"    	        	};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(lk44x)"		};
-    xkb_geometry	{ description = "Digital US LK443";
-			  include "digital_vndr/pc(pc101)"
-			  include "digital_vndr/pc(leds_alone)"	};
-};
-
-xkb_keymap "lk44x" {
-    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};
-    xkb_types           { include "default"    	        	};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(lk44x)"		};
-    xkb_geometry	{ description = "Digital US LK443";
-			  include "digital_vndr/pc(pc101)"
-			  include "digital_vndr/pc(leds_alone)"	};
-};
-
-xkb_keymap "lk450" {
-    xkb_keycodes        { include "digital_vndr/pc(lk450)" 		};
-    xkb_types           { include "default"    	        	};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(vt108)"		};
-    xkb_geometry	{ description = "Digital US LK450";
-			  include "digital_vndr/lk(lk450)"		};
-};
-
-xkb_keymap "pcxalaa" {
-    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
-    xkb_types           { include "default"   	 		};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(pcxalaa)"		};
-    xkb_geometry	{ description = "Digital US PCXAL-AA";
-			  include "digital_vndr/pc(pc101)"
-			  include "digital_vndr/pc(leds_alone)"	};
-};
-
-xkb_keymap "pcxalfa" {
-    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
-    xkb_types           { include "default"   	 		};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(pcxalfa)"		};
-    xkb_geometry	{ description = "Digital US PCXAL-FA";
-			  include "digital_vndr/pc(pc101)"
-			  include "digital_vndr/pc(leds_on_keys)"	};
-};
-
-xkb_keymap "pcxalga" {
-    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
-    xkb_types           { include "default"   	 		};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(pcxalga)"		};
-    xkb_geometry	{ description = "Digital US PCXAL-GA";
-			  include "digital_vndr/pc(pc101)"
-			  include "digital_vndr/pc(leds_alone)"	};
-};
-
-xkb_keymap "pcxalka" {
-    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
-    xkb_types           { include "default"   	 		};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(pcxalka)"		};
-    xkb_geometry	{ description = "Digital US PCXAL-KA";
-			  include "digital_vndr/pc(pc101)"
-			  include "digital_vndr/pc(leds_alone)"	};
-};
-
-xkb_keymap "pcxal" {
-    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};
-    xkb_types           { include "default"   	 		};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(pcxal)"		};
-    xkb_geometry	{ description = "Digital US PCXAL";
-			  include "digital_vndr/pc(pc101)"
-			  include "digital_vndr/pc(leds_alone)"	};
-};
-
-xkb_keymap "mnk" {
-    xkb_keycodes        { include "digital_vndr/pc(pc104)" 		};
-    xkb_types           { include "default"   	 		};
-    xkb_compatibility   { include "default"			};
-    xkb_symbols         { include "digital_vndr/us(pc104)"		};
-    xkb_geometry	{ include "microsoft"			};
-};
+//

+//Copyright (c) 1996  Digital Equipment Corporation

+//

+//Permission is hereby granted, free of charge, to any person obtaining

+//a copy of this software and associated documentation files (the

+//"Software"), to deal in the Software without restriction, including

+//without limitation the rights to use, copy, modify, merge, publish,

+//distribute, sublicense, and sell copies of the Software, and to

+//permit persons to whom the Software is furnished to do so, subject to

+//the following conditions:

+//

+//The above copyright notice and this permission notice shall be included

+//in all copies or substantial portions of the Software.

+//

+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

+//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM,

+//DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR

+//OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR

+//THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+//

+//Except as contained in this notice, the name of the Digital Equipment 

+//Corporation shall not be used in advertising or otherwise to promote

+//the sale, use or other dealings in this Software without prior written

+//authorization from Digital Equipment Corporation.

+//

+// HISTORY

+// Log: us,v 

+// Revision 1.3  1996/06/18  09:14:51  erik

+// use flags correctly, assorted cleanups and consortium fixes

+//

+// Revision 1.1.6.2  1995/10/25  21:00:53  William_Walker

+// 	Add pc104-key support

+// 	[1995/10/23  15:46:24  William_Walker]

+//

+// Revision 1.1.2.6  1995/06/27  12:18:05  William_Walker

+// 	Add LK201 and LK450 support as well as TW and DP variants.

+// 	[1995/06/26  20:26:19  William_Walker]

+// 

+// Revision 1.1.2.5  1995/06/05  19:23:12  William_Walker

+// 	New file.  I love keymaps.

+// 	[1995/06/05  18:14:04  William_Walker]

+// 

+// EndLog

+// 

+// @(#)RCSfile: us,v  Revision: 1.3  (DEC) Date: 1996/02/02 14:21:15

+// 

+

+// **************************************************************

+// *								*

+// * Keymaps for en_US.ISO8859-1 - English for U.S.		*

+// *								*

+// **************************************************************

+

+xkb_keymap "lk201" {

+    xkb_keycodes        { include "digital_vndr/lk(lk201)" 		};

+    xkb_types           { include "default"    	        	};

+    xkb_compatibility   { include "default"			};

+    xkb_symbols         { include "digital_vndr/us(vt105)"		};

+    xkb_geometry	{ description = "Digital US LK201";

+			  include "digital_vndr/lk(lk201)"		};

+};

+

+xkb_keymap "lk401" {

+    xkb_keycodes        { include "digital_vndr/lk(lk401)" 		};

+    xkb_types           { include "default"    	        	};

+    xkb_compatibility   { include "default"			};

+    xkb_symbols         { include "digital_vndr/us(vt108)"		};

+    xkb_geometry	{ description = "Digital US LK401";

+			  include "digital_vndr/lk(lk401)"		};

+};

+

+xkb_keymap "lk411" {

+    xkb_keycodes        { include "digital_vndr/pc(lk411)" 		};

+    xkb_types           { include "default"    	        	};

+    xkb_compatibility   { include "default"			};

+    xkb_symbols         { include "digital_vndr/us(vt108)"		};

+    xkb_geometry	{ description = "Digital US LK411";

+			  include "digital_vndr/lk(lk401)"		};

+};

+

+xkb_keymap "lk421" {

+    xkb_keycodes        { include "digital_vndr/lk(lk421)"		};

+    xkb_types           { include "default"    	        	};

+    xkb_compatibility   { include "default"	        	};

+    xkb_symbols         { include "digital_vndr/us(unix)"		};

+    xkb_geometry	{ description = "Digital US LK421";

+			  include "digital_vndr/unix(unix)"		};

+};

+

+xkb_keymap "lk441" {

+    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};

+    xkb_types           { include "default"    	        	};

+    xkb_compatibility   { include "default"			};

+    xkb_symbols         { include "digital_vndr/us(lk44x)"		};

+    xkb_geometry	{ description = "Digital US LK441";

+			  include "digital_vndr/pc(pc101)"

+			  include "digital_vndr/pc(leds_alone)"	};

+};

+

+xkb_keymap "lk443" {

+    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};

+    xkb_types           { include "default"    	        	};

+    xkb_compatibility   { include "default"			};

+    xkb_symbols         { include "digital_vndr/us(lk44x)"		};

+    xkb_geometry	{ description = "Digital US LK443";

+			  include "digital_vndr/pc(pc101)"

+			  include "digital_vndr/pc(leds_alone)"	};

+};

+

+xkb_keymap "lk44x" {

+    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};

+    xkb_types           { include "default"    	        	};

+    xkb_compatibility   { include "default"			};

+    xkb_symbols         { include "digital_vndr/us(lk44x)"		};

+    xkb_geometry	{ description = "Digital US LK443";

+			  include "digital_vndr/pc(pc101)"

+			  include "digital_vndr/pc(leds_alone)"	};

+};

+

+xkb_keymap "lk450" {

+    xkb_keycodes        { include "digital_vndr/pc(lk450)" 		};

+    xkb_types           { include "default"    	        	};

+    xkb_compatibility   { include "default"			};

+    xkb_symbols         { include "digital_vndr/us(vt108)"		};

+    xkb_geometry	{ description = "Digital US LK450";

+			  include "digital_vndr/lk(lk450)"		};

+};

+

+xkb_keymap "pcxalaa" {

+    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};

+    xkb_types           { include "default"   	 		};

+    xkb_compatibility   { include "default"			};

+    xkb_symbols         { include "digital_vndr/us(pcxalaa)"		};

+    xkb_geometry	{ description = "Digital US PCXAL-AA";

+			  include "digital_vndr/pc(pc101)"

+			  include "digital_vndr/pc(leds_alone)"	};

+};

+

+xkb_keymap "pcxalfa" {

+    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};

+    xkb_types           { include "default"   	 		};

+    xkb_compatibility   { include "default"			};

+    xkb_symbols         { include "digital_vndr/us(pcxalfa)"		};

+    xkb_geometry	{ description = "Digital US PCXAL-FA";

+			  include "digital_vndr/pc(pc101)"

+			  include "digital_vndr/pc(leds_on_keys)"	};

+};

+

+xkb_keymap "pcxalga" {

+    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};

+    xkb_types           { include "default"   	 		};

+    xkb_compatibility   { include "default"			};

+    xkb_symbols         { include "digital_vndr/us(pcxalga)"		};

+    xkb_geometry	{ description = "Digital US PCXAL-GA";

+			  include "digital_vndr/pc(pc101)"

+			  include "digital_vndr/pc(leds_alone)"	};

+};

+

+xkb_keymap "pcxalka" {

+    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};

+    xkb_types           { include "default"   	 		};

+    xkb_compatibility   { include "default"			};

+    xkb_symbols         { include "digital_vndr/us(pcxalka)"		};

+    xkb_geometry	{ description = "Digital US PCXAL-KA";

+			  include "digital_vndr/pc(pc101)"

+			  include "digital_vndr/pc(leds_alone)"	};

+};

+

+xkb_keymap "pcxal" {

+    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};

+    xkb_types           { include "default"   	 		};

+    xkb_compatibility   { include "default"			};

+    xkb_symbols         { include "digital_vndr/us(pcxal)"		};

+    xkb_geometry	{ description = "Digital US PCXAL";

+			  include "digital_vndr/pc(pc101)"

+			  include "digital_vndr/pc(leds_alone)"	};

+};

+

+xkb_keymap "mnk" {

+    xkb_keycodes        { include "digital_vndr/pc(pc104)" 		};

+    xkb_types           { include "default"   	 		};

+    xkb_compatibility   { include "default"			};

+    xkb_symbols         { include "digital_vndr/us(pc104)"		};

+    xkb_geometry	{ include "microsoft"			};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/macintosh b/xorg-server/xkeyboard-config/keymap/macintosh
index de115badc..345667054 100644
--- a/xorg-server/xkeyboard-config/keymap/macintosh
+++ b/xorg-server/xkeyboard-config/keymap/macintosh
@@ -1,17 +1,15 @@
-// $XConsortium: macintosh /main/11 1996/03/07 13:42:13 kaleb $
-// $XFree86: xc/programs/xkbcomp/keymap/macintosh,v 1.1 1999/05/23 05:27:51 dawes Exp $
-default xkb_keymap "macintosh" {
-    xkb_keycodes	{ include "macintosh"				};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols		{ include "macintosh_vndr/us(extended)"		};
-    xkb_geometry	{ include "macintosh"				};
-};
-
-xkb_keymap "macintosh_old" {
-    xkb_keycodes	{ include "macintosh(old)"				};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols		{ include "macintosh_vndr/us(extended)"		};
-    xkb_geometry	{ include "macintosh"				};
-};
+default xkb_keymap "macintosh" {

+    xkb_keycodes	{ include "macintosh"				};

+    xkb_types		{ include "default"				};

+    xkb_compatibility	{ include "default"				};

+    xkb_symbols		{ include "macintosh_vndr/us(extended)"		};

+    xkb_geometry	{ include "macintosh"				};

+};

+

+xkb_keymap "macintosh_old" {

+    xkb_keycodes	{ include "macintosh(old)"				};

+    xkb_types		{ include "default"				};

+    xkb_compatibility	{ include "default"				};

+    xkb_symbols		{ include "macintosh_vndr/us(extended)"		};

+    xkb_geometry	{ include "macintosh"				};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/be b/xorg-server/xkeyboard-config/keymap/sgi_vndr/be
index 9905f0ba6..1301e5596 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/be
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/be
@@ -1,34 +1,32 @@
-// $Xorg: be,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+be"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+be(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+be"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+be(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+be"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc_universal_nodeadkeys)+be(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+be"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc102_nodeadkeys)+be(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/bg b/xorg-server/xkeyboard-config/keymap/sgi_vndr/bg
index a3cb08a22..556f1146b 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/bg
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/bg
@@ -1,19 +1,18 @@
-// $Xorg: bg,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols  { 
-	include "us(pc_universal)+bg+group(shifts_toggle)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols { 
-	include "us(pc102)+bg+group(shifts_toggle)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols  { 

+	include "us(pc_universal)+bg+group(shifts_toggle)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols { 

+	include "us(pc102)+bg+group(shifts_toggle)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ca b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ca
index 38f489657..528b0642a 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ca
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ca
@@ -1,33 +1,32 @@
-// $Xorg: ca,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+ca"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+ca(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+ca"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+ca(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+ca"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc_universal_nodeadkeys)+ca(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+ca"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc102_nodeadkeys)+ca(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch
index 6970a3679..ca35be7d9 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch
@@ -1,67 +1,65 @@
-// $Xorg: de_CH,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "de_indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+ch(de)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "de_indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+ch(de_nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "de_indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+ch(de)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "de_indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+ch(dr_nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
-default xkb_keymap "fr_indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+ch(fr)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "fr_indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+ch(fr_nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "fr_indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+ch(fr)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "fr_indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+ch(fr_nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "de_indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+ch(de)"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "de_indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc_universal_nodeadkeys)+ch(de_nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "de_indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+ch(de)"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "de_indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc102_nodeadkeys)+ch(dr_nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+

+default xkb_keymap "fr_indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+ch(fr)"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "fr_indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc_universal_nodeadkeys)+ch(fr_nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "fr_indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+ch(fr)"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "fr_indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc102_nodeadkeys)+ch(fr_nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/cz b/xorg-server/xkeyboard-config/keymap/sgi_vndr/cz
index 6673b615b..8e4a0a79c 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/cz
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/cz
@@ -1,33 +1,29 @@
-// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-//
-
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+cz"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc102)+cz"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
-default xkb_keymap "indy_qwerty" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+cz(qwerty)"  };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo_qwerty" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc102)+cz(qwerty)"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc_universal)+cz"		};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc102)+cz"		};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+

+default xkb_keymap "indy_qwerty" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc_universal)+cz(qwerty)"  };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indigo_qwerty" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc102)+cz(qwerty)"		};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/de b/xorg-server/xkeyboard-config/keymap/sgi_vndr/de
index 1ad7fe7b0..c63caf9b0 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/de
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/de
@@ -1,34 +1,32 @@
-// $Xorg: de,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal)+de"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+de(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc102)+de"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols {
-	include "en_US(pc102_nodeadkeys)+de(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

+    xkb_types		{ include "default"				};

+    xkb_compatibility	{ include "default"				};

+    xkb_symbols 	{ include "en_US(pc_universal)+de"		};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ 

+	include "en_US(pc_universal_nodeadkeys)+de(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc102)+de"		};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols {

+	include "en_US(pc102_nodeadkeys)+de(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/dk b/xorg-server/xkeyboard-config/keymap/sgi_vndr/dk
index 832f01da7..017443d56 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/dk
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/dk
@@ -1,34 +1,32 @@
-// $Xorg: dk,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal)+dk"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ 
-	include "en_US(pc_universal_nodeadkeys)+dk(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc102)+dk"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+dk(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

+    xkb_types		{ include "default"				};

+    xkb_compatibility	{ include "default"				};

+    xkb_symbols 	{ include "en_US(pc_universal)+dk"		};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ 

+	include "en_US(pc_universal_nodeadkeys)+dk(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc102)+dk"		};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ 

+	include "en_US(pc102_nodeadkeys)+dk(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/dvorak b/xorg-server/xkeyboard-config/keymap/sgi_vndr/dvorak
index bd594b0eb..b84bc5659 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/dvorak
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/dvorak
@@ -1,15 +1,14 @@
-// $Xorg: dvorak,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+dvorak"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc101)+dvorak"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc_universal)+dvorak"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc101)+dvorak"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/en_US b/xorg-server/xkeyboard-config/keymap/sgi_vndr/en_US
index 29f1666b7..184d4b896 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/en_US
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/en_US
@@ -1,4 +1,3 @@
-// $Xorg: en_US,v 1.3 2000/08/17 19:54:40 cpqbld Exp $

 default xkb_keymap "indy" {

     xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

     xkb_types		{ include "default"		};

@@ -55,4 +54,3 @@ xkb_keymap "indigo_nodeadkeys" {
     xkb_symbols 	{ include "en_US(pc102_nodeadkeys)"	};

     xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

 };

-

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/es b/xorg-server/xkeyboard-config/keymap/sgi_vndr/es
index f1aad9a7a..96898c6e3 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/es
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/es
@@ -1,34 +1,32 @@
-// $Xorg: es,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+es"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+es(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+es"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+es(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+es"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc_universal_nodeadkeys)+es(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+es"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc102_nodeadkeys)+es(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/fi b/xorg-server/xkeyboard-config/keymap/sgi_vndr/fi
index 67af07eb7..ca99af149 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/fi
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/fi
@@ -1,34 +1,32 @@
-// $Xorg: fi,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+fi"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+fi(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+fi"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+fi(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+fi"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc_universal_nodeadkeys)+fi(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+fi"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc102_nodeadkeys)+fi(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/fr b/xorg-server/xkeyboard-config/keymap/sgi_vndr/fr
index b6aea29de..fa84b65a7 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/fr
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/fr
@@ -1,34 +1,32 @@
-// $Xorg: fr,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+fr"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols  { 
-	include "en_US(pc_universal_nodeadkeys)+fr(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+fr"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+fr(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+fr"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols  { 

+	include "en_US(pc_universal_nodeadkeys)+fr(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+fr"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc102_nodeadkeys)+fr(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/gb b/xorg-server/xkeyboard-config/keymap/sgi_vndr/gb
index 6fa6d6515..90f79c194 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/gb
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/gb
@@ -1,34 +1,32 @@
-// $Xorg: gb,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+gb"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+gb(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+gb"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+gb(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+gb"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc_universal_nodeadkeys)+gb(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+gb"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc102_nodeadkeys)+gb(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/hu b/xorg-server/xkeyboard-config/keymap/sgi_vndr/hu
index 3c256846e..653236f2f 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/hu
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/hu
@@ -1,105 +1,104 @@
-// $Xorg: hu,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal)+hu(basic)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indy_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(shifts_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(ctrl_shift_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(ctrl_alt_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_caps_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+hu(basic)+group(caps_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc102)+hu(basic)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(shifts_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(ctrl_shift_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(ctrl_alt_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_caps_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+hu(basic)+group(caps_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

+    xkb_types		{ include "default"				};

+    xkb_compatibility	{ include "default"				};

+    xkb_symbols 	{ include "en_US(pc_universal)+hu(basic)"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

+};

+xkb_keymap "indy_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+hu(basic)+group(toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_shift_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+hu(basic)+group(shifts_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_ctrl_shift_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+hu(basic)+group(ctrl_shift_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_ctrl_alt_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+hu(basic)+group(ctrl_alt_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_caps_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+hu(basic)+group(caps_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc102)+hu(basic)"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+hu(basic)+group(toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_shift_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+hu(basic)+group(shifts_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_ctrl_shift_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+hu(basic)+group(ctrl_shift_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_ctrl_alt_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+hu(basic)+group(ctrl_alt_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_caps_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+hu(basic)+group(caps_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/it b/xorg-server/xkeyboard-config/keymap/sgi_vndr/it
index ed92227b7..64a413d4d 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/it
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/it
@@ -1,34 +1,32 @@
-// $Xorg: it,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+it"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+it(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+it"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+it(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+it"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc_universal_nodeadkeys)+it(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+it"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc102_nodeadkeys)+it(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/jp b/xorg-server/xkeyboard-config/keymap/sgi_vndr/jp
index 74ed4243c..96280c105 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/jp
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/jp
@@ -1,8 +1,7 @@
-// $Xorg: jp,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(jp106)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "us(pc101)+sgi_vndr/jp"			};
-    xkb_geometry	{ include "sgi_vndr/indy(jp106)"			};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(jp106)"			};

+    xkb_types		{ include "default"				};

+    xkb_compatibility	{ include "default"				};

+    xkb_symbols 	{ include "us(pc101)+sgi_vndr/jp"			};

+    xkb_geometry	{ include "sgi_vndr/indy(jp106)"			};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/no b/xorg-server/xkeyboard-config/keymap/sgi_vndr/no
index fd32c72c0..8fc326abe 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/no
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/no
@@ -1,34 +1,32 @@
-// $Xorg: no,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+no"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+no(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+no"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+no(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+no"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc_universal_nodeadkeys)+no(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+no"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc102_nodeadkeys)+no(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/pl b/xorg-server/xkeyboard-config/keymap/sgi_vndr/pl
index 3641a31ad..623e06f8f 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/pl
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/pl
@@ -1,29 +1,28 @@
-// $Xorg: pl,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc_universal)+pl"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "us(pc_universal)+pl(nodeadkeys)" 	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc102)+pl"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc102)+pl(nodeadkeys)" };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc_universal)+pl"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

+    xkb_types		{ include "default"				};

+    xkb_compatibility	{ include "default"				};

+    xkb_symbols 	{ include "us(pc_universal)+pl(nodeadkeys)" 	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc102)+pl"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc102)+pl(nodeadkeys)" };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/pt b/xorg-server/xkeyboard-config/keymap/sgi_vndr/pt
index 3ec03471a..6be76ddb9 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/pt
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/pt
@@ -1,34 +1,32 @@
-// $Xorg: pt,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+pt"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+pt(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+pt"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc102_nodeadkeys)+pt(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+pt"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc_universal_nodeadkeys)+pt(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+pt"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc102_nodeadkeys)+pt(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ru b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ru
index fc514d87c..45ebdf76f 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ru
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ru
@@ -1,105 +1,104 @@
-// $Xorg: ru,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};
-    xkb_types		{ include "default"				};
-    xkb_compatibility	{ include "default"				};
-    xkb_symbols 	{ include "en_US(pc_universal)+ru(basic)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};
-};
-xkb_keymap "indy_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(shifts_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(ctrl_shift_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(ctrl_alt_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_caps_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc_universal)+ru(basic)+group(caps_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc102)+ru(basic)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(shifts_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_ctrl_shift_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(ctrl_shift_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_ctrl_alt_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(ctrl_alt_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-xkb_keymap "indigo_caps_toggle" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols { 
-	include "en_US(pc102)+ru(basic)+group(caps_toggle)" 
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

+    xkb_types		{ include "default"				};

+    xkb_compatibility	{ include "default"				};

+    xkb_symbols 	{ include "en_US(pc_universal)+ru(basic)"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

+};

+xkb_keymap "indy_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+ru(basic)+group(toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_shift_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+ru(basic)+group(shifts_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_ctrl_shift_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+ru(basic)+group(ctrl_shift_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_ctrl_alt_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+ru(basic)+group(ctrl_alt_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_caps_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc_universal)+ru(basic)+group(caps_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc102)+ru(basic)"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+ru(basic)+group(toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_shift_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+ru(basic)+group(shifts_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_ctrl_shift_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+ru(basic)+group(ctrl_shift_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_ctrl_alt_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+ru(basic)+group(ctrl_alt_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+xkb_keymap "indigo_caps_toggle" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols { 

+	include "en_US(pc102)+ru(basic)+group(caps_toggle)" 

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/se b/xorg-server/xkeyboard-config/keymap/sgi_vndr/se
index 910a8cc89..7ac2fbc6b 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/se
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/se
@@ -1,34 +1,32 @@
-// $Xorg: se,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "en_US(pc_universal)+se"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indy_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal_nodeadkeys)+se(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+se"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-xkb_keymap "indigo_nodeadkeys" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "en_US(pc102_nodeadkeys)+se(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "en_US(pc_universal)+se"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indy_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc_universal_nodeadkeys)+se(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+se"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

+xkb_keymap "indigo_nodeadkeys" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "en_US(pc102_nodeadkeys)+se(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/sk b/xorg-server/xkeyboard-config/keymap/sgi_vndr/sk
index 09b6a2956..53c5ebd84 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/sk
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/sk
@@ -1,33 +1,29 @@
-// $Xorg: cs,v 1.3 2000/08/17 19:54:40 cpqbld Exp $
-//
-
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+sk"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc102)+sk"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
-default xkb_keymap "indy_qwerty" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)+sk(qwerty)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};
-};
-xkb_keymap "indigo_qwerty" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc102)+sk(qwerty)"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};
-};
-
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc_universal)+sk"		};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc102)+sk"		};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

+

+default xkb_keymap "indy_qwerty" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc_universal)+sk(qwerty)"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

+};

+xkb_keymap "indigo_qwerty" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc102)+sk(qwerty)"		};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/th b/xorg-server/xkeyboard-config/keymap/sgi_vndr/th
index aa03c8c11..a1fb26601 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/th
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/th
@@ -1,17 +1,16 @@
-// $Xorg: th,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{
-	include "en_US(pc_universal)+th+group(shifts_toggle)"
-    };
-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "en_US(pc102)+th+group(shifts_toggle)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{

+	include "en_US(pc_universal)+th+group(shifts_toggle)"

+    };

+    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "en_US(pc102)+th+group(shifts_toggle)"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/us b/xorg-server/xkeyboard-config/keymap/sgi_vndr/us
index 5850145ca..156e3684d 100644
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/us
+++ b/xorg-server/xkeyboard-config/keymap/sgi_vndr/us
@@ -1,43 +1,42 @@
-// $Xorg: us,v 1.3 2000/08/17 19:54:41 cpqbld Exp $
-default xkb_keymap "indy" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols 	{ include "us(pc_universal)"		};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};
-};
-xkb_keymap "indy101_euro" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc_universal)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};
-};
-xkb_keymap "indy_compose" {
-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc_universal)"	};
-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};
-};
-xkb_keymap "indigo" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc101)"		};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
-};
-xkb_keymap "indigo_compose" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc101compose)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
-};
-xkb_keymap "indigo101_compose" {
-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "us(pc101euro)"	};
-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};
-};
+default xkb_keymap "indy" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols 	{ include "us(pc_universal)"		};

+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};

+};

+xkb_keymap "indy101_euro" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc_universal)"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};

+};

+xkb_keymap "indy_compose" {

+    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc_universal)"	};

+    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};

+};

+xkb_keymap "indigo" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc101)"		};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};

+};

+xkb_keymap "indigo_compose" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc101compose)"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};

+};

+xkb_keymap "indigo101_compose" {

+    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "us(pc101euro)"	};

+    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sony b/xorg-server/xkeyboard-config/keymap/sony
index c4be3b1b8..ce4f566df 100644
--- a/xorg-server/xkeyboard-config/keymap/sony
+++ b/xorg-server/xkeyboard-config/keymap/sony
@@ -1,33 +1,32 @@
-// $Xorg: sony,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-xkb_keymap "news5000-nwp5461" {
-    xkb_keycodes	{ include "sony(nwp5461)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sony_vndr/us(nwp5461)"	};
-    xkb_geometry	{ include "sony(nwp5461)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

+//Permission to use, copy, modify, distribute, and sell this software and its

+//documentation for any purpose is hereby granted without fee, provided that

+//the above copyright notice appear in all copies and that both that

+//copyright notice and this permission notice appear in supporting

+//documentation.

+//

+//The above copyright notice and this permission notice shall be

+//included in all copies or substantial portions of the Software.

+//

+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+//OTHER DEALINGS IN THE SOFTWARE.

+//

+//Except as contained in this notice, the name of The Open Group shall

+//not be used in advertising or otherwise to promote the sale, use or

+//other dealings in this Software without prior written authorization

+//from The Open Group.

+//

+xkb_keymap "news5000-nwp5461" {

+    xkb_keycodes	{ include "sony(nwp5461)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sony_vndr/us(nwp5461)"	};

+    xkb_geometry	{ include "sony(nwp5461)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/all.in b/xorg-server/xkeyboard-config/keymap/sun_vndr/all.in
index 047ae7bc4..8415fe8ab 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/all.in
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/all.in
@@ -1089,4 +1089,3 @@ xkb_keymap "US_UNIX6_usb" {
     xkb_symbols 	{ include "sun/us(type6)"	};
     xkb_geometry	{ include "sun(type6unix)"	};
 };
-
diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/de b/xorg-server/xkeyboard-config/keymap/sun_vndr/de
index 4c1ded3fc..e05fdf384 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/de
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/de
@@ -1,78 +1,77 @@
-// $Xorg: de,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-xkb_keymap "type4_de" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+de"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_de_nodeadkeys" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(nodeadkeys)+de(nodeadkeys)"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_de_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+de"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_de" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+de"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_de_nodeadkeys" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(nodeadkeys)+de(nodeadkeys)" 
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_de_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+de"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

+//Permission to use, copy, modify, distribute, and sell this software and its

+//documentation for any purpose is hereby granted without fee, provided that

+//the above copyright notice appear in all copies and that both that

+//copyright notice and this permission notice appear in supporting

+//documentation.

+//

+//The above copyright notice and this permission notice shall be

+//included in all copies or substantial portions of the Software.

+//

+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+//OTHER DEALINGS IN THE SOFTWARE.

+//

+//Except as contained in this notice, the name of The Open Group shall

+//not be used in advertising or otherwise to promote the sale, use or

+//other dealings in this Software without prior written authorization

+//from The Open Group.

+//

+xkb_keymap "type4_de" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(basic)+de"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_de_nodeadkeys" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(nodeadkeys)+de(nodeadkeys)"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_de_openlook" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+de"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_de" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(basic)+de"

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_de_nodeadkeys" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(nodeadkeys)+de(nodeadkeys)" 

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_de_openlook" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+de"	};

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/es b/xorg-server/xkeyboard-config/keymap/sun_vndr/es
index 2de81c011..5af8e4222 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/es
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/es
@@ -1,62 +1,59 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/es,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_es" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+es"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_es_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+es"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_es" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+es"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_es_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+es"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

+//Permission to use, copy, modify, distribute, and sell this software and its

+//documentation for any purpose is hereby granted without fee, provided that

+//the above copyright notice appear in all copies and that both that

+//copyright notice and this permission notice appear in supporting

+//documentation.

+//

+//The above copyright notice and this permission notice shall be

+//included in all copies or substantial portions of the Software.

+//

+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+//OTHER DEALINGS IN THE SOFTWARE.

+//

+//Except as contained in this notice, the name of The Open Group shall

+//not be used in advertising or otherwise to promote the sale, use or

+//other dealings in this Software without prior written authorization

+//from The Open Group.

+//

+xkb_keymap "type4_es" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(basic)+es"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_es_openlook" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+es"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_es" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(basic)+es"

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_es_openlook" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+es"	};

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/fi b/xorg-server/xkeyboard-config/keymap/sun_vndr/fi
index 296ef66c4..3e48c7f43 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/fi
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/fi
@@ -1,62 +1,59 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/fi,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_fi" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+fi"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_fi_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+fi"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_fi" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+fi"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_fi_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+fi"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

+//Permission to use, copy, modify, distribute, and sell this software and its

+//documentation for any purpose is hereby granted without fee, provided that

+//the above copyright notice appear in all copies and that both that

+//copyright notice and this permission notice appear in supporting

+//documentation.

+//

+//The above copyright notice and this permission notice shall be

+//included in all copies or substantial portions of the Software.

+//

+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+//OTHER DEALINGS IN THE SOFTWARE.

+//

+//Except as contained in this notice, the name of The Open Group shall

+//not be used in advertising or otherwise to promote the sale, use or

+//other dealings in this Software without prior written authorization

+//from The Open Group.

+//

+xkb_keymap "type4_fi" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(basic)+fi"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_fi_openlook" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+fi"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_fi" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(basic)+fi"

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_fi_openlook" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+fi"	};

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/fr b/xorg-server/xkeyboard-config/keymap/sun_vndr/fr
index 9301ce031..8e15ca017 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/fr
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/fr
@@ -1,62 +1,59 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/fr,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_fr" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+fr"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_fr_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+fr"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_fr" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+fr"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_fr_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+fr"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

+//Permission to use, copy, modify, distribute, and sell this software and its

+//documentation for any purpose is hereby granted without fee, provided that

+//the above copyright notice appear in all copies and that both that

+//copyright notice and this permission notice appear in supporting

+//documentation.

+//

+//The above copyright notice and this permission notice shall be

+//included in all copies or substantial portions of the Software.

+//

+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+//OTHER DEALINGS IN THE SOFTWARE.

+//

+//Except as contained in this notice, the name of The Open Group shall

+//not be used in advertising or otherwise to promote the sale, use or

+//other dealings in this Software without prior written authorization

+//from The Open Group.

+//

+xkb_keymap "type4_fr" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(basic)+fr"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_fr_openlook" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+fr"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_fr" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(basic)+fr"

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_fr_openlook" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+fr"	};

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/no b/xorg-server/xkeyboard-config/keymap/sun_vndr/no
index 45669237e..200df8910 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/no
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/no
@@ -1,62 +1,59 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/no,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_no" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+no"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_no_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+no"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_no" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+no"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_no_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+no"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

+//Permission to use, copy, modify, distribute, and sell this software and its

+//documentation for any purpose is hereby granted without fee, provided that

+//the above copyright notice appear in all copies and that both that

+//copyright notice and this permission notice appear in supporting

+//documentation.

+//

+//The above copyright notice and this permission notice shall be

+//included in all copies or substantial portions of the Software.

+//

+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+//OTHER DEALINGS IN THE SOFTWARE.

+//

+//Except as contained in this notice, the name of The Open Group shall

+//not be used in advertising or otherwise to promote the sale, use or

+//other dealings in this Software without prior written authorization

+//from The Open Group.

+//

+xkb_keymap "type4_no" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(basic)+no"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_no_openlook" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+no"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_no" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(basic)+no"

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_no_openlook" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+no"	};

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/pl b/xorg-server/xkeyboard-config/keymap/sun_vndr/pl
index 904ffb2d7..2da430f27 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/pl
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/pl
@@ -1,62 +1,59 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/pl,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_pl" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+pl"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_pl_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+pl"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_pl" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+pl"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_pl_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+pl"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

+//Permission to use, copy, modify, distribute, and sell this software and its

+//documentation for any purpose is hereby granted without fee, provided that

+//the above copyright notice appear in all copies and that both that

+//copyright notice and this permission notice appear in supporting

+//documentation.

+//

+//The above copyright notice and this permission notice shall be

+//included in all copies or substantial portions of the Software.

+//

+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+//OTHER DEALINGS IN THE SOFTWARE.

+//

+//Except as contained in this notice, the name of The Open Group shall

+//not be used in advertising or otherwise to promote the sale, use or

+//other dealings in this Software without prior written authorization

+//from The Open Group.

+//

+xkb_keymap "type4_pl" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(basic)+pl"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_pl_openlook" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+pl"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_pl" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(basic)+pl"

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_pl_openlook" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+pl"	};

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/ru b/xorg-server/xkeyboard-config/keymap/sun_vndr/ru
index fc7d75b1e..005f27f3c 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/ru
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/ru
@@ -1,62 +1,59 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/ru,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_ru" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+ru"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_ru_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+ru"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_ru" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+ru"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_ru_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+ru"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

+//Permission to use, copy, modify, distribute, and sell this software and its

+//documentation for any purpose is hereby granted without fee, provided that

+//the above copyright notice appear in all copies and that both that

+//copyright notice and this permission notice appear in supporting

+//documentation.

+//

+//The above copyright notice and this permission notice shall be

+//included in all copies or substantial portions of the Software.

+//

+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+//OTHER DEALINGS IN THE SOFTWARE.

+//

+//Except as contained in this notice, the name of The Open Group shall

+//not be used in advertising or otherwise to promote the sale, use or

+//other dealings in this Software without prior written authorization

+//from The Open Group.

+//

+xkb_keymap "type4_ru" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(basic)+ru"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_ru_openlook" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+ru"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_ru" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(basic)+ru"

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_ru_openlook" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+ru"	};

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/se b/xorg-server/xkeyboard-config/keymap/sun_vndr/se
index fad7009e4..cb3cc6d00 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/se
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/se
@@ -1,56 +1,54 @@
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/se,v 1.2 1998/12/20 09:34:42 dawes Exp $
-
-default xkb_keymap "type5c_se_fixdollar" {
-    xkb_keycodes	{ include "sun(type5_se)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun5)+se(fixdollar)"
-    };
-    xkb_geometry	{ include "sun(type5c_se)"	};
-};
-xkb_keymap "type5c_se" {
-    xkb_keycodes	{ include "sun(type5_se)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun5)"
-    };
-    xkb_geometry	{ include "sun(type5c_se)"	};
-};
-xkb_keymap "type5_se" {
-    xkb_keycodes	{ include "sun(type5_se)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun5)"
-    };
-    xkb_geometry	{ include "sun(type5_se)"	};
-};
-xkb_keymap "type4_se_fixdollar_swapctl" {
-    xkb_keycodes	{ include "sun(type4_se_swapctl)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun4)+se(fixdollar)"
-    };
-    xkb_geometry	{ include "sun(type4_se)"	};
-};
-xkb_keymap "type4_se_fixdollar" {
-    xkb_keycodes	{ include "sun(type4_se)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun4)+se(fixdollar)"
-    };
-    xkb_geometry	{ include "sun(type4_se)"	};
-};
-xkb_keymap "type4_se" {
-    xkb_keycodes	{ include "sun(type4_se)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/se(sun4)"
-    };
-    xkb_geometry	{ include "sun(type4_se)"	};
-};
+default xkb_keymap "type5c_se_fixdollar" {

+    xkb_keycodes	{ include "sun(type5_se)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/se(sun5)+se(fixdollar)"

+    };

+    xkb_geometry	{ include "sun(type5c_se)"	};

+};

+xkb_keymap "type5c_se" {

+    xkb_keycodes	{ include "sun(type5_se)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/se(sun5)"

+    };

+    xkb_geometry	{ include "sun(type5c_se)"	};

+};

+xkb_keymap "type5_se" {

+    xkb_keycodes	{ include "sun(type5_se)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/se(sun5)"

+    };

+    xkb_geometry	{ include "sun(type5_se)"	};

+};

+xkb_keymap "type4_se_fixdollar_swapctl" {

+    xkb_keycodes	{ include "sun(type4_se_swapctl)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/se(sun4)+se(fixdollar)"

+    };

+    xkb_geometry	{ include "sun(type4_se)"	};

+};

+xkb_keymap "type4_se_fixdollar" {

+    xkb_keycodes	{ include "sun(type4_se)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/se(sun4)+se(fixdollar)"

+    };

+    xkb_geometry	{ include "sun(type4_se)"	};

+};

+xkb_keymap "type4_se" {

+    xkb_keycodes	{ include "sun(type4_se)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/se(sun4)"

+    };

+    xkb_geometry	{ include "sun(type4_se)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/uk b/xorg-server/xkeyboard-config/keymap/sun_vndr/uk
index e1fb4970b..11b3efd58 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/uk
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/uk
@@ -1,62 +1,59 @@
-// $TOG: de /main/3 1998/02/10 13:44:36 kaleb $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/sun_vndr/uk,v 1.2 2000/10/28 00:34:05 dawes Exp $
-//
-xkb_keymap "type4_uk" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4)+iso9995-3(basic)+uk"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_uk_openlook" {
-    xkb_keycodes	{ include "sun(type4_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+uk"
-    };
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_uk" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ 
-	include "sun_vndr/us(sun5)+iso9995-3(basic)+uk"
-    };
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
-xkb_keymap "type5_uk_openlook" {
-    xkb_keycodes	{ include "sun(type5_euro)"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+uk"	};
-    xkb_geometry	{ include "sun(type5euro)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

+//Permission to use, copy, modify, distribute, and sell this software and its

+//documentation for any purpose is hereby granted without fee, provided that

+//the above copyright notice appear in all copies and that both that

+//copyright notice and this permission notice appear in supporting

+//documentation.

+//

+//The above copyright notice and this permission notice shall be

+//included in all copies or substantial portions of the Software.

+//

+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+//OTHER DEALINGS IN THE SOFTWARE.

+//

+//Except as contained in this notice, the name of The Open Group shall

+//not be used in advertising or otherwise to promote the sale, use or

+//other dealings in this Software without prior written authorization

+//from The Open Group.

+//

+xkb_keymap "type4_uk" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4)+iso9995-3(basic)+uk"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_uk_openlook" {

+    xkb_keycodes	{ include "sun(type4_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+uk"

+    };

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_uk" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ 

+	include "sun_vndr/us(sun5)+iso9995-3(basic)+uk"

+    };

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

+xkb_keymap "type5_uk_openlook" {

+    xkb_keycodes	{ include "sun(type5_euro)"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+uk"	};

+    xkb_geometry	{ include "sun(type5euro)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/us b/xorg-server/xkeyboard-config/keymap/sun_vndr/us
index 397482f84..68b41de4b 100644
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/us
+++ b/xorg-server/xkeyboard-config/keymap/sun_vndr/us
@@ -1,68 +1,67 @@
-// $Xorg: us,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-xkb_keymap "type4_us" {
-    xkb_keycodes	{ include "sun(type4)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun4)"	};
-    xkb_geometry	{ include "sun(type4)"		};
-};
-xkb_keymap "type4_us_openlook" {
-    xkb_keycodes	{ include "sun(type4)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun4ol)"	};
-    xkb_geometry	{ include "sun(type4)"		};
-};
-default xkb_keymap "type5_us" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5)"	};
-    xkb_geometry	{ include "sun(type5)"		};
-};
-xkb_keymap "type5_us_openlook" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)"	};
-    xkb_geometry	{ include "sun(type5)"		};
-};
-xkb_keymap "type5_unix" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5)"	};
-    xkb_geometry	{ include "sun(type5unix)"	};
-};
-xkb_keymap "type5_unix_openlook" {
-    xkb_keycodes	{ include "sun(type5)"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)"	};
-    xkb_geometry	{ include "sun(type5unix)"	};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

+//Permission to use, copy, modify, distribute, and sell this software and its

+//documentation for any purpose is hereby granted without fee, provided that

+//the above copyright notice appear in all copies and that both that

+//copyright notice and this permission notice appear in supporting

+//documentation.

+//

+//The above copyright notice and this permission notice shall be

+//included in all copies or substantial portions of the Software.

+//

+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+//OTHER DEALINGS IN THE SOFTWARE.

+//

+//Except as contained in this notice, the name of The Open Group shall

+//not be used in advertising or otherwise to promote the sale, use or

+//other dealings in this Software without prior written authorization

+//from The Open Group.

+//

+xkb_keymap "type4_us" {

+    xkb_keycodes	{ include "sun(type4)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun4)"	};

+    xkb_geometry	{ include "sun(type4)"		};

+};

+xkb_keymap "type4_us_openlook" {

+    xkb_keycodes	{ include "sun(type4)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun4ol)"	};

+    xkb_geometry	{ include "sun(type4)"		};

+};

+default xkb_keymap "type5_us" {

+    xkb_keycodes	{ include "sun(type5)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5)"	};

+    xkb_geometry	{ include "sun(type5)"		};

+};

+xkb_keymap "type5_us_openlook" {

+    xkb_keycodes	{ include "sun(type5)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)"	};

+    xkb_geometry	{ include "sun(type5)"		};

+};

+xkb_keymap "type5_unix" {

+    xkb_keycodes	{ include "sun(type5)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5)"	};

+    xkb_geometry	{ include "sun(type5unix)"	};

+};

+xkb_keymap "type5_unix_openlook" {

+    xkb_keycodes	{ include "sun(type5)"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "sun_vndr/us(sun5ol)"	};

+    xkb_geometry	{ include "sun(type5unix)"	};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/xfree86 b/xorg-server/xkeyboard-config/keymap/xfree86
index 8686f78d8..b65efa12f 100644
--- a/xorg-server/xkeyboard-config/keymap/xfree86
+++ b/xorg-server/xkeyboard-config/keymap/xfree86
@@ -1,377 +1,374 @@
-// $XFree86: xc/programs/xkbcomp/keymap/xfree86,v 3.30 2003/04/03 16:34:49 dawes Exp $
-
-
-default xkb_keymap "us" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)"		};
-    xkb_geometry	{ include "pc"			};
-};
-
-// "ar" addition by Arabeyes Team, <support@arabeyes.org>
-xkb_keymap "ar" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+ara"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-xkb_keymap "be"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+be"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "bg"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+bg"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
-xkb_keymap "br"	{
-    xkb_keycodes	{ include "xfree86"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+br"	};
-    xkb_geometry 	{ include "pc(abnt2)"		};
-};
-// cz and sk keymaps by Kamil Toman (ktoman@email.cz) 
-// are designed to replace old czechoslovakian and czsk keyboards
-// and their prog variants. Those are now obsolete and should not be used anymore.
-xkb_keymap "cz" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+cz"	};
-    xkb_geometry	{ include "pc"			};
-};
-xkb_keymap "de"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+de"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "ch_de"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+ch(de)"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "ch_fr"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+ch(fr)"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "dk"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+dk"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "dvorak" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+us(dvorak)"};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-xkb_keymap "en_US" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols 	{ include "pc(pc105)"	};
-    xkb_geometry 	{ include "pc"			};
-};
-xkb_keymap "es"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+es"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "fr"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+fr"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "fr-latin9" {
-    xkb_keycodes        { include "xfree86"             };
-    xkb_types           { include "default"             };
-    xkb_compatibility   { include "default"             };
-    xkb_symbols         { include "pc(pc105)+fr-latin9" };
-    xkb_geometry        { include "pc"           	};
-};
-xkb_keymap "fr_CA"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+ca"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "gb"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+gb"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "hr"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+hr"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "it"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+it"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "jp106" {
-    xkb_keycodes	{ include "xfree86"	};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "jp(jp106)"		};
-    xkb_geometry	{ include "pc(jp106)"		};
-};
-xkb_keymap "lt"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+lt"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "lt_std"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+lt(std)"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "lv"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+lv"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "mk" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+mk"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-xkb_keymap "mt" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+mt"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-xkb_keymap "no"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+no"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "pl"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+pl"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "pt"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+pt"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-// ro: additions by Cristian Gafton, <gafton@redhat.com>
-xkb_keymap "ro" {
-    xkb_keycodes	{ include "xfree86"			};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols		{ include "pc(pc105)+ro(pc101)"	};
-    xkb_geometry	{ include "pc(pc101)"			};
-};
-xkb_keymap "ro_microsoft" {
-    xkb_keycodes	{ include "xfree86"			};
-    xkb_types		{ include "default"			};
-    xkb_compatibility	{ include "default"			};
-    xkb_symbols		{ include "pc(pc105)+ro(pc105)"	};
-    xkb_geometry	{ include "pc(pc105)"			};
-};
-xkb_keymap "ru"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+ru"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "se_FI"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+fi"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "se_SE"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+se"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "sl" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+si"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-xkb_keymap "sl_SI" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+si"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-// cz and sk keymaps by Kamil Toman (ktoman@email.cz) 
-// are designed to replace old czechoslovakian and czsk keyboards
-// and their prog variants. Those are now obsolete and should not be used anymore.
-xkb_keymap "sk" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+sk"	};
-    xkb_geometry	{ include "pc"			};
-};
-// Additions by Emil Soleyman-Zomalan, <emil@nishra.com>
-xkb_keymap "syr" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default" 		};
-    xkb_symbols		{ include "pc(pc105)+syr"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};    
-xkb_keymap "th"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+th"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "th_tis"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+th(tis)"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "th_pat"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+th(pat)"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "tr" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+tr"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-xkb_keymap "uk" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+uk)"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-xkb_keymap "us_flexpro" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "us(pc105)"		};
-    xkb_geometry	{ include "keytronic(FlexPro)"	};
-};
-// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)
-// us_intl means standard us keyboard plus dead_keys symbols
-// these keyboards are very popular in Brazil
-xkb_keymap "us_intl" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "us(pc101)+us(intl)"	};
-    xkb_geometry	{ include "pc"			};
-};
-xkb_keymap "us_microsoft" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "us(pc105)"		};
-    xkb_geometry	{ include "microsoft"		};
-};
-
-xkb_keymap "uz" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+uz"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-
-# svu: compatibility keymaps, based on variants
-xkb_keymap "cz_qwerty" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+cz(qwerty)"	};
-    xkb_geometry	{ include "pc"			};
-};
-xkb_keymap "de_CH"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+ch(de)"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "fr_CH"	{
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+ch(fr)"	};
-    xkb_geometry 	{ include "pc(pc102)"		};
-};
-xkb_keymap "mt_us" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+mt(us)"	};
-    xkb_geometry	{ include "pc(pc102)"		};
-};
-xkb_keymap "sk_qwerty" {
-    xkb_keycodes	{ include "xfree86"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "pc(pc105)+sk(qwerty)"	};
-    xkb_geometry	{ include "pc"			};
-};
+default xkb_keymap "us" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)"		};

+    xkb_geometry	{ include "pc"			};

+};

+

+// "ar" addition by Arabeyes Team, <support@arabeyes.org>

+xkb_keymap "ar" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+ara"	};

+    xkb_geometry	{ include "pc(pc102)"		};

+};

+xkb_keymap "be"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+be"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "bg"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+bg"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)

+xkb_keymap "br"	{

+    xkb_keycodes	{ include "xfree86"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+br"	};

+    xkb_geometry 	{ include "pc(abnt2)"		};

+};

+// cz and sk keymaps by Kamil Toman (ktoman@email.cz) 

+// are designed to replace old czechoslovakian and czsk keyboards

+// and their prog variants. Those are now obsolete and should not be used anymore.

+xkb_keymap "cz" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+cz"	};

+    xkb_geometry	{ include "pc"			};

+};

+xkb_keymap "de"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+de"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "ch_de"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+ch(de)"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "ch_fr"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+ch(fr)"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "dk"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+dk"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "dvorak" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+us(dvorak)"};

+    xkb_geometry	{ include "pc(pc102)"		};

+};

+xkb_keymap "en_US" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols 	{ include "pc(pc105)"	};

+    xkb_geometry 	{ include "pc"			};

+};

+xkb_keymap "es"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+es"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "fr"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+fr"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "fr-latin9" {

+    xkb_keycodes        { include "xfree86"             };

+    xkb_types           { include "default"             };

+    xkb_compatibility   { include "default"             };

+    xkb_symbols         { include "pc(pc105)+fr-latin9" };

+    xkb_geometry        { include "pc"           	};

+};

+xkb_keymap "fr_CA"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+ca"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "gb"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+gb"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "hr"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+hr"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "it"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+it"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "jp106" {

+    xkb_keycodes	{ include "xfree86"	};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "jp(jp106)"		};

+    xkb_geometry	{ include "pc(jp106)"		};

+};

+xkb_keymap "lt"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+lt"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "lt_std"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+lt(std)"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "lv"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+lv"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "mk" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+mk"	};

+    xkb_geometry	{ include "pc(pc102)"		};

+};

+xkb_keymap "mt" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+mt"	};

+    xkb_geometry	{ include "pc(pc102)"		};

+};

+xkb_keymap "no"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+no"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "pl"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+pl"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "pt"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+pt"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+// ro: additions by Cristian Gafton, <gafton@redhat.com>

+xkb_keymap "ro" {

+    xkb_keycodes	{ include "xfree86"			};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols		{ include "pc(pc105)+ro(pc101)"	};

+    xkb_geometry	{ include "pc(pc101)"			};

+};

+xkb_keymap "ro_microsoft" {

+    xkb_keycodes	{ include "xfree86"			};

+    xkb_types		{ include "default"			};

+    xkb_compatibility	{ include "default"			};

+    xkb_symbols		{ include "pc(pc105)+ro(pc105)"	};

+    xkb_geometry	{ include "pc(pc105)"			};

+};

+xkb_keymap "ru"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+ru"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "se_FI"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+fi"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "se_SE"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+se"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "sl" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+si"	};

+    xkb_geometry	{ include "pc(pc102)"		};

+};

+xkb_keymap "sl_SI" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+si"	};

+    xkb_geometry	{ include "pc(pc102)"		};

+};

+// cz and sk keymaps by Kamil Toman (ktoman@email.cz) 

+// are designed to replace old czechoslovakian and czsk keyboards

+// and their prog variants. Those are now obsolete and should not be used anymore.

+xkb_keymap "sk" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+sk"	};

+    xkb_geometry	{ include "pc"			};

+};

+// Additions by Emil Soleyman-Zomalan, <emil@nishra.com>

+xkb_keymap "syr" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default" 		};

+    xkb_symbols		{ include "pc(pc105)+syr"	};

+    xkb_geometry	{ include "pc(pc102)"		};

+};    

+xkb_keymap "th"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+th"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "th_tis"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+th(tis)"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "th_pat"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+th(pat)"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "tr" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+tr"	};

+    xkb_geometry	{ include "pc(pc102)"		};

+};

+xkb_keymap "uk" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+uk)"	};

+    xkb_geometry	{ include "pc(pc102)"		};

+};

+xkb_keymap "us_flexpro" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "us(pc105)"		};

+    xkb_geometry	{ include "keytronic(FlexPro)"	};

+};

+// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)

+// us_intl means standard us keyboard plus dead_keys symbols

+// these keyboards are very popular in Brazil

+xkb_keymap "us_intl" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "us(pc101)+us(intl)"	};

+    xkb_geometry	{ include "pc"			};

+};

+xkb_keymap "us_microsoft" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "us(pc105)"		};

+    xkb_geometry	{ include "microsoft"		};

+};

+

+xkb_keymap "uz" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+uz"	};

+    xkb_geometry	{ include "pc(pc102)"		};

+};

+

+# svu: compatibility keymaps, based on variants

+xkb_keymap "cz_qwerty" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+cz(qwerty)"	};

+    xkb_geometry	{ include "pc"			};

+};

+xkb_keymap "de_CH"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+ch(de)"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "fr_CH"	{

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+ch(fr)"	};

+    xkb_geometry 	{ include "pc(pc102)"		};

+};

+xkb_keymap "mt_us" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+mt(us)"	};

+    xkb_geometry	{ include "pc(pc102)"		};

+};

+xkb_keymap "sk_qwerty" {

+    xkb_keycodes	{ include "xfree86"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "pc(pc105)+sk(qwerty)"	};

+    xkb_geometry	{ include "pc"			};

+};

diff --git a/xorg-server/xkeyboard-config/keymap/xfree98 b/xorg-server/xkeyboard-config/keymap/xfree98
index b344eedbc..c9beb560e 100644
--- a/xorg-server/xkeyboard-config/keymap/xfree98
+++ b/xorg-server/xkeyboard-config/keymap/xfree98
@@ -1,35 +1,33 @@
-// $Xorg: xfree98,v 1.4 2001/02/09 02:05:52 xorgcvs Exp $
-//
-//Copyright 1996, 1998  The Open Group
-//
-//Permission to use, copy, modify, distribute, and sell this software and its
-//documentation for any purpose is hereby granted without fee, provided that
-//the above copyright notice appear in all copies and that both that
-//copyright notice and this permission notice appear in supporting
-//documentation.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// $XFree86: xc/programs/xkbcomp/keymap/xfree98,v 3.6 2001/01/17 23:45:53 dawes Exp $
-
-default xkb_keymap "jp" {
-    xkb_keycodes	{ include "xfree98"		};
-    xkb_types		{ include "default"		};
-    xkb_compatibility	{ include "default"		};
-    xkb_symbols		{ include "nec_vndr/jp(pc98)"	};
-    xkb_geometry	{ include "nec(pc98)"		};
-};
+//

+//Copyright 1996, 1998  The Open Group

+//

+//Permission to use, copy, modify, distribute, and sell this software and its

+//documentation for any purpose is hereby granted without fee, provided that

+//the above copyright notice appear in all copies and that both that

+//copyright notice and this permission notice appear in supporting

+//documentation.

+//

+//The above copyright notice and this permission notice shall be

+//included in all copies or substantial portions of the Software.

+//

+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR

+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

+//OTHER DEALINGS IN THE SOFTWARE.

+//

+//Except as contained in this notice, the name of The Open Group shall

+//not be used in advertising or otherwise to promote the sale, use or

+//other dealings in this Software without prior written authorization

+//from The Open Group.

+//

+

+default xkb_keymap "jp" {

+    xkb_keycodes	{ include "xfree98"		};

+    xkb_types		{ include "default"		};

+    xkb_compatibility	{ include "default"		};

+    xkb_symbols		{ include "nec_vndr/jp(pc98)"	};

+    xkb_geometry	{ include "nec(pc98)"		};

+};