[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/savage savage.man, 1.1.4.3, 1.1.4.4 savage_driver.c, 1.1.4.3, 1.1.4.4

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/savage
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/drivers/savage

Modified Files:
      Tag: XORG-CURRENT
	savage.man savage_driver.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: savage.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/savage/savage.man,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/savage.man	5 Mar 2004 13:40:31 -0000	1.1.4.3
+++ b/savage.man	15 Apr 2004 10:16:33 -0000	1.1.4.4
@@ -14,7 +14,7 @@
 .fi
 .SH DESCRIPTION
 .B savage 
-is an XFree86 driver for the S3 Savage family video accelerator chips.  The
+is an __xservername__ driver for the S3 Savage family video accelerator chips.  The
 .B savage
 driver supports PCI and AGP boards with the following chips:
 .TP 16
@@ -51,7 +51,7 @@
 .B ProSavage DDR-K
 (8d04)
 .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
@@ -101,7 +101,7 @@
 knows how to handle the critical but unusual timing requirements of the 
 various LCD panels supported by the chip.  To do this, the driver searches
 through the BIOS mode list, looking for the mode which most closely matches
-the XF86Config mode line.  Some purists find this scheme objectionable.  If 
+the __xconfigfile__ mode line.  Some purists find this scheme objectionable.  If 
 you would rather have the
 .B savage
 driver use your mode line timing exactly, turn off the UseBios option.  
@@ -119,8 +119,8 @@
 .SH FILES
 savage_drv.o
 .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 Tim Roberts (timr at probo.com) and Ani Joshi (ajoshi at unixbox.com)
-for the 4.0 version, and Tim Roberts and S. Marineau for the 3.3 driver from 
+for this version, and Tim Roberts and S. Marineau for the original driver from 
 which this was derived.

Index: savage_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/savage_driver.c	30 Mar 2004 14:23:13 -0000	1.1.4.3
+++ b/savage_driver.c	15 Apr 2004 10:16:33 -0000	1.1.4.4
@@ -323,7 +323,7 @@
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL,
     ABI_CLASS_VIDEODRV,
     ABI_VIDEODRV_VERSION,