Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch

8 files changed, 15 insertions, 16 deletions

diff --git a/README.sgml b/README.sgml
index a0861c9..4e937ca 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;
 ]>
 
@@ -7,7 +7,6 @@
 <author>The XFree86 Project Inc.
 <date>7 March 2000
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cyrix.sgml,v 1.3 2000/03/08 05:38:43 dawes Exp $
 </ident>
 <toc>
 
@@ -28,7 +27,7 @@ CPUs with integrated graphics:
 <item>Rather sparse (color depth hardcoded to 8)
 </itemize>
 
-<sect>XF86Config Option <p>
+<sect>xorg.conf Option <p>
 <descrip>
 <tag>Option "sw_cursor"</tag>
 disable the hardware cursor. (Code not verified yet!)
@@ -47,7 +46,7 @@ but NEWBIES should use the 3.3.3.1 release instead!
 just after probing for the ``scratchpad size''.  If this is the case,
 email to <email>hecker@cat.dfrc.nasa.gov</email> with the output of 
 <verb>
-XFree86 -probeonly -verbose
+Xorg -probeonly -verbose
 </verb>
 and this will be fixed.
 </itemize>
diff --git a/man/cyrix.man b/man/cyrix.man
index f8fb670..a4d0720 100644
--- a/man/cyrix.man
+++ b/man/cyrix.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man,v 1.3 2002/11/06 11:38:59 alanh Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man,v 1.1 2001/01/24 00:06:17 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH CYRIX __drivermansuffix__ __vendorversion__
@@ -14,7 +14,7 @@ cyrix \- Cyrix video driver
 .fi
 .SH DESCRIPTION
 .B cyrix 
-is an XFree86 driver for the Cyrix MediaGX (now Natsemi Geode) series of
+is an __xservername__ driver for the Cyrix MediaGX (now Natsemi Geode) series of
 processors when using the built in video.
 .SH SUPPORTED HARDWARE
 The
@@ -28,7 +28,7 @@ The MediaGX run length compresses its shared framebuffer, for the best
 performance on a MediaGX machine pick backgrounds that compress well
 horizonally.
 .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
@@ -64,12 +64,12 @@ considerable time.
 .PP
 The 5530A video overlay facility is not currently supported.
 .PP
-XFree86 uses the MediaGX 'SoftVGA' interface. On a small number of boards
+__xservername__ uses the MediaGX 'SoftVGA' interface. On a small number of boards
 this is buggy and may result in strange illegal instruction traps.
 .PP
 Hardware cursors are not currently supported.
 .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: Richard Hecker, Annius Groenink, Dirk Hohndel, The GGI
 Project, Alan Cox.
diff --git a/src/cyrix.h b/src/cyrix.h
index c75c222..a54ea0e 100644
--- a/src/cyrix.h
+++ b/src/cyrix.h
@@ -37,7 +37,7 @@
  *          Dirk H. Hohndel (hohndel@suse.de),
  *          Portions: the GGI project & confidential CYRIX databooks.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.4 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.2 2000/04/19 16:57:43 eich Exp $ */
 
 #ifndef _CYRIX_H_
 #define _CYRIX_H_
diff --git a/src/cyrix_accel.c b/src/cyrix_accel.c
index 652c1d8..4b6ef8e 100644
--- a/src/cyrix_accel.c
+++ b/src/cyrix_accel.c
@@ -26,7 +26,7 @@
  *          Dirk H. Hohndel (hohndel@suse.de),
  *          Portions: the GGI project & confidential CYRIX databooks.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.5 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.3 2000/04/19 16:57:43 eich Exp $ */
 
 #include "vgaHW.h"
 #include "xf86.h"
diff --git a/src/cyrix_bank.c b/src/cyrix_bank.c
index e06d6dd..28cb0ba 100644
--- a/src/cyrix_bank.c
+++ b/src/cyrix_bank.c
@@ -26,7 +26,7 @@
  *          Dirk H. Hohndel (hohndel@suse.de),
  *          Portions: the GGI project & confidential CYRIX databooks.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.3 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.1 2000/02/13 00:56:10 dawes Exp $ */
 
 #define PSZ 8
 
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index d8092a2..ad2a12e 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -50,7 +50,7 @@
  *		(note that most of the data books have been released by
  *		 NatSemi and are downloadable for free as pdf files)
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.31 2003/11/06 18:38:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.30tsi Exp $ */
 
 #include "fb.h"
 #include "mibank.h"
@@ -233,7 +233,7 @@ static XF86ModuleVersionInfo cyrixVersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	CYRIX_MAJOR_VERSION, CYRIX_MINOR_VERSION, CYRIX_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,			/* This is a video driver */
 	ABI_VIDEODRV_VERSION,
diff --git a/src/cyrix_helper.c b/src/cyrix_helper.c
index 771f62c..593507d 100644
--- a/src/cyrix_helper.c
+++ b/src/cyrix_helper.c
@@ -39,7 +39,7 @@
  *          Dirk H. Hohndel (hohndel@suse.de),
  *          Portions: the GGI project & confidential CYRIX databooks.
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.5 2003/09/24 02:43:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.4 2002/11/06 11:38:59 alanh Exp $ */
 
 #include "cyrix.h"
 #include "vgaHW.h"
diff --git a/src/cyrix_shadow.c b/src/cyrix_shadow.c
index 479ad36..87f7709 100644
--- a/src/cyrix_shadow.c
+++ b/src/cyrix_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_shadow.c,v 1.1 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_shadow.c,v 1.1 1999/08/14 10:49:48 dawes Exp $ */
 
 /*
    Copyright (c) 1999,  The XFree86 Project Inc.