[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/input/jamstudio js_x.c, 1.1.4.2, 1.1.4.3 js_x.man, 1.1.4.1, 1.1.4.2

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/jamstudio
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/input/jamstudio

Modified Files:
      Tag: XORG-CURRENT
	js_x.c js_x.man 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: js_x.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/jamstudio/js_x.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/js_x.c	5 Mar 2004 13:40:49 -0000	1.1.4.2
+++ b/js_x.c	15 Apr 2004 10:17:03 -0000	1.1.4.3
@@ -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 @@
    MODULEVENDORSTRING,
    MODINFOSTRING1,
    MODINFOSTRING2,
-   XF86_VERSION_CURRENT,
+   XORG_VERSION_CURRENT,
    1, 0, 0,
    ABI_CLASS_XINPUT,
    ABI_XINPUT_VERSION,

Index: js_x.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/jamstudio/js_x.man,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/js_x.man	5 Mar 2004 13:40:49 -0000	1.1.4.1
+++ b/js_x.man	15 Apr 2004 10:17:03 -0000	1.1.4.2
@@ -21,7 +21,7 @@
 .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 @@
 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 @@
 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 at comcast.net>