diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:03 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:03 +0000 |
| commit | ba6804b2537ea7f5c3a78c523aebfb38d9d0dfac (patch) | |
| tree | ebc294d126ba86a3a7dabe7556bc714ffc228568 | |
| parent | 08d862c6ef323471aea1b098c7e6b5bd8ae79177 (diff) | |
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
| -rw-r--r-- | man/js_x.man | 8 | ||||
| -rw-r--r-- | src/js_x.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/man/js_x.man b/man/js_x.man index d8fbcce..ea4396d 100644 --- a/man/js_x.man +++ b/man/js_x.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/jamstudio/js_x.man,v 1.2 2003/02/24 03:24:15 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/jamstudio/js_x.man,v 1.1 2002/11/11 01:18:08 alanh Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH JS_X __drivermansuffix__ __vendorversion__ @@ -21,7 +21,7 @@ js_x \- JamStudio input driver .fi .SH DESCRIPTION .B js_x -is an XFree86 input driver for JamStudio devices. +is an __xservername__ input driver for JamStudio devices. .PP The .B js_x @@ -31,7 +31,7 @@ X server's core pointer. This driver supports the KB-Gear JamStudio pentablet. This X-Input driver should work on any OS supporting the hiddev raw USB HID driver. .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 @@ -62,6 +62,6 @@ sets the divider for the returned pressure value. This option will allow you to where X equals the value read from the tablet. .RE .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 Brian Goines <bgoines78@comcast.net> @@ -20,11 +20,11 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/jamstudio/js_x.c,v 1.4 2003/11/03 05:11:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/jamstudio/js_x.c,v 1.3tsi Exp $ */ #include <sys/types.h> #include "xf86Version.h" -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) +#if XORG_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0) #define XFREE86_V4 1 #endif #include "misc.h" @@ -345,7 +345,7 @@ static XF86ModuleVersionInfo xf86JS_XVersionRec = { MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, |