diff options
| author | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-10-02 00:37:17 +0200 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@gmx.de> | 2012-10-02 00:37:17 +0200 |
| commit | 549b4e022597853e088479c55281828ed7a23b61 (patch) | |
| tree | b9fb517165a1673e00fee755af3b8729ba6792fb | |
| parent | 9e7ecc41d56148866725e26c872909823d515963 (diff) | |
| download | plan9front-549b4e022597853e088479c55281828ed7a23b61.tar.xz | |
upas/marshal: fix usage line and add missing flags to manpage
| -rw-r--r-- | sys/man/1/marshal | 22 | ||||
| -rw-r--r-- | sys/src/cmd/upas/marshal/marshal.c | 2 |
2 files changed, 22 insertions, 2 deletions
diff --git a/sys/man/1/marshal b/sys/man/1/marshal index b2fc90e27..70baafdb9 100644 --- a/sys/man/1/marshal +++ b/sys/man/1/marshal @@ -10,7 +10,9 @@ marshal \- formatting and sending mail .B -C .I copyaddr ] [ -.B -nrx# +.B -Fr#xn +] [ +.B -p[es] ] [ .B -R .I reply-msg @@ -21,6 +23,8 @@ marshal \- formatting and sending mail .B -t .I mime-type ] [ +.B -8 +| .I mailaddr ... ] .SH DESCRIPTION @@ -90,6 +94,9 @@ and also adds .I copyaddr as a recipient. .TP +.BI -F +file the message +.TP .BI -n intentionally no standard input .TP @@ -131,6 +138,19 @@ 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: +and +.B Cc: +) from RFC 822 header of the message .PD .PP .I Marshal diff --git a/sys/src/cmd/upas/marshal/marshal.c b/sys/src/cmd/upas/marshal/marshal.c index 6c816bf7b..261e882de 100644 --- a/sys/src/cmd/upas/marshal/marshal.c +++ b/sys/src/cmd/upas/marshal/marshal.c @@ -151,7 +151,7 @@ enum void usage(void) { - fprint(2, "usage: %s [-Fr#xn] [-s subject] [-c ccrecipient] [-t type]" + fprint(2, "usage: %s [-Fr#xn] [-s subject] [-C ccrecipient] [-t type]" " [-aA attachment] [-p[es]] [-R replymsg] -8 | recipient-list\n", argv0); exits("usage"); |