X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/ee9b0a0a8b22a0093f2be1a2d21620e27628666a..fd88f5c5678c80ff5e338adc372d28a52ad20530:/usr/src/usr.bin/mail/mail.1

diff --git a/usr/src/usr.bin/mail/mail.1 b/usr/src/usr.bin/mail/mail.1
index 9aa73511b7..c928843a5e 100644
--- a/usr/src/usr.bin/mail/mail.1
+++ b/usr/src/usr.bin/mail/mail.1
@@ -1,13 +1,37 @@
-.\" Copyright (c) 1980, 1990 The Regents of the University of California.
-.\" All rights reserved.
+.\" Copyright (c) 1980, 1990, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
-.\" %sccs.include.redist.man%
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
 .\"
-.\"     @(#)mail.1	6.17 (Berkeley) %G%
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
 .\"
-.Vx
-.Vx
-.Dd 
+.\"	@(#)mail.1	8.8 (Berkeley) 4/28/95
+.\"
+.Dd April 28, 1995
 .Dt MAIL 1
 .Os BSD 4
 .Sh NAME
@@ -20,59 +44,60 @@
 .Op Fl c Ar cc-addr
 .Op Fl b Ar bcc-addr
 .Ar to-addr...
-.br
 .Nm mail
 .Op Fl iInNv
 .Fl f
 .Op Ar name
-.br
 .Nm mail
 .Op Fl iInNv
 .Op Fl u Ar user
 .Sh INTRODUCTION
 .Nm Mail
-is a intelligent mail processing system, which has
+is an intelligent mail processing system, which has
 a command syntax reminiscent of
-.Xr ed 1
+.Xr \&ed 1
 with lines replaced by messages.
 .Pp
-.Tw Ds
-.Tp Fl v
-Verbose mode. The details of
-delivery are displayed on the users terminal.
-.Tp Fl i
-Ignore tty interrupt signals. This is
+.Bl -tag -width flag
+.It Fl v
+Verbose mode.
+The details of
+delivery are displayed on the user's terminal.
+.It Fl i
+Ignore tty interrupt signals.
+This is
 particularly useful when using
 .Nm mail
 on noisy phone lines.
-.Tp Fl I
+.It Fl I
 Forces mail to run in interactive mode even when
-input isn't a terminal.  In particular, the
+input isn't a terminal.
+In particular, the
 .Sq Ic \&~
 special
 character when sending mail is only active in interactive mode.
-.Tp Fl n
+.It Fl n
 Inhibits reading
-.Pa /usr/share/misc/Mail.rc
+.Pa /etc/mail.rc
 upon startup.
-.Tp Fl N
+.It Fl N
 Inhibits the initial display of message headers
 when reading mail or editing a mail folder.
-.Tp Fl s
+.It Fl s
 Specify subject on command line
 (only the first argument after the
 .Fl s
 flag is used as a subject; be careful to quote subjects
 containing spaces.)
-.Tp Fl c
+.It Fl c
 Send carbon copies to
 .Ar list
 of users.
-.Tp Fl b
+.It Fl b
 Send blind carbon copies to
 .Ar list .
 List should be a comma-separated list of names.
-.Tp Fl f
+.It Fl f
 Read in the contents of your
 .Ar mbox
 (or the specified file)
@@ -80,15 +105,17 @@ for processing; when you
 .Ar quit  ,
 .Nm mail
 writes undeleted messages back to this file.
-.Tp Fl u
+.It Fl u
 Is equivalent to:
-.Dl mail -f /var/spool/mail/user
-.Tp
+.Pp
+.Dl mail -f /var/mail/user
+.El
 .Ss Sending mail
 To send a message to one or more people,
 .Nm mail
 can be invoked with arguments which are the names of people to
-whom the mail will be sent.  You are then expected to type in
+whom the mail will be sent.
+You are then expected to type in
 your message, followed
 by an
 .Sq Li control\-D
@@ -109,50 +136,35 @@ The current message is initially the first message (numbered 1)
 and can be printed using the
 .Ic print
 command (which can be abbreviated
-.Cx \&(
-.Ic p
-.Cx \&)).
-.Cx
+.Ql Ic p ) .
 You can move among the messages much as you move between lines in
-.Xr ed 1 ,
+.Xr \&ed 1 ,
 with the commands
-.Sq Ic \&+
+.Ql Ic \&+
 and
-.Sq Ic \&\-
+.Ql Ic \&\-
 moving backwards and forwards, and
 simple numbers.
 .Pp
 .Ss Disposing of mail.
 After examining a message you can
 .Ic delete
-.Cx \&(
-.Ic d
-.Cx \&)
-.Cx
+.Ql Ic d )
 the message or
 .Ic reply
