[PATCH] XKB-Config.xml: update for current releases
Alan Coopersmith
alan.coopersmith at oracle.com
Tue Nov 2 10:36:46 PDT 2010
Matt Dew wrote:
> On Mon, Nov 1, 2010 at 8:42 PM, Alan Coopersmith
> <alan.coopersmith at oracle.com> 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
>> - Add an example of enabling the ctrl-alt-bksp zapping sequence
>>
>> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
>> ---
>> general/input/XKB-Config.xml | 103 +++++++++++++++++++++++++++++------------
>> 1 files changed, 73 insertions(+), 30 deletions(-)
>>
>> diff --git a/general/input/XKB-Config.xml b/general/input/XKB-Config.xml
>> index 118f189..9326c79 100644
>> --- a/general/input/XKB-Config.xml
>> +++ b/general/input/XKB-Config.xml
>> @@ -1,6 +1,6 @@
>> <?xml version="1.0" encoding="UTF-8"?>
>> -<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
>> - "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
>> +<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
>> + "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
>> ]>
>>
> One note: docbook 4.3 vs 4.4.
That was required since I used
<package>xkeyboard-config</package>
which is introduced in 4.4. I could just remove that tag, as it's not
currently styled in our style-sheets.
> Do we want to keep the versions the same across all the docs for
> consistency? Each version has its own stylesheets. The build will
> fail if someone, in this case, has 4.3 installed but not 4.4. The
> other docs in the tree are 4.3.
Looks like across all the modules we have a lot of 4.1.2, a lot of 4.3,
a couple 4.2 (xmore, xlsfonts) and a couple 4.4 (xfs & libXfont).
Getting onto a common version would be nice, but that would take some
work.
For now I'll just remove the package tag & go back to 4.3, so that at
least the xorg-docs module is self-consistent.
--
-Alan Coopersmith- alan.coopersmith at oracle.com
Oracle Solaris Platform Engineering: X Window System
More information about the xorg-devel
mailing list