Changes from Don Beusee:

o escape From line with a leading '>' when needed
o only print To: address and Subject lines if actually present
o new variable 'allnet' to treat user@foo and user@bar as the same "user"
o folders command now takes an optional argument like ls.
o new "pipe" (|) command to pipe the message through an arbitrary command
o make header display format the same as SunOS 4.1.3 /usr/ucb/mail
o tilde commands work regardless of interactive mode.
o fix "read: Interrupted system call" error by retrying if EINTR
o expanded help file
Changes by me:
o read the help file via the PAGER as it is now more than 24 lines long

2 files changed, 52 insertions, 38 deletions

diff --git a/usr.bin/mail/misc/mail.help b/usr.bin/mail/misc/mail.help
index f5c5dd2de0c..30cc31730bd 100644
--- a/usr.bin/mail/misc/mail.help
+++ b/usr.bin/mail/misc/mail.help
@@ -1,23 +1,37 @@
-    Mail   Commands
-t <message list>		type messages
-n				goto and type next message
-e <message list>		edit messages
-f <message list>		give head lines of messages
-d <message list>		delete messages
-s <message list> file		append messages to file
-u <message list>		undelete messages
-R <message list>		reply to message senders
-r <message list>		reply to message senders and all recipients
-pre <message list>		make messages go back to /var/mail
-m <user list>			mail to specific users
-q				quit, saving unresolved messages in mbox
-x				quit, do not remove system mailbox
-h				print out active message headers
-!				shell escape
+Mail Command			Description
+-------------------------	--------------------------------------------
+t [message list]		type message(s).
+n				goto and type next message.
+e [message list]		edit message(s).
+f [message list]		give head lines of messages.
+d [message list]		delete message(s).
+s [message list] <file>		append message(s) to file.
+u [message list]		undelete message(s).
+R [message list]		reply to message sender(s).
+r [message list]		reply to message sender(s) and all recipients.
+p [message list]		print message list (pipe to lpr).
+pre [message list]		make messages go back to /var/mail.
+m <recipient list>		mail to specific recipient(s).
+q				quit, saving unresolved messages in mbox.
+x				quit, do not remove system mailbox.
+h				print out active message headers.
+!				shell escape.
+| [msglist] command		pipe message(s) to shell command.
+pi [msglist] command		pipe message(s) to shell command.
 cd [directory]			chdir to directory or home if none given
+fi <file>			switch to file (%=system inbox, %user=user's
+				system inbox).  + searches in your folder
+				directory for the file.
+set variable[=value]		set Mail variable.
 
-A <message list> consists of integers, ranges of same, or user names separated
-by spaces.  If omitted, Mail uses the last message typed.
+A [message list] consists of integers, ranges of same, :status, /subject, or
+user names separated by spaces.  If omitted, Mail uses the current message.
+The pipe command doesn't accept user names or subject message list, since
+that might conflict with the command string.
 
-A <user list> consists of user names or aliases separated by spaces.
-Aliases are defined in .mailrc in your home directory.
+A <recipient list> consists of recipient addresses or aliases separated by
+spaces.  Aliases are defined in .mailrc in your home directory.
+
+<file> is a full or relative pathname, +folder, % (system inbox), %user
+(specified user's syetem inbox), # (previous file), & (mbox file), or an
+expression understood by ${SHELL:-/bin/sh} -c 'echo ...'.
diff --git a/usr.bin/mail/misc/mail.tildehelp b/usr.bin/mail/misc/mail.tildehelp
index 0b1ab13e883..8873217bca3 100644
--- a/usr.bin/mail/misc/mail.tildehelp
+++ b/usr.bin/mail/misc/mail.tildehelp
@@ -1,22 +1,22 @@
 -----------------------------------------------------------
 The following ~ escapes are defined:
-~~		Quote a single tilde
-~b users	Add users to "blind" cc list
-~c users	Add users to cc list
-~d		Read in dead.letter
-~e		Edit the message buffer
-~f messages	Read in messages
-~F messages	Same as ~f, but keep all header lines
-~h		Prompt for to list, subject and cc list
-~r file		Read a file into the message buffer
-~p		Print the message buffer
-~m messages	Read in messages, right shifted by a tab
-~M messages	Same as ~m, but keep all header lines
-~s subject	Set subject
-~t users	Add users to to list
-~v		Invoke display editor on message
+~~		Quote a single tilde.
+~b users	Add users to "blind" cc list.
+~c users	Add users to cc list.
+~d		Read in dead.letter.
+~e		Edit the message buffer.
+~f messages	Read in messages.
+~F messages	Same as ~f, but keep all header lines.
+~h		Prompt for to list, subject and cc list.
+~r file		Read a file into the message buffer.
+~p		Print (show) the message buffer.
+~m messages	Read in messages, right shifted by a tab.
+~M messages	Same as ~m, but keep all header lines.
+~s subject	Set subject.
+~t users	Add users to to list.
+~v		Invoke display editor on message.
 ~w file		Write message onto file.
-~?		Print this message
-~!command	Invoke the shell
-~|command	Pipe the message through the command
+~?		Print this message.
+~!command	Invoke the shell.
+~|command	Pipe the message through the command and replace it.
 -----------------------------------------------------------