[PATCH xf86-input-keyboard] man: update "rules" default value for xkeyboard-config.

Alan Coopersmith alan.coopersmith at oracle.com
Sat Jun 11 08:32:25 PDT 2011


On 06/11/11 01:31 AM, Matthieu Herrb wrote:
> xkeyboard-config is using "base" not "xorg" as default rules.
> While there remove references to unmaintained PC98 settings.
> ---
>  man/kbd.man |   14 ++++++--------
>  1 files changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/man/kbd.man b/man/kbd.man
> index d224ce5..3d6bf21 100644
> --- a/man/kbd.man
> +++ b/man/kbd.man
> @@ -67,21 +67,19 @@ specifies which XKB rules file to use for interpreting the
>  .BR XkbVariant ,
>  and
>  .B XkbOptions
> -settings.  Default: "xorg" for most platforms, but "xfree98" for the
> -Japanese PC-98 platforms. If you use the "xorg" value then you can
> +settings.  Default: "base" for most platforms.
> +If you use the "base" value then you can
>  find listing of all valid values for these four options in the
>  .I
> -__xkb_path__/rules/xorg.lst
> +__xkb_path__/rules/base.lst
>  file.
>  .TP 7
>  .BI "Option \*qXkbModel\*q \*q" modelname \*q
> -specifies the XKB keyboard model name.  Default: "pc105" for most platforms,
> -but "pc98" for the Japanese PC-98 platforms.
> +specifies the XKB keyboard model name.  Default: "pc105" for most platforms.
>  .TP 7
>  .BI "Option \*qXkbLayout\*q \*q" layoutname \*q
>  specifies the XKB keyboard layout name.  This is usually the country or
> -language type of the keyboard.  Default: "us" for most platforms, but
> -"jp" for the Japanese PC-98 platforms.
> +language type of the keyboard.  Default: "us" for most platforms.
>  .TP 7
>  .BI "Option \*qXkbVariant\*q \*q" variants \*q
>  specifies the XKB keyboard variant components.  These can be used to
> @@ -117,7 +115,7 @@ Section \*qInputDevice\*q
>  Identifier   "Generic Keyboard"
>  Driver       "kbd"
>  Option       "CoreKeyboard"
> -Option       "XkbRules"      "xorg"
> +Option       "XkbRules"      "base"
>  Option       "XkbModel"      "pc105"
>  Option       "XkbLayout"     "us,sk"
>  Option       "XkbVariant"    ",qwerty"

Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System



More information about the xorg-devel mailing list