[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/trident trident.man, 1.1.4.2, 1.1.4.3 trident_driver.c, 1.1.4.3, 1.1.4.4

[Egbert Eich]

Committed by: eich

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

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


Index: trident.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/trident/trident.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/trident.man	5 Mar 2004 13:40:38 -0000	1.1.4.2
+++ b/trident.man	15 Apr 2004 10:16:39 -0000	1.1.4.3
@@ -14,7 +14,7 @@
 .fi
 .SH DESCRIPTION
 .B trident
-is an XFree86 driver for Trident video cards.  The driver is 
+is an __xservername__ driver for Trident video cards.  The driver is 
 accelerated, and provides support for the following framebuffer depths:
 1, 4, 8, 15, 16, and 24. Multi-head configurations are supported.
 The XvImage extension is supported on TGUI96xx and greater cards.
@@ -41,7 +41,7 @@
 8900C, 8900D, 9000, 9200CXr, Cyber9320, 9400CXi, 9440AGi
 These cards have been ported but need further testing and may not work.
 .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
@@ -128,6 +128,6 @@
 Default: gamma and brightness control is turned off. 
 Note: This is not supported on all chipsets.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
 .SH AUTHOR
 Author: Alan Hourihane

Index: trident_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/trident_driver.c	5 Mar 2004 13:40:38 -0000	1.1.4.3
+++ b/trident_driver.c	15 Apr 2004 10:16:39 -0000	1.1.4.4
@@ -565,7 +565,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	TRIDENT_MAJOR_VERSION, TRIDENT_MINOR_VERSION, TRIDENT_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,			/* This is a video driver */
 	ABI_VIDEODRV_VERSION,