Merged changes from RELEASE-1 branchbefore_20040421_xprint_branch_landingXORG-CURRENT-CLOSEDXORG-CURRENT

3 files changed, 34 insertions, 34 deletions

diff --git a/README.sgml b/README.sgml
index 215ffb3..193cfdc 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;
 ]>
 
@@ -10,7 +10,6 @@
 <date>5 October 2003
 
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml,v 3.8 2003/10/19 19:29:14 dawes Exp $
 </ident>
 
 <!-- Table of contents -->
@@ -32,7 +31,7 @@ It currently supports the following chipsets:
 The driver supports:
 <itemize>
   <item>8/16/24 bits color depth; old series also 15;
-  <item>XAA (XFree86 Acceleration Architecture)
+  <item>XAA 
   <item>XVideo (Xv)
   <item>Render (XRAND)
   <item>Hardware cursor; 315/330 series: Color HW cursor;
@@ -47,11 +46,11 @@ Please see http://www.winischhofer.net/linuxsisvga.shtml for detailed documentat
 and updates. Support for the 661, 741 and 760 is entirely untested as of this writing,
 and possibly incomplete for LCD output.
 
-<sect> XF86Config Options <p>
+<sect> xorg.conf Options <p>
 
 The following options are of particular interest for the SiS
 driver. Each of them must be specified in the Device section of the
-XF86Config file for this card.
+xorg.conf file for this card.
 
 <sect1>For all chipsets<p>
 
@@ -158,7 +157,7 @@ XF86Config file for this card.
 <descrip>
 <tag>Option "MaxXFBMem"</tag>
 	DRI requires the linux kernel's SiS framebuffer driver "sisfb" and some
-	other modules which come with either the linux kernel or XFree86. (On *BSD,
+	other modules which come with either the linux kernel or X11R&relvers;. (On *BSD,
 	the DRI driver does not require any framebuffer driver.)
   	Sisfb takes care of memory management for texture data. In order to prevent
 	the X driver and sisfb from overwriting each others video memory, sisfb
@@ -168,7 +167,8 @@ XF86Config file for this card.
 	the amount of RAM sisfb reserved. For this purpose, the Option "MaxXFBMem" exists.
 
 	XFree 4.3.0 disabled SiS DRI support due to a lack of maintenance of the SiS DRI
-	driver. XFree86 4.4 contains a newly written SiS DRI driver by Eric Anholt.
+	driver. X11R&relvers; and X11R&relvers; and XFree86 4.4 contains a newly written 
+        SiS DRI driver by Eric Anholt.
 
 	If you intend to use DRI, I recommend setting the total video memory in the BIOS
 	to 64MB in order to at least overcome the lack of memory swap functions.
diff --git a/man/sis.man b/man/sis.man
index ae13b1d..e842acb 100644
--- a/man/sis.man
+++ b/man/sis.man
@@ -14,7 +14,7 @@ sis \- SiS video driver
 .fi
 .SH DESCRIPTION
 .B sis
-is an XFree86 driver for SiS (Silicon Integrated Systems) video chips. The
+is an __xservername__ driver for SiS (Silicon Integrated Systems) video chips. The
 driver is accelerated, and provides support for colordepths of 8, 16 and 24 bpp.
 XVideo, Render and other extensions are supported as well.
 .SH SUPPORTED HARDWARE
@@ -47,7 +47,7 @@ for SiS315/H/PRO, 55x and (M)65x/(M)661xX/74x, 330, 760
 .PP
 Note: Support for 661FX, M661FX, M661MX, 741 and 760 is untested.
 .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
@@ -364,7 +364,7 @@ more information.
 DRI is supported on the 300 series only. On Linux, DRI requires the
 kernel's SiS framebuffer driver (
 .B sisfb
-) and some other modules which come with either the kernel or XFree86.
+) and some other modules which come with either the kernel or __xservername__.
 .PP
 Sisfb takes care of memory management for texture data. In order to
 prevent the X Server and sisfb from overwriting each other's data,
