Import of XFree86 4.0.1g

4 files changed, 13 insertions, 13 deletions

diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml
index 74985a30c..644004d37 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml
@@ -9,7 +9,7 @@
 <date>11 August 2000
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml,v 1.18 2000/08/11 21:12:49 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Status.sgml,v 1.19 2000/11/28 20:59:17 dawes Exp $
 </ident>
 
 <abstract>
@@ -543,8 +543,8 @@ dependencies/limitations, other architectures known to work on
 	(accelerated) for those ViRGE chips, as well as the Trio3D and
 	Trio3D/2X is provided by the XF86_SVGA server with the s3v
 	driver.  Support (accelerated) for the Savage3D, Savage3D/MV,
-	Savage4, Savage2000, Savage/MX-MV, Savage/MX, Savage/IX-MV and
-	Savage/IX is provided by the XF86_SVGA server with the s3_savage
+	Savage4, Savage2000, is provided by the XF86_SVGA server with
+ the s3_savage
 	driver (CHECK: is this support Linux-only?).
 
 <tag>&relvers;:</tag>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent b/xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent
index ffe0e624a..878e483ec 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent
@@ -1,17 +1,17 @@
-<!-- $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent,v 1.13 2000/06/30 16:54:28 dawes Exp $ -->
+<!-- $XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/defs.ent,v 1.14 2000/11/28 20:59:17 dawes Exp $ -->
 
 <!-- shared entity definitions for the XFree86 documentation -->
 
 <!-- XFree86 version string -->
-<!ENTITY relvers CDATA "4.0.1">
-<!ENTITY prevrelvers CDATA "4.0">
-<!ENTITY srcvers CDATA "401">
-<!ENTITY prevsrcvers CDATA "400">
+<!ENTITY relvers CDATA "4.0.2">
+<!ENTITY prevrelvers CDATA "4.0.1">
+<!ENTITY srcvers CDATA "402">
+<!ENTITY prevsrcvers CDATA "401">
 <!-- Version of the most recent 3.3.x release -->
 <!ENTITY legacyvers CDATA "3.3.6">
 
 <!-- SuperProbe version strings -->
-<!ENTITY spvers CDATA "2.22">
+<!ENTITY spvers CDATA "2.23">
 <!ENTITY legacyspvers CDATA "2.21">
 
 <!-- These should be set according to which snapshot/release this is -->
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre b/xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre
index fd174e9f0..fc3fb96e4 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre
@@ -8,10 +8,10 @@
 <!-- Title information -->
 <title>Documentation for XFree86&trade; version &relvers;
 <author>The XFree86 Project, Inc
-<date>30 June 2000
+<date>December 2000
 
 <!--
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre,v 1.8 2000/06/30 22:09:37 dawes Exp $ 
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/index.pre,v 1.9 2000/11/28 20:59:17 dawes Exp $ 
 -->
 
 <p>
diff --git a/xc/programs/Xserver/hw/xfree86/doc/sgml/s3virge.sgml b/xc/programs/Xserver/hw/xfree86/doc/sgml/s3virge.sgml
index 1687a31be..be41aa45a 100644
--- a/xc/programs/Xserver/hw/xfree86/doc/sgml/s3virge.sgml
+++ b/xc/programs/Xserver/hw/xfree86/doc/sgml/s3virge.sgml
@@ -8,14 +8,14 @@
 <date>10 Jul 1999
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/s3virge.sgml,v 1.2 1999/07/10 12:17:25 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/s3virge.sgml,v 1.3 2000/11/28 20:59:17 dawes Exp $
 </ident>
 
 <toc>
 
 <sect> Supported hardware
 <p>
-The s3virge driver in XFree86 &relvers; supports the S3 ViRGE, ViRGE DX, GX, MX, MX+, and VX chipsets.  A majority of testing is done on ViRGE DX chips, making them the most stable to date.  This release has improved support for 24 bit color depths and resolves all the known issues with Netscape and other applications supporting 24 bit color.
+The s3virge driver in XFree86 &relvers; supports the S3 ViRGE, ViRGE DX, GX, MX, MX+, and VX chipsets.  A majority of testing is done on ViRGE DX chips, making them the most stable to date.  This release has improved support for ViRGE GX2 stability, XVideo support for ViRGE DX (tested) and ViRGE (untested) in depth 16 and 24, conversion to fb framebuffer rendering, and support for the new Render extension (untested).
 
 This driver is moderately stable, however please use caution with any new install.  Please report any problems to
 <email>XFree86@Xfree86.org</email>