[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/cyrix cyrix.man, 1.1.10.1, 1.1.10.1.6.1 cyrix_driver.c, 1.1.4.1.6.1, 1.1.4.1.6.1.6.1

Roland Mainz xorg-commit at pdx.freedesktop.org
Sat Apr 10 02:04:50 PDT 2004


Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/cyrix
In directory pdx:/tmp/cvs-serv7662/xc/programs/Xserver/hw/xfree86/drivers/cyrix

Modified Files:
      Tag: XPRINT
	cyrix.man cyrix_driver.c 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: cyrix.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man,v
retrieving revision 1.1.10.1
retrieving revision 1.1.10.1.6.1
diff -u -d -r1.1.10.1 -r1.1.10.1.6.1
--- a/cyrix.man	4 Mar 2004 17:47:43 -0000	1.1.10.1
+++ b/cyrix.man	10 Apr 2004 09:04:45 -0000	1.1.10.1.6.1
@@ -14,7 +14,7 @@
 .fi
 .SH DESCRIPTION
 .B cyrix 
-is an XFree86 driver for the Cyrix MediaGX (now Natsemi Geode) series of
+is an __xservername__ driver for the Cyrix MediaGX (now Natsemi Geode) series of
 processors when using the built in video.
 .SH SUPPORTED HARDWARE
 The
@@ -28,7 +28,7 @@
 performance on a MediaGX machine pick backgrounds that compress well
 horizonally.
 .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
@@ -64,12 +64,12 @@
 .PP
 The 5530A video overlay facility is not currently supported.
 .PP
-XFree86 uses the MediaGX 'SoftVGA' interface. On a small number of boards
+__xservername__ uses the MediaGX 'SoftVGA' interface. On a small number of boards
 this is buggy and may result in strange illegal instruction traps.
 .PP
 Hardware cursors are not currently supported.
 .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: Richard Hecker, Annius Groenink, Dirk Hohndel, The GGI
 Project, Alan Cox.

Index: cyrix_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/cyrix_driver.c	4 Mar 2004 17:47:43 -0000	1.1.4.1.6.1
+++ b/cyrix_driver.c	10 Apr 2004 09:04:45 -0000	1.1.4.1.6.1.6.1
@@ -233,7 +233,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	CYRIX_MAJOR_VERSION, CYRIX_MINOR_VERSION, CYRIX_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,			/* This is a video driver */
 	ABI_VIDEODRV_VERSION,




More information about the xorg-commit-diffs mailing list