summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:45 +0000
committerEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:45 +0000
commit596b88ad3f020d082e4c5154c0931ac669ebd1dd (patch)
tree847a93154b0a665fe32984e98548b04df53c457f
parent052992744eb0958466878cec9041581ce4bcfb2f (diff)
Merge the new release from HEADXACE-SELINUX
-rw-r--r--man/calcomp.man6
-rw-r--r--src/xf86Calcomp.c2
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 <mk@daveg.com>
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,