[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/apm apm.man, 1.1.10.1, 1.1.10.1.6.1 apm_driver.c, 1.1.4.1.6.1, 1.1.4.1.6.1.6.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/apm
In directory pdx:/tmp/cvs-serv7662/xc/programs/Xserver/hw/xfree86/drivers/apm

Modified Files:
      Tag: XPRINT
	apm.man apm_driver.c 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: apm.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/apm/apm.man,v
retrieving revision 1.1.10.1
retrieving revision 1.1.10.1.6.1
diff -u -d -r1.1.10.1 -r1.1.10.1.6.1
--- a/apm.man	4 Mar 2004 17:47:35 -0000	1.1.10.1
+++ b/apm.man	10 Apr 2004 09:04:43 -0000	1.1.10.1.6.1
@@ -14,7 +14,7 @@
 .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 @@
 .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 @@
 .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: ...

Index: apm_driver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c,v
retrieving revision 1.1.4.1.6.1
retrieving revision 1.1.4.1.6.1.6.1
diff -u -d -r1.1.4.1.6.1 -r1.1.4.1.6.1.6.1
--- a/apm_driver.c	4 Mar 2004 17:47:35 -0000	1.1.4.1.6.1
+++ b/apm_driver.c	10 Apr 2004 09:04:43 -0000	1.1.4.1.6.1.6.1
@@ -227,7 +227,7 @@
     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,