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
commit72004e67929c6704fabe774b2cd5dce3db6d0384 (patch)
treef5b2cc489ccba5e919807502a596dbe4902a499d
parentcbd28eefedd276aa5535eec1093116020df66e77 (diff)
Merge the new release from HEADXACE-SELINUX
-rw-r--r--man/acecad.man7
-rw-r--r--src/acecad.c2
2 files changed, 4 insertions, 5 deletions
diff --git a/man/acecad.man b/man/acecad.man
index 20f60c5..a9cb68c 100644
--- a/man/acecad.man
+++ b/man/acecad.man
@@ -1,4 +1,3 @@
-.\" $XFree86$
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH ACECAD __drivermansuffix__ __vendorversion__
@@ -18,7 +17,7 @@ acecad \- Acecad Flair input driver
.B EndSection
.SH DESCRIPTION
.B acecad
-is an XFree86 input driver for Acecad Flair devices...
+is an __xservername__ input driver for Acecad Flair devices...
.PP
The
.B acecad
@@ -28,13 +27,13 @@ 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...
Edouard TISSERANT
diff --git a/src/acecad.c b/src/acecad.c
index cd32ac9..49e09e8 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -90,7 +90,7 @@ static XF86ModuleVersionInfo VersionRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,