diff options
| author | Egbert Eich <eich@suse.de> | 2004-04-02 21:47:24 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-04-02 21:47:24 +0000 |
| commit | 67d26b3433a1142b0df4321f1115acbe6859f253 (patch) | |
| tree | 066cb6d9174b90d05d174b9d8307d91a5b04a453 | |
| parent | 473e0b46855e6efe8807ef87bb4912a48cccfe54 (diff) | |
70. Merging in the TM branch (Egbert Eich).XORG-RELEASE-1-STSF-FORKXORG-CYGWIN-LAST-MERGEXORG-RELEASE-1-STSF
| -rw-r--r-- | man/tseng.man | 6 | ||||
| -rw-r--r-- | src/tseng_driver.c | 6 |
2 files changed, 6 insertions, 6 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..01bccce 100644 --- a/src/tseng_driver.c +++ b/src/tseng_driver.c @@ -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; |