X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=man%2Fmhmail.man;h=a374b3d3fb1bc46178ab987095580ffc45894992;hb=54dae008ec9e75cd8625945d78cff47a88261bfa;hp=20a09cb2986f385ebdfeb01da3153956c6f0a72d;hpb=99d51f8b8c14ac45d2b6b1be064eae2d316c3871;p=mmh

diff --git a/man/mhmail.man b/man/mhmail.man
index 20a09cb..a374b3d 100644
--- a/man/mhmail.man
+++ b/man/mhmail.man
@@ -10,6 +10,8 @@ mhmail \- send or read mail
 .B mhmail
 .RI [ addrs
 \&...]
+.RB [ \-attach
+.IR file ]
 .RB [ \-body
 .IR text ]
 .RB [ \-cc
@@ -17,18 +19,21 @@ mhmail \- send or read mail
 \&...]
 .RB [ \-from
 .IR addr ]
+.RB [ \-headerfield
+.IR name:value ]
 .RB [ \-subject
 .IR subject ]
+.RB [ \-resent ]
 [switches\ for
 .I post
 \&... |
-.R \-profile
+.RB \-profile
 [switches\ for
 .I send
 \&...]]
+.RB [ \-send " | " \-nosend ]
 .RB [ \-version ]
 .RB [ \-help ]
-.RB [ \-debug ]
 .ad
 .SH DESCRIPTION
 .B mhmail
@@ -67,21 +72,24 @@ name of the temporary file as its argument to deliver the message to
 the specified user.
 .PP
 The
-.B \-profile
-switch instructs
-.B mhmail
-to use
-.B send
-instead of
-.B post
-to send the message.  This allows use of the user's context and aliases.
-.PP
-The
 .B \-subject
 .I subject
 switch can be used to specify the
 \*(lqSubject:\*(rq field of the message.
 .PP
+The
+.B \-resent
+switch indicates that the message body is a fully formed message that
+will be resent, as
+.B dist
+would do.  For example:
+.PP
+.RS 5
+.nf
+mhmail u2@example.com -resent < `mhpath cur`
+.fi
+.RE
+.PP
 By default,
 .B mhmail
 will read the message to be sent from the
@@ -97,7 +105,8 @@ will not send the message and return with status 1.  You can use the switch
 \*(lq\*(rq to force an empty message.
 .PP
 Normally, addresses appearing as arguments are put in the \*(lqTo:\*(rq
-field.  If the
+field.  At least one such address is required when sending a message,
+i.e., if any other switches are supplied. If the
 .B \-cc
 switch is used, all addresses following it, even if there are
 intervening switches, are placed in the \*(lqcc:\*(rq field.
@@ -110,17 +119,85 @@ the draft.  If no
 .B \-from
 switch is used when sending,
 .B mhmail
-will supply a \*(lqFrom:\*(rq header field using the sender's local mailbox.
+will supply a \*(lqFrom:\*(rq header field using the sender's local mailbox,
+see
+.I localmbox
+in
+.BR mh-format (5).
 Naturally,
 .B post
 will fill\-in the \*(lqSender:\*(rq
 header correctly.
 .PP
 The
-.B \-debug
-option shows the draft file that would be posted/sent and the command
-that would be used to post/send the draft, but does not post or send
-it.
+.B \-headerfield
+.I name:value
+switch adds a header field with the specified name and value to the
+message.  (The
+.I value
+is called the
+.I field body
+in RFC 2822, but that's too easily confused with the message body.)
+There need not be a space after the colon that separates the
+name and value in the argument to this switch.  It is usually best to
+enclose the argument in quotes to protect it from the shell.  The
+.B \-headerfield
+switch may be given multiple times to add multiple header fields,
+for example,
+.PP
+.RS 5
+.nf
+mhmail -from sender@example.com \\
+-headerfield 'MIME-Version:1.0' \\
+-headerfield 'Content-Type:text/plain; charset=utf-8' \\
+-headerfield 'Content-Transfer-Encoding:8bit' \\
+recipient@example.com
+.fi
+.RE
+.PP
+Note about this example:  the
+.B \-attach
+switch causes
+.I MIME-Version
+and
+.I Content-Type
+headers to be added to the message.
+.PP
+The
+.B \-profile
+switch instructs
+.B mhmail
+to use
+.B send
+instead of
+.B post
+to send the message.  This allows use of the user's context and aliases.
+.PP
+The
+.B \-attach
+.I file
+switch attaches the specified file to the message.  Use of
+.B \-attach
+enables
+.B \-profile
+because
+.B mhmail
+uses
+.B send
+to handle the attachment.  It is usually best to enclose the argument
+in quotes to protect it from the shell.  The
+.B \-attach
+switch may be given multiple times to add multiple attachments.
+.PP
+The
+.B \-nosend
+option shows the draft file that would be posted/sent on the command's
+standard output but does not post or send it.
+.B \-send
+provides the default behavior of posting or sending the message.  It
+can be used to disable
+.BR \-nosend ,
+for example, when using a shell alias.
 .PP
 All other switches are passed on to
 .B post
@@ -142,10 +219,14 @@ is used.
 .fi
 
 .SH "SEE ALSO"
-inc(1), post(8), send(1)
+dist(1), inc(1), mh-format(5), post(8), send(1)
 
 .SH DEFAULTS
-None
+.nf
+.RB ` \-from "' defaults to sender's local mailbox (localmbox)"
+.RB ` \-profile "' is enabled by default only with " \-attach
+.RB ` \-send '
+.fi
 
 .SH CONTEXT
 If