Merge remote-tracking branch 'origin/released'

* origin/released:
  git update fontconfig mesa libXau pixman xkeyboard-config 30 Sep 2013

13 files changed, 58 insertions, 94 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
index 54b61d215..7948ab19d 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/ch
@@ -8,21 +8,19 @@ xkb_symbols "extended" {
     
     name[Group1]= "Switzerland - German, Mac";
 
-    // Alphanumeric section
-
-    key <AE01> { [	1,	plus, 	plusminus,	infinity		]	};
-    key <AE02> { [	2,	quotedbl, leftdoublequotemark, rightdoublequotemark 	]	};
+    key <AE01> { [	1,	plus, 		plusminus,	infinity	]	};
+    key <AE02> { [	2,	quotedbl, leftdoublequotemark,  rightdoublequotemark ]	};
     key <AE03> { [	3,	asterisk, 	numbersign,	leftcaret	]	};
 					// not displayed here
     key <AE04> { [	4,	ccedilla, 	Ccedilla,	slash		]	};
     key <AE05> { [	5,	percent, 	bracketleft			]	};
     key <AE06> { [	6,	ampersand, 	bracketright			]	};
-    key <AE07> { [	7,	slash, 	bar,		backslash		]	};
+    key <AE07> { [	7,	slash, 		bar,		backslash	]	};
     key <AE08> { [	8,	parenleft, 	braceleft,	Ograve		]	};
     key <AE09> { [	9,	parenright, 	braceright,	Ocircumflex	]	};
     key <AE10> { [	0,	equal, 	notequal,	Uacute			]	};
-    key <AE11> { [	apostrophe,	question, 	questiondown, 	NoSymbol		]	};
-    key <AE12> { [	dead_circumflex,dead_grave, 	dead_acute,	asciicircum		]	};
+    key <AE11> { [	apostrophe,	question, 	questiondown, 	NoSymbol ]	};
+    key <AE12> { [	dead_circumflex,dead_grave, 	dead_acute,	asciicircum ]	};
     key <AD01> { [	q,	Q, 	oe,		OE			]	};
     key <AD02> { [	w,	W, 	Greek_SIGMA,	Aacute			]	};
     key <AD03> { [ 	e,	E, 	EuroSign,	Ediaeresis		]	};
@@ -33,8 +31,8 @@ xkb_symbols "extended" {
     key <AD08> { [ 	i,	I, 	exclamdown,	idotless		]	};
     key <AD09> { [ 	o,	O, 	oslash,		Ooblique		]	};
     key <AD10> { [ 	p,	P, 	Greek_pi,	Greek_PI		]	};
-    key <AD11> { [	udiaeresis,	egrave, 	section,	ydiaeresis		]	};
-    key <AD12> { [	dead_diaeresis,	exclam, 	grave,		apostrophe		]	};
+    key <AD11> { [	udiaeresis,	egrave, 	section,	ydiaeresis ]	};
+    key <AD12> { [	dead_diaeresis,	exclam, 	grave,		apostrophe ]	};
     key <AC01> { [ 	a,	A, 	aring,		Aring			]	};
     key <AC02> { [ 	s,	S, 	ssharp, 	NoSymbol		]	}; 
 					// ligature fl
@@ -60,11 +58,11 @@ xkb_symbols "extended" {
     key <AB08> { [	comma,	semicolon, 	guillemotleft,	guillemotright	]	};
     key <AB09> { [	period,	colon, 	ellipsis,	division		]	};
     key <AB10> { [	minus,	underscore, 	hyphen,		emdash		]	};
-    key <TLDE> { [	section,	degree,   	NoSymbol, 	NoSymbol		]	};
+    key <TLDE> { [	section,	degree,   	NoSymbol, 	NoSymbol ]	};
 			// ligature fi	// per mille
     key <SPCE> { [	space, 	nobreakspace,	nobreakspace		]	};
-    key <LSGT> { [	less,	greater, 	lessthanequal,	greaterthanequal	]  	};
-    key <BKSL> { [	dollar,	sterling, 	paragraph,	enfilledcircbullet	]	};
+    key <LSGT> { [	less,	greater, 	lessthanequal,	greaterthanequal ]  	};
+    key <BKSL> { [	dollar,	sterling, 	paragraph,	enfilledcircbullet ]	};
 
     include "kpdl(comma)"
     include "level3(ralt_switch)"
@@ -78,9 +76,6 @@ xkb_symbols "de" {
 partial alphanumeric_keys 
 xkb_symbols "fr" {
 
-    // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple Swiss/French keybaord
-
     include "macintosh_vndr/ch(extended)"
     name[Group1]= "Switzerland - French, Mac";
 
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de
index da5bc7772..66da8281e 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/de
@@ -4,12 +4,11 @@ default partial alphanumeric_keys
 xkb_symbols "basic" {
 
     // Describes the differences between a very simple US/ASCII
-    // keyboard and a very simple German keybaord
+    // keyboard and a simple German keyboard.
 
     include "latin"
     name[Group1]= "Germany - Mac";
 
-    // Alphanumeric section
     key <TLDE> {	[ dead_circumflex,	degree,    notsign 		]	};
     key <AE01> {	[         1,    exclam,  exclamdown,   at		]	};
     key <AE02> {	[	  2,	quotedbl,  twosuperior			]	};
@@ -53,7 +52,6 @@ xkb_symbols "basic" {
 
     include "kpdl(comma)"
     include "level3(ralt_switch)"
-
 };
 
 partial alphanumeric_keys 
@@ -62,14 +60,14 @@ xkb_symbols "Sundeadkeys" {
     include "macintosh_vndr/de(basic)"
     name[Group1]= "Germany - Mac, Sun dead keys";
 
-    key <TLDE> {	[ SunFA_Circum,	degree,    notsign 			]	};
-    key <AE12> {	[ SunFA_Acute,	SunFA_Grave,  SunFA_Cedilla			]	};
+    key <TLDE> {	[ SunFA_Circum,	degree,      notsign 			]	};
+    key <AE12> {	[ SunFA_Acute,	SunFA_Grave, SunFA_Cedilla		]	};
     key <AD11> {	[ udiaeresis,	Udiaeresis,  SunFA_Diaeresis		]	};
-    key <AD12> {	[      plus,	asterisk,  SunFA_Tilde,	dead_macron	]	};
-    key <AC10> {	[ odiaeresis,	Odiaeresis,  SunFA_Acute			]	};
-    key <AC11> {	[ adiaeresis,	Adiaeresis,  SunFA_Circum			]	};
+    key <AD12> {	[       plus,	asterisk,    SunFA_Tilde,  dead_macron	]	};
+    key <AC10> {	[ odiaeresis,	Odiaeresis,  SunFA_Acute		]	};
+    key <AC11> {	[ adiaeresis,	Adiaeresis,  SunFA_Circum		]	};
 
-    key <BKSL> {	[ numbersign,	acute,  SunFA_Grave			]	};
+    key <BKSL> {	[ numbersign,	acute,       SunFA_Grave		]	};
 };
 
 partial alphanumeric_keys 
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
index 11e38598c..e464519e0 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
@@ -21,26 +21,24 @@ xkb_symbols "basic" {
     key <AE08> {	[        8,       parenleft,      bracketleft,   guillemotleft	]};
     key <AE09> {	[        9,      parenright,     bracketright,  guillemotright	]};
     key <AE10> {	[        0,           equal,       braceright,          degree	]};
+    key <AE11> {	[     plus,        question,        plusminus,    questiondown	]};
+    key <AE12> {   	[ dead_acute,    dead_grave,              bar,       brokenbar	]};
+    key <AB03> {	[        c,               C,        copyright,        NoSymbol	]};
     key <AB08> {	[    comma,       semicolon,     dead_cedilla,     dead_ogonek	]};
     key <AB09> {	[   period,           colon,   periodcentered,   dead_abovedot	]};
-    key <AB03> {	[        c,               C,        copyright,        NoSymbol	]};
     key <AB10> {	[    minus,      underscore,           hyphen,          macron	]};
-    key <AC01> {        [        a,               A,      ordfeminine,       masculine      ]};
-    key <AC03> {        [        d,               D,              eth,             ETH      ]};
-    key <AD03> {        [        e,               E,         EuroSign,            cent      ]};
-    key <AD04> {        [        r,               R,       registered,        NoSymbol      ]};
-    key <AD05> {        [        t,               T,            thorn,           THORN      ]};
-    key <AD08> {        [        i,               I,         NoSymbol,        NoSymbol      ]};
-    key <AD09> {        [        o,               O,               oe,              OE      ]};
-    key	<AC10> {	[	ae,               AE	]};
-    key <AE11> {	[     plus,        question,        plusminus,    questiondown	]};
+    key <AC01> {	[        a,               A,      ordfeminine,       masculine  ]};
+    key <AC03> {	[        d,               D,              eth,             ETH  ]};
+    key <AC10> {	[	ae,               AE	]};
     key <AC11> {	[   oslash,        Ooblique 	]};
-    key <BKSL> {	[ apostrophe,        asterisk, dead_doubleacute,        multiply	]};
+    key <AD03> {	[        e,               E,         EuroSign,            cent  ]};
+    key <AD04> {	[        r,               R,       registered,        NoSymbol  ]};
+    key <AD05> {	[        t,               T,            thorn,           THORN  ]};
+    key <AD08> {	[        i,               I,         NoSymbol,        NoSymbol  ]};
+    key <AD09> {	[        o,               O,               oe,              OE  ]};
     key <AD11> {	[    aring,           Aring 	]};
-    key <AE12> {   	[ dead_acute,      dead_grave,              bar,       brokenbar	]};
-    key <AD12> {   	[ dead_diaeresis, dead_circumflex,       dead_tilde,      dead_caron      ]};
-
-    // End alphanumeric section
+    key <AD12> {	[ dead_diaeresis, dead_circumflex, dead_tilde,      dead_caron	]};
+    key <BKSL> {	[ apostrophe,      asterisk, dead_doubleacute,        multiply	]};
 
     include "eurosign(e)"
     include "level3(ralt_switch)"
@@ -52,7 +50,7 @@ xkb_symbols "nodeadkeys" {
     name[Group1]= "Denmark - Mac, eliminate dead keys";
 
     key <AE12> {	[           acute,           grave,              bar,          ogonek	]	};
-    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};
+    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron	]      	};
 };
 
 partial alphanumeric_keys
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi
index 7a865d2bc..842c7b6cf 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fi
@@ -1,15 +1,9 @@
 partial default alphanumeric_keys 
 xkb_symbols "basic" {
-
-    // Describes the differences between a very simple mac_US
-    // keyboard and a very simple Swedish(Finland) keybaord
-
     include "macintosh_vndr/se(basic)" // for consistent naming
     name[Group1]= "Finland - Mac";
-
 };
 
-
 partial alphanumeric_keys 
 xkb_symbols "nodeadkeys" {
     include "macintosh_vndr/se(basic)"	// for consistent naming
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr
index 9a8f8de23..b2c9354e0 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/fr
@@ -33,7 +33,6 @@ xkb_symbols "extended" {
 
     key <ESC>  {	[ Escape			]	};
 
-    // Alphanumeric section
     key <TLDE> {	[	   at,	  numbersign,	periodcentered,  	Ydiaeresis	]	};
     key <ENTR> {        [    KP_Enter                   ]       };
     key <AE01> {	[   ampersand,	  1,	  	VoidSymbol,	  	dead_acute	]	}; // MISSING: Apple
@@ -91,7 +90,6 @@ xkb_symbols "extended" {
     key <AB10> {	[     equal,	plus,		notequal,		plusminus	]	};
 
     key <SPCE> {	[     space,	space,		nobreakspace,		nobreakspace	]	};
-    // End alphanumeric section
 
     include "level3(ralt_switch)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb
index 4e4248561..f85078aaa 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/gb
@@ -12,8 +12,6 @@ xkb_symbols "basic" {
     key <AE03> {	[               3,        sterling,       numbersign	]	};
     key <TLDE> {	[         section,       plusminus ]	};
     key <LSGT> {	[           grave,      asciitilde ]	};
-
-    // End alphanumeric section
     
     include "level3(ralt_switch)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
index 2438231cd..3784b0e05 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/it
@@ -2,7 +2,6 @@ xkb_symbols "extended" {
 
     name[Group1]= "Italy - Mac";
 
-    // Alphanumeric section
     key <LSGT> {	[        less,  greater   	]	};
     key <TLDE> {        [        at,    numbersign,    periodcentered              ]	};
     key <AE01> {	[   ampersand,    1, guillemotleft,guillemotright	]	};
@@ -55,8 +54,6 @@ xkb_symbols "extended" {
     key <AB09> {	[     colon,	slash,        bar,    backslash	]	};
     key <AB10> {	[    ograve,	exclam,     exclamdown			]	};
 
-    // End alphanumeric section
-
     include "kpdl(dot)"
     include "level3(ralt_switch)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam
index dcb9db624..485f12720 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/latam
@@ -2,7 +2,7 @@ partial default alphanumeric_keys
 xkb_symbols "basic" {
 
     // Describes the differences between a very simple mac_US
-    // keyboard and a very simple Spanish keybaord
+    // keyboard and a very simple Spanish keyboard.
 
     include "latin"
     name[Group1]= "Latin American - Mac";
@@ -31,7 +31,5 @@ xkb_symbols "basic" {
     key <AC11> {	[       semicolon,    	     colon 	]	};
     key <BKSL> {	[      apostrophe,        quotedbl	]	};
 
-    // End alphanumeric section
-
     include "level3(ralt_switch)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl
index 5eb66c444..ad0ee4bf2 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/nl
@@ -1,15 +1,9 @@
 partial default alphanumeric_keys 
 xkb_symbols "basic" {
 
-    // Describes the differences between a very simple mac_US
-    // keyboard and a very simple netherland keybaord
-
     include "latin"
 
     name[Group1]= "Netherlands - Mac";
 
     include "level3(ralt_switch)"
-
-// do just nothing
-
 };
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no
index fb0cb74a2..53e62cf6d 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/no
@@ -2,7 +2,7 @@ partial default alphanumeric_keys
 xkb_symbols "basic" {
 
     // Describes the differences between a very simple en_US
-    // keyboard and a very simple Norwegian keybaord
+    // keyboard and a very simple Norwegian keyboard.
 
     include "latin"
 
@@ -10,28 +10,26 @@ xkb_symbols "basic" {
 
     key <TLDE> {	[             bar,         section      ]	};
     key <AE02> {	[               2,        quotedbl, 	       at,	 oneeighth	]	};
+    key <AE03> {	[               3,	numbersign,      sterling,        sterling	]	};
     key <AE04> {	[	        4,        currency, 	   dollar,	    dollar	]	};
-    key <AE03> {	[               3,	numbersign,         sterling,        sterling	]	};
     key <AE06> {	[               6,       ampersand     	]	};
     key <AE07> {	[               7,           slash, 	      bar,       backslash	]  	};
-    key <AE08> {	[               8,       parenleft,      bracketleft,	 braceleft	]	};
-    key <AE09> {	[               9,      parenright,     bracketright,      braceright	]	};
+    key <AE08> {	[               8,       parenleft,   bracketleft,	 braceleft	]	};
+    key <AE09> {	[               9,      parenright,  bracketright,	braceright	]	};
     key <AE10> {	[               0,           equal     	]	};
+    key <AE11> {	[            plus,        question      ]	};
+    key <AE12> {	[      dead_grave,      dead_acute, 	    acute,     dead_ogonek 	]	};
 
     key <AB08> {	[           comma,       semicolon     	]	};
     key <AB09> {	[          period,           colon     	]	};
     key <AB10> {	[           minus,      underscore     	]	};
-    key	<AC10> {	[	   oslash,        Ooblique,       odiaeresis,     Odiaeresis	]	};
-    key <AE11> {	[            plus,        question      ]	};
+    key <AC10> {	[	   oslash,        Ooblique,       odiaeresis,   Odiaeresis	]	};
     key <AC11> {	[              ae,              AE 	]	};
     key <AD11> {	[	    aring,           Aring     	]	};
-    key <AE12> {	[      dead_grave,      dead_acute, 	    acute,     dead_ogonek 	]	};
-    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};
+    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,  dead_macron     	]      	};
     key <BKSL> {	[              at,        asterisk	]	};
     key <LSGT> {	[            less,         greater	]	};
 
-    // End alphanumeric section
-
     include "eurosign(e)"
     include "level3(ralt_switch)"
 };
@@ -45,6 +43,6 @@ xkb_symbols "nodeadkeys" {
     name[Group1]= "Norway - Mac, eliminate dead keys";
 
     key <AE12> {	[           grave,           acute, 	    acute,          ogonek 	]	};
-    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,          macron     	]      	};
+    key <AD12> {	[       diaeresis,     asciicircum,    asciitilde,          macron     	]      	};
 
 };
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt
index 01ac86d85..f5b56a2c2 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/pt
@@ -4,7 +4,7 @@ partial default alphanumeric_keys
 xkb_symbols "basic" {
 
     // Describes the differences between a very simple en_US
-    // keyboard and a very simple Portuguese keybaord
+    // keyboard and a very simple Portuguese keyboard.
 
     include "latin"
 
@@ -12,8 +12,8 @@ xkb_symbols "basic" {
 
     key <LSGT> {	[	     less,	   greater, 	      bar,       brokenbar	]	};
     key <AE02> {	[               2,	  quotedbl, 	       at,       oneeighth	]	};
-    key <AE04> {	[               4,	    dollar,          section,          dollar	]	};
-    key <AE03> {	[               3,	numbersign,         sterling,        sterling     	]	};
+    key <AE03> {	[               3,	numbersign,      sterling,        sterling     	]	};
+    key <AE04> {	[               4,	    dollar,       section,          dollar	]	};
     key <AE06> {	[               6,       ampersand     	]	};
     key <AE07> {	[               7,           slash     	]	};
     key <AE08> {	[               8,       parenleft,      bracketleft,       braceleft     	]	};
@@ -29,7 +29,6 @@ xkb_symbols "basic" {
     key <AC12> {	[       backslash,	       bar     	]	};
     key <AD11> {	[       masculine,     ordfeminine      ]	};
     key <AD12> {	[      dead_acute,      dead_grave 	]	};
-    // End alphanumeric section
 
     include "eurosign(e)"
     include "level3(ralt_switch)"
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se
index d2d05f248..beb226fa3 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/se
@@ -2,7 +2,7 @@ partial default alphanumeric_keys
 xkb_symbols "basic" {
 
     // Describes the differences between a very simple en_US
-    // keyboard and a very simple Swedish(Sweden) keybaord
+    // keyboard and a very simple Swedish(Sweden) keyboard.
 
     include "latin"
 
@@ -11,25 +11,25 @@ xkb_symbols "basic" {
     key <TLDE> {	[         section,         degree	]	};
 
     key <AE01> {	[               1,          exclam,        copyright,      exclamdown	]	};
-    key <AE02> {	[               2,        quotedbl, 	       at,	 oneeighth	]	};
+    key <AE02> {	[               2,        quotedbl,               at,       oneeighth	]	};
     key <AE03> {	[               3,      numbersign,         sterling,             yen	]	};
-    key <AE04> {	[               4,        currency, 	   dollar,	      cent	]	};
+    key <AE04> {	[               4,        currency, 	      dollar,	         cent	]	};
     key <AE06> {	[               6,       ampersand     	]	};
-    key <AE07> {	[               7,           slash, 	      bar,       backslash	]	};
+    key <AE07> {	[               7,           slash, 	         bar,       backslash	]	};
     key <AE08> {	[               8,       parenleft,      bracketleft,       braceleft	]	};
     key <AE09> {	[               9,      parenright,     bracketright,      braceright	]	};
     key <AB08> {	[           comma,       semicolon     	]	};
     key <AE10> {	[               0,           equal     	]	};
+    key <AE11> {	[            plus,        question      ]	};
+    key <AE12> {	[           acute,           grave	]	};
     key <AB09> {	[          period,           colon     	]	};
     key <AB10> {	[           minus,      underscore     	]	};
-    key	<AC10> {	[      odiaeresis,      Odiaeresis, 	   oslash,	    Ooblique	]	};
-    key <AE11> {	[            plus,        question      ]	};
-    key <AC11> {	[      adiaeresis,      Adiaeresis,               ae,		AE	]	};
+    key <AC10> {	[      odiaeresis,      Odiaeresis, 	   oslash,	     Ooblique	]	};
+    key <AC11> {	[      adiaeresis,      Adiaeresis,            ae,		   AE	]	};
     key <AD11> {	[	    aring,           Aring     	]	};
-    key <AE12> {	[           acute,           grave	]	};
     key <AD12> {	[       diaeresis,     asciicircum, 	asciitilde			]	};
-    key <BKSL> {	[      apostrophe,        asterisk,               at			]	};
-    key <LSGT> {        [            less,         greater,              bar,       brokenbar      ]       };
+    key <BKSL> {	[      apostrophe,        asterisk,            at			]	};
+    key <LSGT> {	[            less,         greater,           bar,       brokenbar      ]       };
 
     include "kpdl(comma)"
     include "eurosign(e)"
diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
index d0cf5600b..81e4b77b9 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/us
@@ -5,7 +5,6 @@ xkb_symbols "extended" {
     name[Group1]= "USA";
     key <ESC>  {	[ Escape			]	};
 
-    // Alphanumeric section
     key <TLDE> {	[     grave,	asciitilde	]	};
     key <AE01> {	[	  1,	exclam 		]	};
     key <AE02> {	[	  2,	at		]	};
@@ -58,13 +57,11 @@ xkb_symbols "extended" {
     key <AB10> {	[     slash,	question	]	};
 
     key <SPCE> {	[  space			]	};
-    // End alphanumeric section
-
 
     include "eurosign(e)"
     include "keypad"
 
-    key <KPEQ> {	[  equal				]	};
+    key <KPEQ> {	[  equal			]	};
 };
 
 hidden
@@ -104,11 +101,11 @@ xkb_symbols "oldmac" {
     key <RGHT> {	[  Right	]	};
     // End "Editing" section
 
-    key <BKSP> {	[ BackSpace			]	};
-    key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
+    key <BKSP> {	[ BackSpace	]	};
+    key  <TAB> {	[ Tab,	ISO_Left_Tab ]	};
     key <RTRN> {	[ Return	]	};
     key <CAPS> {	[ Caps_Lock	]	};
-    key <NMLK> {	[ Num_Lock, Pointer_EnableKeys		]	};
+    key <NMLK> {	[ Num_Lock, Pointer_EnableKeys ] };
 
     // Begin "Modifier" section
     key <LFSH> {	[  Shift_L	]	};