Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE

8 files changed, 18 insertions, 22 deletions

diff --git a/CALLMAP b/CALLMAP
index b6d1b3f..7ca58e0 100644
--- a/CALLMAP
+++ b/CALLMAP
@@ -20,4 +20,4 @@ ChipScreenInit
 
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/CALLMAP,v 1.2 1998/11/22 10:37:28 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/CALLMAP,v 1.1 1998/11/01 12:35:58 dawes Exp $
diff --git a/README.sgml b/README.sgml
index a85b932..e47b8c4 100644
--- a/README.sgml
+++ b/README.sgml
@@ -1,4 +1,4 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
@@ -8,18 +8,15 @@
 <date>19 Dec 2001
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/s3virge.sgml,v 1.6 2003/02/13 03:21:33 dawes Exp $
 </ident>
 
 <toc>
 
 <sect> Supported hardware
 <p>
-The s3virge driver in XFree86 &relvers; supports the S3 ViRGE, ViRGE DX, GX, GX2, MX, MX+, and VX chipsets.  It also supports Trio3D and Trio3D/2x chips.  A majority of testing is done on ViRGE DX chips, making them the most stable to date.  This release has added support for doublescan modes on DX.
+The s3virge driver in X11R&relvers; supports the S3 ViRGE, ViRGE DX, GX, GX2, MX, MX+, and VX chipsets.  It also supports Trio3D and Trio3D/2x chips.  A majority of testing is done on ViRGE DX chips, making them the most stable to date.  This release has added support for doublescan modes on DX.
 
-This driver is moderately stable, however please use caution with any new install.  Please report any problems to
-<email>XFree86@XFree86.org</email>
-using the appropriate bug report sheet. 
+This driver is moderately stable, however please use caution with any new install.  Please report any problems to bugzilla.freedesktop.org, using the xorg component.
 
 <sect>Features:
 <p>
@@ -44,11 +41,11 @@ these in your "Device" section.
 <p>
 
 The driver has several supported options which are documented in the s3virge man
-page.  Please refer to it for additional details about XF86Config options.
+page.  Please refer to it for additional details about configuration options.
 
 <sect>Support:
 <p>
-For support with XFree86 video drivers please refer to our web site at <url name="XFree86" url="http://www.XFree86.org">.  For problems not addressed in the web page please contact our support email address  <email>XFree86@XFree86.org</email>
+For support with X11R&relvers video drivers please refer to our web site at <url name="wiki.x.org" url="http://wiki.x.org">. 
 
 <sect>Authors
 <p>
diff --git a/TODO_NOTES b/TODO_NOTES
index de5920b..7d6a878 100644
--- a/TODO_NOTES
+++ b/TODO_NOTES
@@ -323,4 +323,4 @@ the new config. management stuff may help here.
 
 
 
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES,v 1.23 2003/02/13 03:21:33 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES,v 1.22 2003/02/04 02:20:49 dawes Exp $
diff --git a/man/s3virge.man b/man/s3virge.man
index b0120ec..3232130 100644
--- a/man/s3virge.man
+++ b/man/s3virge.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3virge.man,v 1.4 2003/02/13 03:21:33 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3virge.man,v 1.3 2001/11/21 22:43:00 dawes Exp $
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH s3virge __drivermansuffix__ __vendorversion__
@@ -20,7 +20,7 @@ s3virge \- S3 ViRGE video driver
 .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 @@ driver supports PCI and AGP video cards based on the following S3 chips:
 .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 @@ development debug option.  Default: off.
 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 @@ s3virge driver.  On PPC this is reported to cause problems for 2M
 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@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.
 
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 6eddce0..9e5f603 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -364,7 +364,7 @@ static XF86ModuleVersionInfo S3VVersRec =
     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,
diff --git a/src/s3v_rop.h b/src/s3v_rop.h
index 11e0bd3..e4b393a 100644
--- a/src/s3v_rop.h
+++ b/src/s3v_rop.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_rop.h,v 1.3 1999/03/14 03:22:04 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_rop.h,v 1.2 1998/11/28 10:43:16 dawes Exp $ */
 
 /*
 Copyright (C) 1994-1998 The XFree86 Project, Inc.  All Rights Reserved.
diff --git a/src/s3v_shadow.c b/src/s3v_shadow.c
index 5522aaf..7499d84 100644
--- a/src/s3v_shadow.c
+++ b/src/s3v_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c,v 1.3 2000/03/31 20:13:33 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c,v 1.2 2000/03/06 22:59:30 dawes Exp $ */
 
 /*
 Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
diff --git a/src/s3v_xv.c b/src/s3v_xv.c
index 5cf2bb3..e13c792 100644
--- a/src/s3v_xv.c
+++ b/src/s3v_xv.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_xv.c,v 1.11 2003/11/10 18:22:25 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_xv.c,v 1.10tsi Exp $ */
 /*
 Copyright (C) 2000 The XFree86 Project, Inc.  All Rights Reserved.