X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=man%2Fsend.man;h=4a69b008bc87e5ab5927def6117f643e6f564825;hb=34ae8b856a0adbbdd68a49e2e97cd0124b8b32dd;hp=87a74eb91e65234620963ccc024f51a3cfc20420;hpb=3bede3fae77775088b8b66e7a26a5e2ee1f61fff;p=mmh

diff --git a/man/send.man b/man/send.man
index 87a74eb..4a69b00 100644
--- a/man/send.man
+++ b/man/send.man
@@ -38,9 +38,11 @@ send \- send a message
 .IR ssf ]
 .RB [ \-saslmech
 .IR mechanism ]
+.RB [ \-snoop ]
 .RB [ \-user
 .IR username ]
 .RB [ \-tls ]
+.RB [ \-notls ]
 .RB [ \-width
 .IR columns ]
 .RB [ file
@@ -49,6 +51,7 @@ send \- send a message
 .RB [ \-help ]
 .RB [ \-attach
 .IR header-field-name ]
+.RB [ \-noattach ]
 .RB [ \-attachformat
 .IR 0 " | " 1 " | " 2 ]
 .ad
@@ -76,15 +79,15 @@ are actually performed by
 .BR post .
 
 .PP
-If a
-.I header-field-name
-is supplied using the
-.B -attach
-option, the draft is scanned for a header whose field name matches the
-supplied
-.IR header-field-name .
+By default the draft is scanned for a header named
+.IR Nmh-Attachment .
 The draft is converted to a MIME message if one or more matches are found.
-This conversion occurs before all other processing.
+This conversion occurs before all other processing.  The header name
+can be changed with the
+.B \-attach
+option.  This behavior can be disabled completely with the
+.B \-noattach
+option.
 .PP
 The first part of the MIME message is the draft body if that body contains
 any non-blank characters.
@@ -93,14 +96,17 @@ The body of each header field whose name matches the
 is interpreted as a file name, and each file named is included as a separate
 part in the MIME message.
 .PP
-For file names with dot suffixes, the context is scanned for a
+For file names with dot suffixes, the profile is scanned for a
 .I mhshow-suffix-
 entry for that suffix.
-The content-type for the part is taken from that context entry if a match is
-found.
+The content-type for the part is taken from that profile entry if a match is
+found.  If a match is not found in the user profile, the mhn.defaults
+profile is scanned next.
 If no match is found or the file does not have a dot suffix, the content-type
 is text/plain if the file contains only ASCII characters or application/octet-stream
-if it contains characters outside of the ASCII range.
+if it contains characters outside of the ASCII range.  See
+.BR mhshow (1)
+for more details and example syntax.
 .PP
 Each part contains a name attribute that is the last component of the path name.
 A
@@ -113,12 +119,12 @@ command on the file.
 The
 .B -attachformat
 option specifies the MIME header field formats:  a value of
-.B 0,
-the default,
+.B 0
 includes the
 .I x-unix-mode
 attribute as noted above.  A value of
-.B 1
+.BR 1 ,
+the default,
 suppresses that, puts the file name in the
 \*(lqContent-Description\*(rq header, and
 adds a \*(lqContent-Disposition\*(rq header.  A value of
@@ -234,7 +240,8 @@ is the intended file, whereas
 .B \-draft
 will suppress this question.
 Once the transport system has successfully accepted custody of the
-message, the file will be renamed with a leading comma, which allows
+message, the file will be renamed with a site-dependent prefix
+(usually a comma), which allows
 it to be retrieved until the next draft message is sent.  If there are
 errors in the formatting of the message,
 .B send
@@ -276,16 +283,7 @@ switch, then
 will
 use the MIME rules for encapsulation.
 .PP
-Prior to sending the message, the fields \*(lqFrom:\ user@local\*(rq,
-and \*(lqDate:\ now\*(rq will be appended to the headers in the message.
-If the environment variable
-.B $SIGNATURE
-is set, then its value
-is used as your personal name when constructing the \*(lqFrom:\*(rq
-line of the message.  If this environment variable is not set, then
-.B send
-will consult the profile entry \*(lqSignature\*(rq for
-this information.
+Prior to sending the message, the \*(lqDate:\ now\*(rq field will be appended to the headers in the message.
 If
 .B \-msgid
 is specified, then a \*(lqMessage\-ID:\*(rq field will also
@@ -297,9 +295,26 @@ is re\-distributing a message (when invoked by
 .BR dist ),
 then \*(lqResent\-\*(rq will be prepended to each of these
 fields: \*(lqFrom:\*(rq, \*(lqDate:\*(rq, and \*(lqMessage\-ID:\*(rq.
-If the message already contains a \*(lqFrom:\*(rq field, then a
-\*(lqSender: user@local\*(rq field will be added as well.  (An already
-existing \*(lqSender:\*(rq field is an error!)
+.PP
+A \*(lqFrom:\*(rq field is required for all outgoing messages.  Multiple
+addresses are permitted in the \*(lqFrom:\*(rq field, but a \*(lqSender:\*(rq
+field is required in this case.  Otherwise a \*(lqSender:\*(rq field
+is optional.
+.PP
+If a message with multiple \*(lqFrom:\*(rq
+addresses does
+.B NOT
+include a \*(lqSender:\*(rq field but does include an \*(lqEnvelope\-From:\*(rq
+field, the \*(lqEnvelope\-From:\*(rq field will be used to construct
+a \*(lqSender:\*(rq field.
+.PP
+When using SMTP for mail submission, the envelope\-from used for the SMTP
+transaction is derived from the \*(lqEnvelope\-From:\*(rq field.
+If no \*(lqEnvelope\-From:\*(rq field is present, the \*(lqSender:\*(rq
+field is used.  If neither the \*(lqEnvelope\-From:\*(rq nor the
+\*(lqSender:\*(rq field is present, the \*(lqFrom:\*(rq field is used.
+When \*(lqEnvelope\-From:\*(rq appears in a message
+it will be removed from the final outgoing message.
 .PP
 By using the
 .B \-format
@@ -330,10 +345,13 @@ If nmh is using the SMTP MTA, the
 and the
 .B \-port
 switches can be used to override the default mail server (defined by the
-.RI servers
-entry in
 .I %etcdir%/mts.conf
-).
+.RI servers
+entry).  The
+.B \-snoop
+switch can be used to view the SMTP transaction.  (Beware that the
+SMTP transaction may contain authentication information either in
+plaintext or easily decoded base64.)
 .PP
 If
 .B nmh
@@ -370,7 +388,9 @@ If
 .B nmh
 has been compiled with TLS support, the
 .B \-tls
-switch will require the negotiation of TLS support when connecting to the
+and
+.B \-notls
+switches will require and disable the negotiation of TLS support when connecting to the
 SMTP MTA.  Encrypted data is labelled with `(tls-encrypted)' and
 `(tls-decrypted)' when viewing the SMTP transction with the
 .B \-snoop
@@ -425,7 +445,8 @@ comp(1), dist(1), forw(1), repl(1), mh\-alias(5), post(8)
 .RB ` \-noverbose '
 .RB ` \-nowatch '
 .RB ` "\-width\ 72" '
-.RB ` "\-attachformat\ 0" '
+.RB ` "\-attach\ Nmh-Attachment" '
+.RB ` "\-attachformat\ 1" '
 .fi
 
 .SH CONTEXT