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

[Egbert Eich]

Committed by: eich

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

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


Index: mga.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/mga/mga.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/mga.man	5 Mar 2004 13:40:25 -0000	1.1.4.2
+++ b/mga.man	15 Apr 2004 10:16:30 -0000	1.1.4.3
@@ -14,7 +14,7 @@
 .fi
 .SH DESCRIPTION
 .B mga 
-is an XFree86 driver for Matrox video cards.  The driver is fully
+is an __xservername__ driver for Matrox video cards.  The driver is fully
 accelerated, and provides support for the following framebuffer depths:
 8, 15, 16, 24, and an 8+24 overlay mode.  All
 visual types are supported for depth 8, and both TrueColor and DirectColor
@@ -55,7 +55,7 @@
 .TP 12
 .B G550
 .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
@@ -150,7 +150,7 @@
 bits per pixel.
 Default: off.
 .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: Radoslaw Kapitan, Mark Vojkovich, and also David Dawes, Guy
 Desbief, Dirk Hohndel, Doug Merritt, Andrew E. Mileski, Andrew van der Stock,

Index: mga_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_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/mga_driver.c	5 Mar 2004 13:40:25 -0000	1.1.4.2
+++ b/mga_driver.c	15 Apr 2004 10:16:30 -0000	1.1.4.3
@@ -413,7 +413,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	MGA_MAJOR_VERSION, MGA_MINOR_VERSION, MGA_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,			/* This is a video driver */
 	ABI_VIDEODRV_VERSION,

Index: mga_halmod.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_halmod.c,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/mga_halmod.c	5 Mar 2004 13:40:25 -0000	1.1.4.1
+++ b/mga_halmod.c	15 Apr 2004 10:16:30 -0000	1.1.4.2
@@ -15,7 +15,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	HAL_MAJOR_VERSION, HAL_MINOR_VERSION, HAL_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,			/* This is a video driver */
 	ABI_VIDEODRV_VERSION,