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

[Egbert Eich]

Committed by: eich

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

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


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

Index: void.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/void/void.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/void.man	5 Mar 2004 13:40:51 -0000	1.1.4.1
+++ b/void.man	15 Apr 2004 10:17:08 -0000	1.1.4.2
@@ -14,16 +14,16 @@
 .fi
 .SH DESCRIPTION
 .B void 
-is an dummy/null XFree86 input driver.  It doesn't connect to any
+is an dummy/null __xservername__ input driver.  It doesn't connect to any
 physical device, and it never delivers any events.  It functions as
 both a pointer and keyboard device, and may be used as X server's core
 pointer and/or core keyboard.  It's purpose is to allow the X server
 to operate without a core pointer and/or core keyboard.
 .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
 driver doesn't have any configuration options in addition to those.
 .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...