summaryrefslogtreecommitdiff
path: root/bin/ksh
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2013-06-13 19:43:10 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2013-06-13 19:43:10 +0000
commit7b9cbdc585215100702879688c12365d35f2af9c (patch)
treea0a7ac845942f2c35a669d86e6c05e1fbde1c7a0 /bin/ksh
parent3e6dea100267c861a621c71cd8c30097db0caa2a (diff)
Document correct interaction of -e flag with && and ||. OK jmc@
Diffstat (limited to 'bin/ksh')
-rw-r--r--bin/ksh/ksh.111
-rw-r--r--bin/ksh/sh.111
2 files changed, 14 insertions, 8 deletions
diff --git a/bin/ksh/ksh.1 b/bin/ksh/ksh.1
index 645c9a5d52c..cdfdf4253c9 100644
--- a/bin/ksh/ksh.1
+++ b/bin/ksh/ksh.1
@@ -1,8 +1,8 @@
-.\" $OpenBSD: ksh.1,v 1.146 2013/03/18 11:10:52 mpi Exp $
+.\" $OpenBSD: ksh.1,v 1.147 2013/06/13 19:43:09 millert Exp $
.\"
.\" Public Domain
.\"
-.Dd $Mdocdate: March 18 2013 $
+.Dd $Mdocdate: June 13 2013 $
.Dt KSH 1
.Os
.Sh NAME
@@ -3611,11 +3611,14 @@ explicitly tested by a shell construct such as
.Ic if ,
.Ic until ,
.Ic while ,
-.Ic && ,
-.Ic || ,
or
.Ic !\&
statements.
+For
+.Ic &&
+or
+.Ic || ,
+only the status of the last command is tested.
.It Fl f \*(Ba Ic noglob
Do not expand file name patterns.
.It Fl h \*(Ba Ic trackall
diff --git a/bin/ksh/sh.1 b/bin/ksh/sh.1
index 5d4598f3ad8..2c7c82a1071 100644
--- a/bin/ksh/sh.1
+++ b/bin/ksh/sh.1
@@ -1,8 +1,8 @@
-.\" $OpenBSD: sh.1,v 1.93 2013/01/17 21:20:25 jmc Exp $
+.\" $OpenBSD: sh.1,v 1.94 2013/06/13 19:43:09 millert Exp $
.\"
.\" Public Domain
.\"
-.Dd $Mdocdate: January 17 2013 $
+.Dd $Mdocdate: June 13 2013 $
.Dt SH 1
.Os
.Sh NAME
@@ -2917,11 +2917,14 @@ explicitly tested by a shell construct such as
.Ic if ,
.Ic until ,
.Ic while ,
-.Ic && ,
-.Ic || ,
or
.Ic !\&
statements.
+For
+.Ic &&
+or
+.Ic || ,
+only the status of the last command is tested.
.It Fl f \*(Ba Ic noglob
Do not expand file name patterns.
.It Fl h \*(Ba Ic trackall