summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2004-04-10 09:05:21 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2004-04-10 09:05:21 +0000
commit0bf53193ce3e44660d42a45afd9238563d9c3e4a (patch)
treeae0e95b883807f482aea640c1e80f5196a8b679b
parent21386f2f21c15dfbdd049dc20ef19d56efecf92d (diff)
Resync to 2004-04-10 XORG-RELEASE-1 branchXPRINT_BEGINXPRINT
-rw-r--r--man/penmount.man8
-rw-r--r--src/xf86PM.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/man/penmount.man b/man/penmount.man
index b247648..2eaaee7 100644
--- a/man/penmount.man
+++ b/man/penmount.man
@@ -1,4 +1,4 @@
-.\" $XFree86$
+.\" $Id$
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH PENMOUNT __drivermansuffix__ __vendorversion__
@@ -18,7 +18,7 @@ penmount \- PenMount input driver
.B EndSection
.SH DESCRIPTION
.B penmount
-is an XFree86 input driver for PenMount devices...
+is an __xservername__ input driver for PenMount devices...
.PP
The
.B penmount
@@ -28,12 +28,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/xf86PM.c b/src/xf86PM.c
index 2dcea2d..bc86dfc 100644
--- a/src/xf86PM.c
+++ b/src/xf86PM.c
@@ -63,7 +63,7 @@ static XF86ModuleVersionInfo VersionRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
1, 0, 0,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,