From 594288d8da98d85fc51ca250dc763f2014f6b350 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 15 Apr 2004 10:17:07 +0000 Subject: Merged changes from RELEASE-1 branch --- man/tek4957.man | 6 +++--- src/xf86Tek4957.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/man/tek4957.man b/man/tek4957.man index 670dd83..5b2ee5a 100644 --- a/man/tek4957.man +++ b/man/tek4957.man @@ -15,14 +15,14 @@ tek4957 \- Tektronix 4957 input driver .fi .SH DESCRIPTION .B tek4957 -is an XFree86 input driver for the Tektronix 4957 tablet. +is an __xservername__ input driver for the Tektronix 4957 tablet. .PP The .B tek4957 driver functions as a pointer input device, and may be used as the X server's core pointer. .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. .RS 8 @@ -80,6 +80,6 @@ Y coordinate of the bottom corner of the active zone. ( Default = full scale ) .SH "BUGS / LIMITATIONS" Currently, only "Absolute" mode is supported ( Sorry ) .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 Olivier DANET diff --git a/src/xf86Tek4957.c b/src/xf86Tek4957.c index 41ef830..96f5406 100644 --- a/src/xf86Tek4957.c +++ b/src/xf86Tek4957.c @@ -758,7 +758,7 @@ static XF86ModuleVersionInfo TekVersionRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, -- cgit v1.2.3