[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/chips chips.man, 1.1.4.1, 1.1.4.2 ct_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/chips
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/drivers/chips

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


Index: chips.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/chips/chips.man,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/chips.man	5 Mar 2004 13:40:21 -0000	1.1.4.1
+++ b/chips.man	15 Apr 2004 10:16:19 -0000	1.1.4.2
@@ -14,7 +14,7 @@
 .fi
 .SH DESCRIPTION
 .B chips 
-is an XFree86 driver for Chips and Technologies video processors.  The majority
+is an __xservername__ driver for Chips and Technologies video processors.  The majority
 of the Chips and Technologies chipsets are supported by this driver. In general
 the limitation on the capabilities of this driver are determined by the 
 chipset on which it is run. Where possible, this driver provides full
@@ -77,7 +77,7 @@
 The DirectColor visual is supported on all color depths except the 8+16
 overlay mode. Full acceleration is supplied for all chipsets.
 .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
@@ -206,10 +206,10 @@
 rate on the two screens.
 Default: off.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
 .PP
 You are also recommended to read the README.chips file that comes with all
-XFree86 distributions, which discusses the
+__xservername__ distributions, which discusses the
 .B chips
 driver in more detail.
 .SH AUTHORS

Index: ct_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/chips/ct_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/ct_driver.c	30 Mar 2004 14:23:13 -0000	1.1.4.3
+++ b/ct_driver.c	15 Apr 2004 10:16:19 -0000	1.1.4.4
@@ -748,7 +748,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	CHIPS_MAJOR_VERSION, CHIPS_MINOR_VERSION, CHIPS_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,