summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:46 +0000
committerEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:43:46 +0000
commit22a63fa7a0046af61bb3c15854bac8846dc700af (patch)
tree6e584c49165ea73d5cced8831556c66163bd2405
parenta483ac379d70b2e2e1c66a1517fe4b59978431d4 (diff)
Merge the new release from HEADXACE-SELINUX
-rw-r--r--man/dynapro.man6
-rw-r--r--src/xf86Dyna.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/man/dynapro.man b/man/dynapro.man
index 438f5b0..e28fa40 100644
--- a/man/dynapro.man
+++ b/man/dynapro.man
@@ -15,7 +15,7 @@ dynapro \- Dynapro input driver
.fi
.SH DESCRIPTION
.B dynapro
-is an XFree86 input driver for Dynapro devices...
+is an __xservername__ input driver for Dynapro devices...
.PP
The
.B dynapro
@@ -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/xf86Dyna.c b/src/xf86Dyna.c
index d8baf4b..23821e5 100644
--- a/src/xf86Dyna.c
+++ b/src/xf86Dyna.c
@@ -62,7 +62,7 @@ static XF86ModuleVersionInfo VersionRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,