X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=man%2Fsend.man;h=2cd840b5c75bc69e9139ce4338ef21168c2d44c2;hb=dfa7b4ffa462d4f24016ab4729928dee5ec389bb;hp=25fa35799529e8cda7df0ed3069016e421e84874;hpb=7b98850d3b8b2453b473fdfb6db52f4aa3fe39b6;p=mmh

diff --git a/man/send.man b/man/send.man
index 25fa357..2cd840b 100644
--- a/man/send.man
+++ b/man/send.man
@@ -1,6 +1,5 @@
 .\"
 .\" %nmhwarning%
-.\" $Id$
 .\"
 .TH SEND %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
@@ -34,10 +33,16 @@ send \- send a message
 .RB [ \-port
 .IR port-name/number ]
 .RB [ \-sasl ]
+.RB [ \-nosasl ]
+.RB [ \-saslmaxssf
+.IR ssf ]
 .RB [ \-saslmech
 .IR mechanism ]
+.RB [ \-snoop ]
 .RB [ \-user
 .IR username ]
+.RB [ \-tls ]
+.RB [ \-notls ]
 .RB [ \-width
 .IR columns ]
 .RB [ file
@@ -116,7 +121,8 @@ includes the
 .I x-unix-mode
 attribute as noted above.  A value of
 .B 1
-suppresses both that and the \*(lqContent-Description\*(rq header, and
+suppresses that, puts the file name in the
+\*(lqContent-Description\*(rq header, and
 adds a \*(lqContent-Disposition\*(rq header.  A value of
 .B 2
 adds the file
@@ -127,7 +133,7 @@ messages at the
 .I whatnow
 prompt.
 .PP
-Here are example message part headers for each of the
+Here are example message part headers, for an attachment, for each of the
 .B -attachformat
 values:
 .PP
@@ -138,11 +144,13 @@ Content-Type: text/plain; name="VERSION"; x-unix-mode="0644";
 Content-Description: ASCII text 
 
 -attachformat 1:
-Content-Type: text/plain; charset="us-ascii"
+Content-Type: text/plain; name="VERSION"; charset="us-ascii"
+Content-Description: VERSION
 Content-Disposition: attachment; filename="VERSION"
 
 -attachformat 2:
-Content-Type: text/plain; charset="us-ascii"
+Content-Type: text/plain; name="VERSION"; charset="us-ascii"
+Content-Description: VERSION
 Content-Disposition: attachment; filename="VERSION"; modification-date="Mon, 19 Dec 2005 22:39:51 -0600"
 .fi
 .PP
@@ -270,16 +278,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
@@ -291,9 +290,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
@@ -324,16 +340,21 @@ 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
 has been compiled with SASL support, the
 .B \-sasl
-switch will enable
+and
+.B \-nosasl
+switches will enable and disable
 the use of SASL authentication with the SMTP MTA.  Depending on the
 SASL mechanism used, this may require an additional password prompt from the
 user (but the
@@ -352,6 +373,22 @@ will attempt to negotiate a security layer for session encryption.
 Encrypted data is labelled with `(encrypted)' and `(decrypted)' when
 viewing the SMTP transaction with the
 .B \-snoop
+switch.  The
+.B \-saslmaxssf
+switch can be used to select the maximum value of the Security Strength Factor.
+This is an integer value and the exact meaning of this value depends on the
+underlying SASL mechanism.  A value of 0 disables encryption.
+.PP
+If
+.B nmh
+has been compiled with TLS support, the
+.B \-tls
+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
 switch.
 .PP
 The files specified by the profile entry \*(lqAliasfile:\*(rq and any