Merging XORG-CURRENT into trunkXACE-SELINUX-MERGECOMPOSITEWRAP

12 files changed, 22 insertions, 21 deletions

diff --git a/README.sgml b/README.sgml
index 328e44d..d99a746 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;
 ]>
 
@@ -8,7 +8,7 @@
 	 Henrik Harmsen (<email>Henrik.Harmsen@erv.ericsson.se</email>)
 <date> 6 March 2000
 <ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/apm.sgml,v 1.5 2004/02/24 03:41:40 dawes Exp $
+$Id$ 
 </ident>
 <toc>
 
@@ -37,7 +37,7 @@ graphics chipsets. The following chipsets are supported:
 
 <sect> Acceleration
 <p>
-The apm driver uses the XAA (XFree86 Acceleration Architecture) in the 
+The apm driver uses the XAA in the 
 SVGA server. It has support for the following acceleration:
 
 <itemize>
@@ -77,15 +77,15 @@ memory and to use it you will have to put
   Option "ShadowFB"
 </verb>
 
-in your XF86Config file.
+in your xorg.conf file.
 
 <sect> Configuration
 <p>
-First: Run the xf86config program to create a correct
+First: Run the xorgconfig program to create a correct
 configuration.
 
 You can turn off hardware cursor by inserting the following line in the
-Device section of the XF86Config file:
+Device section of the xorg.conf file:
 <verb>
   Option "SWcursor"
 </verb>
diff --git a/man/apm.man b/man/apm.man
index cb206c1..d3ff413 100644
--- a/man/apm.man
+++ b/man/apm.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.man,v 1.3 2002/05/07 12:53:49 alanh Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.man,v 1.2 2001/01/27 18:20:46 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH APM __drivermansuffix__ __vendorversion__
@@ -14,7 +14,7 @@ apm \- Alliance ProMotion video driver
 .fi
 .SH DESCRIPTION
 .B apm 
-is an XFree86 driver for Alliance ProMotion video cards. The driver
+is an __xservername__ driver for Alliance ProMotion video cards. The driver
 is accelerated for supported hardware/depth combination. It supports
 framebuffer depths of 8, 15, 16, 24 and 32 bits. For 6420, 6422, AT24,
 AT3D and AT25, all depths are fully accelerated except 24 bpp for which
@@ -35,7 +35,7 @@ ProMotion chipsets
 .TP 12
 .B AT25
 .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
@@ -101,6 +101,6 @@ Force the software cursor.  Default: off.
 .BI "Option \*qShadowFB\*q \*q" boolean \*q
 Enable or disable use of the shadow framebuffer layer.  Default: off.
 .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: ...
diff --git a/src/apm.h b/src/apm.h
index ddf9b06..ceeffff 100644
--- a/src/apm.h
+++ b/src/apm.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h,v 1.20 2003/11/03 05:11:04 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h,v 1.19tsi Exp $ */
 
 
 /* All drivers should typically include these */
diff --git a/src/apm_accel.c b/src/apm_accel.c
index 72b0cee..b59e2a7 100644
--- a/src/apm_accel.c
+++ b/src/apm_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c,v 1.21 2002/10/08 22:14:03 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c,v 1.20tsi Exp $ */
 
 #include "apm.h"
 #include "miline.h"
diff --git a/src/apm_cursor.c b/src/apm_cursor.c
index 6a23341..3f26f0d 100644
--- a/src/apm_cursor.c
+++ b/src/apm_cursor.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c,v 1.15 2003/10/30 18:37:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c,v 1.14 2000/06/30 18:27:02 dawes Exp $ */
 
 
 #include "X.h"
diff --git a/src/apm_dga.c b/src/apm_dga.c
index 3a5f362..88867a9 100644
--- a/src/apm_dga.c
+++ b/src/apm_dga.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_dga.c,v 1.10 2002/01/25 21:55:54 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_dga.c,v 1.9 2001/01/06 21:29:11 tsi Exp $ */
 /*
  * file: apm_dga.c
  * ported from s3virge, ported from mga
diff --git a/src/apm_driver.c b/src/apm_driver.c
index 43ee94e..00dfcc5 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c,v 1.66 2003/10/30 18:37:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c,v 1.65 2003/10/30 17:36:57 tsi Exp $ */
 
 #include "apm.h"
 #include "xf86cmap.h"
@@ -227,7 +227,7 @@ static XF86ModuleVersionInfo apmVersRec = {
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     APM_MAJOR_VERSION, APM_MINOR_VERSION, APM_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,			/* This is a video driver */
     ABI_VIDEODRV_VERSION,
diff --git a/src/apm_funcs.c b/src/apm_funcs.c
index 2a0e6a6..7bfb5a2 100644
--- a/src/apm_funcs.c
+++ b/src/apm_funcs.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c,v 1.19 2003/11/03 05:11:04 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c,v 1.18tsi Exp $ */
 
 #define FASTER
 #ifndef PSZ
diff --git a/src/apm_i2c.c b/src/apm_i2c.c
index dc250b1..aa45bc7 100644
--- a/src/apm_i2c.c
+++ b/src/apm_i2c.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c,v 1.7 2002/01/25 21:55:55 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c,v 1.6.4.1 2001/11/28 22:35:13 tsi Exp $ */
 
 #include "apm.h"
 #include "apm_regs.h"
diff --git a/src/apm_regs.h b/src/apm_regs.h
index 633a1eb..bd4d015 100644
--- a/src/apm_regs.h
+++ b/src/apm_regs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_regs.h,v 1.8 2002/01/25 21:55:55 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_regs.h,v 1.7 2000/02/29 03:09:18 dawes Exp $ */
 
 
 
diff --git a/src/apm_rush.c b/src/apm_rush.c
index 9b4da96..4e0b745 100644
--- a/src/apm_rush.c
+++ b/src/apm_rush.c
@@ -1,4 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.12 2003/02/12 21:46:42 tsi Exp $ */
+/* $XdotOrg$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.11tsi Exp $ */
 /*
  * Copyright Loïc Grenié 1999
  */
diff --git a/src/apm_video.c b/src/apm_video.c
index 5a75be0..dcaa00b 100644
--- a/src/apm_video.c
+++ b/src/apm_video.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_video.c,v 1.12 2003/11/10 18:22:17 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_video.c,v 1.11tsi Exp $ */
 
 #if PSZ != 24
 #include "dixstruct.h"