[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/sis sis.man, 1.1.4.1.6.1, 1.1.4.1.6.1.6.1 sis_driver.c, 1.1.4.6.2.2, 1.1.4.6.2.2.6.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sis
In directory pdx:/tmp/cvs-serv7662/xc/programs/Xserver/hw/xfree86/drivers/sis

Modified Files:
      Tag: XPRINT
	sis.man sis_driver.c 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: sis.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sis/sis.man,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/sis.man	4 Mar 2004 17:47:54 -0000	1.1.4.1.6.1
+++ b/sis.man	10 Apr 2004 09:04:51 -0000	1.1.4.1.6.1.6.1
@@ -14,7 +14,7 @@
 .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 @@
 .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 @@
 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 @@
 .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

Index: sis_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c,v
retrieving revision 1.1.4.6.2.2
retrieving revision 1.1.4.6.2.2.6.1
diff -u -d -r1.1.4.6.2.2 -r1.1.4.6.2.2.6.1
--- a/sis_driver.c	4 Mar 2004 17:47:54 -0000	1.1.4.6.2.2
+++ b/sis_driver.c	10 Apr 2004 09:04:51 -0000	1.1.4.6.2.2.6.1
@@ -300,7 +300,7 @@
     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,
@@ -2347,13 +2347,13 @@
     xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 	"Copyright (C) 2001-2004 Thomas Winischhofer <thomas at 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 @@
 #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;