diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2017-12-12 11:34:39 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2017-12-12 11:34:39 +0000 |
| commit | 3bd504efc9a0fbe2d19cdad1450356580e6421bb (patch) | |
| tree | 4d50aaa21966509e45fe1942e16ea17c388e370d /bin/ksh | |
| parent | b3908691ec24cc1f5f8dda3b1ac2d2a966a2c439 (diff) | |
Document change in the default shell prompts.
Discussed with and ok jmc
Diffstat (limited to 'bin/ksh')
| -rw-r--r-- | bin/ksh/ksh.1 | 6 | ||||
| -rw-r--r-- | bin/ksh/sh.1 | 19 |
2 files changed, 15 insertions, 10 deletions
diff --git a/bin/ksh/ksh.1 b/bin/ksh/ksh.1 index 812384b2ec4..67ed7108542 100644 --- a/bin/ksh/ksh.1 +++ b/bin/ksh/ksh.1 @@ -1,8 +1,8 @@ -.\" $OpenBSD: ksh.1,v 1.196 2017/11/22 12:17:34 anton Exp $ +.\" $OpenBSD: ksh.1,v 1.197 2017/12/12 11:34:38 tb Exp $ .\" .\" Public Domain .\" -.Dd $Mdocdate: November 22 2017 $ +.Dd $Mdocdate: December 12 2017 $ .Dt KSH 1 .Os .Sh NAME @@ -1539,7 +1539,7 @@ By the way, don't blame me for this hack; it's in the original .Nm . .Pp -The default prompt is +The default prompt is the first part of the hostname, followed by .Sq $\ \& for non-root users, .Sq #\ \& diff --git a/bin/ksh/sh.1 b/bin/ksh/sh.1 index 7ea6cfabd72..26731d8f8b7 100644 --- a/bin/ksh/sh.1 +++ b/bin/ksh/sh.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sh.1,v 1.143 2017/06/01 20:37:38 tb Exp $ +.\" $OpenBSD: sh.1,v 1.144 2017/12/12 11:34:38 tb Exp $ .\" .\" Copyright (c) 2015 Jason McIntyre <jmc@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: June 1 2017 $ +.Dd $Mdocdate: December 12 2017 $ .Dt SH 1 .Os .Sh NAME @@ -2101,11 +2101,6 @@ A .Sq !\& in the prompt is expanded to the number of the next command in history to be typed. -The default value is -.Sq $\ \& -for normal users and -.Sq #\ \& -for root. .It Ev PS2 Newline prompt displayed in an interactive shell when a newline has been entered @@ -2228,6 +2223,16 @@ built-ins should exit/return from the outermost loop if the argument is greater than the level of loops. .El .Pp +The default value for the +.Ev PS1 +user prompt contains the machine's hostname, +followed by +.Sq $\ \& +for normal users and +.Sq #\ \& +for root; +POSIX does not include the hostname. +.Pp Enabling POSIX mode changes some behaviour to make .Nm adhere more strictly to the |