merge

[plan9front.git] / sys / man / 1 / marshal

diff --git a/sys/man/1/marshal b/sys/man/1/marshal
old mode 100755 (executable)
new mode 100644 (file)
index b2fc90e..ef654a1
--- a/sys/man/1/marshal
+++ b/sys/man/1/marshal
@@ -10,7 +10,12 @@ marshal \- formatting and sending mail
 .B -C
 .I copyaddr
 ] [
-.B -nrx#
+.B -B
+.I copyaddr
+] [
+.B -Fr#xn
+] [
+.B -p[es]
 ] [
 .B -R
 .I reply-msg
@@ -21,6 +26,8 @@ marshal \- formatting and sending mail
 .B -t
 .I mime-type
 ] [
+.B -8
+|
 .I mailaddr ...
 ]
 .SH DESCRIPTION
@@ -82,14 +89,21 @@ directing any mail reader to display the attachment
 (if it can) when the mail message is read.
 .TP
 .BI -C copyaddr
+or
+.BI -B copyaddr
 adds a
 .B Cc:
+or
+.B Bcc:
 header with
 .I copyaddr
 and also adds
 .I copyaddr
 as a recipient.
 .TP
+.BI -F
+file the message
+.TP
 .BI -n
 intentionally no standard input
 .TP
@@ -131,6 +145,20 @@ all subsequent
 and
 .B -A
 options.
+.TP
+.B -ps
+pgp sign the message
+.TP
+.B -pe
+pgp encrypt the message
+.TP
+.B -8
+reads recipients (
+.B To:
+.B Cc:
+and
+.B Bcc:
+) from RFC 822 header of the message
 .PD
 .PP
 .I Marshal
@@ -153,6 +181,17 @@ For example:
 .EX
 upasname=natasha@kremvax.com upas/mail boris@squirrel.com
 .EE
+.PP
+.I Marshal
+interprets file attachment headers
+.B Attach:
+and
+.B Include:
+as if the
+.B -A
+or
+.B -a
+options would have been given.
 .SH FILES
 .TP
 .B /mail/box/*/dead.letter