[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/s3virge s3v_driver.c, 1.1.4.1, 1.1.4.2 s3virge.man, 1.1.4.1, 1.1.4.2

[Egbert Eich]

Committed by: eich

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

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


Index: s3v_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.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/s3v_driver.c	26 Nov 2003 22:48:59 -0000	1.1.4.1
+++ b/s3v_driver.c	15 Apr 2004 10:16:33 -0000	1.1.4.2
@@ -364,7 +364,7 @@
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     S3VIRGE_VERSION_MAJOR, S3VIRGE_VERSION_MINOR, S3VIRGE_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,		       /* This is a video driver */
     ABI_VIDEODRV_VERSION,

Index: s3virge.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3virge.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/s3virge.man	5 Mar 2004 13:40:30 -0000	1.1.4.1
+++ b/s3virge.man	15 Apr 2004 10:16:33 -0000	1.1.4.2
@@ -20,7 +20,7 @@
 .B EndSection
 .SH DESCRIPTION
 .B s3virge 
-is an XFree86 driver for S3 based video cards.  The driver is fully
+is an __xservername__ driver for S3 based video cards.  The driver is fully
 accelerated, and provides support for the following framebuffer depths:
 8, 15, 16, and 24.  All
 visual types are supported for depth 8, and TrueColor
@@ -61,7 +61,7 @@
 .B Trio 3D/2X
 86C362, 86C368
 .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.  All options names are case and white space insensitive when
 parsed by the server, for example,  "virge vx" and "VIRGEvx" are equivalent.
@@ -221,7 +221,7 @@
 Enable or disable a cr3a fix added for ViRGE MX.  Default: on.
 
 .SH SEE ALSO
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
 
 .SH KNOWN BUGS
 The VideoRam generic driver parameter is presently ignored by the
@@ -229,11 +229,10 @@
 cards, because they may autodetect as 4M.
 
 .SH SUPPORT
-For assistance with this driver, or XFree86 in general, check the XFree86 web
-site at http://www.xfree86.org.  A FAQ is available on the web site at
-http://www.xfree86.org/FAQ/.  If you find a problem with XFree86 or have a
+For assistance with this driver, or __xservername__ in general, check the web
+site at http://www.x.org.  If you find a problem with __xservername__ or have a
 question not answered in the FAQ please use our bug report form available on
-the web site or send mail to XFree86 at XFree86.org.  When reporting problems
+the web site.  When reporting problems
 with the driver send as much detail as possible, including chipset type, a 
 server output log, and operating system specifics.