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

[Egbert Eich]

Committed by: eich

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

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


Index: generic.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/vga/generic.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/generic.c	5 Mar 2004 13:40:39 -0000	1.1.4.2
+++ b/generic.c	15 Apr 2004 10:16:40 -0000	1.1.4.3
@@ -178,7 +178,7 @@
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     VGA_VERSION_MAJOR, VGA_VERSION_MINOR, VGA_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,
     ABI_VIDEODRV_VERSION,

Index: vga.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/vga/vga.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/vga.man	5 Mar 2004 13:40:39 -0000	1.1.4.1
+++ b/vga.man	15 Apr 2004 10:16:41 -0000	1.1.4.2
@@ -14,7 +14,7 @@
 .fi
 .SH DESCRIPTION
 .B vga 
-is an XFree86 driver for generic VGA video cards.  It can drive most
+is an __xservername__ driver for generic VGA video cards.  It can drive most
 VGA-compatible video cards, but only makes use of the basic standard
 VGA core that is common to these cards.  The driver supports depths 1, 4
 and 8.  All relevant visual types are supported at each depth.
@@ -28,7 +28,7 @@
 driver supports most VGA-compatible video cards.  There are some known
 exceptions, and those should be listed here.
 .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
@@ -60,6 +60,6 @@
 when using those depths in a multi-head configuration where one or more
 of the other screens is operating at a different depth.
 .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: Marc La France, David Dawes, and Dirk Hohndel.