@@ -409,7 +409,7 @@ The amount is to be specified in megabyte, the default is 8.
 .SH "KNOWN BUGS"
 none.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
 .PP
 .B "http://www.winischhofer.net/linuxsisvga.shtml"
 for more information and updates
diff --git a/src/sis_driver.c b/src/sis_driver.c
index 380102b..3951f7c 100644
--- a/src/sis_driver.c
+++ b/src/sis_driver.c
@@ -99,7 +99,7 @@ static int      	SISEntityIndex = -1;
 
 #ifdef SISMERGED
 #ifdef SISXINERAMA
-static Bool 		SiSnoXineramaExtension = TRUE;
+static Bool 		SiSnoPanoramiXExtension = TRUE;
 int 			SiSXineramaPixWidth = 0;
 int 			SiSXineramaPixHeight = 0;
 int 			SiSXineramaNumScreens = 0;
@@ -300,7 +300,7 @@ static XF86ModuleVersionInfo sisVersRec =
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     SIS_MAJOR_VERSION, SIS_MINOR_VERSION, SIS_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,         /* This is a video driver */
     ABI_VIDEODRV_VERSION,
@@ -1571,7 +1571,7 @@ SiSUpdateXineramaScreenInfo(ScrnInfoPtr pScrn1)
 
     if(!pSiS->MergedFB) return;
 
-    if(SiSnoXineramaExtension) return;
+    if(SiSnoPanoramiXExtension) return;
 
     if(!SiSXineramadataPtr) return;
 
