diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-15 10:16:41 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-15 10:16:41 +0000 |
| commit | 6f05967c9680829bcd6ed8dcd2f3e7da92017faf (patch) | |
| tree | c26b3f209cb07bbd210974a343a35653847ffba3 | |
| parent | f29b4da0f7342723dcfd65a40ea9c2bbbc2c3d42 (diff) | |
Merged changes from RELEASE-1 branchbefore_20040421_xprint_branch_landingXORG-CURRENT-CLOSED
| -rw-r--r-- | man/vmware.man | 7 | ||||
| -rw-r--r-- | src/vmware.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/man/vmware.man b/man/vmware.man index efacc94..e8615ba 100644 --- a/man/vmware.man +++ b/man/vmware.man @@ -1,4 +1,3 @@ -.\" $XFree86$ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH VMWARE __drivermansuffix__ __vendorversion__ @@ -14,9 +13,9 @@ vmware \- VMware SVGA video driver .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 @@ Enable or disable the HW cursor. Default: off. .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. diff --git a/src/vmware.c b/src/vmware.c index 76d4bc3..f635ff2 100644 --- a/src/vmware.c +++ b/src/vmware.c @@ -130,7 +130,7 @@ static XF86ModuleVersionInfo vmwareVersRec = { MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, VMWARE_MAJOR_VERSION, VMWARE_MINOR_VERSION, VMWARE_PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, |