X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2e04b8ea0e57e411665aa6a8814ff65db0d4cd2b..d3ecbe4bae7a3f1972b553d4b1efab3079ef0bae:/man/send.man?ds=sidebyside

diff --git a/man/send.man b/man/send.man
index 15a3f573..5a2f3139 100644
--- a/man/send.man
+++ b/man/send.man
@@ -1,7 +1,7 @@
 .\"
 .\" %nmhwarning%
 .\"
-.TH SEND %manext1% "July 5, 2016" "%nmhversion%"
+.TH SEND %manext1% "August 14, 2016" "%nmhversion%"
 .SH NAME
 send \- send a message
 .SH SYNOPSIS
@@ -40,8 +40,6 @@ send \- send a message
 .IR port-name/number ]
 .RB [ \-sasl ]
 .RB [ \-nosasl ]
-.RB [ \-saslmaxssf
-.IR ssf ]
 .RB [ \-saslmech
 .IR mechanism ]
 .RB [ \-authservice
@@ -422,17 +420,19 @@ 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.
+switch; see the
+.B post
+man page description of
+.B \-snoop
+for its other features.
 .PP
 If
 .B nmh
 has been compiled with OAuth support, the
+.B \-sasl
+and
 .B \-saslmech xoauth2
-switch will enable OAuth authentication.  The
+switches will enable OAuth authentication.  The
 .B \-user
 switch must be used, and the
 .I user-name
@@ -443,7 +443,7 @@ be specified with the
 switch.  Before using this, the user must authorize nmh by running
 .B mhlogin
 and grant authorization to that account.  See the
-.B mhlogin
+.IR mhlogin (1)
 man page for more details.
 .PP
 If
@@ -463,7 +463,11 @@ 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.
+switch; see the
+.B post
+man page description of
+.B \-snoop
+for its other features.
 The
 .B \-notls
 switch will disable all attempts to negotiate TLS.
@@ -485,14 +489,14 @@ can be named).
 See
 .IR mh\-alias (5)
 for more information.
-.SS Selection based on From: address:  sendfrom
+.SS Selection based on sender address:  sendfrom
 One or more
 .I sendfrom
 profile components can be used to select a mail server address, mail server
 port, or any other switch that can be supplied to
 .BR post .
-It works by first looking at the address and domain name in the From: header
-line in the message draft.
+It works by first looking at the sender address and domain name in the
+message draft, as described below.
 It then looks for a corresponding profile entry, which contains the
 .B post
 switches.
@@ -502,7 +506,8 @@ To enable, add profile entries of the form:
 .RI sendfrom- "address/domain name" : " post switches"
 .RE
 .PP
-The email address is extracted from the From: header line of the message draft.
+The email address is extracted from the Envelope-From:  header, if not blank,
+the Sender: header, or the From: header line in the message draft.
 Multiple profile entries, with different email addresses or domain names, are
 supported.
 This allows different switches to
@@ -524,7 +529,7 @@ sendfrom-gmail_address@example.com: -saslmech xoauth2
 .PP
 (Indentation indicates a continued line, as supported in MH profiles.)
 The username need not be the same as the sender address, which was extracted
-from the From: header line.
+from the appropriate header line as noted above.
 .PP
 Here are example profile entries that use an nmh credentials file:
 .PP
@@ -592,8 +597,8 @@ man page for login credentials.
 ^Signature:~^To determine the user's mail signature
 ^mailproc:~^Program to post failure notices
 ^postproc:~^Program to post the message
-^sendfrom-address:~^Switches to post for From: address
-^sendfrom-domain:~^Switches to post for From: domain name
+^sendfrom-address:~^Switches to post for sender address
+^sendfrom-domain:~^Switches to post for sender domain name
 .fi
 .SH "SEE ALSO"
 .IR comp (1),