--- src/bin/sh/sh.1 2003/06/17 04:22:50 1.2 +++ src/bin/sh/sh.1 2006/07/20 17:01:21 1.2.4.1 @@ -34,7 +34,7 @@ .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD: src/bin/sh/sh.1,v 1.39.2.25 2003/02/13 19:28:08 fanf Exp $ -.\" $DragonFly: src/bin/sh/sh.1,v 1.1 2003/06/15 23:50:32 dillon Exp $ +.\" $DragonFly$ .\" .Dd May 5, 1995 .Dt SH 1 @@ -205,13 +205,18 @@ option if it has been set). .It Fl e Li errexit Exit immediately if any untested command fails in non-interactive mode. The exit status of a command is considered to be -explicitly tested if the command is used to control -an if, elif, while, or until; or if the command is the left +explicitly tested if the command is part of the list used to control +an if, elif, while, or until; if the command is the left hand operand of an .Dq Li && or .Dq Li || +operator; or if the command is a pipeline preceded by the +.Ic !\& operator. +If a shell function is executed and its exit status is explicitly +tested, all commands of the function are considered to be tested as +well. .It Fl f Li noglob Disable pathname expansion. .It Fl I Li ignoreeof