diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-06-11 10:56:08 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-06-21 17:54:14 -0700 |
| commit | c3278f3c1786e66019a39e2612761f74782a48ee (patch) | |
| tree | 0bb7ac8d030ce26681a1b45eba4e86d527b51182 | |
| parent | 19e37067131175219eca7d2b11c2ee59af280575 (diff) | |
Xdmx.man: additional updates to modernize XKB information
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | hw/dmx/man/Xdmx.man | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/dmx/man/Xdmx.man b/hw/dmx/man/Xdmx.man index df148dd87..652b24fc6 100644 --- a/hw/dmx/man/Xdmx.man +++ b/hw/dmx/man/Xdmx.man @@ -1,4 +1,3 @@ -.\" $XFree86$ .\" .\" Copyright 2001-2004 Red Hat Inc., Durham, North Carolina. .\" All Rights Reserved. @@ -11,7 +10,7 @@ .\" and to permit persons to whom the Software is furnished to do so, .\" subject to the following conditions: .\" -.\" he above copyright notice and this permission notice (including the +.\" The above copyright notice and this permission notice (including the .\" next paragraph) shall be included in all copies or substantial .\" portions of the Software. .\" @@ -141,6 +140,9 @@ initialize the keyboard. For an SGI keyboard, ",xkb,sgi/indy(pc102)" might be useful. A list of keycodes, symbols, and geometries can be found in .IR __xkbdir__ . +Use of keycodes, symbols and geometries for XKB configuration is +deprecated in favor of the rules, layout, model, variant and options +settings available via the -param command line switch. If this option is not specified, the input device will be queried, perhaps using the XKEYBOARD extension. .RE @@ -361,7 +363,7 @@ Defaults to "__XKB_DFLT_RULES__". Other values may include "sgi" and "sun". .sp .TP 8 .B XkbModel -Defaults to "__XKB_DFLT_MODEL__". When used with "xfree86" rules, other values +Defaults to "__XKB_DFLT_MODEL__". When used with "base" rules, other values may include "pc102", "pc104", "microsoft", and many others. When used with "sun" rules, other values may include "type4" and "type5". .sp |