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

[Egbert Eich]

Committed by: eich

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

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


Index: aiptek.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/aiptek/aiptek.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/aiptek.man	5 Mar 2004 13:40:48 -0000	1.1.4.1
+++ b/aiptek.man	15 Apr 2004 10:16:50 -0000	1.1.4.2
@@ -15,7 +15,7 @@
 .fi
 .SH DESCRIPTION
 .B aiptek 
-is an XFree86 input driver for Aiptek HyperPen USB-based tablet devices.
+is an __xservername__ input driver for Aiptek HyperPen USB-based tablet devices.
 This driver only supports the USB protocol, and only under Linux; for 
 RS-232C-based HyperPens, please see the \fI"hyperpen"\fP driver.
 .PP
@@ -27,7 +27,7 @@
 This driver supports the Aiptek HyperPen 4000U, 5000U, 6000U, 8000U
 and 12000U USB-based input tablet on some Linux platforms.
 .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
@@ -150,7 +150,7 @@
 This driver is currently Linux specific.
 .PP
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__), hyperpen(__drivermansuffix__).
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), hyperpen(__drivermansuffix__).
 .SH AUTHORS
 Bryan W. Headley <bheadley at earthlink.net>
 .SH PROJECT PAGE

Index: xf86Aiptek.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.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/xf86Aiptek.c	5 Mar 2004 13:40:48 -0000	1.1.4.2
+++ b/xf86Aiptek.c	15 Apr 2004 10:16:50 -0000	1.1.4.3
@@ -2437,7 +2437,7 @@
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     1, 0, 0,
     ABI_CLASS_XINPUT,
     ABI_XINPUT_VERSION,