From 92f6cc432baae248273c2a43bd9a554dc576e0ef 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/calcomp.man | 6 +++--- src/xf86Calcomp.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/man/calcomp.man b/man/calcomp.man index 322b1cf..d059411 100644 --- a/man/calcomp.man +++ b/man/calcomp.man @@ -15,7 +15,7 @@ calcomp \- Calcomp input driver .fi .SH DESCRIPTION .B calcomp -is an XFree86 input driver for Calcomp devices. +is an __xservername__ input driver for Calcomp devices. .PP The .B calcomp @@ -25,7 +25,7 @@ X server's core pointer. This driver supports the Calcomp binary format used by the Drawing Board II and III series. .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 @@ -77,6 +77,6 @@ sets the level of debugging info reported. .TP 4 .RE .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 Martin Kroeker diff --git a/src/xf86Calcomp.c b/src/xf86Calcomp.c index f71de09..5f24365 100644 --- a/src/xf86Calcomp.c +++ b/src/xf86Calcomp.c @@ -95,7 +95,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