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

[Egbert Eich]

Committed by: eich

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

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


Index: vmware.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.c,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/vmware.c	5 Mar 2004 13:40:44 -0000	1.1.4.3
+++ b/vmware.c	15 Apr 2004 10:16:41 -0000	1.1.4.4
@@ -130,7 +130,7 @@
     MODULEVENDORSTRING,
     MODINFOSTRING1,
     MODINFOSTRING2,
-    XF86_VERSION_CURRENT,
+    XORG_VERSION_CURRENT,
     VMWARE_MAJOR_VERSION, VMWARE_MINOR_VERSION, VMWARE_PATCHLEVEL,
     ABI_CLASS_VIDEODRV,
     ABI_VIDEODRV_VERSION,

Index: vmware.man
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.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/vmware.man	5 Mar 2004 13:40:44 -0000	1.1.4.1
+++ b/vmware.man	15 Apr 2004 10:16:41 -0000	1.1.4.2
@@ -1,4 +1,3 @@
-.\" $XFree86$
 .\" shorthand for double quote that works everywhere.
 .ds q \N'34'
 .TH VMWARE __drivermansuffix__ __vendorversion__
@@ -14,9 +13,9 @@
 .fi
 .SH DESCRIPTION
 .B vmware 
-is an XFree86 driver for VMware virtual video cards. 
+is an __xservername__ driver for VMware virtual video cards. 
 .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
@@ -32,6 +31,6 @@
 .BI "Option \*qNoAccel\*q \*q" boolean \*q
 Disable or enable acceleration.  Default: acceleration is enabled.
 .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
 Copyright (c) 1999-2001 VMware, Inc.