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

[Egbert Eich]

Committed by: eich

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

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


Index: dmc.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/dmc/dmc.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/dmc.man	5 Mar 2004 13:40:48 -0000	1.1.4.1
+++ b/dmc.man	15 Apr 2004 10:16:51 -0000	1.1.4.2
@@ -1,4 +1,3 @@
-.\" $XFree86$
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH DMC __drivermansuffix__ __vendorversion__
@@ -18,7 +17,7 @@
 .B EndSection
 .SH DESCRIPTION
 .B dmc 
-is an XFree86 input driver for DMC FIT10-controller...
+is an __xservername__ input driver for DMC FIT10-controller...
 .PP
 The
 .B dmc
@@ -28,12 +27,12 @@
 .SH SUPPORTED HARDWARE
 What is supported...
 .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
 Config details...
 .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
 Authors include...

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