From baa4e1521bed673de1ae6a7219525de50599e22f Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 15 Apr 2004 10:16:51 +0000 Subject: Merged changes from RELEASE-1 branch --- man/dmc.man | 7 +++---- src/xf86DMC.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/man/dmc.man b/man/dmc.man index ac7a069..22160b3 100644 --- a/man/dmc.man +++ b/man/dmc.man @@ -1,4 +1,3 @@ -.\" $XFree86$ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH DMC __drivermansuffix__ __vendorversion__ @@ -18,7 +17,7 @@ dmc \- DMC input driver .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 @@ THIS MAN PAGE NEEDS TO BE FILLED IN. .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... diff --git a/src/xf86DMC.c b/src/xf86DMC.c index f9015ba..690c6d7 100644 --- a/src/xf86DMC.c +++ b/src/xf86DMC.c @@ -70,7 +70,7 @@ static XF86ModuleVersionInfo VersionRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, 1, 0, 0, ABI_CLASS_XINPUT, ABI_XINPUT_VERSION, -- cgit v1.2.3