[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/tdfx tdfx.man, 1.1.4.2, 1.1.4.3 tdfx_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/tdfx
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/drivers/tdfx

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


Index: tdfx.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.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/tdfx.man	5 Mar 2004 13:40:37 -0000	1.1.4.2
+++ b/tdfx.man	15 Apr 2004 10:16:38 -0000	1.1.4.3
@@ -14,13 +14,13 @@
 .fi
 .SH DESCRIPTION
 .B tdfx 
-is an XFree86 driver for 3Dfx video cards.
+is an __xservername__ driver for 3Dfx video cards.
 .SH SUPPORTED HARDWARE
 The
 .B tdfx
 driver supports Voodoo Banshee, Voodoo3, Voodoo4 and Voodoo5 cards.
 .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.
 .PP
@@ -56,6 +56,6 @@
 .SH FILES
 tdfx_drv.o
 .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: tdfx_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_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/tdfx_driver.c	5 Mar 2004 13:40:37 -0000	1.1.4.2
+++ b/tdfx_driver.c	15 Apr 2004 10:16:38 -0000	1.1.4.3
@@ -279,7 +279,7 @@
   MODULEVENDORSTRING,
   MODINFOSTRING1,
   MODINFOSTRING2,
-  XF86_VERSION_CURRENT,
+  XORG_VERSION_CURRENT,
   TDFX_MAJOR_VERSION, TDFX_MINOR_VERSION, TDFX_PATCHLEVEL,
   ABI_CLASS_VIDEODRV,
   ABI_VIDEODRV_VERSION,