X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=man%2Fmhmail.man;h=3b382af276f1bfdb290990fb87d0edbd0830f4f2;hb=26d1d48706344c9311fe19f3691e5c0a230da710;hp=261fbc73ec3b65f880465d8730b06a0e7c900b2e;hpb=74d6825e0e5dd0b44ed8438f2dbcc0a1ef3602c7;p=mmh

diff --git a/man/mhmail.man b/man/mhmail.man
index 261fbc7..3b382af 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,10 +19,21 @@ mhmail \- send or read mail
 \&...]
 .RB [ \-from
 .IR addr ]
+.RB [ \-header\-field
+.IR name:body ]
 .RB [ \-subject
 .IR subject ]
+.RB [ \-resent ]
+[switches\ for
+.I post
+\&... |
+.RB \-profile
+[switches\ for
+.I send
+\&...]]
+.RB [ \-send " | " \-nosend ]
 .RB [ \-version ]
-.RB [ \-help ] 
+.RB [ \-help ]
 .ad
 .SH DESCRIPTION
 .B mhmail
@@ -64,6 +77,19 @@ The
 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
@@ -74,15 +100,15 @@ line with the
 switch.  If the standard input has zero
 length,
 .B mhmail
-will not send the message.  You can use the switch
+will not send the message and return with status 1.  You can use the switch
 .B \-body
 \*(lq\*(rq to force an empty message.
 .PP
 Normally, addresses appearing as arguments are put in the \*(lqTo:\*(rq
 field.  If the
 .B \-cc
-switch is used, all addresses following it are
-placed in the \*(lqcc:\*(rq field.
+switch is used, all addresses following it, even if there are
+intervening switches, are placed in the \*(lqcc:\*(rq field.
 .PP
 By using
 .B \-from
@@ -97,6 +123,81 @@ Naturally,
 .B post
 will fill\-in the \*(lqSender:\*(rq
 header correctly.
+.PP
+The
+.B \-header\-field
+.I name:body
+switch adds a header field with the specified name and body to the
+message.  There need not be a space after the colon that separates the
+name and body in the argument to this switch.  It is usually best to
+enclose the argument in quotes to protect it from the shell.  The
+.B \-header\-field
+switch may be given multiple times to add multiple header fields,
+for example,
+.PP
+.RS 5
+.nf
+mhmail -from sender@example.com \\
+-header\-field 'MIME-Version:1.0' \\
+-header\-field 'Content-Type:text/plain; charset=utf-8' \\
+-header\-field '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
+if
+.B \-profile
+is not used, or
+.B send
+if
+.B \-profile
+is used.
 
 .SH FILES
 .fc ^ ~
@@ -108,14 +209,23 @@ header correctly.
 .fi
 
 .SH "SEE ALSO"
-inc(1), post(8)
+dist(1), inc(1), post(8), send(1)
 
 .SH DEFAULTS
-None
+.nf
+.RB ` \-send '
+.fi
+.RB ` \-profile' ,
+enabled by default only with
+.B \-attach
 
 .SH CONTEXT
 If
 .B inc
 is invoked, then
 .BR inc 's
-context changes occur.
+context changes occur.  With the
+.B \-profile
+switch, the context of
+.B send
+is used.