summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2004-04-10 09:05:01 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2004-04-10 09:05:01 +0000
commit22590eed57ec16c65cbca107a2c0f50218fbc772 (patch)
tree2495cadfaa156e0da706bb10954cb57d1fecae71
parent8bfd5f7bb773c61bbd56e04df7d1563f553bb307 (diff)
Resync to 2004-04-10 XORG-RELEASE-1 branchXPRINT_BEGIN
-rw-r--r--man/vmware.man8
-rw-r--r--src/vmware.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/man/vmware.man b/man/vmware.man
index efacc94..8e6ef60 100644
--- a/man/vmware.man
+++ b/man/vmware.man
@@ -1,4 +1,4 @@
-.\" $XFree86$
+.\" $__xservername__$
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH VMWARE __drivermansuffix__ __vendorversion__
@@ -14,9 +14,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 +32,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,