rewrite DIAGNOSTICS to avoid confusion about which application returns

what, and when;

started by Jeffrey 'jf' Lim, with some correction from Ingo Schwarze;
ok otto

1 files changed, 18 insertions, 17 deletions

diff --git a/usr.bin/env/env.1 b/usr.bin/env/env.1
index 207414302b8..c850fcf6508 100644
--- a/usr.bin/env/env.1
+++ b/usr.bin/env/env.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: env.1,v 1.13 2006/05/28 05:29:54 ray Exp $
+.\"	$OpenBSD: env.1,v 1.14 2007/05/20 23:15:57 jmc Exp $
 .\" Copyright (c) 1980, 1990 The Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -77,29 +77,30 @@ of the variables in the environment, with one
 .Ar name Ns = Ns Ar value
 pair per line.
 .Sh DIAGNOSTICS
-If the
-.Ar utility
-is invoked, the exit status of
-.Nm
-shall be the exit status of
-.Ar utility ;
-otherwise, the
 .Nm
-utility exits with one of the following values:
+exits with one of the following values:
 .Bl -tag -width Ds
 .It 0
-The
+.Ar utility
+was invoked and completed successfully.
+In this case the exit code is returned by the utility itself, not
+.Nm .
+If no utility was specified, then
 .Nm
-utility completed successfully.
-.It 1-125
-The exit code returned from the
-.Ar utility .
+completed successfully and returned the exit code itself.
+.It 1
+An invalid command line option was passed to
+.Nm .
+.It 1\(en125
+.Ar utility
+was invoked but failed in some way;
+see its manual page for more information.
+In this case the exit code is returned by the utility itself, not
+.Nm .
 .It 126
-The utility specified by
 .Ar utility
-was found, but could not be invoked.
+was found but could not be invoked.
 .It 127
-The utility specified by
 .Ar utility
 could not be found.
 .El