From da41616009778417f0ad6577bc8964b5f0910ffa Mon Sep 17 00:00:00 2001 From: Eamon Walsh Date: Tue, 4 May 2004 19:43:36 +0000 Subject: Merge the new release from HEAD --- man/suncg14.man | 6 +++--- src/cg14_driver.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/man/suncg14.man b/man/suncg14.man index f333658..026ffd3 100644 --- a/man/suncg14.man +++ b/man/suncg14.man @@ -14,17 +14,17 @@ suncg14 \- CG14 video driver .fi .SH DESCRIPTION .B suncg14 -is an XFree86 driver for Sun CG14 video cards. +is an __xservername__ driver for Sun CG14 video cards. THIS MAN PAGE NEEDS TO BE FILLED IN. .SH SUPPORTED HARDWARE The .B suncg14 driver supports... .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. .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: Jakub Jelinek diff --git a/src/cg14_driver.c b/src/cg14_driver.c index 9a07d8f..f749f03 100644 --- a/src/cg14_driver.c +++ b/src/cg14_driver.c @@ -98,7 +98,7 @@ static XF86ModuleVersionInfo suncg14VersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, CG14_MAJOR_VERSION, CG14_MINOR_VERSION, CG14_PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, -- cgit v1.2.3