Merging XORG-CURRENT into trunkXACE-SELINUX-MERGECOMPOSITEWRAP

3 files changed, 8 insertions, 8 deletions

diff --git a/man/vesa.man b/man/vesa.man
index 5a9dfd5..4ae43bb 100644
--- a/man/vesa.man
+++ b/man/vesa.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.man,v 1.3 2001/12/17 20:52:34 dawes Exp $ 
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.man,v 1.2 2001/01/27 18:20:56 dawes Exp $ 
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH VESA __drivermansuffix__ __vendorversion__
@@ -14,7 +14,7 @@ vesa \- Generic VESA video driver
 .fi
 .SH DESCRIPTION
 .B vesa
-is an XFree86 driver for generic VESA video cards.  It can drive most
+is an __xservername__ driver for generic VESA video cards.  It can drive most
 VESA-compatible video cards, but only makes use of the basic standard
 VESA core that is common to these cards.  The driver supports depths 8, 15
 16 and 24.
@@ -24,7 +24,7 @@ The
 driver supports most VESA-compatible video cards.  There are some known
 exceptions, and those should be listed here.
 .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
@@ -47,6 +47,6 @@ Enable or disable use of the shadow framebuffer layer.  Default: on.
 
 This option is recommended for performance reasons.
 .SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86cfg(1), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgcfg(__appmansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
 .SH AUTHORS
-Authors include: Paulo César Pereira de Andrade.
+Authors include: Paulo Ce\'sar Pereira de Andrade.
diff --git a/src/vesa.c b/src/vesa.c
index 86eb228..298391e 100644
--- a/src/vesa.c
+++ b/src/vesa.c
@@ -28,7 +28,7 @@
  * Authors: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *          David Dawes <dawes@xfree86.org>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.c,v 1.41 2003/11/07 22:50:57 dawes Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.c,v 1.40 2003/11/03 05:11:45 tsi Exp $
  */
 
 #include "vesa.h"
@@ -212,7 +212,7 @@ static XF86ModuleVersionInfo vesaVersionRec =
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     VESA_MAJOR_VERSION, VESA_MINOR_VERSION, VESA_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,			/* This is a video driver */
     ABI_VIDEODRV_VERSION,
diff --git a/src/vesa.h b/src/vesa.h
index cc448eb..78b9e1e 100644
--- a/src/vesa.h
+++ b/src/vesa.h
@@ -26,7 +26,7 @@
  *
  * Authors: Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
  *
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h,v 1.14 2003/01/16 16:09:10 eich Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h,v 1.12 2002/08/06 13:46:27 dawes Exp $
  */
 
 #ifndef _VESA_H_