From cde3b2263ac4c74996792b55449ec949f9dc315d Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 23 Apr 2004 19:46:10 +0000 Subject: Merging XORG-CURRENT into trunk --- man/sunbw2.man | 8 ++++---- src/bw2.h | 2 +- src/bw2_driver.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/man/sunbw2.man b/man/sunbw2.man index ac05ccf..7520e17 100644 --- a/man/sunbw2.man +++ b/man/sunbw2.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.2 2001/01/27 18:20:53 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/sunbw2.man,v 1.1 2001/01/24 00:06:28 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH SUNBW2 __drivermansuffix__ __vendorversion__ @@ -14,17 +14,17 @@ sunbw2 \- BW2 video driver .fi .SH DESCRIPTION .B sunbw2 -is an XFree86 driver for Sun BW2 video cards. +is an __xservername__ driver for Sun BW2 video cards. THIS MAN PAGE NEEDS TO BE FILLED IN. .SH SUPPORTED HARDWARE The .B sunbw2 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/bw2.h b/src/bw2.h index a1284c8..6277f05 100644 --- a/src/bw2.h +++ b/src/bw2.h @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2.h,v 1.1 2000/06/30 17:15:13 dawes Exp $ */ +/* $XFree86:$ */ #ifndef BW2_H #define BW2_H diff --git a/src/bw2_driver.c b/src/bw2_driver.c index 5888b0e..e6bd2a9 100644 --- a/src/bw2_driver.c +++ b/src/bw2_driver.c @@ -20,7 +20,7 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2_driver.c,v 1.4 2003/10/30 17:37:11 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/bw2_driver.c,v 1.3 2001/05/04 19:05:45 dawes Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" @@ -96,7 +96,7 @@ static XF86ModuleVersionInfo sunbw2VersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, BW2_MAJOR_VERSION, BW2_MINOR_VERSION, BW2_PATCHLEVEL, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, -- cgit v1.2.3