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

---
 README.sgml          | 7 +++----
 man/newport.man      | 6 +++---
 src/newport_driver.c | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/README.sgml b/README.sgml
index 92c6546..70a22bd 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>Guido G&uuml;nther
 <date>24 February 2003
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/newport.sgml,v 1.6 2003/02/25 19:31:02 dawes Exp $
 </ident>
 <toc>
 
@@ -27,7 +26,7 @@ working.
 <sect>Notes
 <p>
 <itemize>
-  <item>X -configure does not generate a XF86Config file.
+  <item>X -configure does not generate a xorg.conf file.
   <item>There's only a 1280x1024 mode.
 </itemize>
 
@@ -36,7 +35,7 @@ working.
 <p>
 The driver auto-detects all device information necessary to
 initialize the card on the Indy. The only lines you need in the "Device"
-section of your XF86Config file are:
+section of your xorg.conf file are:
 <verb>
        Section "Device"
            Identifier "SGI newport"
diff --git a/man/newport.man b/man/newport.man
index 8c181df..28c336f 100644
--- a/man/newport.man
+++ b/man/newport.man
@@ -14,14 +14,14 @@ newport \- Newport video driver
 .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 @@ Enable or disable the HW cursor. Default: on.
 .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@sigxcpu.org\fP
diff --git a/src/newport_driver.c b/src/newport_driver.c
index 0f927dc..0964a19 100644
--- a/src/newport_driver.c
+++ b/src/newport_driver.c
@@ -127,7 +127,7 @@ static XF86ModuleVersionInfo newportVersRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	NEWPORT_MAJOR_VERSION, NEWPORT_MINOR_VERSION, NEWPORT_PATCHLEVEL,
 	ABI_CLASS_VIDEODRV,
 	ABI_VIDEODRV_VERSION,
-- 
cgit v1.2.3