[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/i740 i740.man, 1.1.10.1, 1.1.10.1.6.1 i740_driver.c, 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/drivers/i740
In directory pdx:/tmp/cvs-serv7662/xc/programs/Xserver/hw/xfree86/drivers/i740

Modified Files:
      Tag: XPRINT
	i740.man i740_driver.c 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: i740.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i740/i740.man,v
retrieving revision 1.1.10.1
retrieving revision 1.1.10.1.6.1
diff -u -d -r1.1.10.1 -r1.1.10.1.6.1
--- a/i740.man	4 Mar 2004 17:47:44 -0000	1.1.10.1
+++ b/i740.man	10 Apr 2004 09:04:47 -0000	1.1.10.1.6.1
@@ -14,17 +14,17 @@
 .fi
 .SH DESCRIPTION
 .B i740
-is an XFree86 driver for Intel i740 video cards.
+is an __xservername__ driver for Intel i740 video cards.
 THIS MAN PAGE NEEDS TO BE FILLED IN.
 .SH SUPPORTED HARDWARE
 The
 .B i740
 driver supports...
 .SH CONFIGURATION DETAILS
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
 details.  This section only covers configuration details specific to this
 driver.
 .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: ...

Index: i740_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i740/i740_driver.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/i740_driver.c	4 Mar 2004 17:47:44 -0000	1.1.4.1.6.1
+++ b/i740_driver.c	10 Apr 2004 09:04:47 -0000	1.1.4.1.6.1.6.1
@@ -286,7 +286,7 @@
   MODULEVENDORSTRING,
   MODINFOSTRING1,
   MODINFOSTRING2,
-  XF86_VERSION_CURRENT,
+  XORG_VERSION_CURRENT,
   I740_MAJOR_VERSION, I740_MINOR_VERSION, I740_PATCHLEVEL,
   ABI_CLASS_VIDEODRV,
   ABI_VIDEODRV_VERSION,