[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/input/palmax palmax.man, 1.1.4.1, 1.1.4.2 xf86Palmax.c, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/palmax
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/input/palmax

Modified Files:
      Tag: XORG-CURRENT
	palmax.man xf86Palmax.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: palmax.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/palmax/palmax.man,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/palmax.man	5 Mar 2004 13:40:50 -0000	1.1.4.1
+++ b/palmax.man	15 Apr 2004 10:17:06 -0000	1.1.4.2
@@ -18,7 +18,7 @@
 .B EndSection
 .SH DESCRIPTION
 .B palmax
-is an XFree86 input driver for the Palmax PD1000/PD1100
+is an __xservername__ input driver for the Palmax PD1000/PD1100
 .PP
 The
 .B palmax
@@ -29,7 +29,7 @@
 Palmax PD1000, Palmax PD1100. In theory also any other system using a
 TR88L803 wired to a serial port.
 .SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
 details and for options that can be used with all input drivers.  This
 section only covers configuration details specific to this driver.
 .PP
@@ -79,10 +79,10 @@
 .PP
 The smoothing algorithm would benefit from real mathematics.
 .PP
-XFree86 needs a nice calibration tool.
+__xservername__ needs a nice calibration tool.
 .PP
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
 .SH AUTHORS
 Authors include...
  Alan Cox

Index: xf86Palmax.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/palmax/xf86Palmax.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/xf86Palmax.c	5 Mar 2004 13:40:50 -0000	1.1.4.2
+++ b/xf86Palmax.c	15 Apr 2004 10:17:06 -0000	1.1.4.3
@@ -806,7 +806,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_XINPUT,
 	ABI_XINPUT_VERSION,