svn merge ^/branches/released .

11 files changed, 611 insertions, 637 deletions

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)"	};

+};