From 3655ddee8d1b21d1e59423ed57170ff0e53ff15b Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 15 Apr 2004 10:16:50 +0000 Subject: Merged changes from RELEASE-1 branch --- man/aiptek.man | 6 +++--- src/xf86Aiptek.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/man/aiptek.man b/man/aiptek.man index f2ea668..c54e31f 100644 --- a/man/aiptek.man +++ b/man/aiptek.man @@ -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 .SH PROJECT PAGE diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c index 1f52f9c..005a2a3 100644 --- a/src/xf86Aiptek.c +++ b/src/xf86Aiptek.c @@ -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, -- cgit v1.2.3