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

[Egbert Eich]

Committed by: eich

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

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


Index: dynapro.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/dynapro/dynapro.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/dynapro.man	5 Mar 2004 13:40:48 -0000	1.1.4.1
+++ b/dynapro.man	15 Apr 2004 10:16:52 -0000	1.1.4.2
@@ -15,7 +15,7 @@
 .fi
 .SH DESCRIPTION
 .B dynapro 
-is an XFree86 input driver for Dynapro devices...
+is an __xservername__ input driver for Dynapro devices...
 .PP
 The
 .B dynapro
@@ -25,12 +25,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: xf86Dyna.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/dynapro/xf86Dyna.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/xf86Dyna.c	5 Mar 2004 13:40:48 -0000	1.1.4.1
+++ b/xf86Dyna.c	15 Apr 2004 10:16:52 -0000	1.1.4.2
@@ -62,7 +62,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_XINPUT,
 	ABI_XINPUT_VERSION,