update the tilde escapes for both these files,

and try and keep them in a similar format/order;

2 files changed, 18 insertions, 13 deletions

diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index eb9314de629..c0f2fdf8e7b 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mail.1,v 1.55 2008/11/03 15:42:35 martynas Exp $
+.\"	$OpenBSD: mail.1,v 1.56 2008/11/03 18:50:12 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -714,8 +714,6 @@ is somewhat of a misnomer since the actual escape character can be set
 by the option
 .Ic escape .
 .Bl -tag -width Ds
-.It Ic ~! Ns Ar command
-Execute the indicated shell command, then return to the message.
 .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).
@@ -794,6 +792,10 @@ No message is copied to
 even if
 .Ic save
 is set.
+.It Ic ~?
+Prints a brief summary of tilde escapes.
+.It Ic ~! Ns Ar command
+Execute the indicated shell command, then return to the message.
 .It Ic ~| Ns Ar command
 Pipe the message through the command as a filter.
 If the command gives
diff --git a/usr.bin/mail/misc/mail.tildehelp b/usr.bin/mail/misc/mail.tildehelp
index 8873217bca3..48199eaac1d 100644
--- a/usr.bin/mail/misc/mail.tildehelp
+++ b/usr.bin/mail/misc/mail.tildehelp
@@ -1,22 +1,25 @@
 -----------------------------------------------------------
 The following ~ escapes are defined:
-~~		Quote a single tilde.
-~b users	Add users to "blind" cc list.
-~c users	Add users to cc list.
+~b name ...	Add users to "blind" cc list.
+~c name ...	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.
+~f messages	Read in messages.
 ~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.
+~m messages	Read in messages, right shifted by a tab.
+~p		Print (show) the message buffer.
+~q		Abort message; optionally save copy to ~/dead.letter.
+~r filename	Read a file into the message buffer.
+~s string	Set subject.
+~t name		Add users to to list.
 ~v		Invoke display editor on message.
-~w file		Write message onto file.
+~w filename	Write message onto file.
+~x		Abort message; no copy is saved.
 ~?		Print this message.
 ~!command	Invoke the shell.
 ~|command	Pipe the message through the command and replace it.
+~:mail-command	Execute the given mail command.
+~~string	Quote a single tilde.
 -----------------------------------------------------------