[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/input/citron citron.c, 1.1.4.2, 1.1.4.3 citron.man, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/citron
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/input/citron

Modified Files:
      Tag: XORG-CURRENT
	citron.c citron.man 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: citron.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/citron/citron.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/citron.c	5 Mar 2004 13:40:48 -0000	1.1.4.2
+++ b/citron.c	15 Apr 2004 10:16:51 -0000	1.1.4.3
@@ -279,7 +279,7 @@
 	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 */

Index: citron.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/citron/citron.man,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/citron.man	5 Mar 2004 13:40:48 -0000	1.1.4.2
+++ b/citron.man	15 Apr 2004 10:16:51 -0000	1.1.4.3
@@ -20,7 +20,7 @@
 .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 @@
  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 @@
 
 
 .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 at citron.de)