From a398fd9a90b1173859a5e884b2eebcaa8a3d741d Mon Sep 17 00:00:00 2001 From: jmc Date: Thu, 13 Oct 2022 21:37:05 +0000 Subject: [PATCH] controm terminql -> controlling terminal; --- bin/ps/ps.1 | 15 ++++++++------- lib/libc/compat-43/sigvec.3 | 8 ++++---- lib/libc/gen/signal.3 | 12 ++++++------ lib/libc/gen/ttyname.3 | 7 ++++--- lib/libc/sys/execve.2 | 8 ++++---- lib/libc/sys/getpgrp.2 | 7 +++---- lib/libc/sys/sigaction.2 | 8 ++++---- sbin/dump/dump.8 | 6 +++--- share/man/man4/pty.4 | 8 ++++---- usr.bin/tset/tset.1 | 6 +++--- 10 files changed, 43 insertions(+), 42 deletions(-) diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index 4406d46c9bb..9ad7e8c99f9 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ps.1,v 1.128 2022/09/03 15:59:04 jmc Exp $ +.\" $OpenBSD: ps.1,v 1.129 2022/10/13 21:37:05 jmc Exp $ .\" $NetBSD: ps.1,v 1.16 1996/03/21 01:36:28 jtc Exp $ .\" .\" Copyright (c) 1980, 1990, 1991, 1993, 1994 @@ -30,7 +30,7 @@ .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" -.Dd $Mdocdate: September 3 2022 $ +.Dd $Mdocdate: October 13 2022 $ .Dt PS 1 .Os .Sh NAME @@ -443,7 +443,8 @@ information: .Pp .Bl -tag -width indent -compact .It + -The process is in the foreground process group of its control terminal. +The process is in the foreground process group of its controlling +terminal. .It \*(Lt The process has a raised CPU scheduling priority (see @@ -508,7 +509,7 @@ Saved GID from a setgid executable. .It Cm svuid Saved UID from a setuid executable. .It Cm tdev -Control terminal device number. +Controlling terminal device number. .It Cm tid Thread ID. Used together with @@ -518,11 +519,11 @@ Alias: .Cm cputime . Accumulated CPU time, user + system. .It Cm tpgid -Control terminal process group ID. +Controlling terminal process group ID. .\".It trss .\"Text resident set size, in Kilobytes. .It Cm tsess -Control terminal session pointer. +Controlling terminal session pointer. .It Cm tsiz Text size, in Kilobytes. .It Cm tt @@ -536,7 +537,7 @@ This is followed by a if the process can no longer reach that controlling terminal (i.e. it has been revoked). .It Cm tty -Full name of control terminal. +Full name of controlling terminal. .It Cm ucomm Alias: .Cm comm . diff --git a/lib/libc/compat-43/sigvec.3 b/lib/libc/compat-43/sigvec.3 index 5ad8e0a0d5d..b014ed9febf 100644 --- a/lib/libc/compat-43/sigvec.3 +++ b/lib/libc/compat-43/sigvec.3 @@ -25,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: sigvec.3,v 1.36 2022/03/31 17:27:15 naddy Exp $ +.\" $OpenBSD: sigvec.3,v 1.37 2022/10/13 21:37:05 jmc Exp $ .\" -.Dd $Mdocdate: March 31 2022 $ +.Dd $Mdocdate: October 13 2022 $ .Dt SIGVEC 3 .Os .Sh NAME @@ -243,8 +243,8 @@ with names as in the include file .It Dv SIGTSTP Ta "stop process" Ta "stop signal generated from keyboard" .It Dv SIGCONT Ta "discard signal" Ta "continue after stop" .It Dv SIGCHLD Ta "discard signal" Ta "child status has changed" -.It Dv SIGTTIN Ta "stop process" Ta "background read attempted from control terminal" -.It Dv SIGTTOU Ta "stop process" Ta "background write attempted to control terminal" +.It Dv SIGTTIN Ta "stop process" Ta "background read attempted from controlling terminal" +.It Dv SIGTTOU Ta "stop process" Ta "background write attempted to controlling terminal" .It Dv SIGIO Ta "discard signal" Ta "I/O is possible on a descriptor (see" .Xr fcntl 2 ) .It Dv SIGXCPU Ta "terminate process" Ta "CPU time limit exceeded (see" diff --git a/lib/libc/gen/signal.3 b/lib/libc/gen/signal.3 index 01fc95a853a..52de1a7384a 100644 --- a/lib/libc/gen/signal.3 +++ b/lib/libc/gen/signal.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: signal.3,v 1.56 2017/08/01 14:57:02 schwarze Exp $ +.\" $OpenBSD: signal.3,v 1.57 2022/10/13 21:37:05 jmc Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: August 1 2017 $ +.Dd $Mdocdate: October 13 2022 $ .Dt SIGNAL 3 .Os .Sh NAME @@ -76,12 +76,12 @@ typing the character. .Pp Signals are used when a process is stopped because it wishes to access -its control terminal while in the background (see +its controlling terminal while in the background (see .Xr tty 4 ) . Signals are optionally generated when a process resumes after being stopped, when the status of child processes changes, -or when input is ready at the control terminal. +or when input is ready at the controlling terminal. Most signals result in the termination of the process receiving them if no action is taken; some signals instead cause the process receiving them @@ -120,8 +120,8 @@ These signals are defined in the file .It Dv SIGTSTP Ta "stop process" Ta "stop signal generated from keyboard" .It Dv SIGCONT Ta "discard signal" Ta "continue after stop" .It Dv SIGCHLD Ta "discard signal" Ta "child status has changed" -.It Dv SIGTTIN Ta "stop process" Ta "background read attempted from control terminal" -.It Dv SIGTTOU Ta "stop process" Ta "background write attempted to control terminal" +.It Dv SIGTTIN Ta "stop process" Ta "background read attempted from controlling terminal" +.It Dv SIGTTOU Ta "stop process" Ta "background write attempted to controlling terminal" .It Dv SIGIO Ta "discard signal" Ta "I/O is possible on a descriptor (see" .Xr fcntl 2 ) .It Dv SIGXCPU Ta "terminate process" Ta "CPU time limit exceeded (see" diff --git a/lib/libc/gen/ttyname.3 b/lib/libc/gen/ttyname.3 index e2d1bd9d55f..94d50d84e7a 100644 --- a/lib/libc/gen/ttyname.3 +++ b/lib/libc/gen/ttyname.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ttyname.3,v 1.19 2013/11/12 05:12:15 deraadt Exp $ +.\" $OpenBSD: ttyname.3,v 1.20 2022/10/13 21:37:05 jmc Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: November 12 2013 $ +.Dd $Mdocdate: October 13 2022 $ .Dt TTYNAME 3 .Os .Sh NAME @@ -94,7 +94,8 @@ The maximum length of the terminal name is .Pp The .Fn ttyslot -function fetches the current process's control terminal number from the +function fetches the current process's controlling terminal number from +the .Xr ttys 5 file entry. .Sh RETURN VALUES diff --git a/lib/libc/sys/execve.2 b/lib/libc/sys/execve.2 index 5d8616b3177..0d5c1b03f23 100644 --- a/lib/libc/sys/execve.2 +++ b/lib/libc/sys/execve.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: execve.2,v 1.57 2022/09/24 15:21:21 jmc Exp $ +.\" $OpenBSD: execve.2,v 1.58 2022/10/13 21:37:05 jmc Exp $ .\" $NetBSD: execve.2,v 1.9 1995/02/27 12:32:25 cgd Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)execve.2 8.3 (Berkeley) 1/24/94 .\" -.Dd $Mdocdate: September 24 2022 $ +.Dd $Mdocdate: October 13 2022 $ .Dt EXECVE 2 .Os .Sh NAME @@ -156,7 +156,7 @@ The process will be started without the new permissions. The new process also inherits the following attributes from the calling process: .Pp -.Bl -tag -width parent_process_ID -offset indent -compact +.Bl -tag -width controlling_terminal -offset indent -compact .It process ID see .Xr getpid 2 @@ -178,7 +178,7 @@ see .It root directory see .Xr chroot 2 -.It control terminal +.It controlling terminal see .Xr termios 4 .It resource usages diff --git a/lib/libc/sys/getpgrp.2 b/lib/libc/sys/getpgrp.2 index bcdb3026353..b215c0b046f 100644 --- a/lib/libc/sys/getpgrp.2 +++ b/lib/libc/sys/getpgrp.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: getpgrp.2,v 1.18 2015/09/10 17:55:21 schwarze Exp $ +.\" $OpenBSD: getpgrp.2,v 1.19 2022/10/13 21:37:05 jmc Exp $ .\" $NetBSD: getpgrp.2,v 1.8 1995/02/27 12:33:09 cgd Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)getpgrp.2 8.1 (Berkeley) 6/4/93 .\" -.Dd $Mdocdate: September 10 2015 $ +.Dd $Mdocdate: October 13 2022 $ .Dt GETPGRP 2 .Os .Sh NAME @@ -71,8 +71,7 @@ The .Fn tcgetpgrp and .Fn tcsetpgrp -calls -are used to get/set the process group of the control terminal. +calls are used to get/set the process group of the controlling terminal. .Sh ERRORS .Fn getpgrp always succeeds, however diff --git a/lib/libc/sys/sigaction.2 b/lib/libc/sys/sigaction.2 index 5b318968fa6..7e821468c60 100644 --- a/lib/libc/sys/sigaction.2 +++ b/lib/libc/sys/sigaction.2 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sigaction.2,v 1.76 2022/03/31 17:27:16 naddy Exp $ +.\" $OpenBSD: sigaction.2,v 1.77 2022/10/13 21:37:05 jmc Exp $ .\" $NetBSD: sigaction.2,v 1.7 1995/10/12 15:41:16 jtc Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)sigaction.2 8.2 (Berkeley) 4/3/94 .\" -.Dd $Mdocdate: March 31 2022 $ +.Dd $Mdocdate: October 13 2022 $ .Dt SIGACTION 2 .Os .Sh NAME @@ -327,8 +327,8 @@ with names as in the include file .It Dv SIGTSTP Ta "stop process" Ta "stop signal generated from keyboard" .It Dv SIGCONT Ta "discard signal" Ta "continue after stop" .It Dv SIGCHLD Ta "discard signal" Ta "child status has changed" -.It Dv SIGTTIN Ta "stop process" Ta "background read attempted from control terminal" -.It Dv SIGTTOU Ta "stop process" Ta "background write attempted to control terminal" +.It Dv SIGTTIN Ta "stop process" Ta "background read attempted from controlling terminal" +.It Dv SIGTTOU Ta "stop process" Ta "background write attempted to controlling terminal" .It Dv SIGIO Ta "discard signal" Ta "I/O is possible on a descriptor (see" .Xr fcntl 2 ) .It Dv SIGXCPU Ta "terminate process" Ta "CPU time limit exceeded (see" diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8 index e0ede7a50e1..22c0c8e8963 100644 --- a/sbin/dump/dump.8 +++ b/sbin/dump/dump.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: dump.8,v 1.55 2022/06/02 15:35:55 millert Exp $ +.\" $OpenBSD: dump.8,v 1.56 2022/10/13 21:37:05 jmc Exp $ .\" $NetBSD: dump.8,v 1.17 1997/06/05 11:15:06 lukem Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 @@ -31,7 +31,7 @@ .\" .\" @(#)dump.8 8.1 (Berkeley) 6/16/93 .\" -.Dd $Mdocdate: June 2 2022 $ +.Dd $Mdocdate: October 13 2022 $ .Dt DUMP 8 .Os .Sh NAME @@ -314,7 +314,7 @@ flag, .Nm interacts with the operator on .Nm dump Ns 's -control terminal at times when +controlling terminal at times when .Nm can no longer proceed, or if something is grossly wrong. diff --git a/share/man/man4/pty.4 b/share/man/man4/pty.4 index e08c1d848bb..6ac98d7be59 100644 --- a/share/man/man4/pty.4 +++ b/share/man/man4/pty.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pty.4,v 1.25 2018/06/05 16:43:19 anton Exp $ +.\" $OpenBSD: pty.4,v 1.26 2022/10/13 21:37:05 jmc Exp $ .\" $NetBSD: pty.4,v 1.4 1998/03/21 03:14:30 fair Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)pty.4 8.2 (Berkeley) 11/30/93 .\" -.Dd $Mdocdate: June 5 2018 $ +.Dd $Mdocdate: October 13 2022 $ .Dt PTY 4 .Os .Sh NAME @@ -226,8 +226,8 @@ independent of .Dv TIOCPKT . This mode causes input to the pseudo terminal to be flow controlled and not input edited (regardless of the terminal mode). -Each write to the control terminal produces a record boundary for the process -reading the terminal. +Each write to the controlling terminal produces a record boundary for the +process reading the terminal. In normal usage, a write of data is like the data typed as a line on the terminal; a write of 0 bytes is like typing an end-of-file character. diff --git a/usr.bin/tset/tset.1 b/usr.bin/tset/tset.1 index a3bf5c85199..3ff51025368 100644 --- a/usr.bin/tset/tset.1 +++ b/usr.bin/tset/tset.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tset.1,v 1.23 2022/03/31 17:27:28 naddy Exp $ +.\" $OpenBSD: tset.1,v 1.24 2022/10/13 21:37:05 jmc Exp $ .\" .\" Copyright (c) 1985, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)tset.1 8.1 (Berkeley) 6/9/93 .\" -.Dd $Mdocdate: March 31 2022 $ +.Dd $Mdocdate: October 13 2022 $ .Dt TSET 1 .Os .Sh NAME @@ -275,7 +275,7 @@ and .Ql \&! inverts the sense of the test. The baud rate is specified as a number and is compared with the speed -of the standard error output (which should be the control terminal). +of the standard error output (which should be the controlling terminal). The terminal type is a string. .Pp If the terminal type is not specified on the command line, the -- 2.20.1