X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=man%2Fsend.man;h=e18ed20d2a65673587f370305c9444ccc9718b73;hb=156d35f6425bea4c1ed3c4c79783dc613379c65b;hp=0c65f5acd4975926fad5a284615215ead149c016;hpb=ac33b2e9c3632537b93fc4755a925c682d1eb82e;p=mmh

diff --git a/man/send.man b/man/send.man
index 0c65f5a..e18ed20 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,11 +28,10 @@ send \- send a message
 .IR seconds ]
 .RB [ \-verbose " | " \-noverbose ]
 .RB [ \-watch " | " \-nowatch ]
-.RB [ \-sasl ]
-.RB [ \-saslmech
-.IR mechanism ]
-.RB [ \-user
-.IR username ]
+.RB [ \-server
+.IR servername ]
+.RB [ \-port
+.IR port-name/number ]
 .RB [ \-width
 .IR columns ]
 .RB [ file
@@ -123,7 +121,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
@@ -134,11 +132,11 @@ 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-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
@@ -315,32 +313,25 @@ 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
-.B \-sasl
-switch will enable
-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
-.RI \*(lq \&.netrc \*(rq
-file can be used to store this password).
-.B \-saslmech
-switch can be used to select a particular SASL mechanism,
-and the the
-.B \-user
-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.
+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