Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE

10 files changed, 16 insertions, 17 deletions

diff --git a/README.sgml b/README.sgml
index aa7e0ab..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.7 2003/10/19 19:47:17 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/XF86Config.indy b/XF86Config.indy
index 3a1dcc6..c0fca03 100644
--- a/XF86Config.indy
+++ b/XF86Config.indy
@@ -27,7 +27,7 @@
 # dealings in this Software without prior written authorization from the
 # XFree86 Project.
 #
-# $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy,v 1.3 2003/02/20 04:05:15 dawes Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy,v 1.2 2000/12/14 20:59:12 dawes Exp $
 
 # **********************************************************************
 # This is a configuration file for the Indy's Newport Graphics and the
diff --git a/man/newport.man b/man/newport.man
index 19272c3..28c336f 100644
--- a/man/newport.man
+++ b/man/newport.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport.man,v 1.4 2003/02/17 23:06:11 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport.man,v 1.3 2001/11/23 19:50:45 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH NEWPORT __drivermansuffix__ __vendorversion__
@@ -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.h b/src/newport.h
index ee71736..231cbf8 100644
--- a/src/newport.h
+++ b/src/newport.h
@@ -1,7 +1,7 @@
 /* 
  * Id: newport.h,v 1.4 2000/11/29 20:58:10 agx Exp $
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport.h,v 1.10 2002/12/10 04:03:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport.h,v 1.9 2002/09/30 22:17:55 alanh Exp $ */
 
 #ifndef __NEWPORT_H__
 #define __NEWPORT_H__
diff --git a/src/newport_cmap.c b/src/newport_cmap.c
index 8052bdb..30445e4 100644
--- a/src/newport_cmap.c
+++ b/src/newport_cmap.c
@@ -1,7 +1,7 @@
 /*
  * Id: newport_cmap.c,v 1.1 2000/11/29 20:58:10 agx Exp $
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_cmap.c,v 1.3 2002/12/10 04:03:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_cmap.c,v 1.2 2001/11/23 19:50:45 dawes Exp $ */
 
 #include "newport.h"
 
diff --git a/src/newport_cursor.c b/src/newport_cursor.c
index b5328f8..4d4cf41 100644
--- a/src/newport_cursor.c
+++ b/src/newport_cursor.c
@@ -1,7 +1,7 @@
 /*
  * newport_cursor.c
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_cursor.c,v 1.1 2002/12/10 04:03:00 dawes Exp $ */
+/* $XFree86$ */
 
 #include "newport.h"
 #include "cursorstr.h"
diff --git a/src/newport_driver.c b/src/newport_driver.c
index f1dd100..0964a19 100644
--- a/src/newport_driver.c
+++ b/src/newport_driver.c
@@ -30,7 +30,7 @@
  * Project.
  *
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_driver.c,v 1.26 2003/08/23 15:03:08 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_driver.c,v 1.25 2003/04/23 21:51:41 tsi Exp $ */
 
 /* function prototypes, common data structures & generic includes */
 #include "newport.h"
@@ -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,
diff --git a/src/newport_regs.c b/src/newport_regs.c
index 30028d1..3461df6 100644
--- a/src/newport_regs.c
+++ b/src/newport_regs.c
@@ -1,7 +1,7 @@
 /*
  * Id: newport_regs.c,v 1.3 2000/11/29 20:58:10 agx Exp $
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_regs.c,v 1.7 2002/12/10 04:03:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_regs.c,v 1.6 2001/12/21 15:37:23 tsi Exp $ */
 
 #include "newport.h"
 
diff --git a/src/newport_regs.h b/src/newport_regs.h
index f4b04cb..f2f7b69 100644
--- a/src/newport_regs.h
+++ b/src/newport_regs.h
@@ -4,7 +4,7 @@
  * Register Layouts of the various newport chips
  * mostly as found in linux/include/asm/newport.h 
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_regs.h,v 1.3 2002/12/10 04:03:00 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_regs.h,v 1.2 2001/11/23 19:50:45 dawes Exp $ */
 
 typedef volatile unsigned long npireg_t;
 
diff --git a/src/newport_shadow.c b/src/newport_shadow.c
index cfbf522..001206e 100644
--- a/src/newport_shadow.c
+++ b/src/newport_shadow.c
@@ -1,7 +1,7 @@
 /* 
  * Id: newport_shadow.c,v 1.3 2000/11/29 20:58:10 agx Exp $
  */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_shadow.c,v 1.3 2002/09/30 22:17:55 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/newport/newport_shadow.c,v 1.2 2001/11/23 19:50:45 dawes Exp $ */
 
 #include "newport.h"