summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:47 +0000
committerEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:47 +0000
commit0c3f12c6c7cedbc90e571e9fd22871881f12183c (patch)
tree1c34c638caa487c7c88c739bbf42925b860d3c4b
parent5363c29f6035428a84a19a2d4cc2bb705286d997 (diff)
Merge the new release from HEADXACE-SELINUX
-rw-r--r--man/microtouch.man6
-rw-r--r--src/microtouch.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/man/microtouch.man b/man/microtouch.man
index dd4be74..61c869e 100644
--- a/man/microtouch.man
+++ b/man/microtouch.man
@@ -15,7 +15,7 @@ microtouch \- MicroTouch input driver
.fi
.SH DESCRIPTION
.B microtouch
-is an XFree86 input driver for MicroTouch devices...
+is an __xservername__ input driver for MicroTouch devices...
.PP
The
.B microtouch
@@ -25,12 +25,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/microtouch.c b/src/microtouch.c
index 29dd853..665bfd1 100644
--- a/src/microtouch.c
+++ b/src/microtouch.c
@@ -99,7 +99,7 @@ static XF86ModuleVersionInfo VersionRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,