diff options
| author | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:46 +0000 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:46 +0000 |
| commit | 8a1ac399969f9cb867a253b8ea1c44ceeffea4d1 (patch) | |
| tree | ebc294d126ba86a3a7dabe7556bc714ffc228568 | |
| parent | 68b68523549fb44e45c9320d3ff994e07d00c128 (diff) | |
Merge the new release from HEADXACE-SELINUX
| -rw-r--r-- | man/js_x.man | 6 | ||||
| -rw-r--r-- | src/js_x.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/man/js_x.man b/man/js_x.man index 5cc2914..ea4396d 100644 --- a/man/js_x.man +++ b/man/js_x.man @@ -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> @@ -24,7 +24,7 @@ #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, |