X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=man%2Fsend.man;h=e75583eb5fe9117d9c199b1e75a3031f50b1b202;hb=f6aa95b724fd8c791164abe7ee5468bf5c34f226;hp=57f37b7c9a75aae36dcb40fb0db27e23027a598d;hpb=5ff96d61ee5af34956ae958a0bc72ee78734a4d7;p=mmh

diff --git a/man/send.man b/man/send.man
index 57f37b7..e75583e 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
@@ -29,6 +28,10 @@ send \- send a message
 .IR seconds ]
 .RB [ \-verbose " | " \-noverbose ]
 .RB [ \-watch " | " \-nowatch ]
+.RB [ \-server
+.IR servername ]
+.RB [ \-port
+.IR port-name/number ]
 .RB [ \-sasl ]
 .RB [ \-saslmech
 .IR mechanism ]
@@ -123,21 +126,22 @@ 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
 .nf
 -attachformat 0:
 Content-Type: text/plain; name="VERSION"; x-unix-mode="0644";
+	charset="us-ascii"
 Content-Description: ASCII text 
 
 -attachformat 1:
-Content-Type: text/plain; charset="us-ascii"
+Content-Type: text/plain; name="VERSION"; charset="us-ascii"
 Content-Disposition: attachment; filename="VERSION"
 
 -attachformat 2:
-Content-Type: text/plain; charset="us-ascii"
+Content-Type: text/plain; name="VERSION"; charset="us-ascii"
 Content-Disposition: attachment; filename="VERSION"; modification-date="Mon, 19 Dec 2005 22:39:51 -0600"
 .fi
 .PP
@@ -314,6 +318,16 @@ switch, the user can direct
 .B send
 as to how long it should make header lines containing addresses.
 .PP
+If nmh is using the SMTP MTA, the
+.B \-server
+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
+).
+.PP
 If
 .B nmh
 has been compiled with SASL support, the
@@ -331,15 +345,23 @@ and the the
 switch can be used to select a authorization userid
 to provide to SASL other than the default.
 .PP
-Currently SASL security layers are not supported for SMTP.
-.BR nmh 's
-SMTP SASL code
-will always negotiate an unencrypted connection.  This means that while the SMTP
-authentication can be encrypted, the subsequent data stream can not.  This is in
-contrast to
-.BR nmh 's
-POP3 SASL support, where encryption is supported for both the
-authentication and the data stream.
+If SASL authentication is successful, 
+.BR nmh
+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.
+.PP
+If
+.B nmh
+has been compiled with TLS support, the
+.B \-tls
+switch will require 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
 additional alias files given by the