[PATCH xserver 1/2] Xinput: replace hard coded X11 version with X server version

Gaetan Nadon memsize at videotron.ca
Sun Sep 25 06:06:46 PDT 2011


On Sat, 2011-09-24 at 17:16 -0600, Matt Dew wrote:

> Gaetan, can we use xorg-sgml-doctools/defs.ent ?

We do for the "X Version 11, Release 7.6" value. The server version is
only known by the server module.

I have added a search path to all 22 docbook.am files to find local
entities. Any module can add entities that is know only by itself to use
in their docs. The xserver already had this search path and used local
entities.


> 
> 
> 
> 
> 
> 
> On 09/24/2011 03:21 PM, Gaetan Nadon wrote:
> > Which is more useful.
> >
> > Signed-off-by: Gaetan Nadon<memsize at videotron.ca>
> > ---
> >   doc/Xinput.xml |    7 ++++---
> >   1 files changed, 4 insertions(+), 3 deletions(-)
> >
> > diff --git a/doc/Xinput.xml b/doc/Xinput.xml
> > index 1ae7afe..87c6d7f 100644
> > --- a/doc/Xinput.xml
> > +++ b/doc/Xinput.xml
> > @@ -1,20 +1,21 @@
> >   <?xml version="1.0" encoding="UTF-8" ?>
> >   <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
> > -                   "http://www.oasis-open.org/docbook/xml/4.3/dGaeocbookx.dtd">
> > -
> > +                   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"[
> > +<!ENTITY % defs SYSTEM "/xserver/doc/xml/xserver.ent">  %defs;
> > +]>
> >
> >   <!-- lifted from troff+ms+XMan by doclifter -->
> >   <book id="porting">
> >
> >   <bookinfo>
> >      <title>X11 Input Extension Porting Document</title>
> > -<releaseinfo>X Version 11, Release 6.7</releaseinfo>
> >      <authorgroup>
> >         <author>
> >            <firstname>George</firstname><surname>Sachs</surname>
> >            <affiliation><orgname>Hewlett-Packard</orgname></affiliation>
> >         </author>
> >      </authorgroup>
> > +<releaseinfo>X server version&xserver.version;</releaseinfo>
> >      <corpname>X Consortium Standard</corpname>
> >      <copyright><year>1989</year><holder>Hewlett-Packard Company</holder></copyright>
> >      <copyright><year>1990</year><holder>Hewlett-Packard Company</holder></copyright>
> 


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110925/3b282321/attachment-0001.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110925/3b282321/attachment-0001.pgp>


More information about the xorg-devel mailing list