-.Cx \&(
-.Ic r
-.Cx \&)
-.Cx
+.Ql Ic r )
 to it.
 Deletion causes the
 .Nm mail
 program to forget about the message.
 This is not irreversible; the message can be
 .Ic undeleted
-.Cx \&(
-.Ic u
-.Cx \&)
-.Cx
+.Ql Ic u )
 by giving its number, or the
 .Nm mail
 session can be aborted by giving the
 .Ic exit
-.Cx \&(
-.Ic x
-.Cx \&)
-.Cx
+.Ql Ic x )
 command.
 Deleted messages will, however, usually disappear never to be seen again.
 .Pp
@@ -169,9 +181,9 @@ deletes messages 1 and 2, while
 .Dq Li delete 1\-5
 deletes messages 1 through 5.
 The special name
-.Sq Li \&*
+.Ql Li \&*
 addresses all messages, and
-.Sq Li \&$
+.Ql Li \&$
 addresses
 the last message; thus the command
 .Ic top
@@ -190,10 +202,10 @@ defines the contents of the message.
 While you are composing a message,
 .Nm mail
 treats lines beginning with the character
-.Sq Ic \&~
+.Ql Ic \&~
 specially.
 For instance, typing
-.Sq Ic \&~m
+.Ql Ic \&~m
 (alone on a line) will place a copy
 of the current message into the response right shifting it by a tabstop
 (see
@@ -201,7 +213,8 @@ of the current message into the response right shifting it by a tabstop
 variable, below).
 Other escapes will set up subject fields, add and delete recipients
 to the message and allow you to escape to an editor to revise the
-message or to a shell to run some commands.  (These options
+message or to a shell to run some commands.
+(These options
 are given in the summary below.)
 .Pp
 .Ss Ending a mail processing session.
@@ -209,15 +222,13 @@ You can end a
 .Nm mail
 session with the
 .Ic quit
-.Cx  \&(
-.Ic q
-.Cx \&)
-.Cx
+.Ql Ic q )
 command.
 Messages which have been examined go to your
 .Ar mbox
 file unless they have been deleted in which case they are discarded.
