update mail docs w/ reality;

help and ok millert@

9 files changed, 230 insertions, 147 deletions

diff --git a/usr.bin/mail/USD.doc/mail0.nr b/usr.bin/mail/USD.doc/mail0.nr
index 9e3fff56ba7..24b499ed3f6 100644
--- a/usr.bin/mail/USD.doc/mail0.nr
+++ b/usr.bin/mail/USD.doc/mail0.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail0.nr,v 1.3 2003/06/03 02:56:11 millert Exp $
+.\"	$OpenBSD: mail0.nr,v 1.4 2004/06/04 00:04:54 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,6 +29,10 @@
 .\"
 .\"	@(#)mail0.nr	8.1 (Berkeley) 6/8/93
 .\"
+.if n \{\
+.po 5n
+.ll 70n
+.\}
 .eh 'USD:7-%''Mail Reference Manual'
 .oh 'Mail Reference Manual''USD:7-%'
 .if n \
diff --git a/usr.bin/mail/USD.doc/mail1.nr b/usr.bin/mail/USD.doc/mail1.nr
index 71f6cb5895e..1d21d526403 100644
--- a/usr.bin/mail/USD.doc/mail1.nr
+++ b/usr.bin/mail/USD.doc/mail1.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail1.nr,v 1.3 2003/06/03 02:56:11 millert Exp $
+.\"	$OpenBSD: mail1.nr,v 1.4 2004/06/04 00:04:54 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -61,18 +61,37 @@ and
 .q "Text Editing with Ex and Vi"
 can be consulted for more information on these topics.
 .pp
+A word of explanation is in order here concerning the name
+.i Mail :
+the original UNIX mail program was known as
+.i /bin/mail .
+The BSD mail program was called
+.i Mail
+to differentiate it from the older mail program.
+.i /bin/mail
+is not included in OpenBSD so there is no ambiguity and the BSD
+mail program is installed as
+.i /usr/bin/mail ;
+.i /usr/bin/Mail
+is simply a link for backwards compatibility.
+To further confuse the issue, a second link was retained for
+compatibility with SystemV systems,
+.i mailx .
+In this document, we use the original name, `Mail',
+to refer to any of these.
+.pp
 Here is how messages are handled:
 the mail system accepts incoming
 .i messages
 for you from other people
 and collects them in a file, called your
 .i "system mailbox" .
-When you login, the system notifies you if there are any messages
+When you log in, the system notifies you if there are any messages
 waiting in your system mailbox.  If you are a
 .i csh
 user, you will be notified when new mail arrives if you inform
-the shell of the location of your mailbox.  On version 7 systems,
-your system mailbox is located in the directory /usr/spool/mail
+the shell of the location of your mailbox.  On OpenBSD,
+your system mailbox is located in the directory /var/mail
 in a file with your login name.  If your login name is
 .q sam,
 then you can make
@@ -80,7 +99,7 @@ then you can make
 notify you of new mail by including the following line in your .cshrc
 file:
 .(l
-set mail=/usr/spool/mail/sam
+set mail=/var/mail/sam
 .)l
 When you read your mail using
 .i Mail ,
diff --git a/usr.bin/mail/USD.doc/mail2.nr b/usr.bin/mail/USD.doc/mail2.nr
index 6962f8e2972..d5df6706012 100644
--- a/usr.bin/mail/USD.doc/mail2.nr
+++ b/usr.bin/mail/USD.doc/mail2.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail2.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
+.\"	$OpenBSD: mail2.nr,v 1.5 2004/06/04 00:04:54 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -43,7 +43,7 @@ command:
 % Mail root
 .)l
 then type your message.  When you reach the end of the message, type
-an EOT (control\-d) at the beginning of a line, which will cause
+an EOT (Control-D) at the beginning of a line, which will cause
 .i Mail
 to echo \*(lqEOT\*(rq and return you to the Shell.  When the user you sent mail
 to next logs in, he will receive the message:
@@ -54,7 +54,7 @@ to alert him to the existence of your message.
 .pp
 If, while you are composing the message
 you decide that you do not wish to send it after all, you can
-abort the letter with a \s-2RUBOUT\s0.  Typing a single \s-2RUBOUT\s0
+abort the letter with a <Control-C>.  Typing a single <Control-C>
 causes
 .i Mail
 to print
@@ -62,7 +62,7 @@ to print
 (Interrupt -- one more to kill letter)
 .)l
 Typing a second
-\s-2RUBOUT\s0 causes
+<Control-C> causes
 .i Mail
 to save your partial letter on the file
 .q dead.letter
@@ -82,7 +82,7 @@ Thus,
 .(l
 % Mail sam bob john
 Tuition fees are due next Friday.  Don't forget!!
-<Control\-d>
+<Control-D>
 EOT
 %
 .)l
@@ -171,7 +171,7 @@ as your first command to
 .i Mail
 to type the first message.
 .pp
-If, after typing a message, you wish to immediately send a reply,
+If, after reading a message, you wish to immediately send a reply,
 you can do so with the
 .b reply
 command.
@@ -181,7 +181,7 @@ like
 takes a message number as an argument.
 .i Mail
 then begins a message addressed to the user who sent you the message.
-You may then type in your letter in reply, followed by a <control-d>
+You may then type in your letter in reply, followed by a <Control-D>
 at the beginning of a line, as before.
 .i Mail
 will type EOT, then type the ampersand prompt to indicate its readiness
@@ -200,7 +200,7 @@ and waiting for you to enter your letter.
 You are now in the message collection mode described at the beginning
 of this section and
 .i Mail
-will gather up your message up to a control\-d.
+will gather up your message up to a <Control-D>.
 Note that it copies the subject
 header from the original message.  This is useful in that correspondence
 about a particular matter will tend to retain the same subject heading,
@@ -210,7 +210,7 @@ For example, if the letter had a
 .q "To:"
 header listing several recipients,
 .i Mail
-would arrange to send your replay to the same people as well.
+would arrange to send your reply to the same people as well.
 Similarly, if the original message contained a
 .q "Cc:"
 (carbon copies to) field,
@@ -382,7 +382,9 @@ set crt=24
 .)l
 to paginate messages that will not fit on their screens.
 In the default state, \fImore\fP (default paginator) prints a screenful of
-information, then types --More--.  Type a space to see the next screenful.
+information, then types ``byte XXX'', where `XXX' represents the number
+of bytes paginated.
+Type a space to see the next screenful.
 .pp
 Another adaptation to user needs that
 .i Mail
