summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Mainz <roland.mainz@nrubsig.org>2004-04-10 09:05:00 +0000
committerRoland Mainz <roland.mainz@nrubsig.org>2004-04-10 09:05:00 +0000
commit39136fb4070f70734b79feb1b28476f3169abe07 (patch)
treeec3190c035ca576740e560ba387a61faea7b5f65
parente13a02a36b40364bc101f53ed67b3fc30a87c932 (diff)
Resync to 2004-04-10 XORG-RELEASE-1 branchXPRINT_BEGINXPRINT
-rw-r--r--man/vga.man6
-rw-r--r--src/generic.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/man/vga.man b/man/vga.man
index 1d4e87f..9eccf9e 100644
--- a/man/vga.man
+++ b/man/vga.man
@@ -14,7 +14,7 @@ vga \- Generic VGA video driver
.fi
.SH DESCRIPTION
.B vga
-is an XFree86 driver for generic VGA video cards. It can drive most
+is an __xservername__ driver for generic VGA video cards. It can drive most
VGA-compatible video cards, but only makes use of the basic standard
VGA core that is common to these cards. The driver supports depths 1, 4
and 8. All relevant visual types are supported at each depth.
@@ -28,7 +28,7 @@ The
driver supports most VGA-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
@@ -60,6 +60,6 @@ This option is recommended for performance reasons when running at depths
when using those depths in a multi-head configuration where one or more
of the other screens is operating at a different depth.
.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
Authors include: Marc La France, David Dawes, and Dirk Hohndel.
diff --git a/src/generic.c b/src/generic.c
index ac20129..7ae477e 100644
--- a/src/generic.c
+++ b/src/generic.c
@@ -178,7 +178,7 @@ static XF86ModuleVersionInfo GenericVersionRec =
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
VGA_VERSION_MAJOR, VGA_VERSION_MINOR, VGA_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,