Document new -initialtls option.

diff --git a/docs/pending-release-notes b/docs/pending-release-notes
index a0f5abc..3b22581 100644 (file)
--- a/docs/pending-release-notes
+++ b/docs/pending-release-notes
@@ -52,6 +52,8 @@ NEW FEATURES
   and mhn(1) when used with -auto.
 - All nmh commands now support transactional locking for sequence files.
 - There is no longer a per-folder maximum number of sequences.
+- For the SMTP MTA TLS can now be negotiated at the beginning of the
+  connection with the -initialtls switch.
 
 ----------------------------
 OBSOLETE/DEPRECATED FEATURES

diff --git a/man/post.man b/man/post.man
index d59a6f9..4a5bb29 100644 (file)
--- a/man/post.man
+++ b/man/post.man
@@ -1,4 +1,4 @@
-.TH POST %manext8% "July 21, 2012" "%nmhversion%"
+.TH POST %manext8% "March 31, 2013" "%nmhversion%"
 .\"
 .\" %nmhwarning%
 .\"
@@ -37,6 +37,7 @@ post \- deliver a message
 .RB [ \-user
 .IR username ]
 .RB [ \-tls ]
+.RB [ \-initialtls ]
 .RB [ \-notls ]
 .I file
 .RB [ \-version ]
@@ -229,13 +230,22 @@ If
 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
+.B \-initialtls
+switches will require the negotiation of TLS when
+connecting to the SMTP MTA.  The
+.B \-tls
+switch will negotiate TLS as part of the normal SMTP protocol
+using the STARTTLS command.  The
+.B \-initialtls
+will negotiate TLS immediately after the connection has
+taken place, before any SMTP commands are sent or received.  Encrypted data
+is labelled with `(tls-encrypted)' and
 `(tls-decrypted)' when viewing the SMTP transction with the
 .B \-snoop
 switch.
+The
+.B \-notls
+switch will disable all attempts to negotiate TLS.
 .SH FILES
 .fc ^ ~
 .nf

diff --git a/man/send.man b/man/send.man
index b954aa2..6c8791a 100644 (file)
--- a/man/send.man
+++ b/man/send.man
@@ -1,7 +1,7 @@
 .\"
 .\" %nmhwarning%
 .\"
-.TH SEND %manext1% "September 11, 2012" "%nmhversion%"
+.TH SEND %manext1% "March 31, 2013" "%nmhversion%"
 .SH NAME
 send \- send a message
 .SH SYNOPSIS
@@ -46,6 +46,7 @@ send \- send a message
 .RB [ \-user
 .IR username ]
 .RB [ \-tls ]
+.RB [ \-initialtls ]
 .RB [ \-notls ]
 .RB [ \-width
 .IR columns ]
@@ -420,12 +421,22 @@ If
 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
+.B \-initialtls
+switches will require the negotiation of TLS when
+connecting to the SMTP MTA.  The
+.B \-tls
+switch will negotiate TLS as part of the normal SMTP protocol
+using the STARTTLS command.  The
+.B \-initialtls
+will negotiate TLS immediately after the connection has
+taken place, before any SMTP commands are sent or received.  Encrypted data
+is labelled with `(tls-encrypted)' and
 `(tls-decrypted)' when viewing the SMTP transction with the
 .B \-snoop
 switch.
+The
+.B \-notls
+switch will disable all attempts to negotiate TLS.
 .PP
 The files specified by the profile entry \*(lqAliasfile:\*(rq and any
 additional alias files given by the