[xorg-commit-diffs] xc/programs/Xserver/hw/xfree86/drivers/vesa vesa.c, 1.1.4.2, 1.1.4.3 vesa.man, 1.1.4.1, 1.1.4.2

Egbert Eich xorg-commit at pdx.freedesktop.org
Thu Apr 15 03:16:44 PDT 2004


Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/vesa
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/xfree86/drivers/vesa

Modified Files:
      Tag: XORG-CURRENT
	vesa.c vesa.man 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: vesa.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/vesa.c	5 Mar 2004 13:40:39 -0000	1.1.4.2
+++ b/vesa.c	15 Apr 2004 10:16:40 -0000	1.1.4.3
@@ -212,7 +212,7 @@
     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,

Index: vesa.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.man,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/vesa.man	5 Mar 2004 13:40:39 -0000	1.1.4.1
+++ b/vesa.man	15 Apr 2004 10:16:40 -0000	1.1.4.2
@@ -14,7 +14,7 @@
 .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 @@
 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 @@
 
 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.




More information about the xorg-commit-diffs mailing list