- merge two sections on error messages and interrupts

- move some non-standard sections into a more general CAVEATS
- some macro cleanup

1 files changed, 35 insertions, 63 deletions

diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index dd9af40d05a..f8a79ef3c00 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pr.1,v 1.24 2014/04/15 17:27:37 jmc Exp $
+.\"	$OpenBSD: pr.1,v 1.25 2014/04/18 22:11:57 jmc Exp $
 .\"
 .\" Copyright (c) 1991 Keith Muller.
 .\" Copyright (c) 1993
@@ -33,7 +33,7 @@
 .\"
 .\"     from: @(#)pr.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: April 15 2014 $
+.Dd $Mdocdate: April 18 2014 $
 .Dt PR 1
 .Os
 .Sh NAME
@@ -41,7 +41,7 @@
 .Nd print files
 .Sh SYNOPSIS
 .Nm pr
-.Op Ar +page
+.Op Cm + Ns Ar page
 .Op Fl Ar column
 .Op Fl adFfmrt
 .Op Fl e Ns Oo Ar char Oc Ns Op Ar gap
@@ -91,25 +91,18 @@ By default text columns are separated by at least one
 Input lines that do not fit into a text column are truncated, except
 in the default single columns output mode.
 .Pp
-If standard output is associated with a terminal,
-diagnostic messages are suppressed until the
+Error messages are written to standard error during the printing
+process (if output is redirected) or after all successful
+file printing is complete (when printing to a terminal).
+If
 .Nm pr
-utility has completed processing.
-.Pp
-In the following option descriptions,
-.Em column ,
-.Em lines ,
-.Em offset ,
-.Em page ,
-and
-.Em width
-are positive decimal integers and
-.Em gap
-is a non-negative decimal integer.
+receives an interrupt while printing to a terminal, it
+flushes all accumulated error messages to the screen before
+terminating.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
-.It Ar \&+page
+.It Cm + Ns Ar page
 Begin output at page number
 .Ar page
 of the formatted input.
@@ -301,39 +294,40 @@ If no
 operands are specified, or if a
 .Ar file
 operand is
-.Dq - ,
+.Sq - ,
 the standard input is used.
 The standard input is used only if no
 .Ar file
 operands are specified, or if a
 .Ar file
 operand is
-.Dq - .
+.Sq - .
 .El
-.Pp
-The
-.Fl s
-option does not allow the option letter to be separated from its
-argument, and the options
-.Fl e ,
-.Fl i ,
-and
-.Fl n
-require that both arguments, if present, not be separated from the option
-letter.
 .Sh EXIT STATUS
 .Ex -std pr
+.Sh SEE ALSO
+.Xr cat 1 ,
+.Xr more 1 ,
+.Xr ascii 7
+.Sh STANDARDS
+The
+.Nm
+utility is compliant with the
+.St -p1003.1-2008
+specification.
 .Pp
-Error messages are written to standard error during the printing
-process (if output is redirected) or after all successful
-file printing is complete (when printing to a terminal).
-.Pp
-If
+.St -p1003.1-2008
+is relatively silent concerning the
+handling of input characters beyond the behavior dictated by the
 .Nm pr
-receives an interrupt while printing to a terminal, it
-flushes all accumulated error messages to the screen before
-terminating.
-.Sh NOTES
+required command
+options.
+.Sh HISTORY
+A
+.Nm
+command appeared in
+.At v1 .
+.Sh CAVEATS
 The interpretation of
 .Em <form-feed> Ns s
 in the input stream is that they are special
@@ -345,7 +339,7 @@ common convention of placing a
 .Em <form-feed>
 on a line by itself is actually interpreted as a blank line, page break,
 blank line.
-.Sh RESTRICTIONS
+.Pp
 The
 .Nm pr
 utility is intended to paginate input containing basic
@@ -363,28 +357,6 @@ or
 .Em <return>
 characters, and except in the case of unmodified single-column output,
 use of these characters will cause formatting errors.
-.Sh SEE ALSO
-.Xr cat 1 ,
-.Xr more 1 ,
-.Xr ascii 7
-.Sh STANDARDS
-The
-.Nm
-utility is compliant with the
-.St -p1003.1-2008
-specification.
-.Pp
-.St -p1003.1-2008
-is relatively silent concerning the
-handling of input characters beyond the behavior dictated by the
-.Nm pr
-required command
-options.
-.Sh HISTORY
-A
-.Nm
-command appeared in
-.At v1 .
 .Sh BUGS
 The lack of a line wrapping option, and the specification that truncation
 does not apply to single-column output frequently results in formatting