diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:05 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:54:05 +0000 |
| commit | 2e05fc0dce5ddbbabaac4795152d2296a1167941 (patch) | |
| tree | fa9a15aa06c9211cd62706ac761cb15d235622c0 | |
| parent | e6ad5c52b96444c15f499a6c119d55ba0b779efc (diff) | |
Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch
| -rw-r--r-- | man/penmount.man | 7 | ||||
| -rw-r--r-- | src/xf86PM.c | 4 | ||||
| -rw-r--r-- | src/xf86PM.h | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/man/penmount.man b/man/penmount.man index a51ac80..30676ad 100644 --- a/man/penmount.man +++ b/man/penmount.man @@ -1,4 +1,3 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/penmount/penmount.man,v 1.3 2001/08/17 13:27:57 dawes Exp $ .\" 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 2e89b90..bc86dfc 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -28,7 +28,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/penmount/xf86PM.c,v 1.3 2001/11/26 16:25:53 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/penmount/xf86PM.c,v 1.2 2000/08/11 19:10:46 dawes Exp $ */ #define _PENMOUNT_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, diff --git a/src/xf86PM.h b/src/xf86PM.h index 93757d9..844ecf9 100644 --- a/src/xf86PM.h +++ b/src/xf86PM.h @@ -27,7 +27,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/penmount/xf86PM.h,v 1.1 2000/08/01 18:59:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/penmount/xf86PM.h,v 1.2 1999/08/22 05:57:37 dawes Exp $ */ #ifndef _PENMOUNT_H_ #define _PENMOUNT_H_ |