From 79d8ae2d7e8f311c1be6abddfe101dec1147a597 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 15 Apr 2004 10:16:20 +0000
Subject: Merged changes from RELEASE-1 branch

---
 README.sgml        | 7 +++----
 man/cyrix.man      | 8 ++++----
 src/cyrix_driver.c | 2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/README.sgml b/README.sgml
index f43a984..4e937ca 100644
--- a/README.sgml
+++ b/README.sgml
@@ -1,4 +1,4 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
 <!ENTITY % defs SYSTEM "defs.ent"> %defs;
 ]>
 
@@ -7,7 +7,6 @@
 <author>The XFree86 Project Inc.
 <date>7 March 2000
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cyrix.sgml,v 1.2 1999/08/23 06:18:33 dawes Exp $
 </ident>
 <toc>
 
@@ -28,7 +27,7 @@ CPUs with integrated graphics:
 <item>Rather sparse (color depth hardcoded to 8)
 </itemize>
 
-<sect>XF86Config Option <p>
+<sect>xorg.conf Option <p>
 <descrip>
 <tag>Option "sw_cursor"</tag>
 disable the hardware cursor. (Code not verified yet!)
@@ -47,7 +46,7 @@ but NEWBIES should use the 3.3.3.1 release instead!
 just after probing for the ``scratchpad size''.  If this is the case,
 email to <email>hecker@cat.dfrc.nasa.gov</email> with the output of 
 <verb>
-XFree86 -probeonly -verbose
+Xorg -probeonly -verbose
 </verb>
 and this will be fixed.
 </itemize>
diff --git a/man/cyrix.man b/man/cyrix.man
index 9343107..a4d0720 100644
--- a/man/cyrix.man
+++ b/man/cyrix.man
@@ -14,7 +14,7 @@ cyrix \- Cyrix video driver
 .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 @@ The MediaGX run length compresses its shared framebuffer, for the best
 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 @@ considerable time.
 .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.
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index 270e046..ad2a12e 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -233,7 +233,7 @@ static XF86ModuleVersionInfo cyrixVersRec =
 	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,
-- 
cgit v1.2.3