[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/input/mouse mouse.c, 1.1.4.4, 1.1.4.5 mouse.man, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

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

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


Index: mouse.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/mouse.c	30 Mar 2004 14:23:14 -0000	1.1.4.4
+++ b/mouse.c	15 Apr 2004 10:17:05 -0000	1.1.4.5
@@ -3568,7 +3568,7 @@
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     1, 0, 0,
     ABI_CLASS_XINPUT,
     ABI_XINPUT_VERSION,

Index: mouse.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/mouse/mouse.man,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/mouse.man	5 Mar 2004 13:40:50 -0000	1.1.4.2
+++ b/mouse.man	15 Apr 2004 10:17:05 -0000	1.1.4.3
@@ -16,7 +16,7 @@
 .fi
 .SH DESCRIPTION
 .B mouse 
-is an XFree86 input driver for mice.  The driver supports most available
+is an __xservername__ input driver for mice.  The driver supports most available
 mouse types and interfaces.  USB mice are only supported on some OSs,
 and the level of support for PS/2 mice depends on the OS.
 .PP
@@ -34,7 +34,7 @@
 in __projectroot__/lib/X11/doc/, or online at
 http://www.xfree86.org/current/mouse.html.
 .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
@@ -224,5 +224,5 @@
 for serial port communication, but they are not documented here because
 the driver sets them correctly for each mouse protocol type.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__),
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__),
 README.mouse.