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
commita013b089422f1821e3c1f5d7dc8fcb76715fe433 (patch)
treef2dfc0897353192616ee0452596570efb5e13f91
parente6079d630262dc4ccd0230c639bacb92b74874cd (diff)
Merge the new release from HEADXACE-SELINUX
-rw-r--r--man/mutouch.man6
-rw-r--r--src/xf86MuTouch.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/man/mutouch.man b/man/mutouch.man
index 6886a15..0b1fe6c 100644
--- a/man/mutouch.man
+++ b/man/mutouch.man
@@ -18,7 +18,7 @@ mutouch \- Microtouch input driver
.B EndSection
.SH DESCRIPTION
.B mutouch
-is an XFree86 input driver for Microtouch devices...
+is an __xservername__ input driver for Microtouch devices...
.PP
The
.B mutouch
@@ -28,13 +28,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...
Patrick Lecoanet
diff --git a/src/xf86MuTouch.c b/src/xf86MuTouch.c
index 45a1929..bb06f80 100644
--- a/src/xf86MuTouch.c
+++ b/src/xf86MuTouch.c
@@ -1871,7 +1871,7 @@ static XF86ModuleVersionInfo version_rec = {
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,