Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch

3 files changed, 8 insertions, 7 deletions

diff --git a/man/aiptek.man b/man/aiptek.man
index 466c871..c54e31f 100644
--- a/man/aiptek.man
+++ b/man/aiptek.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/aiptek.man,v 1.1 2003/06/30 16:52:57 eich Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/aiptek.man,v 0.0 2003/03/23 00:00:00 bheadley Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH AIPTEK __drivermansuffix__ __vendorversion__
@@ -15,7 +15,7 @@ aiptek \- Aiptek USB Digital Tablet Input Driver for Linux
 .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 @@ X server's core pointer.
 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 @@ sets the level of debugging info reported.
 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@earthlink.net>
 .SH PROJECT PAGE
diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
index 6156fea..005a2a3 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -35,7 +35,7 @@
  * TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.c,v 1.2 2003/12/22 17:48:10 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.c,v 1.1tsi Exp $ */
 
 /*
  *
@@ -2437,7 +2437,7 @@ static XF86ModuleVersionInfo xf86AiptekVersionRec =
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     1, 0, 0,
     ABI_CLASS_XINPUT,
     ABI_XINPUT_VERSION,
diff --git a/src/xf86Aiptek.h b/src/xf86Aiptek.h
index 33923c7..da6adc3 100644
--- a/src/xf86Aiptek.h
+++ b/src/xf86Aiptek.h
@@ -34,7 +34,8 @@
  * TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.3 2003/12/10 01:50:33 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.3 2003/12/10 01:50:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.2 2003/11/03 05:36:32 tsi Exp $ */
 
 #ifndef _AIPTEK_H_
 #define _AIPTEK_H_