diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-15 10:16:39 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-15 10:16:39 +0000 |
| commit | 26ab0db360526f30ad71b137f15aaf18f7fa194a (patch) | |
| tree | 536f9f8b29d09471efa8aec996df3fe85e7a1b8e | |
| parent | 62106ce7c775a599e1bec06dd62ce123a45f9aa1 (diff) | |
Merged changes from RELEASE-1 branchbefore_20040421_xprint_branch_landingXORG-CURRENT-CLOSEDXORG-CURRENT
| -rw-r--r-- | man/tseng.man | 6 | ||||
| -rw-r--r-- | src/tseng_driver.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/man/tseng.man b/man/tseng.man index ef76408..e1354a7 100644 --- a/man/tseng.man +++ b/man/tseng.man @@ -14,17 +14,17 @@ tseng \- Tseng Labs video driver .fi .SH DESCRIPTION .B tseng -is an XFree86 driver for Tseng Labs video cards. +is an __xservername__ driver for Tseng Labs video cards. THIS MAN PAGE NEEDS TO BE FILLED IN. .SH SUPPORTED HARDWARE The .B tseng 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: ... diff --git a/src/tseng_driver.c b/src/tseng_driver.c index 588ab4f..2c1f991 100644 --- a/src/tseng_driver.c +++ b/src/tseng_driver.c @@ -281,7 +281,7 @@ static XF86ModuleVersionInfo tsengVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, TSENG_MAJOR_VERSION, TSENG_MINOR_VERSION, TSENG_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, @@ -1237,7 +1237,7 @@ TsengProcessHibit(ScrnInfoPtr pScrn) if (xf86IsOptionSet(pTseng->Options, OPTION_HIBIT_HIGH)) { if (xf86IsOptionSet(pTseng->Options, OPTION_HIBIT_LOW)) { xf86Msg(X_ERROR, "\nOptions \"hibit_high\" and \"hibit_low\" are incompatible;\n"); - xf86Msg(X_ERROR, " specify only one (not both) in XFree86 configuration file\n"); + xf86Msg(X_ERROR, " specify only one (not both) in X configuration file\n"); return FALSE; } pTseng->save_divide = 0x40; @@ -1253,7 +1253,7 @@ TsengProcessHibit(ScrnInfoPtr pScrn) xf86Msg(X_WARNING, "Non-standard VGA text or graphics mode while probing for hibit:\n"); xf86Msg(X_WARNING, " probed 'hibit' value may be wrong.\n"); xf86Msg(X_WARNING, " Preferably run probe from 80x25 textmode,\n"); - xf86Msg(X_WARNING, " or specify correct value in XFree86 configuration file.\n"); + xf86Msg(X_WARNING, " or specify correct value in X configuration file.\n"); } /* Check for initial state of divide flag */ outb(0x3C4, 7); @@ -1473,7 +1473,7 @@ TsengGetLinFbAddress(ScrnInfoPtr pScrn) break; default: xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "TsengNonPciLinMem(): Internal error. This should not happen: please report to XFree86@XFree86.Org\n"); + "TsengNonPciLinMem(): Internal error. This should not happen: Please check "__VENDORDWEBSUPPORT__"\n"); xf86DrvMsg(pScrn->scrnIndex, X_ERROR, " Falling back to banked mode.\n"); pTseng->UseLinMem = FALSE; |