<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN"> <HTML> <HEAD> <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8"> <META NAME="GENERATOR" CONTENT="GtkHTML/3.32.2"> </HEAD> <BODY> On Sat, 2011-06-11 at 10:59 -0700, Alan Coopersmith wrote: <BLOCKQUOTE TYPE=CITE> <PRE> Signed-off-by: Alan Coopersmith <<A HREF="mailto:alan.coopersmith@oracle.com">alan.coopersmith@oracle.com</A>> --- 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 df148dd..c29dbd1 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 availble via the -param command line switch. </PRE> </BLOCKQUOTE> Shouldn't that be spelled "available"? Reviewed-by: Gaetan Nadon <memsize@videotron.ca> <BLOCKQUOTE TYPE=CITE> <PRE> 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 </PRE> </BLOCKQUOTE> </BODY> </HTML>