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

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


Index: newport.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/newport/newport.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/newport.man	5 Mar 2004 13:40:26 -0000	1.1.4.1
+++ b/newport.man	15 Apr 2004 10:16:31 -0000	1.1.4.2
@@ -14,14 +14,14 @@
 .fi
 .SH DESCRIPTION
 .B newport
-is an XFree86 driver for the SGI Indy's and Indigo2's newport video cards.
+is an __xservername__ driver for the SGI Indy's and Indigo2's newport video cards.
 .SH SUPPORTED HARDWARE
 The
 .B newport
 driver supports the Newport (also called XL) cards found in SGI Indys and Indigo2s.
 It supports both the 8bit and 24bit versions of the Newport.
 .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
@@ -39,7 +39,7 @@
 .BI "Option \*qBusID\*q \*q"integer \*q
 Set to 1 for the Indigo2 XL. Default: 0
 .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:
 Guido GÜnther \fIagx at sigxcpu.org\fP

Index: newport_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/newport/newport_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/newport_driver.c	5 Mar 2004 13:40:26 -0000	1.1.4.2
+++ b/newport_driver.c	15 Apr 2004 10:16:31 -0000	1.1.4.3
@@ -127,7 +127,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	NEWPORT_MAJOR_VERSION, NEWPORT_MINOR_VERSION, NEWPORT_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,