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

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/citron
In directory pdx:/tmp/cvs-serv7662/xc/programs/Xserver/hw/xfree86/input/citron

Modified Files:
      Tag: XPRINT
	citron.c citron.man 
Log Message:
Resync to 2004-04-10 XORG-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.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/citron.c	4 Mar 2004 17:48:04 -0000	1.1.4.1.6.1
+++ b/citron.c	10 Apr 2004 09:05:12 -0000	1.1.4.1.6.1.6.1
@@ -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.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/citron.man	4 Mar 2004 17:48:04 -0000	1.1.4.1.6.1
+++ b/citron.man	10 Apr 2004 09:05:12 -0000	1.1.4.1.6.1.6.1
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2000-2003 Peter Kunzmann <support at citron.de>
-.\" $Id$
+.\" $Id: citron.man,v 1.1.4.1.6.1 2004/03/04 17:48:04 eich Exp $
 .\"
 .\" $XFree86: xc/programs/Xserver/hw/xfree86/input/citron/citron.man,v 1.2 2001/01/27 18:20:57 dawes Exp $
 .\"
@@ -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)