diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-23 19:53:24 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-23 19:53:24 +0000 |
| commit | 23a8e1b91ca8b618f4a55d028499c7bd88c81424 (patch) | |
| tree | ec3190c035ca576740e560ba387a61faea7b5f65 | |
| parent | 3322eede2037b9684e5db0be1ebc11d6a1cca3f8 (diff) | |
Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch
| -rw-r--r-- | man/vga.man | 8 | ||||
| -rw-r--r-- | src/generic.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/man/vga.man b/man/vga.man index 5781c1b..9eccf9e 100644 --- a/man/vga.man +++ b/man/vga.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man,v 1.3 2001/12/17 20:52:34 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/vga.man,v 1.2 2001/01/27 18:20:56 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH VGA __drivermansuffix__ __vendorversion__ @@ -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 2829049..7ae477e 100644 --- a/src/generic.c +++ b/src/generic.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.65 2003/10/30 17:37:15 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c,v 1.64 2003/08/23 16:09:23 dawes Exp $ */ /* * Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved. * @@ -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, |