diff options
| author | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:45 +0000 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:45 +0000 |
| commit | a6ac7dc0794c66490a9d9ddecbebc1cac84ebbf7 (patch) | |
| tree | 8441534c79632b6424b63848fa211c16be4cbe7c | |
| parent | 2c5f9d39ff4c3c423e7fb680628dd918dcb14e63 (diff) | |
Merge the new release from HEADXACE-SELINUX
| -rw-r--r-- | man/aiptek.man | 6 | ||||
| -rw-r--r-- | src/xf86Aiptek.c | 2 | ||||
| -rw-r--r-- | src/xf86Aiptek.h | 2 |
3 files changed, 5 insertions, 5 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 <bheadley@earthlink.net> .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, diff --git a/src/xf86Aiptek.h b/src/xf86Aiptek.h index da6adc3..80ce640 100644 --- a/src/xf86Aiptek.h +++ b/src/xf86Aiptek.h @@ -34,7 +34,7 @@ * TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XdotOrg: 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.2 2004/04/23 19:54:02 eich 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_ |