@@ -433,7 +435,7 @@ To make them more convenient to use,
 .i Mail
 always looks for two files when it is invoked.  It first reads
 a system wide file
-.q /usr/lib/Mail.rc,
+.q /etc/mail.rc,
 then a user specific file,
 .q .mailrc,
 which is found in the user's home directory.
@@ -462,9 +464,9 @@ at the system-wide level
 by the mail delivery
 system
 .i sendmail .
-These aliases are stored in the file /usr/lib/aliases and are
+These aliases are stored in the file /etc/mail/aliases and are
 accessible to all users of the system.
-The lines in /usr/lib/aliases are of
+The lines in /etc/mail/aliases are of
 the form:
 .(l
 alias: name\*<1\*>, name\*<2\*>, name\*<3\*>
@@ -475,9 +477,10 @@ is the mailing list name and the
 .i name\*<i\*>
 are the members of the list.  Long lists can be continued onto the next
 line by starting the next line with a space or tab.  Remember that you
-must execute the shell command
+must execute the command
 .i newaliases
-after editing /usr/lib/aliases since the delivery system
+(as superuser)
+after editing /etc/mail/aliases since the delivery system
 uses an indexed file created by
 .i newaliases .
 .pp
@@ -486,7 +489,7 @@ We have seen that
 can be invoked with command line arguments which are people
 to send the message to, or with no arguments to read mail.
 Specifying the
-.rb \-f
+.rb -f
 flag on the command line causes
 .i Mail
 to read messages from a file other than your system mailbox.
@@ -497,7 +500,7 @@ you can use
 .i Mail
 to read them with:
 .(l
-% Mail \-f letters
+% Mail -f letters
 .)l
 You can use all
 the
@@ -517,7 +520,7 @@ in your home directory by default, you can read
 .i mbox
 in your home directory by using simply
 .(l
-% Mail \-f
+% Mail -f
 .)l
 .pp
 Normally, messages that you examine using the
diff --git a/usr.bin/mail/USD.doc/mail3.nr b/usr.bin/mail/USD.doc/mail3.nr
index df934202be2..adb6acf4577 100644
--- a/usr.bin/mail/USD.doc/mail3.nr
+++ b/usr.bin/mail/USD.doc/mail3.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail3.nr,v 1.3 2003/06/03 02:56:11 millert Exp $
+.\"	$OpenBSD: mail3.nr,v 1.4 2004/06/04 00:04:54 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -52,11 +52,11 @@ begin with a `/,'
 .i Mail
 will assume that your folder directory is to be found starting from
 your home directory.  Thus, if your home directory is
-.b /usr/person
+.b /home/person
 the above example told
 .i Mail
 to find your folder directory in
-.b /usr/person/letters .
+.b /home/person/letters .
 .pp
 Anywhere a file name is expected, you can use a folder name, preceded
 with `+.'  For example, to put a message into a folder with the
diff --git a/usr.bin/mail/USD.doc/mail4.nr b/usr.bin/mail/USD.doc/mail4.nr
index 6c8a901b58a..b9bf05241af 100644
--- a/usr.bin/mail/USD.doc/mail4.nr
+++ b/usr.bin/mail/USD.doc/mail4.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail4.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
+.\"	$OpenBSD: mail4.nr,v 1.5 2004/06/04 00:04:54 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -35,7 +35,7 @@
 While typing in a message to be sent to others, it is often
 useful to be able to invoke the text editor on the partial message,
 print the message, execute a shell command, or do some other
-auxiliary function. 
+auxiliary function.
 .i Mail
 provides these capabilities through
 .i "tilde escapes" ,
@@ -49,8 +49,8 @@ which will print a line of dashes, the recipients of your message, and
 the text of the message so far.
 Since
 .i Mail
-requires two consecutive \s-2RUBOUT\s0's to abort a letter, you
-can use a single \s-2RUBOUT\s0 to abort the output of ~p or any other
+requires two consecutive <Control-C>'s to abort a letter, you
+can use a single <Control-C> to abort the output of ~p or any other
 ~ escape without killing your letter.
 .pp
 If you are dissatisfied with the message as
@@ -60,7 +60,7 @@ it stands, you can invoke the text editor on it using the escape
 .)l
 which causes the message to be copied into a temporary file and an
 instance of the editor to be spawned.  After modifying the message to
-your satisfaction, write it out and quit the editor. 
+your satisfaction, write it out and quit the editor.
 .i Mail
 will respond
 by typing
@@ -68,20 +68,23 @@ by typing
 (continue)
 .)l
 after which you may continue typing text which will be appended to your
-message, or type <control-d> to end the message.
+message, or type <Control-D> to end the message.
 A standard text editor is provided by
 .i Mail .
 You can override this default by setting the valued option
 .q EDITOR
 to something else.  For example, you might prefer:
 .(l
-set EDITOR=/usr/ucb/ex
+set EDITOR=/bin/ed
 .)l
 .pp
 Many systems offer a screen editor as an alternative to the standard
 text editor, such as the
 .i vi
-editor from UC Berkeley.
+editor from UC Berkeley,
+or
+.i mg ,
+an emacs-like editor.
 To use the screen, or
 .i visual
 editor, on your current message, you can use the escape,
@@ -101,7 +104,7 @@ file in your message; the escape
 ~r filename
 .)l
 is provided for this purpose, and causes the named file to be appended
-to your current message. 
+to your current message.
 .i Mail
 complains if the file doesn't exist
 or can't be read.  If the read is successful, the number of lines and
@@ -118,13 +121,13 @@ reads in the file
 in your home directory.  This is often useful since
 .i Mail
 copies the text
-of your message there when you abort a message with \s-2RUBOUT\s0.
+of your message there when you abort a message with <Control-C>.
 .pp
 To save the current text of your message on a file you may use the
 .(l
 ~w filename
 .)l
-escape. 
+escape.
 .i Mail
 will print out the number of lines and characters written
 to the file, after which you may continue appending text to your message.
@@ -206,10 +209,10 @@ characters, they are appended to the end of the current list of
 recipients.  You can also use your erase character to erase back into
 the list of recipients, or your kill character to erase them altogether.
 Thus, for example, if your erase and kill characters are the standard
-(on printing terminals) # and @ symbols,
+(on printing terminals) <Control-H> and <Control-U> keys,
 .(l
 ~h
-To: root kurt####bill
+To: root kurt^H^H^H^Hbill
 .)l
 would change the initial recipients
 .q "root kurt"
@@ -308,8 +311,8 @@ Changing the escape character removes the special meaning of ~.
 This section describes how to send mail to people on other machines.
 Recall that sending to a plain login name sends mail to that person
 on your machine.  If your machine is directly (or sometimes, even,
-indirectly) connected to the Arpanet, you can send messages to people
-on the Arpanet using a name of the form
+indirectly) connected to the Internet, you can send messages to people
+on the Internet using a name of the form
 .(l
 name@host.domain
 .)l
@@ -317,8 +320,8 @@ where
 .i name
 is the login name of the person you're trying to reach,
 .i host
-is the name of the machine on the Arpanet,
-and 
+is the name of the machine on the Internet,
+and
 .i domain
 is the higher-level scope within which the hostname is known, e.g. EDU (for educational
 institutions), COM (for commercial entities), GOV (for governmental agencies),
diff --git a/usr.bin/mail/USD.doc/mail5.nr b/usr.bin/mail/USD.doc/mail5.nr
index 145a3119645..2844ade5abd 100644
--- a/usr.bin/mail/USD.doc/mail5.nr
+++ b/usr.bin/mail/USD.doc/mail5.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail5.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
+.\"	$OpenBSD: mail5.nr,v 1.5 2004/06/04 00:04:54 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -58,8 +58,8 @@ consists of a list of message numbers, ranges, and names,
 separated by spaces or tabs.  Message numbers may be either
 decimal numbers, which directly specify messages, or one of the
 special characters
-.q \(ua
-.q "."
+.q "^" ,
+.q "." ,
 or
 .q "$"
 to specify the first relevant, current, or last
@@ -154,17 +154,17 @@ Used to preface a command to be executed by the shell.
 Like
 .b print ,
 but also print out ignored header fields.  See also
-\fBprint\fP, \fBignore\fP and \fBretain\fP.
+\fBprint\fP, \fBignore\fP, and \fBretain\fP.
 \fBPrint\fP can be abbreviated to \fBP\fP.
 .ip "\fBReply\fP or \fBRespond\fP\ \ "
 Note the capital \fBR\fP in the name.
-Frame a reply to a one or more messages.
+Frame a reply to one or more messages.
 The reply (or replies if you are using this on multiple messages)
 will be sent ONLY to the person who sent you the message
 (respectively, the set of people who sent the messages you are
 replying to).
 You can
-add people using the \fB~t\fP, \fB~c\fP and \fB~b\fP
+add people using the \fB~t\fP, \fB~c\fP, and \fB~b\fP
 tilde escapes.  The subject in your reply is formed by prefacing the
 subject in the original message with
 .q "Re:"
@@ -206,7 +206,7 @@ If one argument is given, that alias is printed (if it exists).
 \fBAlias\fP can be abbreviated to \fBa\fP.
 .ip "\fBalternates\fP\ \ "
 If you have accounts on several machines, you may find it convenient
-to use the /usr/lib/aliases on all the machines except one to direct
+to use /etc/mail/aliases on all the machines except one to direct
 your mail to a single account.
 The
 .b alternates
@@ -256,7 +256,7 @@ command.
 These
 commands delete the current message and print the next message.
 They are useful for quickly reading and disposing of mail.
-If there is no next message, \fImail\fP says ``at EOF.''
+If there is no next message, \fIMail\fP says ``No more messages.''
 .ip "\fBedit\fP\ \ "
 To edit individual messages using the text editor, the
 .b edit
@@ -291,7 +291,7 @@ statement.
 .ip "\fBexit\fP or \fBxit\fP\ \ "
 Leave
 .i Mail
-without updating the system mailbox or the file your were reading.
+without updating the system mailbox or the file you were reading.
 Thus, if you accidentally delete several messages, you can use
 .b exit
 to avoid scrambling your mailbox.
@@ -366,17 +366,16 @@ command (and thus the initial header listing)
 only lists the first so many message headers.
 The number of headers listed depends on the speed of your
 terminal.
-This can be overridden by specifying the number of headers you
-want with the
-.i window
-option.
 .i Mail
 maintains a notion of the current
 .q window
 into your messages for the purposes of printing headers.
 Use the
 .b z
-command to move forward and back a window.
+command to move forward a window,
+and
+.b z-
+to move back a window.
 You can move
 .i Mail's
 notion of the current window directly to a particular message by
@@ -387,17 +386,14 @@ headers 40
 to move
 .i Mail's
 attention to the messages around message 40.
-If a ``+'' argument is given, then the next screenful of message headers is
-printed, and if a ``\-'' argument is given, the previous screenful of message
-headers is printed.
 \fBHeaders\fP can be abbreviated to \fBh\fP.
 .ip "\fBhelp\fP\ \ "
 Print a brief and usually out of date help message about the commands
 in
 .i Mail .
-The 
+The
 .i man
-page for 
+page for
 .i mail
 is usually more up-to-date than either the help message or this manual.
 It is also a synonym for \fB?\fP.
@@ -440,7 +436,7 @@ and
 .b N.B.:
 .i Ignore
 has been superseded by
-.i retain.
+.i retain .
 .br
 Add the list of header fields named to the
 .i "ignore list" .
@@ -457,6 +453,12 @@ ignored fields.
 If
 .b ignore
 is executed with no arguments, it lists the current set of ignored fields.
+.ip "\fBinc\fP\ \ "
+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 it
+cause any changes made so far to be saved.
 .ip "\fBlist\fP\ \ "
 List the valid
 .i Mail
@@ -496,10 +498,10 @@ option set,
 will prompt you for a subject to your message.  Then you
 can type in your message, using tilde escapes as described in
 section 4 to edit, print, or modify your message.  To signal your
-satisfaction with the message and send it, type control-d at the
+satisfaction with the message and send it, type <Control-D> at the
 beginning of a line, or a . alone on a line if you set the option
 .i dot .
-To abort the message, type two interrupt characters (\s-2RUBOUT\s0
+To abort the message, type two interrupt characters (Control-C
 by default) in a row or use the
 .b ~q
 escape.
@@ -513,6 +515,8 @@ action for messages if you do
 have the
 .i hold
 option set.
+.ip "\fBmore\fP\ \ "
+Takes a message list and invokes the pager on that list.
 .ip "\fBnext\fP or \fB+\fP\ \ "
 The
 .b next
@@ -555,12 +559,12 @@ variable is set, messages longer than the number of lines it indicates
 are paged through the command specified by the \fBPAGER\fP variable.
 The \fBprint\fP command can be abbreviated to \fBp\fP.
 .ip "\fBquit\fP\ \ "
-Terminates the session, saving all undeleted, unsaved and unwritten messages 
+Terminates the session, saving all undeleted, unsaved and unwritten messages
 in the user's \fImbox\fP file in their login directory
 (messages marked as having been read), preserving all
 messages marked with \fBhold\fP or \fBpreserve\fP or never referenced
 in their system mailbox.
-Any messages that were deleted, saved, written or saved to \fImbox\fP are
+Any messages that were deleted, saved, written, or saved to \fImbox\fP are
 removed from their system mailbox.
 If new mail has arrived during the session, the message
 ``You have new mail'' is given.  If given while editing a mailbox file
@@ -573,7 +577,7 @@ Frame a reply to a single message.
 The reply will be sent to the
 person who sent you the message (to which you are replying), plus all
 the people who received the original message, except you.  You can
-add people using the \fB~t\fP, \fB~c\fP and \fB~b\fP
+add people using the \fB~t\fP, \fB~c\fP, and \fB~b\fP
 tilde escapes.  The subject in your reply is formed by prefacing the
 subject in the original message with
 .q "Re:"
@@ -628,6 +632,17 @@ at quit time, nor are they selected by the
 .b next
 command described above, unless explicitly specified.
 \fBSave\fP can be abbreviated to \fBs\fP.
+.ip "\fBsaveignore\fP\ \ "
+\fBsaveignore\fP is to \fBsave\fP what \fBignore\fP is to \fBprint\fP
+and \fBtype\fR.
+Header fields thus marked are filtered out when saving a message
+by \fBsave\fP or when automatically saving to \fImbox\fP.
+.ip "\fBsaveretain\fP\ \ "
+\fBsaveretain\fP is to \fBsave\fP what \fBretain\fP is to \fBprint\fP
+and \fBtype\fR.
+Header fields thus marked are the only ones saved with a message
+when saving by \fBsave\fP or when automatically saving to \fImbox\fP.
+\fBsaveretain\fP overrides \fBsaveignore\fP.
 .ip "\fBset\fP\ \ "
 Set an option or give an option a value.  Used to customize
 .i Mail .
@@ -709,6 +724,10 @@ might be preferred.
 Same as \fBprint\fP.
 Takes a message list and types out each message on the terminal.
 The \fBtype\fP command can be abbreviated to \fBt\fP.
+.ip "\fBunalias\fP \ \"
+Takes a list of names defined by \fBalias\fP commands and
+discards the remembered groups of users.
+The group names no longer have any significance.
 .ip "\fBundelete\fP \ \"
 Takes a message list and marks each message as \fInot\fP
 being deleted.
@@ -720,7 +739,7 @@ having been read.
 \fBUnread\fP can be abbreviated to \fBU\fP.
 .ip "\fBunset\fP\ \ "
 Takes a list of option names and discards their remembered values;
-the inverse of \fBset\fP .
+the inverse of \fBset\fP.
 .ip "\fBvisual\fP\ \ "
 It is often useful to be able to invoke one of two editors,
 based on the type of terminal one is using.  To invoke
@@ -737,14 +756,22 @@ Both the
 .b edit
 and
 .b visual
-commands assume some default text editors.  These default editors
-can be overridden by the valued options
+commands assume some default text editors.
+The default for
+.q EDITOR
+is
+.i /usr/bin/ex .
+The default for
+.q VISUAL
+is
+.i /usr/bin/vi .
+These default editors can be overridden by the valued options
 .q EDITOR
 and
 .q VISUAL
 for the standard and screen editors.  You might want to do:
 .(l
-set EDITOR=/usr/ucb/ex VISUAL=/usr/ucb/vi
+set EDITOR=/bin/ed VISUAL=/usr/bin/mg
 .)l
 \fBVisual\fP can be abbreviated to \fBv\fP.
 .ip "\fBwrite\fP\ \ "
@@ -768,8 +795,8 @@ As suggested by this example, the
 .b write
 command is useful for such tasks as sending and receiving
 source program text over the message system.
-The filename in quotes, followed by the line
-count and character count is echoed on the user's terminal.
+The filename in quotes, followed by additional file information,
+is echoed on the user's terminal.
 .ip "\fBz\fP\ \ "
 .i Mail
 presents message headers in windowfuls as described under
@@ -806,7 +833,17 @@ The valued option
 .q EDITOR
 defines the pathname of the text editor to be used in the
 .b edit
-command and ~e.  If not defined, a standard editor is used.
+command and ~e escape.
+If not defined,
+.i /usr/bin/ex
+is used.
+.ip "\fBLISTER\fP\ \ "
+Pathname of the directory lister to use in the \fBfolders\fP command.
+Default is \fI/bin/ls\fP.
+.ip "\fBMBOX\fP\ \ "
+The name of the \fImbox\fP file.
+It can be the name of a folder.
+The default is ``mbox'' in the user's home directory.
 .ip "\fBPAGER\fP\ \ "
 Pathname of the program to use for paginating output when
 it exceeds \fIcrt\fP lines.
@@ -824,7 +861,10 @@ The valued option
 defines the pathname of the screen editor to be used in the
 .b visual
 command
-and ~v escape.  A standard screen editor is used if you do not define one.
+and ~v escape.
+If not defined,
+.i /usr/bin/vi
+is used.
 .ip "\fBappend\fP\ \ "
 The
 .q append
@@ -846,12 +886,22 @@ causes
 .i Mail
 to prompt you for the subject of each message you send.
 If you respond with simply a newline, no subject field will be sent.
+.ip "\fBaskbcc\fP\ \ "
+.q Askbcc
+is a binary option which
+causes you to be prompted for additional blind carbon copy recipients at the
+end of each message.  Responding with a newline shows your
+satisfaction with the current list.
 .ip "\fBaskcc\fP\ \ "
 .q Askcc
 is a binary option which
 causes you to be prompted for additional carbon copy recipients at the
 end of each message.  Responding with a newline shows your
 satisfaction with the current list.
+.ip "\fBautoinc\fP\ \ "
+Causes new mail to be automatically incorporated when it arrives.
+Setting this is similar to issuing the \fBinc\fP command at each prompt,
+except that the current message is not reset when new mail arrives.
 .ip "\fBautoprint\fP\ \ "
 .q Autoprint
 is a binary option which
@@ -905,8 +955,8 @@ being automatically swept into your \fImbox\fP file.
 .ip "\fBignore\fP\ \ "
 The binary option
 .q ignore
-causes \s-2RUBOUT\s0 characters from your terminal to be ignored and echoed
-as @'s while you are sending mail.  \s-2RUBOUT\s0 characters retain their
+causes <Control-C> characters from your terminal to be ignored and echoed
+as @'s while you are sending mail.  <Control-C> characters retain their
 original meaning in
 .i Mail
 command mode.
@@ -919,14 +969,18 @@ flag on the command line as described in section 6.
 An option related to
 .q dot
 is
-.q ignoreeof
+.q ignoreeof ,
 which makes
 .i Mail
-refuse to accept a control\-d as the end of a message.
+refuse to accept a <Control-D> as the end of a message.
 .q Ignoreeof
 also applies to
 .i Mail
 command mode.
+.ip "\fBindentprefix\fP\ \ "
+String used by the \fB~m\fP tilde escape for indenting messages,
+in place of the normal tab character (`^I').
+Be sure to quote the value if it contains spaces or tabs.
 .ip "\fBkeep\fP\ \ "
 The
 .q keep
@@ -936,7 +990,7 @@ to truncate your system mailbox instead of deleting it when it
 is empty.  This is useful if you elect to protect your mailbox, which
 you would do with the shell command:
 .(l
-chmod 600 /usr/spool/mail/yourname
+chmod 600 /var/mail/yourname
 .)l
 where
 .i yourname
@@ -970,7 +1024,7 @@ is first invoked. Setting this option is the same as using
 on the command line.
 .ip "\fBnosave\fP\ \ "
 Normally,
-when you abort a message with two \s-2RUBOUTs\s0,
+when you abort a message with two <Control-C>'s,
 .i Mail
 copies the partial letter to the file
 .q dead.letter
@@ -1013,6 +1067,17 @@ specifies how many message headers you want printed.
 This number is also used for scrolling with the
 .b z
 command.
+.ip "\fBsearchheaders\fP\ \ "
+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 omitted, 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.
 .ip "\fBsendmail\fP\ \ "
 To use an alternate mail delivery system, set the
 .q sendmail
@@ -1027,7 +1092,7 @@ command will print out instead of the default five lines.
 .ip "\fBverbose\fP\ \ "
 The binary option "verbose" causes
 .i Mail
-to invoke sendmail with the 
+to invoke sendmail with the
 .b \-v
 flag, which causes it to go into verbose mode and announce expansion
 of aliases, etc. Setting the "verbose" option is equivalent to
diff --git a/usr.bin/mail/USD.doc/mail6.nr b/usr.bin/mail/USD.doc/mail6.nr
index cbbc47ebec5..7c63b9251be 100644
--- a/usr.bin/mail/USD.doc/mail6.nr
+++ b/usr.bin/mail/USD.doc/mail6.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail6.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
+.\"	$OpenBSD: mail6.nr,v 1.5 2004/06/04 00:04:54 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -34,10 +34,11 @@
 This section describes command line options for
 .i Mail
 and what they are used for.
-.ip \-N
-Suppress the initial printing of headers.
-.ip \-d
-Turn on debugging information.  Not of general interest.
+.ip "\-b list\ \ "
+Send blind carbon copies to list.
+.ip "\-c list\ \ "
+Send carbon copies to list of users.
+List should be a comma separated list of names.
 .ip "\-f file\ \ "
 Show the messages in
 .i file
@@ -48,16 +49,18 @@ is omitted,
 reads
 .i mbox
 in your home directory.
+.ip \-I
+Forces mail to run in interactive mode,
+even when input is not a terminal.
+In particular, the special \fB~\fP command character,
+used when sending mail, is only available interactively.
 .ip \-i
-Ignore tty interrupt signals.  Useful on noisy phone lines, which
-generate spurious RUBOUT or DELETE characters.  It's usually
-more effective to change your interrupt character to control\-c,
-for which see the
-.i stty
-shell command.
+Ignore tty interrupt signals.
+This is particularly useful when using mail on noisy phone lines.
+.ip \-N
+Suppress the initial printing of headers.
 .ip \-n
-Inhibit reading of /usr/lib/Mail.rc.  Not generally useful, since
-/usr/lib/Mail.rc is usually empty.
+Inhibit reading of /etc/mail.rc upon startup.
 .ip "\-s string"
 Used for sending mail.
 .i String
@@ -71,7 +74,7 @@ mail instead of your own.  Unwitting others often neglect to protect
 their mailboxes, but discretion is advised. Essentially,
 .b "\-u user"
 is a shorthand way of doing
-.b "\-f /usr/spool/mail/user".
+.b "\-f /var/mail/user".
 .ip "\-v"
 Use the
 .b \-v
@@ -82,6 +85,8 @@ The following command line flags are also recognized, but are
 intended for use by programs invoking
 .i Mail
 and not for people.
+.ip \-d
+Turn on debugging information.  Not of general interest.
 .ip "\-T file"
 Arrange to print on
 .i file
@@ -92,31 +97,3 @@ fields of all messages that were either read or deleted.
 is for the
 .i readnews
 program and should NOT be used for reading your mail.
-.ip "\-h number"
-Pass on hop count information.
-.i Mail
-will take the number, increment it, and pass it with
-.b \-h
-to the mail delivery system.
-.b \-h
-only has effect when sending mail and is used for network mail
-forwarding.
-.ip "\-r name"
-Used for network mail forwarding:  interpret
-.i name
-as the sender of the message.  The
-.i name
-and
-.b \-r
-are simply sent along to the mail delivery system.  Also,
-.i Mail
-will wait for the message to be sent and return the exit status.
-Also restricts formatting of message.
-.pp
-Note that
-.b \-h
-and
-.b \-r ,
-which are for network mail forwarding, are not used in practice
-since mail forwarding is now handled separately.  They may
-disappear soon.
diff --git a/usr.bin/mail/USD.doc/mail8.nr b/usr.bin/mail/USD.doc/mail8.nr
index 76cdd339c28..327774720f6 100644
--- a/usr.bin/mail/USD.doc/mail8.nr
+++ b/usr.bin/mail/USD.doc/mail8.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail8.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
+.\"	$OpenBSD: mail8.nr,v 1.5 2004/06/04 00:04:54 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -55,7 +55,7 @@ A collection of messages.  Often used in the phrase,
 .q "Have you read your mail?"
 .ip "\fImailbox\fP"
 The place where your mail is stored, typically in the directory
-/usr/spool/mail.
+/var/mail.
 .ip "\fImessage\fP"
 A single letter from someone, initially stored in your
 .i mailbox .
diff --git a/usr.bin/mail/USD.doc/mail9.nr b/usr.bin/mail/USD.doc/mail9.nr
index ed780716447..e74b3a8ea13 100644
--- a/usr.bin/mail/USD.doc/mail9.nr
+++ b/usr.bin/mail/USD.doc/mail9.nr
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail9.nr,v 1.4 2003/06/03 02:56:11 millert Exp $
+.\"	$OpenBSD: mail9.nr,v 1.5 2004/06/04 00:04:54 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -70,10 +70,11 @@ help	Same as \fB?\fP
 hold	Same as \fBpreserve\fP
 if	Conditional execution of \fIMail\fP commands
 ignore	Set/examine list of ignored header fields
+inc	Incorporate new messages
 list	List valid \fIMail\fP commands
-local	List other names for the local host
 mail	Send mail to specified names
 mbox	Arrange to save a list of messages in \fImbox\fP
+more	Invoke pager on message list
 next	Go to next message and type it
 preserve	Arrange to leave list of messages in system mailbox
 print	Print messages
@@ -82,12 +83,15 @@ reply	Compose a reply to a message
 respond	Same as \fBreply\fP
 retain	Supersedes \fBignore\fP
 save	Append messages, headers included, on a file
+saveignore	List of headers to ignore when using the \fBsave\fP command
+saveretain	List of headers to retain when using the \fBsave\fP command
 set	Set binary or valued options
 shell	Invoke an interactive shell
 size	Prints out size of message list
 source	Read \fImail\fP commands from a file
 top	Print first so many (5 by default) lines of list of messages
 type	Same as \fBprint\fP
+unalias	Remove alias
 undelete	Undelete list of messages
 unread	Marks list of messages as not been read
 unset	Undo the operation of a \fBset\fP
@@ -107,12 +111,16 @@ l ci l.
 Option	Type	Description
 _
 EDITOR	valued	Pathname of editor for ~e and \fBedit\fP
-PAGER	valued	Pathname of paginator for \fBPrint\fP, \fBprint\fP, \fBType\fP and \fBtype\fP
+LISTER	valued	Pathname of directory lister
+MBOX	valued	Pathname of the \fImbox\fP file
+PAGER	valued	Pathname of pager for \fBPrint\fP, \fBprint\fP, \fBType\fP and \fBtype\fP
 SHELL	valued	Pathname of shell for \fBshell\fP, ~! and \fB!\fP
 VISUAL	valued	Pathname of screen editor for ~v, \fBvisual\fP
 append	binary	Always append messages to end of \fImbox\fP
 ask	binary	Prompt user for Subject: field when sending
+askbcc	binary	Prompt user for additional BCc's at end of message
 askcc	binary	Prompt user for additional Cc's at end of message
+autoinc	binary	Automatically incorporate new mail
 autoprint	binary	Print next message after \fBdelete\fP
 crt	valued	Minimum number of lines before using \fBPAGER\fP
 debug	binary	Print out debugging information
@@ -120,16 +128,19 @@ dot	binary	Accept . alone on line to terminate message input
 escape	valued	Escape character to be used instead of\ \ ~
 folder	valued	Directory to store folders in
 hold	binary	Hold messages in system mailbox by default
-ignore	binary	Ignore \s-2RUBOUT\s0 while sending mail
-ignoreeof	binary	Don't terminate letters/command input with \fB\(uaD\fP
+ignore	binary	Ignore <Control-C> while sending mail
+ignoreeof	binary	Don't terminate letters/command input with \fB^D\fP
+indentprefix	valued	String used for indenting messages
 keep	binary	Don't unlink system mailbox when empty
 keepsave	binary	Don't delete \fBsave\fPd messages by default
 metoo	binary	Include sending user in aliases
 noheader	binary	Suppress initial printing of version and headers
 nosave	binary	Don't save partial letter in \fIdead.letter\fP
-quiet	binary	Suppress printing of \fIMail\fP version and message numbers
+Replyall	binary	Reverses the sense of the \fB[Rr]eply\fP commands
+quiet	binary	Suppress printing of \fIMail\fP version/message numbers
 record	valued	File to save all outgoing mail in
 screen	valued	Size of window of message headers for \fBz\fP, etc.
+searchheaders	binary	Search string for message headers
 sendmail	valued	Choose alternate mail delivery system
 toplines	valued	Number of lines to print in \fBtop\fP
 verbose	binary	Invoke sendmail with the \fB\-v\fP flag
@@ -151,10 +162,12 @@ _
 ~d		Read \fIdead.letter\fP into message
 ~e		Invoke text editor on partial message
 ~f	messages	Read named messages
+~F	messages	Same as ~f, but includes all headers
 ~h		Edit the header fields
 ~m	messages	Read named messages, right shift by tab
+~M	messages	Same as ~m, but includes all headers
 ~p		Print message entered so far
-~q		Abort entry of letter; like \s-2RUBOUT\s0
+~q		Abort entry of letter; like <Control-C>
 ~r	filename	Read file into message
 ~s	string	Set Subject: field to \fIstring\fP
 ~t	name ...	Add names to To: field
@@ -176,24 +189,23 @@ c c
 l a.
 Flag	Description
 _
-\-N	Suppress the initial printing of headers
-\-T \fIfile\fP	Article-id's of read/deleted messages to \fIfile\fP
+\-b \fIlist\fP	Send blind carbon copies to \fIlist\fP.
+\-c \fIlist\fP	Send carbon copies to \fIlist\fP
 \-d	Turn on debugging
-\-f \fIfile\fP	Show messages in \fIfile\fP or \fI~/mbox\fP
-\-h \fInumber\fP	Pass on hop count for mail forwarding
+\-f [\fIname\fP]	Show messages in \fIname\fP or \fI~/mbox\fP
+\-I	Force \fIMail\fP to run in interactive mode
 \-i	Ignore tty interrupt signals
-\-n	Inhibit reading of /usr/lib/Mail.rc
-\-r \fIname\fP	Pass on \fIname\fP for mail forwarding
-\-s \fIstring\fP	Use \fIstring\fP as subject in outgoing mail
-\-u \fIname\fP	Read \fIname's\fP mail instead of your own
+\-N	Suppress the initial printing of headers
+\-n	Inhibit reading of /etc/mail.rc
+\-s \fIsubject\fP	Use \fIsubject\fP as subject in outgoing mail
+\-T \fIfile\fP	Article-id's of read/deleted messages to \fIfile\fP
+\-u \fIuser\fP	Read \fIuser\fP's mail instead of your own
 \-v 	Invoke sendmail with the \fB\-v\fP flag
 .TE
 .)b
 .lp
 Notes:
-.b \-T ,
-.b \-d ,
-.b \-h ,
+.b \-d
 and
-.b \-r
+.b \-T
 are not for human use.