diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-15 10:17:06 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-15 10:17:06 +0000 |
| commit | ab11d99611187848790618ed72e911205a41b70d (patch) | |
| tree | fa9a15aa06c9211cd62706ac761cb15d235622c0 | |
| parent | cb9c424420f3eb53f4b57f72df3ef9e62bb22c69 (diff) | |
Merged changes from RELEASE-1 branchbefore_20040421_xprint_branch_landingXORG-CURRENT-CLOSEDXORG-CURRENT
| -rw-r--r-- | man/penmount.man | 7 | ||||
| -rw-r--r-- | src/xf86PM.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/man/penmount.man b/man/penmount.man index b247648..30676ad 100644 --- a/man/penmount.man +++ b/man/penmount.man @@ -1,4 +1,3 @@ -.\" $XFree86$ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH PENMOUNT __drivermansuffix__ __vendorversion__ @@ -18,7 +17,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 +27,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, |