Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig xkeyboard-config git update 4 Sep 2013

1 files changed, 17 insertions, 17 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/capslock b/xorg-server/xkeyboard-config/symbols/capslock
index 3e0880573..8b315c6f1 100644
--- a/xorg-server/xkeyboard-config/symbols/capslock
+++ b/xorg-server/xkeyboard-config/symbols/capslock
@@ -1,68 +1,68 @@
 default partial hidden modifier_keys
 xkb_symbols "capslock" {
-    replace key <CAPS> {	[	Caps_Lock		]	};
+    replace key <CAPS> { [ Caps_Lock ] };
     modifier_map Lock { Caps_Lock };
 };
 
 partial hidden modifier_keys
 xkb_symbols "shiftlock" {
-    replace key <CAPS> {	[	Shift_Lock		]	};
+    replace key <CAPS> { [ Shift_Lock ] };
     modifier_map Shift { Shift_Lock };
 };
 
 partial hidden modifier_keys
 xkb_symbols "grouplock" {
-    replace key <CAPS> {	[	ISO_Next_Group,	Caps_Lock	]	};
+    replace key <CAPS> { [ ISO_Next_Group, Caps_Lock ] };
 };
 
 partial hidden modifier_keys
 xkb_symbols "swapescape" {
-    key <CAPS> {        [       Escape  ]       };
-    key <ESC>  {        [     Caps_Lock    ]       };
+    key <CAPS> { [ Escape ] };
+    key <ESC>  { [ Caps_Lock ] };
 };
 
 partial hidden modifier_keys
 xkb_symbols "groupshift" {
     key <CAPS> {
-       type[Group1]="PC_ALT_LEVEL2",
-       [       Mode_switch,    Caps_Lock       ]
+        type[Group1] = "PC_ALT_LEVEL2",
+        [ Mode_switch, Caps_Lock ]
     };
 };
 
 partial hidden modifier_keys
 xkb_symbols "escape" {
-    key <CAPS> {        [       Escape  ]       };
+    key <CAPS> { [ Escape ] };
 };
 
 partial hidden modifier_keys
 xkb_symbols "backspace" {
-    key <CAPS> {        [       BackSpace  ]       };
+    key <CAPS> { [ BackSpace ] };
 };
 
 partial hidden modifier_keys
 xkb_symbols "super" {
-    key <CAPS> {        [       Super_L  ]       };
-    modifier_map Mod4   { <CAPS> };
+    key <CAPS> { [ Super_L ] };
+    modifier_map Mod4 { <CAPS> };
 };
 
 partial hidden modifier_keys
 xkb_symbols "hyper" {
-    key <CAPS> {        [       Hyper_L  ]       };
-    modifier_map Mod4   { <CAPS> };
+    key <CAPS> { [ Hyper_L ] };
+    modifier_map Mod4 { <CAPS> };
 };
 
 partial hidden modifier_keys
 xkb_symbols "none" {
-    key <CAPS> {        [       VoidSymbol  ]       };
+    key <CAPS> { [ VoidSymbol ] };
 };
 
 partial hidden modifier_keys
 xkb_symbols "numlock" {
-    key <CAPS> {        [       Num_Lock  ]       };
+    key <CAPS> { [ Num_Lock ] };
 };
 
-// This changes the modifier behavior of the <CAPS> key.
-// The keysym will be reset to Caps_Lock
+// This changes the <CAPS> key to become a Control modifier,
+// but it will still produce the Caps_Lock keysym.
 partial hidden modifier_keys
 xkb_symbols "ctrl_modifier" {
     replace key <CAPS> {