[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/i740 i740.man, 1.1.4.1, 1.1.4.2 i740_driver.c, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

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

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


Index: i740.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i740/i740.man,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/i740.man	5 Mar 2004 13:40:23 -0000	1.1.4.1
+++ b/i740.man	15 Apr 2004 10:16:22 -0000	1.1.4.2
@@ -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.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/i740_driver.c	5 Mar 2004 13:40:23 -0000	1.1.4.2
+++ b/i740_driver.c	15 Apr 2004 10:16:22 -0000	1.1.4.3
@@ -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,