move exit returns blurb out of DIAGNOSTICS; from daniel dickman

3 files changed, 41 insertions, 35 deletions

diff --git a/bin/pax/cpio.1 b/bin/pax/cpio.1
index 6ee5fadb5ad..a8d4eeeba6e 100644
--- a/bin/pax/cpio.1
+++ b/bin/pax/cpio.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cpio.1,v 1.28 2008/06/11 07:42:50 jmc Exp $
+.\"	$OpenBSD: cpio.1,v 1.29 2010/07/22 08:09:29 jmc Exp $
 .\"
 .\" Copyright (c) 1997 SigmaSoft, Th. Lockert
 .\" All rights reserved.
@@ -23,9 +23,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: cpio.1,v 1.28 2008/06/11 07:42:50 jmc Exp $
+.\"	$OpenBSD: cpio.1,v 1.29 2010/07/22 08:09:29 jmc Exp $
 .\"
-.Dd $Mdocdate: June 11 2008 $
+.Dd $Mdocdate: July 22 2010 $
 .Dt CPIO 1
 .Os
 .Sh NAME
@@ -240,21 +240,23 @@ Be verbose about operations.
 List filenames as they are copied.
 .El
 .El
-.Sh ENVIRONMENT
-.Bl -tag -width Fl
-.It Ev TMPDIR
-Path in which to store temporary files.
-.El
-.Sh ERRORS
+.Pp
+The
 .Nm
-will exit with one of the following values:
-.Bl -tag -width 2n
+utility exits with one of the following values:
+.Pp
+.Bl -tag -width Ds -compact
 .It 0
 All files were processed successfully.
 .It 1
 An error occurred.
 .El
-.Pp
+.Sh ENVIRONMENT
+.Bl -tag -width Fl
+.It Ev TMPDIR
+Path in which to store temporary files.
+.El
+.Sh DIAGNOSTICS
 Whenever
 .Nm
 cannot create a file or a link when extracting an archive or cannot
diff --git a/bin/pax/pax.1 b/bin/pax/pax.1
index 0eafae69aee..4f7e0b37d7e 100644
--- a/bin/pax/pax.1
+++ b/bin/pax/pax.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pax.1,v 1.58 2009/08/16 09:41:08 sobrado Exp $
+.\"	$OpenBSD: pax.1,v 1.59 2010/07/22 08:09:29 jmc Exp $
 .\"	$NetBSD: pax.1,v 1.3 1995/03/21 09:07:37 cgd Exp $
 .\"
 .\" Copyright (c) 1992 Keith Muller.
@@ -34,7 +34,7 @@
 .\"
 .\"	@(#)pax.1	8.4 (Berkeley) 4/18/94
 .\"
-.Dd $Mdocdate: August 16 2009 $
+.Dd $Mdocdate: July 22 2010 $
 .Dt PAX 1
 .Os
 .Sh NAME
@@ -1033,6 +1033,17 @@ options are specified along with the
 .Fl n
 option, a file is not considered selected unless it is newer
 than the file to which it is compared.
+.Pp
+The
+.Nm
+utility exits with one of the following values:
+.Pp
+.Bl -tag -width 2n -offset indent -compact
+.It 0
+All files were processed successfully.
+.It 1
+An error occurred.
+.El
 .Sh ENVIRONMENT
 .Bl -tag -width Fl
 .It Ev TMPDIR
@@ -1092,15 +1103,6 @@ files with the same name found in the source file tree
 .Pp
 .Dl "$ pax -r -w -v -Y -Z home /backup"
 .Sh DIAGNOSTICS
-.Nm
-will exit with one of the following values:
-.Bl -tag -width 2n -offset indent
-.It 0
-All files were processed successfully.
-.It 1
-An error occurred.
-.El
-.Pp
 Whenever
 .Nm
 cannot create a file or a link when reading an archive or cannot
diff --git a/bin/pax/tar.1 b/bin/pax/tar.1
index 21656023dfe..843692c59e0 100644
--- a/bin/pax/tar.1
+++ b/bin/pax/tar.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tar.1,v 1.51 2008/12/27 13:35:34 sobrado Exp $
+.\"	$OpenBSD: tar.1,v 1.52 2010/07/22 08:09:29 jmc Exp $
 .\"
 .\" Copyright (c) 1996 SigmaSoft, Th. Lockert
 .\" All rights reserved.
@@ -23,9 +23,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: tar.1,v 1.51 2008/12/27 13:35:34 sobrado Exp $
+.\"	$OpenBSD: tar.1,v 1.52 2010/07/22 08:09:29 jmc Exp $
 .\"
-.Dd $Mdocdate: December 27 2008 $
+.Dd $Mdocdate: July 22 2010 $
 .Dt TAR 1
 .Os
 .Sh NAME
@@ -280,6 +280,17 @@ The options
 .Op Fl 014578
 can be used to select one of the compiled-in backup devices,
 .Pa /dev/rstN .
+.Pp
+The
+.Nm
+utility exits with one of the following values:
+.Pp
+.Bl -tag -width 2n -offset indent -compact
+.It 0
+All files were processed successfully.
+.It 1
+An error occurred.
+.El
 .Sh ENVIRONMENT
 .Bl -tag -width Fl
 .It Ev TMPDIR
@@ -332,15 +343,6 @@ Note that the glob pattern has been quoted to avoid expansion by the shell:
 For more detailed examples, see
 .Xr pax 1 .
 .Sh DIAGNOSTICS
-.Nm
-will exit with one of the following values:
-.Bl -tag -width 2n -offset indent
-.It 0
-All files were processed successfully.
-.It 1
-An error occurred.
-.El
-.Pp
 Whenever
 .Nm
 cannot create a file or a link when extracting an archive or cannot