diff options
| author | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:37 +0000 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@epoch.ncsc.mil> | 2004-05-04 19:43:37 +0000 |
| commit | f008e920ca0bd43c1ee8af7cba9611f5a8bf1a0b (patch) | |
| tree | 7a75016b1ff0cd2f0f38f563f247781c7ec10770 | |
| parent | ab7ffe9a25767589e3e5250349cdcc3666a9ab18 (diff) | |
Merge the new release from HEADXACE-SELINUX
| -rw-r--r-- | man/trident.man | 6 | ||||
| -rw-r--r-- | src/trident_driver.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/man/trident.man b/man/trident.man index 57c6813..e484315 100644 --- a/man/trident.man +++ b/man/trident.man @@ -14,7 +14,7 @@ trident \- Trident video driver .fi .SH DESCRIPTION .B trident -is an XFree86 driver for Trident video cards. The driver is +is an __xservername__ driver for Trident video cards. The driver is accelerated, and provides support for the following framebuffer depths: 1, 4, 8, 15, 16, and 24. Multi-head configurations are supported. The XvImage extension is supported on TGUI96xx and greater cards. @@ -41,7 +41,7 @@ CyberBlade/e4, CyberBladeXP, CyberBladeAi1/XP, BladeXP 8900C, 8900D, 9000, 9200CXr, Cyber9320, 9400CXi, 9440AGi These cards have been ported but need further testing and may not work. .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 @@ -128,6 +128,6 @@ an integer value greater or equal to 0 and less than 128. Default: gamma and brightness control is turned off. Note: This is not supported on all chipsets. .SH "SEE ALSO" -XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__) +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) .SH AUTHOR Author: Alan Hourihane diff --git a/src/trident_driver.c b/src/trident_driver.c index b8256f1..0e507e5 100644 --- a/src/trident_driver.c +++ b/src/trident_driver.c @@ -565,7 +565,7 @@ static XF86ModuleVersionInfo tridentVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, TRIDENT_MAJOR_VERSION, TRIDENT_MINOR_VERSION, TRIDENT_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, |