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

[Egbert Eich]

Committed by: eich

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

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


Index: cg6_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/suncg6/cg6_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/cg6_driver.c	5 Mar 2004 13:40:35 -0000	1.1.4.2
+++ b/cg6_driver.c	15 Apr 2004 10:16:37 -0000	1.1.4.3
@@ -105,7 +105,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	CG6_MAJOR_VERSION, CG6_MINOR_VERSION, CG6_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,

Index: suncg6.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/suncg6/suncg6.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/suncg6.man	5 Mar 2004 13:40:35 -0000	1.1.4.1
+++ b/suncg6.man	15 Apr 2004 10:16:37 -0000	1.1.4.2
@@ -14,17 +14,17 @@
 .fi
 .SH DESCRIPTION
 .B suncg6
-is an XFree86 driver for Sun GX and Turbo GX (also known as cgsix) video cards.
+is an __xservername__ driver for Sun GX and Turbo GX (also known as cgsix) video cards.
 THIS MAN PAGE NEEDS TO BE FILLED IN.
 .SH SUPPORTED HARDWARE
 The
 .B suncg6
 driver supports...
 .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.
 .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: Jakub Jelinek <jakub at redhat.com>