summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2004-04-10 09:05:12 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2004-04-10 09:05:12 +0000
commit194b53637d93bbcd0489cf79439fd308112ef1a3 (patch)
tree19601a8757ee4b30d6fb530766efa2298100dc46
parentd71eaf8caa974ec91d48e0fee14b32b9f637a77a (diff)
Resync to 2004-04-10 XORG-RELEASE-1 branchXPRINT_BEGINXPRINT
-rw-r--r--man/citron.man6
-rw-r--r--src/citron.c2
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 */