diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-15 10:16:51 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-15 10:16:51 +0000 |
| commit | 504c518bfb80f6073fe1d1d893c4390d1aba7968 (patch) | |
| tree | 19601a8757ee4b30d6fb530766efa2298100dc46 | |
| parent | c683ea179775618bfc036f6930ca7bc719840f0c (diff) | |
Merged changes from RELEASE-1 branchbefore_20040421_xprint_branch_landingXORG-CURRENT-CLOSEDXORG-CURRENT
| -rw-r--r-- | man/citron.man | 6 | ||||
| -rw-r--r-- | src/citron.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/man/citron.man b/man/citron.man index 5d4f276..a7d7393 100644 --- a/man/citron.man +++ b/man/citron.man @@ -20,7 +20,7 @@ citron \- Citron Infrared Touch Driver (CiTouch) .B EndSection .SH DESCRIPTION .B citron -is a XFree86 input driver for +is a __xservername__ input driver for .I Citron Infrared Touch devices. .PP @@ -47,7 +47,7 @@ touches. 15.1 inch Infrared Touch .SH CONFIGURATION DETAILS -Please refer to XF86Config(5x) for general configuration +Please refer to __xconfigfile__(5x) 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. For better understanding please read also the @@ -703,6 +703,6 @@ every 20ms. This option is only available for "ZPress" and .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 2000-2003 - written by Citron GmbH (support@citron.de) diff --git a/src/citron.c b/src/citron.c index 259e8e6..29c7cd6 100644 --- a/src/citron.c +++ b/src/citron.c @@ -279,7 +279,7 @@ static XF86ModuleVersionInfo VersionRec = MODULEVENDORSTRING, /* vendor specific string */ MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, /* Current XFree version */ + XORG_VERSION_CURRENT, /* Current XFree version */ CITOUCH_VERSION_MAJOR, /* Module-specific major version */ CITOUCH_VERSION_MINOR, /* Module-specific minor version */ CITOUCH_VERSION_PATCH, /* Module-specific patch level */ |