@@ -1770,7 +1770,7 @@ SiSProcXineramaGetState(ClientPtr client)
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
-    rep.state = !SiSnoXineramaExtension;
+    rep.state = !SiSnoPanoramiXExtension;
     if(client->swapped) {
        swaps (&rep.sequenceNumber, n);
        swapl (&rep.length, n);
@@ -1842,7 +1842,7 @@ SiSProcXineramaIsActive(ClientPtr client)
     rep.type = X_Reply;
     rep.length = 0;
     rep.sequenceNumber = client->sequence;
-    rep.state = !SiSnoXineramaExtension;
+    rep.state = !SiSnoPanoramiXExtension;
     if(client->swapped) {
 	register int n;
 	swaps(&rep.sequenceNumber, n);
@@ -1862,7 +1862,7 @@ SiSProcXineramaQueryScreens(ClientPtr client)
 
     rep.type = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.number = (SiSnoXineramaExtension) ? 0 : SiSXineramaNumScreens;
+    rep.number = (SiSnoPanoramiXExtension) ? 0 : SiSXineramaNumScreens;
     rep.length = rep.number * sz_XineramaScreenInfo >> 2;
     if(client->swapped) {
        register int n;
@@ -1872,7 +1872,7 @@ SiSProcXineramaQueryScreens(ClientPtr client)
     }
     WriteToClient(client, sizeof(xXineramaQueryScreensReply), (char *)&rep);
 
-    if(!SiSnoXineramaExtension) {
+    if(!SiSnoPanoramiXExtension) {
        xXineramaScreenInfo scratch;
        int i;
 
@@ -2018,20 +2018,20 @@ SiSXineramaExtensionInit(ScrnInfoPtr pScrn)
     if(!(SiSXineramadataPtr)) {
 
        if(!pSiS->MergedFB) {
-          SiSnoXineramaExtension = TRUE;
+          SiSnoPanoramiXExtension = TRUE;
           return;
        }
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
        if(!noPanoramiXExtension) {
           xf86DrvMsg(pScrn->scrnIndex, X_INFO,
        	     "Xinerama active, not initializing SiS Pseudo-Xinerama\n");
-          SiSnoXineramaExtension = TRUE;
+          SiSnoPanoramiXExtension = TRUE;
           return;
        }
 #endif
 
-       if(SiSnoXineramaExtension) {
+       if(SiSnoPanoramiXExtension) {
           xf86DrvMsg(pScrn->scrnIndex, X_INFO,
        	      "SiS Pseudo-Xinerama disabled\n");
           return;
@@ -2040,14 +2040,14 @@ SiSXineramaExtensionInit(ScrnInfoPtr pScrn)
        if(pSiS->CRT2Position == sisClone) {
           xf86DrvMsg(pScrn->scrnIndex, X_INFO,
        	     "Running MergedFB in Clone mode, SiS Pseudo-Xinerama disabled\n");
-          SiSnoXineramaExtension = TRUE;
+          SiSnoPanoramiXExtension = TRUE;
           return;
        }
 
        if(!(pSiS->AtLeastOneNonClone)) {
           xf86DrvMsg(pScrn->scrnIndex, X_INFO,
        	     "Only Clone modes defined, SiS Pseudo-Xinerama disabled\n");
-          SiSnoXineramaExtension = TRUE;
+          SiSnoPanoramiXExtension = TRUE;
           return;
        }
 
@@ -2072,7 +2072,7 @@ SiSXineramaExtensionInit(ScrnInfoPtr pScrn)
 
        if(!success) {
           SISErrorLog(pScrn, "Failed to initialize SiS Pseudo-Xinerama extension\n");
-          SiSnoXineramaExtension = TRUE;
+          SiSnoPanoramiXExtension = TRUE;
           return;
        }
 
@@ -2347,13 +2347,13 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 	"Copyright (C) 2001-2004 Thomas Winischhofer <thomas@winischhofer.net> and others\n");
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-        "Compiled for XFree86 %d.%d.%d.%d\n",
+        "Compiled for X.Org %d.%d.%d.%d\n",
 	XF86_VERSION_MAJOR, XF86_VERSION_MINOR,
 	XF86_VERSION_PATCH, XF86_VERSION_SNAP);
 #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,2,99,0,0)
     if(xf86GetVersion() != XF86_VERSION_CURRENT) {
        xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-         "This version of the driver is not compiled for this version of XFree86!\n");
+         "This version of the driver is not compiled for this version of X.Org!\n");
     }
 #endif
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -4996,7 +4996,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
 #endif
           } else {
 	     xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-	   	"Building list of built-in modes failed, using XFree86 defaults\n");
+	   	"Building list of built-in modes failed, using X.Org defaults\n");
 	  }
        } else {
           pSiS->HaveCustomModes = TRUE;
@@ -5481,7 +5481,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
     	pSiS->SiS_SD_Flags |= SiS_SD_ISDUALHEAD;
 	if(pSiS->SecondHead)      pSiS->SiS_SD_Flags |= SiS_SD_ISDHSECONDHEAD;
 	else			  pSiS->SiS_SD_Flags &= ~(SiS_SD_SUPPORTXVGAMMA1);
-#ifdef XINERAMA
+#ifdef PANORAMIX
 	if(!noPanoramiXExtension) {
 	   pSiS->SiS_SD_Flags |= SiS_SD_ISDHXINERAMA;
 	   pSiS->SiS_SD_Flags &= ~(SiS_SD_SUPPORTXVGAMMA1);
@@ -7100,13 +7100,13 @@ SISScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
        pSiS->ShadowFB = FALSE;
 #ifdef SISXINERAMA
        if(pSiS->UseSiSXinerama) {
-          SiSnoXineramaExtension = FALSE;
+          SiSnoPanoramiXExtension = FALSE;
           SiSXineramaExtensionInit(pScrn);
-	  if(!SiSnoXineramaExtension) {
+	  if(!SiSnoPanoramiXExtension) {
 #if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
-	     xf86DisableRandR();
-	     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-	     "SiS Pseudo-Xinerama enabled, RandR disabled\n");
+             xf86DisableRandR();
+             xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+	  	 "SiS Pseudo-Xinerama enabled, RandR disabled\n");
 #endif
 	     pSiS->SiS_SD_Flags |= SiS_SD_PSEUDOXINERAMA;
 	  }