Merged changes from RELEASE-1 branchbefore_20040421_xprint_branch_landingXORG-CURRENT-CLOSEDXORG-CURRENT

4 files changed, 12 insertions, 12 deletions

diff --git a/README.sgml b/README.sgml
index edb7f31..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.4 2003/10/19 19:47:17 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 035f7b0..d3ff413 100644
--- a/man/apm.man
+++ b/man/apm.man
@@ -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_driver.c b/src/apm_driver.c
index 018a4d5..00dfcc5 100644
--- a/src/apm_driver.c
+++ b/src/apm_driver.c
@@ -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_rush.c b/src/apm_rush.c
index 4c5161a..4e0b745 100644
--- a/src/apm_rush.c
+++ b/src/apm_rush.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.1.4.1 2003/12/18 19:29:14 kaleb Exp $ */
+/* $XdotOrg$ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.11tsi Exp $ */
 /*
  * Copyright Loïc Grenié 1999
@@ -346,7 +346,7 @@ XFree86RushExtensionInit(ScreenPtr pScreen)
 {
     ExtensionEntry* extEntry;
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
     if (!noPanoramiXExtension)
 	return;
 #endif