-Unexamined messages go back to the post office. (See the
+Unexamined messages go back to the post office.
+(See the
 .Fl f
 option above).
 .Pp
@@ -263,21 +274,24 @@ for a description of network addresses.
 .Pp
 .Nm Mail
 has a number of options which can be set in the
-.Pa \& .mailrc
+.Pa .mailrc
 file to alter its behavior; thus
 .Dq Li set askcc
 enables the
 .Ar askcc
-feature.  (These options are summarized below.)
+feature.
+(These options are summarized below.)
 .Sh SUMMARY
 (Adapted from the `Mail Reference Manual')
 .Pp
 Each command is typed on a line by itself, and may take arguments
-following the command word.  The command need not be typed in its
+following the command word.
+The command need not be typed in its
 entirety \- the first command which matches the typed prefix is used.
 For commands which take message lists as arguments, if no message
 list is given, then the next message forward which satisfies the
-command's requirements is used.  If there are no messages forward of
+command's requirements is used.
+If there are no messages forward of
 the current message, the search proceeds backwards, and if there are no
 good messages at all,
 .Nm mail
@@ -285,126 +299,105 @@ types
 .Dq Li No applicable messages
 and
 aborts the command.
-.Tp Ic \&\-
-Print out the preceding message.  If given a numeric
+.Bl -tag -width delete
+.It Ic \&\-
+Print out the preceding message.
+If given a numeric
 argument
 .Ar n  ,
 goes to the
-.Cx Ar n
-.Cx \'th
-.Cx
+.Ar n Ns 'th
 previous message and prints it.
-.Tp Ic \&?
+.It Ic \&?
 Prints a brief summary of commands.
-.Tp Ic \&!
+.It Ic \&!
 Executes the shell
 (see
 .Xr sh 1
 and
 .Xr csh 1 )
 command which follows.
-.Tp Ic Print
-.Cx \&(
-.Ic P
-.Cx \&)
-.Cx
+.It Ic Print
+.Pq Ic P
 Like
 .Ic print
-but also prints out ignored header fields. See also
+but also prints out ignored header fields.
+See also
 .Ic print ,
 .Ic ignore
 and
 .Ic retain .
-.Tp Ic Reply
-.Cx \&(
-.Ic R
-.Cx \&)
-.Cx
-Reply to originator. Does not reply to other
+.It Ic Reply
+.Pq Ic R
+Reply to originator.
+Does not reply to other
 recipients of the original message.
-.Tp Ic Type
-.Cx \&(
-.Ic T
-.Cx \&)
-.Cx
+.It Ic Type
+.Pq Ic T
 Identical to the
 .Ic Print
 command.
-.Tp Ic alias
-.Cx \&(
-.Ic a
-.Cx \&)
-.Cx
-With no arguments, prints out all currently-defined aliases.  With one
-argument, prints out that alias.  With more than one argument, creates
+.It Ic alias
+.Pq Ic a
+With no arguments, prints out all currently-defined aliases.
+With one
+argument, prints out that alias.
+With more than one argument, creates
 a new alias or changes an old one.
-.Tp Ic alternates
-.Cx \&(
-.Ic alt
-.Cx \&)
-.Cx
+.It Ic alternates
+.Pq Ic alt
 The
 .Ic alternates
 command is useful if you have accounts on several machines.
 It can be used to inform
 .Nm mail
-that the listed addresses are really you. When you
+that the listed addresses are really you.
+When you
 .Ic reply
 to messages,
 .Nm mail
 will not send a copy of the message to any of the addresses
 listed on the
 .Ic alternates
-list. If the
+list.
+If the
 .Ic alternates
 command is given with no argument, the current set of alternate
 names is displayed.
-.Tp Ic chdir
-.Cx \&(
-.Ic c
-.Cx \&)
-.Cx
-Changes the user's working directory to that specified, if given.  If
+.It Ic chdir
+.Pq Ic c
+Changes the user's working directory to that specified, if given.
+If
 no directory is given, then changes to the user's login directory.
-.Tp Ic copy
-.Cx \&(
-.Ic co
-.Cx \&)
-.Cx
+.It Ic copy
+.Pq Ic co
 The
 .Ic copy
 command does the same thing that
 .Ic save
 does, except that it does not mark the messages it
 is used on for deletion when you quit.
-.Tp Ic delete
-.Cx \&(
-.Ic d
-.Cx \&)
-.Cx
+.It Ic delete
+.Pq Ic d
 Takes a list of messages as argument and marks them all as deleted.
 Deleted messages will not be saved in
 .Ar mbox  ,
 nor will they be available for most other commands.
-.Tp Ic dp
+.It Ic dp
 (also
 .Ic dt )
 Deletes the current message and prints the next message.
 If there is no next message,
 .Nm mail
 says
-.Dq Li at EOF.
-.Tp Ic edit
-.Cx \&(
-.Ic e
-.Cx \&)
-.Cx
+.Dq Li "at EOF" .
+.It Ic edit
+.Pq Ic e
 Takes a list of messages and points the text editor at each one in
-turn.  On return from the editor, the message is read back in.
-.Tp Ic exit
-.Cx \&(
-.Ic ex
-.Cx
+turn.
+On return from the editor, the message is read back in.
+.It Ic exit
+.Pf ( Ic ex
 or
 .Ic x )
 Effects an immediate return to the Shell without
@@ -412,58 +405,50 @@ modifying the user's system mailbox, his
 .Ar mbox
 file, or his edit file in
 .Fl f  .
-.Tp Ic file
-.Cx \&(
-.Ic fi
-.Cx )
-.Cx
+.It Ic file
+.Pq Ic fi
 The same as
 .Ic folder  .
-.Tp Ic folders
+.It Ic folders
 List the names of the folders in your folder directory.
-.Tp Ic folder
-.Cx \&(
-.Ic fo
-.Cx \&)
-.Cx
+.It Ic folder
+.Pq Ic fo
 The
 .Ic folder
-command switches to a new mail file or folder. With no
+command switches to a new mail file or folder.
+With no
 arguments, it tells you which file you are currently reading.
 If you give it an argument, it will write out changes (such
 as deletions) you have made in the current file and read in
-the new file. Some special conventions are recognized for
-the name. # means the previous file, % means your system
+the new file.
+Some special conventions are recognized for
+the name.
+# means the previous file, % means your system
 mailbox, %user means user's system mailbox, & means
 your
 .Ar mbox
-file, and +folder means a file in your folder
+file, and
+\&+\&folder means a file in your folder
 directory.
-.Tp Ic from
-.Cx \&(
-.Ic f
-.Cx \&)
-.Cx
+.It Ic from
+.Pq Ic f
 Takes a list of messages and prints their message headers.
-.Tp Ic headers
-.Cx \&(
-.Ic h
-.Cx \&)
-.Cx
-Lists the current range of headers, which is an 18\-message group.  If
+.It Ic headers
+.Pq Ic h
+Lists the current range of headers, which is an 18\-message group.
+If
 a
-.Sq Li \&+
+.Ql \&+
 argument is given, then the next 18\-message group is printed, and if
 a
-.Sq Li \&\-
+.Ql \&\-
 argument is given, the previous 18\-message group is printed.
-.Tp Ic help
+.It Ic help
 A synonym for
 .Ic \&?
-.Tp Ic hold
-.Cx \&(
-.Ic ho  ,
-.Cx
+.ne 1i
+.It Ic hold
+.Pf ( Ic ho ,
 also
 .Ic preserve )
 Takes a message list and marks each
@@ -473,68 +458,62 @@ user's system mailbox instead of in
 Does not override the
 .Ic delete
 command.
-.Tp Ic ignore
-.Sy N.B.:
-.Ic Ignore
-has been superseded by
-.Ic retain .
-.br
+.It Ic ignore
 Add the list of header fields named to the
-.Ar ignored list
+.Ar ignored list .
 Header fields in the ignore list are not printed
-on your terminal when you print a message. This
+on your terminal when you print a message.
+This
 command is very handy for suppression of certain machine-generated
-header fields. The
+header fields.
+The
 .Ic Type
 and
 .Ic Print
 commands can be used to print a message in its entirety, including
-ignored fields. If
+ignored fields.
+If
 .Ic ignore
 is executed with no arguments, it lists the current set of
 ignored fields.
-.Tp Ic mail
-.Cx \&(
-.Ic m
-.Cx \&)
-.Cx
+.It Ic inc
+Incorporate any new messages that have arrived while mail
+is being read.
+The new messages are added to the end of the message list,
+and the current message is reset to be the first new mail message.
+This does not renumber the existing message list, nor does
+does it cause any changes made so far to be saved.
+.It Ic mail
+.Pq Ic m
 Takes as argument login names and distribution group names and sends
 mail to those people.
-.Tp Ic mbox
+.It Ic mbox
 Indicate that a list of messages be sent to
 .Ic mbox
-in your home directory when you quit. This is the default
+in your home directory when you quit.
+This is the default
 action for messages if you do
 .Em not
 have the
 .Ic hold
 option set.
-.Tp Ic next
-.Cx \&(
-.Ic n
-.Cx
+.It Ic next
+.Pq Ic n
 like
 .Ic \&+
-or CR) Goes to the next message in sequence and types it.
+or
+.Tn CR )
+Goes to the next message in sequence and types it.
 With an argument list, types the next matching message.
-.Tp Ic preserve
-.Cx \&(
-.Ic pre
-.Cx \&)
-.Cx
+.It Ic preserve
+.Pq Ic pre
 A synonym for
 .Ic hold  .
-.Tp Ic print
-.Cx \&(
-.Ic p
-.Cx \&)
-.Cx
+.It Ic print
+.Pq Ic p
 Takes a message list and types out each message on the user's terminal.
-.Tp Ic quit
-.Cx \&(
-.Ic q
-.Cx \&)
-.Cx
+.It Ic quit
+.Pq Ic q
 Terminates the session, saving all undeleted, unsaved messages in
 the user's
 .Ar mbox
@@ -544,28 +523,28 @@ or
 .Ic preserve
 or never referenced
 in his system mailbox, and removing all other messages from his system
-mailbox.  If new mail has arrived during the session, the message
-.Dq Li You have new mail
-is given.  If given while editing a
+mailbox.
+If new mail has arrived during the session, the message
+.Dq Li "You have new mail"
+is given.
+If given while editing a
 mailbox file with the
 .Fl f
-flag, then the edit file is rewritten.  A return to the Shell is
+flag, then the edit file is rewritten.
+A return to the Shell is
 effected, unless the rewrite of edit file fails, in which case the user
 can escape with the
 .Ic exit
 command.
-.Tp Ic reply
-.Cx \&(
-.Ic r
-.Cx \&)
-.Cx
+.It Ic reply
+.Pq Ic r
 Takes a message list and sends mail to the sender and all
 recipients of the specified message.
 The default message must not be deleted.
-.Tp Ic respond
+.It Ic respond
 A synonym for
 .Ic reply  .
-.Tp Ic retain
+.It Ic retain
 Add the list of header fields named to the
 .Ar retained list
 Only the header fields in the retain list
@@ -580,28 +559,25 @@ If
 .Ic retain
 is executed with no arguments, it lists the current set of
 retained fields.
-.Tp Ic save
-.Cx \&(
-.Ic s
-.Cx \&)
-.Cx
+.It Ic save
+.Pq Ic s
 Takes a message list and a filename and appends each message in
-turn to the end of the file.  The filename in quotes, followed by the line
+turn to the end of the file.
+The filename in quotes, followed by the line
 count and character count is echoed on the user's terminal.
-.Tp Ic set
-.Cx \&(
-.Ic se
-.Cx \&)
-.Cx
-With no arguments, prints all variable values.  Otherwise, sets
-option.  Arguments are of the form
+.It Ic set
+.Pq Ic se
+With no arguments, prints all variable values.
+Otherwise, sets
+option.
+Arguments are of the form
 .Ar option=value
 (no space before or after =) or
 .Ar option .
 Quotation marks may be placed around any part of the assignment statement to
 quote blanks or tabs, i.e.
-.Dq Li set indentprefix="->"
-.Tp Ic saveignore
+.Dq Li "set indentprefix=\*q->\*q"
+.It Ic saveignore
 .Ic Saveignore
 is to
 .Ic save
@@ -616,7 +592,8 @@ saving a message by
 .Ic save
 or when automatically saving to
 .Ar mbox  .
-.Tp Ic saveretain
+.pl +1
+.It Ic saveretain
 .Ic Saveretain
 is to
 .Ic save
@@ -634,138 +611,108 @@ or when automatically saving to
 .Ic Saveretain
 overrides
 .Ic saveignore  .
-.Tp Ic shell
-.Cx \&(
-.Ic sh
-.Cx \&)
-.Cx
+.It Ic shell
+.Pq Ic sh
 Invokes an interactive version of the shell.
-.Tp Ic size
+.It Ic size
 Takes a message list and prints out the size in characters of each
 message.
-.Tp Ic source
-.Cx \&(
-.Ic so
-.Cx \&)
+.It Ic source
 The
 .Ic source
 command reads
-.Nm mail
 commands from a file.
-.Tp Ic top
-Takes a message list and prints the top few lines of each.  The number of
+.It Ic top
+Takes a message list and prints the top few lines of each.
+The number of
 lines printed is controlled by the variable
 .Ic toplines
 and defaults to five.
-.Tp Ic type
-.Cx \&(
-.Ic t
-.Cx \&)
-.Cx
+.It Ic type
+.Pq Ic t
 A synonym for
 .Ic print  .
-.Tp Ic unalias
+.It Ic unalias
 Takes a list of names defined by
 .Ic alias
-commands and discards the remembered groups of users.  The group names
+commands and discards the remembered groups of users.
+The group names
 no longer have any significance.
-.Tp Ic undelete
-.Cx \&(
-.Ic u
-.Cx \&)
-.Cx
+.It Ic undelete
+.Pq Ic u
 Takes a message list and marks each message as
 .Ic not
 being deleted.
-.Tp Ic unread
-.Cx \&(
-.Ic U
-.Cx \&)
-.Cx
+.It Ic unread
+.Pq Ic U
 Takes a message list and marks each message as
 .Ic not
 having been read.
-.Tp Ic unset
+.It Ic unset
 Takes a list of option names and discards their remembered values;
 the inverse of
 .Ic set  .
-.Tp Ic visual
-.Cx \&(
-.Ic v
-.Cx \&)
-.Cx
+.It Ic visual
+.Pq Ic v
 Takes a message list and invokes the display editor on each message.
-.Tp Ic write
-.Cx \&(
-.Ic w
-.Cx \&)
-.Cx
+.It Ic write
+.Pq Ic w
 Similar to
 .Ic save  ,
 except that
 .Ic only
 the message body
-.Cx \&(
-.Ar without
-.Cx
+.Pq Ar without
 the header) is saved.
 Extremely useful for such tasks as sending and receiving source
 program text over the message system.
-.Tp Ic xit
-.Cx \&(
-.Ic x
-.Cx \&)
-.Cx
+.It Ic xit
+.Pq Ic x
 A synonym for
 .Ic exit  .
-.Tp Ic z
+.It Ic z
 .Nm Mail
 presents message headers in windowfuls as described under the
 .Ic headers
-command. You can move
-.Cx Nm mail
-.Cx 's
-.Cx
+command.
+You can move
+.Nm mail Ns 's
 attention forward to the next window with the
 .Ic \&z
-command. Also, you can move to the previous window by using
+command.
+Also, you can move to the previous window by using
 .Ic \&z\&\-  .
-.Tp
+.El
 .Ss Tilde/Escapes
 .Pp
 Here is a summary of the tilde escapes,
 which are used when composing messages to perform
-special functions.  Tilde escapes are only recognized at the beginning
-of lines.  The name
+special functions.
+Tilde escapes are only recognized at the beginning
+of lines.
+The name
 .Dq Em tilde\ escape
 is somewhat of a misnomer since the actual escape character can be set
 by the option
 .Ic escape .
-.Tw Ds
-.Tp Cx Ic \&~!
-.Ar command
-.Cx
+.Bl -tag -width Ds
+.It Ic \&~! Ns Ar command
 Execute the indicated shell command, then return to the message.
-.Tp Cx Ic \&~b
-.Ar name ...
-.Cx
+.It Ic \&~b Ns Ar name ...
 Add the given names to the list of carbon copy recipients but do not make
 the names visible in the Cc: line ("blind" carbon copy).
-.Tp Cx Ic \&~c
-.Ar name ...
-.Cx
+.It Ic \&~c Ns Ar name ...
 Add the given names to the list of carbon copy recipients.
-.Tp Ic \&~d
+.It Ic \&~d
 Read the file
 .Dq Pa dead.letter
 from your home directory into the message.
-.Tp Ic \&~e
-Invoke the text editor on the message collected so far.  After the
+.It Ic \&~e
+Invoke the text editor on the message collected so far.
+After the
 editing session is finished, you may continue appending text to the
 message.
-.Tp Cx Ic \&~f
-.Ar messages
-.Cx
+.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.
 Message headers currently being ignored (by the
@@ -773,19 +720,16 @@ Message headers currently being ignored (by the
 or
 .Ic retain
 command) are not included.
-.Tp Cx Ic \&~F
-.Ar messages
-.Cx
+.ne 1i
+.It Ic \&~F Ns Ar messages
 Identical to
 .Ic \&~f ,
 except all message headers are included.
-.Tp Ic \&~h
+.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.
-.Tp Cx Ic \&~m
-.Ar messages
-.Cx
+.It Ic \&~m Ns Ar messages
 Read the named messages into the message being sent, indented by a
 tab or by the value of
 .Ar indentprefix  .
@@ -796,97 +740,98 @@ Message headers currently being ignored (by the
 or
 .Ic retain
 command) are not included.
-.Tp Cx Ic \&~M
-.Ar messages
-.Cx
+.It Ic \&~M Ns Ar messages
 Identical to
 .Ic \&~m ,
 except all message headers are included.
-.Tp Ic \&~p
+.It Ic \&~p
 Print out the message collected so far, prefaced by the message header
 fields.
-.Tp Ic \&~q
+.It Ic \&~q
 Abort the message being sent, copying the message to
 .Dq Pa dead.letter
 in your home directory if
 .Ic save
 is set.
-.Tp Cx Ic \&~r
-.Ar filename
-.Cx
+.It Ic \&~r Ns Ar filename
 Read the named file into the message.
-.Tp Cx Ic \&~s
-.Ar string
-.Cx
+.It Ic \&~s Ns Ar string
 Cause the named string to become the current subject field.
-.Tp Cx Ic \&~\&t
-.Ar name ...
-.Cx
+.It Ic \&~\&t Ns Ar name ...
 Add the given names to the direct recipient list.
-.\" This .br should have to be here
-.br
-.Tp Ic \&~\&v
-Invoke an alternate editor (defined by the VISUAL option) on the
-message collected so far.  Usually, the alternate editor will be a
-screen editor.  After you quit the editor, you may resume appending
+.It Ic \&~\&v
+Invoke an alternate editor (defined by the
+.Ev VISUAL
+option) on the
+message collected so far.
+Usually, the alternate editor will be a
+screen editor.
+After you quit the editor, you may resume appending
 text to the end of your message.
-.Tp Cx Ic \&~w
-.Ar filename
-.Cx
+.It Ic \&~w Ns Ar filename
 Write the message onto the named file.
-.Tp Cx Ic \&~\&|
-.Ar command
-.Cx
-Pipe the message through the command as a filter.  If the command gives
+.It Ic \&~\&| Ns Ar command
+Pipe the message through the command as a filter.
+If the command gives
 no output or terminates abnormally, retain the original text of the
-message.  The command
-.Xr fmt  1
+message.
+The command
+.Xr fmt 1
 is often used as
 .Ic command
 to rejustify the message.
-.Tp Cx Ic \&~:
-.Ar mail-command
-.Cx
-Execute the given mail command.  Not all commands, however, are allowed.
-.Tp Cx Ic \&~~
-.Ar string
-.Cx
-Insert the string of text in the message prefaced by a single ~.  If
+.It Ic \&~: Ns Ar mail-command
+Execute the given mail command.
+Not all commands, however, are allowed.
+.It Ic \&~~ Ns Ar string
+Insert the string of text in the message prefaced by a single ~.
+If
 you have changed the escape character, then you should double
 that character in order to send it.
-.Tp
+.El
 .Ss Mail Options
 Options are controlled via
 .Ic set
 and
 .Ic unset
-commands.  Options may be either binary, in which case it is only
+commands.
+Options may be either binary, in which case it is only
 significant to see whether they are set or not; or string, in which
 case the actual value is of interest.
 The binary options include the following:
-.Tp Ar append
+.Bl -tag -width append
+.It Ar append
 Causes messages saved in
 .Ar mbox
 to be appended to the end rather than prepended.
 This should always be set (perhaps in
-.Pa /usr/share/misc/Mail.rc ) .
-.Tp Ar ask
+.Pa /etc/mail.rc ) .
+.It Ar ask
 Causes
 .Nm mail
-to prompt you for the subject of each message you send.  If
+to prompt you for the subject of each message you send.
+If
 you respond with simply a newline, no subject field will be sent.
-.Tp Ar askcc
+.ne 1i
+.It Ar askcc
 Causes you to be prompted for additional carbon copy recipients at the
-end of each message.  Responding with a newline indicates your
+end of each message.
+Responding with a newline indicates your
 satisfaction with the current list.
-.Tp Ar autoprint
+.It Ar autoinc
+Causes new mail to be automatically incorporated when it arrives.
+Setting this is similar to issuing the
+.Ic inc
+command at each prompt, except that the current message is not
+reset when new mail arrives.
+.It Ar autoprint
 Causes the
 .Ic delete
 command to behave like
 .Ic dp
 \- thus, after deleting a message, the next one will be typed
 automatically.
-.Tp Ar debug
+.It Ar debug
 Setting the binary option
 .Ar debug
 is the same as specifying
@@ -895,20 +840,20 @@ on the command line and causes
 .Nm mail
 to output all sorts of information useful for debugging
 .Nm mail  .
-.Tp Ar dot
+.It Ar dot
 The binary option
 .Ar dot
 causes
 .Nm mail
 to interpret a period alone on a line as the terminator
 of a message you are sending.
-.Tp Ar hold
+.It Ar hold
 This option is used to hold messages in the system mailbox
 by default.
-.Tp Ar ignore
+.It Ar ignore
 Causes interrupt signals from your terminal to be ignored and echoed as
 @'s.
-.Tp Ar ignoreeof
+.It Ar ignoreeof
 An option related to
 .Ar dot
 is
@@ -920,118 +865,142 @@ refuse to accept a control-d as the end of a message.
 also applies to
 .Nm mail
 command mode.
-.Tp Ar metoo
+.It Ar metoo
 Usually, when a group is expanded that contains the sender, the sender
-is removed from the expansion.  Setting this option causes the sender
+is removed from the expansion.
+Setting this option causes the sender
 to be included in the group.
-.Tp Ar noheader
+.It Ar noheader
 Setting the option
 .Ar noheader
 is the same as giving the
 .Fl N
 flag on the command line.
-.Tp Ar nosave
+.It Ar nosave
 Normally, when you abort a message with two
-.Li RUBOUT
+.Tn RUBOUT
 (erase or delete)
 .Nm mail
 copies the partial letter to the file
 .Dq Pa dead.letter
-in your home directory. Setting the binary option
+in your home directory.
+Setting the binary option
 .Ar nosave
 prevents this.
-.Tp Ar Replyall
+.It Ar Replyall
 Reverses the sense of
 .Ic reply
 and
 .Ic Reply
 commands.
-.Tp Ar quiet
+.It Ar quiet
 Suppresses the printing of the version when first invoked.
-.Tp Ar verbose
+.It Ar searchheaders
+If this option is set, then a message-list specifier in the form ``/x:y''
+will expand to all messages containing the substring ``y'' in the header
+field ``x''.  The string search is case insensitive.
+If ``x'' is ommitted, it will default to the ``Subject'' header field.
+The form ``/to:y'' is a special case, and will expand
+to all messages containing the substring ``y'' in the ``To'', ``Cc''
+or ``Bcc'' header fields.
+The check for "to" is case sensitive, so that
+``/To:y'' can be used to limit the search for ``y'' to just
+the ``To:'' field.
+.It Ar verbose
 Setting the option
 .Ar verbose
 is the same as using the
 .Fl v
-flag on the command line. When mail runs in verbose mode,
-the actual delivery of messages is displayed on he users
+flag on the command line.
+When mail runs in verbose mode,
+the actual delivery of messages is displayed on the user's
 terminal.
-.Tp
+.El
 .Ss Option String Values
-.Tw Va
-.Tp Va EDITOR
+.Bl -tag -width Va
+.It Ev EDITOR
 Pathname of the text editor to use in the
 .Ic edit
 command and
 .Ic \&~e
-escape.  If not defined, then a default editor is used.
-.Tp Va LISTER
+escape.
+If not defined, then a default editor is used.
+.It Ev LISTER
 Pathname of the directory lister to use in the
 .Ic folders
-command.  Default is
+command.
+Default is
 .Pa /bin/ls .
-.Tp Va PAGER
+.It Ev PAGER
 Pathname of the program to use in the
 .Ic more
 command or when
 .Ic crt
-variable is set.  The default paginator
+variable is set.
+The default paginator
 .Xr more 1
 is used if this option is not defined.
-.Tp Va SHELL
+.It Ev SHELL
 Pathname of the shell to use in the
 .Ic \&!
 command and the
 .Ic \&~!
-escape.  A default shell is used if this option is
+escape.
+A default shell is used if this option is
 not defined.
-.Tp Va VISUAL
+.It Ev VISUAL
 Pathname of the text editor to use in the
 .Ic visual
 command and
 .Ic \&~v
 escape.
-.Tp Va crt
+.ne 1i
+.It Va crt
 The valued option
 .Va crt
 is used as a threshold to determine how long a message must
 be before
-.Va PAGER
-is used to read it.  If
+.Ev PAGER
+is used to read it.
+If
 .Va crt
 is set without a value,
 then the height of the terminal screen stored in the system
 is used to compute the threshold (see
 .Xr stty 1 ) .
-.Tp Ar escape
+.It Ar escape
 If defined, the first character of this option gives the character to
 use in the place of ~ to denote escapes.
-.Tp Ar folder
+.It Ar folder
 The name of the directory to use for storing folders of
-messages. If this name begins with a `/',
+messages.
+If this name begins with a `/',
 .Nm mail
 considers it to be an absolute pathname; otherwise, the
 folder directory is found relative to your home directory.
-.Tp Ar MBOX
+.It Ev MBOX
 The name of the
 .Ar mbox
-file.  It can be the name of a folder.
+file.
+It can be the name of a folder.
 The default is
 .Dq Li mbox
 in the user's home directory.
-.Tp Ar record
+.It Ar record
 If defined, gives the pathname of the file used to record all outgoing
-mail.  If not defined, then outgoing mail is not so saved.
-.Tp Ar indentprefix
+mail.
+If not defined, then outgoing mail is not so saved.
+.It Ar indentprefix
 String used by the ``~m'' tilde escape for indenting messages, in place of
-the normal tab character (^I).  Be sure to quote the value if it contains
+the normal tab character (^I).
+Be sure to quote the value if it contains
 spaces or tabs.
-.Tp Ar toplines
+.It Ar toplines
 If defined, gives the number of lines of a message to be printed out
 with the
 .Ic top
 command; normally, the first five lines are printed.
-.Tp
+.El
 .Sh ENVIRONMENT
 .Nm Mail
 utilizes the
@@ -1040,23 +1009,24 @@ and
 .Ev USER
 environment variables.
 .Sh FILES
-.Dw /usr/share/misc/Mail.help*
-.Di L
-.Dp Pa /var/spool/mail/*
-post office
-.Dp ~/mbox
-your old mail
-.Dp ~/.mailrc
-file giving initial mail commands
-.Dp Pa /tmp/R*
-temporary files
-.Dp Pa /usr/share/misc/Mail.help*
-help files
-.Dp Pa /usr/share/misc/Mail.rc
-system initialization file
-.Dp
+.Bl -tag -width /usr/share/misc/Mail.help* -compact
+.It Pa /var/mail/*
+Post office.
+.It ~/mbox
+User's old mail.
+.It ~/.mailrc
+File giving initial mail commands.
+This can be overridden by setting the
+.Ev MAILRC
+environment variable.
+.It Pa /tmp/R*
+Temporary files.
+.It Pa /usr/share/misc/Mail.help*
+Help files.
+.It Pa /etc/mail.rc
+System initialization file.
+.El
 .Sh SEE ALSO
-.Xr binmail 1 ,
 .Xr fmt 1 ,
 .Xr newaliases 1 ,
 .Xr vacation 1 ,
@@ -1064,17 +1034,21 @@ system initialization file
 .Xr mailaddr 7 ,
 .Xr sendmail 8
 and
-.Em The Mail Reference Manual .
+.Rs
+.%T "The Mail Reference Manual" .
+.Re
 .Sh HISTORY
 A
 .Nm mail
 command
-appeared in Version 6 AT&T UNIX.
+appeared in
+.At v6 .
 This man page is derived from
-.Em The Mail Reference Manual
+.%T "The Mail Reference Manual"
 originally written by Kurt Shoens.
 .Sh BUGS
-There are some flags that are not documented here. Most are
+There are some flags that are not documented here.
+Most are
 not useful to the general user.
 .Pp
 Usually,