summaryrefslogtreecommitdiff
path: root/config/x11-input.fdi
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-05-08 13:16:48 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-05-08 13:16:48 +0930
commit1a314a1ef06222977e7ccb94331ce31c17534b2a (patch)
tree082a2a4b75781756ce909cce06c8e634ce7ba2db /config/x11-input.fdi
parent26188875de1ccc84ac60bfb251e3ec43de2b9e22 (diff)
Revert "config: deprecate (and ignore) the use of input.xkb.whatever options."
daniels: "Hrm, I'd prefer to have input.xkb.{m,l,v,o} be the primary keys, and have input.x11_options be a backup for that, rather than the former being deprecated, for the reasons I listed earlier ..." see http://bugs.freedesktop.org/show_bug.cgi?id=13037#c51 This reverts commit 26188875de1ccc84ac60bfb251e3ec43de2b9e22.
Diffstat (limited to 'config/x11-input.fdi')
-rw-r--r--config/x11-input.fdi16
1 files changed, 7 insertions, 9 deletions
diff --git a/config/x11-input.fdi b/config/x11-input.fdi
index 85d7a1fe1..f2e2d50ab 100644
--- a/config/x11-input.fdi
+++ b/config/x11-input.fdi
@@ -26,21 +26,19 @@
Do not specify "input.x11_options.Device" since "input.device"
will be used automatically.
-
- XKB configuration:
- "input.x11_options.XkbRules"
- "input.x11_options.XkbModel"
- "input.x11_options.XkbLayout"
- "input.x11_options.XkbVariant"
- "input.x11_options.XkbOptions"
-
- Legacy Keys (deprecated and ignored by the server):
+ Legacy Keys
"input.xkb.rules"
"input.xkb.model"
"input.xkb.layout"
"input.xkb.variant"
"input.xkb.options"
+ These keys are deprecated. Use these instead:
+ "input.x11_options.XkbRules"
+ "input.x11_options.XkbModel"
+ "input.x11_options.XkbLayout"
+ "input.x11_options.XkbVariant"
+ "input.x11_options.XkbOptions"
See the evdev documentation for more information.