Merge remote-tracking branch 'origin/released'

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

1 files changed, 1 insertions, 12 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/mv b/xorg-server/xkeyboard-config/symbols/mv
index e82b1e873..5c9177b06 100644
--- a/xorg-server/xkeyboard-config/symbols/mv
+++ b/xorg-server/xkeyboard-config/symbols/mv
@@ -1,7 +1,4 @@
-//
-// NOTES:
-//
-//Keymap for thaana/divehi script (divehi language)
+// Keymap for Thaana/Dhivehi script (Dhivehi language).
 
 partial default alphanumeric_keys
 xkb_symbols "basic" {
@@ -32,12 +29,9 @@ xkb_symbols "basic" {
     key <AD08> { [	0x10007A8,      0x10007A9      ]       };
     key <AD09> { [	0x10007AE,      0x10007AF      ]       };
     key <AD10> { [	0x1000795,    	division       ]       };
-// The following brackets are as they appear on the US_en keyboard. 
-//Please verify whether the names used are correct. I referred to keysymdef.h
     key <AD11> {	[ 	bracketleft,	braceleft      ]	};
     key <AD12> {	[ 	bracketright,	braceright     ]	};
 
-
     key <AC01> { [	0x10007A6,       0x10007A7     ]       };
     key <AC02> { [	0x1000790,       0x1000781     ]       };
     key <AC03> { [	0x100078B,       0x1000791     ]       };
@@ -53,7 +47,6 @@ xkb_symbols "basic" {
 
     key <LSGT> { [        bar,      	brokenbar	]       };
     key <AB01> { [ 	0x1000792,    	0x10007A1       ]       };
-//multiply sign is the same as the algebraic symbol which looks like an italicized x. I am presuming its the same thing here. If not, please substitute an 'x' instead
     key <AB02> { [	multiply,      	0x1000798	  ]       };
     key <AB03> { [	0x1000797,     	0x100079D	  ]       };
     key <AB04> { [	0x1000788,      0x10007A5	  ]       };
@@ -64,10 +57,6 @@ xkb_symbols "basic" {
     key <AB09> { [	period,         greater           ]       };
     key <AB10> { [	slash, 		Arabic_question_mark ]       };
 
-    // End alphanumeric section
-    
-    // Begin modifier mappings 
-
     modifier_map Shift  { Shift_L };
     modifier_map Lock   { Caps_Lock };
     modifier_map Control{ Control_L };