Update to xkeyboard-config 2.14.

ok matthieu@

2 files changed, 23 insertions, 4 deletions

diff --git a/data/xkeyboard-config/man/xkeyboard-config.7 b/data/xkeyboard-config/man/xkeyboard-config.7
index 0c255ecd9..f16e6f61c 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.13" "X Version 11"
+.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.14" "X Version 11"
 .SH NAME
 xkeyboard-config \- XKB data description files
 .SH DESCRIPTION
@@ -244,6 +244,7 @@ ara(digits)	Arabic (digits)
 ara(qwerty)	Arabic (qwerty)
 ara(qwerty_digits)	Arabic (qwerty/digits)
 ara(buckwalter)	Arabic (Buckwalter)
+ara(mac)	Arabic (Macintosh)
 
 _
 al	Albanian
@@ -690,6 +691,8 @@ ru(mac)	Russian (Macintosh)
 ru(srp)	Serbian (Russia)
 ru(bak)	Bashkirian
 ru(chm)	Mari
+ru(phonetic_azerty)	Russian (phonetic azerty)
+ru(phonetic_fr)	Russian (phonetic French)
 
 _
 rs	Serbian
@@ -1158,7 +1161,7 @@ lB l.
 Option	Description
 numpad:pc	Default numeric keypad keys
 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:microsoft	NumLock on: digits, Shift switches to arrow keys, Numlock off: always arrow keys (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
 apple:alupckeys	Apple Aluminium Keyboard: emulate PC keys (Print, Scroll Lock, Pause, Num Lock)
@@ -1255,6 +1258,22 @@ japan:hztg_escape	Make Zenkaku Hankaku an additional ESC
 
 
 .SS
+Korean Hangul/Hanja keys
+.BR
+.TS
+left,box;
+lB lB
+___
+lB l.
+Option	Description
+korean:hw_keys	Hardware Hangul/Hanja keys
+korean:ralt_rctrl	Right Alt as Hangul, right Ctrl as Hanja
+korean:rctrl_ralt	Right Ctrl as Hangul, right Alt as Hanja
+
+.TE
+
+
+.SS
 Adding Esperanto supersigned letters
 .BR
 .TS
diff --git a/data/xkeyboard-config/pc/Makefile b/data/xkeyboard-config/pc/Makefile
index b2d832a56..cc1cdb0e8 100644
--- a/data/xkeyboard-config/pc/Makefile
+++ b/data/xkeyboard-config/pc/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.4 2014/12/28 16:41:04 shadchin Exp $
+#	$OpenBSD: Makefile,v 1.5 2015/03/30 17:11:29 shadchin Exp $
 
 XKC_TOP =		../../..
-PACKAGE_VERSION =	2.13
+PACKAGE_VERSION =	2.14
 PKGCONFIG =		xkeyboard-config.pc
 EXTRA_PKGCONFIG_SUBST =	-e 's,@VERSION@,${PACKAGE_VERSION},g' \
 			-e 's,@xkb_base@,${XKB_BASE},g'