more small fixes from Igor Sobrado, tweaked by myself;

1 files changed, 36 insertions, 41 deletions

diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index 8a513c0fbaf..8b2c9e2959a 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail.1,v 1.48 2007/02/26 13:17:37 jmc Exp $
+.\"	$OpenBSD: mail.1,v 1.49 2007/02/26 13:38:26 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -330,26 +330,6 @@ Executes the shell
 and
 .Xr csh 1 )
 command which follows.
-.It Ic Print
-.Pq Ic P
-Like
-.Ic print
-but also prints out ignored header fields.
-See also
-.Ic print ,
-.Ic ignore ,
-and
-.Ic retain .
-.It Ic Reply
-.Pq Ic R
-Reply to originator.
-Does not reply to other
-recipients of the original message.
-.It Ic Type
-.Pq Ic T
-Identical to the
-.Ic Print
-command.
 .It Ic alias
 .Pq Ic a
 With no arguments, prints out all currently defined aliases.
@@ -525,6 +505,16 @@ With an argument list, types the next matching message.
 .Pq Ic pre
 A synonym for
 .Ic hold .
+.It Ic Print
+.Pq Ic P
+Like
+.Ic print
+but also prints out ignored header fields.
+See also
+.Ic print ,
+.Ic ignore ,
+and
+.Ic retain .
 .It Ic print
 .Pq Ic p
 Takes a message list and types out each message on the user's terminal.
@@ -552,6 +542,11 @@ effected, unless the rewrite of edit file fails, in which case the user
 can escape with the
 .Ic exit
 command.
+.It Ic Reply
+.Pq Ic R
+Reply to originator.
+Does not reply to other
+recipients of the original message.
 .It Ic reply
 .Pq Ic r
 Takes a message list and sends mail to the sender and all
@@ -643,6 +638,11 @@ The number of
 lines printed is controlled by the variable
 .Ic toplines
 and defaults to five.
+.It Ic Type
+.Pq Ic T
+Identical to the
+.Ic Print
+command.
 .It Ic type
 .Pq Ic t
 A synonym for
@@ -655,14 +655,10 @@ The group names
 no longer have any significance.
 .It Ic undelete
 .Pq Ic u
-Takes a message list and marks each message as
-.Ic not
-being deleted.
+Takes a message list and marks each message as not being deleted.
 .It Ic unread
 .Pq Ic U
-Takes a message list and marks each message as
-.Ic not
-having been read.
+Takes a message list and marks each message as not having been read.
 .It Ic unset
 Takes a list of option names and discards their remembered values;
 the inverse of
@@ -677,8 +673,7 @@ Similar to
 except that
 .Ic only
 the message body
-.Pf ( Ar without
-the header)
+(without the header)
 is saved.
 Extremely useful for such tasks as sending and receiving source
 program text over the message system.
@@ -727,6 +722,10 @@ Invoke the text editor on the message collected so far.
 After the
 editing session is finished, you may continue appending text to the
 message.
+.It Ic ~F Ns Ar messages
+Identical to
+.Ic ~f ,
+except all message headers are included.
 .It Ic ~f Ns Ar messages
 Read the named messages into the message being sent.
 If no messages are specified, read in the current message.
@@ -735,14 +734,14 @@ Message headers currently being ignored (by the
 or
 .Ic retain
 command) are not included.
-.It Ic ~F Ns Ar messages
-Identical to
-.Ic ~f ,
-except all message headers are included.
 .It Ic ~h
 Edit the message header fields by typing each one in turn and allowing
 the user to append text to the end or modify the field by using the
 current terminal erase and kill characters.
+.It Ic ~M Ns Ar messages
+Identical to
+.Ic ~m ,
+except all message headers are included.
 .It Ic ~m Ns Ar messages
 Read the named messages into the message being sent, indented by a
 tab or by the value of
@@ -754,10 +753,6 @@ Message headers currently being ignored (by the
 or
 .Ic retain
 command) are not included.
-.It Ic ~M Ns Ar messages
-Identical to
-.Ic ~m ,
-except all message headers are included.
 .It Ic ~p
 Print out the message collected so far, prefaced by the message header
 fields.
@@ -999,7 +994,7 @@ in the user's home directory.
 Pathname of the program to use in the
 .Ic more
 command or when the
-.Ic crt
+.Ar crt
 variable is set.
 The default paginator
 .Xr more 1
@@ -1021,15 +1016,15 @@ escape.
 If not defined,
 .Pa /usr/bin/vi
 is used.
-.It Va crt
+.It Ar crt
 The valued option
-.Va crt
+.Ar crt
 is used as a threshold to determine how long a message must
 be before
 .Ev PAGER
 is used to read it.
 If
-.Va crt
+.Ar crt
 is set without a value,
 then the height of the terminal screen stored in the system
 is used to compute the threshold (see