Update to xkeyboard-config 2.5.

ok matthieu@

1 files changed, 11 insertions, 14 deletions

diff --git a/data/xkeyboard-config/man/xkeyboard-config.7 b/data/xkeyboard-config/man/xkeyboard-config.7
index acef84d03..c14656731 100644
--- a/data/xkeyboard-config/man/xkeyboard-config.7
+++ b/data/xkeyboard-config/man/xkeyboard-config.7
@@ -1,5 +1,5 @@
 .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes.
-.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.4.1" "X Version 11"
+.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.5" "X Version 11"
 .SH NAME
 xkeyboard-config \- XKB data description files
 .SH DESCRIPTION
@@ -663,13 +663,13 @@ ru(bak)	Bashkirian
 ru(chm)	Mari
 
 _
-rs	Serbian
-rs(yz)	Serbian (Z and ZHE swapped)
+rs	Serbian (Cyrillic)
+rs(yz)	Serbian (Cyrillic, Z and ZHE swapped)
 rs(latin)	Serbian (Latin)
 rs(latinunicode)	Serbian (Latin Unicode)
 rs(latinyz)	Serbian (Latin qwerty)
 rs(latinunicodeyz)	Serbian (Latin Unicode qwerty)
-rs(alternatequotes)	Serbian (with guillemets)
+rs(alternatequotes)	Serbian (Cyrillic with guillemets)
 rs(latinalternatequotes)	Serbian (Latin with guillemets)
 rs(rue)	Pannonian Rusyn (homophonic)
 
@@ -903,6 +903,7 @@ grp:lctrl_lshift_toggle	Left Ctrl+Left Shift
 grp:rctrl_rshift_toggle	Right Ctrl+Right Shift
 grp:ctrl_alt_toggle	Alt+Ctrl
 grp:alt_shift_toggle	Alt+Shift
+grp:lalt_lshift_toggle	Left Alt+Left Shift
 grp:alt_space_toggle	Alt+Space
 grp:menu_toggle	Menu
 grp:lwin_toggle	Left Win
@@ -940,9 +941,9 @@ lv3:enter_switch	Enter on keypad
 lv3:caps_switch	Caps Lock
 lv3:bksl_switch	Backslash
 lv3:lsgt_switch	<Less/Greater>
-lv3:caps_switch_latch	Caps Lock (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)
-lv3:bksl_switch_latch	Backslash (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)
-lv3:lsgt_switch_latch	<Less/Greater> (chooses 3rd level, latches when pressed together with another 3rd-level-chooser)
+lv3:caps_switch_latch	Caps Lock chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser
+lv3:bksl_switch_latch	Backslash chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser
+lv3:lsgt_switch_latch	<Less/Greater> chooses 3rd level, acts as onetime lock when pressed together with another 3rd-level-chooser
 
 .TE
 
@@ -1109,7 +1110,7 @@ ___
 lB l.
 Option	Description
 numpad:pc	Default numeric keypad keys
-numpad:mac	Numeric keypad keys work as with Macintosh
+numpad:mac	Numeric keypad keys always enter digits (as in Mac OS)
 numpad:microsoft	Shift with numeric keypad keys works as in MS Windows
 numpad:shift3	Shift does not cancel Num Lock, chooses 3rd level instead
 srvrkeys:none	Special keys (Ctrl+Alt+<key>) handled in a server
@@ -1120,6 +1121,7 @@ shift:both_capslock	Both Shift-Keys together toggle Caps Lock
 shift:both_capslock_cancel	Both Shift-Keys together activate Caps Lock, one Shift-Key deactivates
 shift:both_shiftlock	Both Shift-Keys together toggle ShiftLock
 keypad:pointerkeys	Toggle PointerKeys with Shift + NumLock.
+grab:break_actions	Allow breaking grabs with keyboard actions (warning: security risk)
 
 .TE
 
@@ -1155,12 +1157,6 @@ lv5:lsgt_switch_lock	<Less/Greater> chooses 5th level, locks when pressed togeth
 lv5:ralt_switch_lock	Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser
 lv5:lwin_switch_lock	Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser
 lv5:rwin_switch_lock	Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser
-lv5:lsgt_switch_lock_cancel	<Less/Greater> chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock
-lv5:ralt_switch_lock_cancel	Right Alt chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock
-lv5:lwin_switch_lock_cancel	Left Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock
-lv5:rwin_switch_lock_cancel	Right Win chooses 5th level, locks when pressed together with another 5th-level-chooser, one press releases the lock
-lv5:lsgt_switch_lock_cancel	<Less/Greater> chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock
-lv5:ralt_switch_lock_cancel	Right Alt chooses 5th level and activates level5-Lock when pressed together with another 5th-level-chooser, one press releases the lock
 
 .TE
 
@@ -1205,6 +1201,7 @@ lB l.
 Option	Description
 japan:kana_lock	Kana Lock key is locking
 japan:nicola_f_bs	NICOLA-F style Backspace
+japan:hztg_escape	Make Zenkaku Hankaku an additional ESC
 
 .TE