[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/input/calcomp calcomp.man, 1.1.4.1, 1.1.4.2 xf86Calcomp.c, 1.1.4.1, 1.1.4.2

[Egbert Eich]

Committed by: eich

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

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


Index: calcomp.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/calcomp/calcomp.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/calcomp.man	5 Mar 2004 13:40:48 -0000	1.1.4.1
+++ b/calcomp.man	15 Apr 2004 10:16:51 -0000	1.1.4.2
@@ -15,7 +15,7 @@
 .fi
 .SH DESCRIPTION
 .B calcomp
-is an XFree86 input driver for Calcomp devices.
+is an __xservername__ input driver for Calcomp devices.
 .PP
 The
 .B calcomp
@@ -25,7 +25,7 @@
 This driver supports the Calcomp binary format used by the Drawing Board II
 and III series.
 .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.
 .PP
@@ -77,6 +77,6 @@
 .TP 4
 .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
 Martin Kroeker <mk at daveg.com>

Index: xf86Calcomp.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/calcomp/xf86Calcomp.c,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/xf86Calcomp.c	5 Mar 2004 13:40:48 -0000	1.1.4.1
+++ b/xf86Calcomp.c	15 Apr 2004 10:16:51 -0000	1.1.4.2
@@ -95,7 +95,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_XINPUT,
 	ABI_XINPUT_VERSION,