From 94b44fb81352015733d8189ce1bc61b9d8566468 Mon Sep 17 00:00:00 2001 From: nicm Date: Fri, 23 Aug 2024 15:10:40 +0000 Subject: [PATCH] Fix some program names that were not expanded correctly when ncurses was updated and were instead replaced by ?. ok millert --- lib/libcurses/terminfo.5 | 22 +++++++++++----------- usr.bin/tput/tput.1 | 6 +++--- usr.bin/tset/tset.1 | 16 ++++++++-------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/libcurses/terminfo.5 b/lib/libcurses/terminfo.5 index f79728bbb60..6343908516b 100644 --- a/lib/libcurses/terminfo.5 +++ b/lib/libcurses/terminfo.5 @@ -33,7 +33,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: terminfo.5,v 1.2 2023/10/17 09:52:08 nicm Exp $ +.\" $Id: terminfo.5,v 1.3 2024/08/23 15:10:40 nicm Exp $ .TH terminfo 5 2023-07-01 "ncurses 6.4" "File formats" .ds n 5 .ds d /usr/share/terminfo @@ -73,8 +73,8 @@ used by screen-oriented programs such as and other curses applications, using high-level calls to libraries such as \fBcurses\fP(3). It is also used via low-level calls by non-curses applications -which may be screen-oriented (such as \fB?\fP(1)) -or non-screen (such as \fB?\fP(1)). +which may be screen-oriented (such as \fBclear\fP(1)) +or non-screen (such as \fBtabs\fP(1)). .PP .I Terminfo describes terminals by giving a set of capabilities which they @@ -1784,7 +1784,7 @@ T} .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: terminfo.5,v 1.2 2023/10/17 09:52:08 nicm Exp $ +.\" $Id: terminfo.5,v 1.3 2024/08/23 15:10:40 nicm Exp $ .ps +1 .SS User-Defined Capabilities . @@ -3140,7 +3140,7 @@ and respectively. These strings are output by \fIreset\fP option of \fBtput\fP, -or by the \fB?\fP program +or by the \fBreset\fP program (an alias of \fBtset\fP), which is used when the terminal gets into a wedged state. Commands are normally placed in @@ -3157,7 +3157,7 @@ normally be part of but it causes an annoying glitch of the screen and is not normally needed since the terminal is usually already in 80-column mode. .PP -The \fB?\fP program writes strings including +The \fBreset\fP program writes strings including .BR iprog , etc., in the same order as the .I init @@ -3173,7 +3173,7 @@ If any of or .B rf reset capability strings are missing, -the \fB?\fP program +the \fBreset\fP program falls back upon the corresponding initialization capability string. .PP If there are commands to set and clear tab stops, they can be given as @@ -3189,13 +3189,13 @@ or .BR if . .PP The \fBtput reset\fP command uses the same capability strings -as the \fB?\fP command, -although the two programs (\fBtput\fP and \fB?\fP) +as the \fBreset\fP command, +although the two programs (\fBtput\fP and \fBreset\fP) provide different command-line options. .PP In practice, these terminfo capabilities are not often used in initialization of tabs -(though they are required for the \fB?\fP program): +(though they are required for the \fBtabs\fP program): .bP Almost all hardware terminals (at least those which supported tabs) initialized those to every \fIeight\fP columns: @@ -3828,7 +3828,7 @@ files containing terminal descriptions .na .hy 0 \fBinfocmp\fP(1), -\fB?\fP(1), +\fBtabs\fP(1), \fBtic\fP(1), \fBcurses\fP(3), \fBcurs_color\fP(3), diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1 index d4e2561fa47..31ae8b6371b 100644 --- a/usr.bin/tput/tput.1 +++ b/usr.bin/tput/tput.1 @@ -1,5 +1,5 @@ '\" t -.\" $OpenBSD: tput.1,v 1.27 2023/10/17 09:52:11 nicm Exp $ +.\" $OpenBSD: tput.1,v 1.28 2024/08/23 15:10:40 nicm Exp $ .\"*************************************************************************** .\" Copyright 2018-2022,2023 Thomas E. Dickey * .\" Copyright 1998-2016,2017 Free Software Foundation, Inc. * @@ -607,9 +607,9 @@ as ncurses. NetBSD curses documents different exit codes which do not correspond to either ncurses or X/Open. .SH SEE ALSO -\fB?\fP(\*n), +\fBclear\fP(\*n), \fBstty\fP(1), -\fB?\fP(\*n), +\fBtabs\fP(\*n), \fBtset\fP(\*n), \fBtermcap\fP(3), \fBterminfo\fP(5). diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1 index 9c9b55a2062..8d23968bfb2 100644 --- a/usr.bin/tset/tset.1 +++ b/usr.bin/tset/tset.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tset.1,v 1.25 2023/10/17 09:52:11 nicm Exp $ +.\" $OpenBSD: tset.1,v 1.26 2024/08/23 15:10:40 nicm Exp $ .\" .\"*************************************************************************** .\" Copyright 2018-2022,2023 Thomas E. Dickey * @@ -40,11 +40,11 @@ .el .IP \(bu 2 .. .SH NAME -\fBtset\fP, \fB?\fP \- terminal initialization +\fBtset\fP, \fBreset\fP \- terminal initialization .SH SYNOPSIS \fBtset\fP [\fB\-IQVcqrsw\fP] [\fB\-\fP] [\fB\-e\fP \fIch\fP] [\fB\-i\fP \fIch\fP] [\fB\-k\fP \fIch\fP] [\fB\-m\fP \fImapping\fP] [\fIterminal\fP] .br -\fB?\fP [\fB\-IQVcqrsw\fP] [\fB\-\fP] [\fB\-e\fP \fIch\fP] [\fB\-i\fP \fIch\fP] [\fB\-k\fP \fIch\fP] [\fB\-m\fP \fImapping\fP] [\fIterminal\fP] +\fBreset\fP [\fB\-IQVcqrsw\fP] [\fB\-\fP] [\fB\-e\fP \fIch\fP] [\fB\-i\fP \fIch\fP] [\fB\-k\fP \fIch\fP] [\fB\-m\fP \fImapping\fP] [\fIterminal\fP] .SH DESCRIPTION .SS tset - initialization This program initializes terminals. @@ -118,7 +118,7 @@ Finally, if the erase, interrupt and line kill characters have changed, or are not set to their default values, their values are displayed to the standard error output. .SS reset - reinitialization -When invoked as \fB?\fP, \fBtset\fP sets the terminal +When invoked as \fBreset\fP, \fBtset\fP sets the terminal modes to \*(``sane\*('' values: .bP sets cooked and echo modes, @@ -134,12 +134,12 @@ doing the terminal initialization described above. Also, rather than using the terminal \fIinitialization\fP strings, it uses the terminal \fIreset\fP strings. .PP -The \fB?\fP command is useful +The \fBreset\fP command is useful after a program dies leaving a terminal in an abnormal state: .bP you may have to type .sp - \fI\fB?\fI\fR + \fI\fBreset\fI\fR .sp (the line-feed character is normally control-J) to get the terminal to work, as carriage-return may no longer work in the abnormal state. @@ -313,7 +313,7 @@ S. Raymond . .SH COMPATIBILITY Neither IEEE Std 1003.1/The Open Group Base Specifications Issue 7 (POSIX.1-2008) nor -X/Open Curses Issue 7 documents \fBtset\fP or \fB?\fP. +X/Open Curses Issue 7 documents \fBtset\fP or \fBreset\fP. .PP The AT&T \fBtput\fP utility (AIX, HPUX, Solaris) incorporated the terminal-mode manipulation as well as termcap-based features @@ -370,7 +370,7 @@ although it is strongly recommended that such usage be fixed to explicitly specify the character. .PP As of 4.4BSD, -executing \fBtset\fP as \fB?\fP no longer implies the \fB\-Q\fP option. +executing \fBtset\fP as \fBreset\fP no longer implies the \fB\-Q\fP option. Also, the interaction between the \- option and the \fIterminal\fP argument in some historic implementations of \fBtset\fP has been removed. .PP -- 2.20.1