[PATCH] Xkb-Config.xml: update for current releases

[Alan Coopersmith]

Peter Hutterer wrote:
> On Mon, Nov 01, 2010 at 05:21:57PM -0700, Alan Coopersmith wrote:
>> - Document xorg.conf.d keyboard matches instead of kbd driver entries
>>   in xorg.conf
>> - Update to current xkb-config file names & paths, and link to the
>>   xkb-config project site
>>
>> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
>> ---
>>  general/input/XKB-Config.xml |   69 +++++++++++++++++++++++++-----------------
>>  1 files changed, 41 insertions(+), 28 deletions(-)
>>
>> HTML & Text output of the document with these changes applied can be found at:
>>      http://people.freedesktop.org/~alanc/input/XKB-Config.html
>>      http://people.freedesktop.org/~alanc/input/XKB-Config.txt
>>
>> diff --git a/general/input/XKB-Config.xml b/general/input/XKB-Config.xml
>> index 118f189..dd60854 100644
>> --- a/general/input/XKB-Config.xml
>> +++ b/general/input/XKB-Config.xml
>> @@ -17,13 +17,17 @@
>>  	<surname>Pascal</surname>
>>        </author>
>>      </authorgroup>
>> -    <pubdate>25 November 2002</pubdate>
>> +    <pubdate>November 2010</pubdate>
>>  
>>      <abstract>
>>  
>>        <para>
>>  This document describes how to configure Xorg XKB from a user's point
>>  of view. It covers basic configuration syntax and gives also a few examples.
>> +This version covers Xorg server versions 1.8 and later, used with the
>> +data files from the <ulink
>> +url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
>> +>xkeyboard-config</ulink> project.
>>        </para>
>>  
>>      </abstract>
>> @@ -40,6 +44,14 @@ you might need. Unless you have a completely atypical keyboard you really don't
>>  need to touch any of the xkb configuration files.
>>      </para>
>>  
>> +    <para>
>> +Some desktop environments now provide integrated graphical configuration tools
>> +for setting XKB configuration as part of your desktop session.   These
>> +instructions are provided for those without such support, those who need to
>> +configure XKB before the session startup (such as at the login screen), or
>> +those who need to perform more advanced configuration than those tools provide.
> 
> nitpick: "These instructions" isn't quite correct here, better use "The
> instructions herein" or something like this.

Okay.

>> +    </para>
>> +
>>    </sect1>
>>  
>>    <sect1>
>> @@ -98,13 +110,14 @@ files of rules to be used for keyboard mapping composition
>>      </para>
>>  
>>      <para>
>> -The proper rules file depends on your vendor. In reality, the commonest
>> -file of rules is <filename>xorg</filename>. For each rules file there is a
>> -description file named
>> +The rules file commonly used with Xorg is the <filename>base</filename>
> 
> 
> base or evdev. using base with evdev gives a few funny bugs.

Oops, somehow I thought evdev had switched back to using base now.

> I would skip the -rules bit in the setxkbmap examples, because the rules are
> usually selected already (e.g. evdev forces "evdev") and not tampering with
> it is safer for the user.

Makes sense.

New patch follows with all those fixed (and html/txt versions re-uploaded
to  http://people.freedesktop.org/~alanc/input/ ).   Thanks for the review.

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