Merged changes from RELEASE-1 branchbefore_20040421_xprint_branch_landingXORG-CURRENT-CLOSEDXORG-CURRENT

2 files changed, 4 insertions, 4 deletions

diff --git a/man/void.man b/man/void.man
index 04c2ae0..39b7e9f 100644
--- a/man/void.man
+++ b/man/void.man
@@ -14,16 +14,16 @@ void \- null input driver
 .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...
diff --git a/src/void.c b/src/void.c
index 21c91e0..02a0f71 100644
--- a/src/void.c
+++ b/src/void.c
@@ -264,7 +264,7 @@ static XF86ModuleVersionInfo xf86VoidVersionRec =
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     1, 0, 0,
     ABI_CLASS_XINPUT,
     ABI_XINPUT_VERSION,