[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/i128 i128.man, 1.1.4.1, 1.1.4.2 i128_driver.c, 1.1.4.2, 1.1.4.3

[Egbert Eich]

Committed by: eich

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

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


Index: i128.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i128/i128.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/i128.man	5 Mar 2004 13:40:23 -0000	1.1.4.1
+++ b/i128.man	15 Apr 2004 10:16:21 -0000	1.1.4.2
@@ -14,7 +14,7 @@
 .fi
 .SH DESCRIPTION
 .B i128 
-is an XFree86 driver for Number 9 I128 video cards.  The driver is
+is an __xservername__ driver for Number 9 I128 video cards.  The driver is
 accelerated and provides support for all versions of the I128 chip family,
 including the SGI flatpanel configuration.  Multi-head configurations are
 supported.
@@ -34,7 +34,7 @@
 .B I128-T2R4
 Ticket 2 Ride IV
 .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
@@ -65,6 +65,6 @@
 This turns on verbose debug information from the driver.
 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__)
 .SH AUTHORS
 Authors include: Robin Cutshaw (driver), Galen Brooks (flatpanel support).

Index: i128_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i128/i128_driver.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/i128_driver.c	5 Mar 2004 13:40:23 -0000	1.1.4.2
+++ b/i128_driver.c	15 Apr 2004 10:16:21 -0000	1.1.4.3
@@ -141,7 +141,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	I128_MAJOR_VERSION, I128_MINOR_VERSION, I128_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,			/* This is a video driver */
 	ABI_VIDEODRV_VERSION,