diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:05 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:05 +0000 |
| commit | 1028c3f905f6b590440f07317de0b2abeb52538a (patch) | |
| tree | 66f2d6fca0aa897a9292e8ef9dfd7e5ba2064ff0 | |
| parent | 25ed0bdc34f8e3751cc37703bbe790eb647017f6 (diff) | |
Merging XORG-CURRENT into trunk
| -rw-r--r-- | man/tek4957.man | 8 | ||||
| -rw-r--r-- | src/xf86Tek4957.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/man/tek4957.man b/man/tek4957.man index 9167af4..5b2ee5a 100644 --- a/man/tek4957.man +++ b/man/tek4957.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/tek4957/tek4957.man,v 1.1 2002/11/11 01:18:08 alanh Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/jamstudio/js_x.man,v 0.2 2002/11/09 18:20:59 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH TEK4957 __drivermansuffix__ __vendorversion__ @@ -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 <odanet@caramail.com> diff --git a/src/xf86Tek4957.c b/src/xf86Tek4957.c index 452a2bb..96f5406 100644 --- a/src/xf86Tek4957.c +++ b/src/xf86Tek4957.c @@ -21,7 +21,7 @@ * TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/tek4957/xf86Tek4957.c,v 1.1 2002/11/11 01:18:08 alanh Exp $ */ +/* $XFree86$ */ #ifndef XFree86LOADER #include <unistd.h> @@ -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, |