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 | f3a8b69286c808d1f43c8dd6898ba859ff531999 (patch) | |
| tree | ec3190c035ca576740e560ba387a61faea7b5f65 | |
| parent | 935652e8217a0678732c4f38a1a5940f7721a362 (diff) | |
Merged changes from RELEASE-1 branchbefore_20040421_xprint_branch_landingXORG-CURRENT-CLOSEDXORG-CURRENT
| -rw-r--r-- | man/vga.man | 6 | ||||
| -rw-r--r-- | src/generic.c | 2 |
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, |