Better description of the Sender header in man page

Plus wording improvements and other minor stuff.

diff --git a/man/mh-profile.man5 b/man/mh-profile.man5
index fd4adbf..dd051b7 100644 (file)
--- a/man/mh-profile.man5
+++ b/man/mh-profile.man5
@@ -305,9 +305,10 @@ Philipp Takacs <philipp@bureaucracy.de>
 .RS 5
 Tells
 .B spost
 .RS 5
 Tells
 .B spost

-which addresse shall be used, if the draft dosn\'t contain a
+which address to use, if the draft dosn't contain a

 .RI ` From '
 Header or the draft is not from the user.
 .RI ` From '
 Header or the draft is not from the user.

+(profile, no default)

 .RE
 .PP
 .BR Aliasfile :
 .RE
 .PP
 .BR Aliasfile :

diff --git a/man/spost.man8 b/man/spost.man8
index c4558be..4a704f8 100644 (file)
--- a/man/spost.man8
+++ b/man/spost.man8
@@ -39,7 +39,7 @@ and finally feeds the message to the MTA.
 will not normally be called directly by the user.
 .PP
 .B Spost
 will not normally be called directly by the user.
 .PP
 .B Spost

-searches the `To:', `Cc:', `Bcc:', `Dcc',
+searches the `To:', `Cc:', `Bcc:', `Dcc:',

 `Fcc:', and `Resent\-xxx:' header lines of the specified
 message for destination addresses,
 .PP
 `Fcc:', and `Resent\-xxx:' header lines of the specified
 message for destination addresses,
 .PP

@@ -65,7 +65,7 @@ invokes
 .B send
 to send the Bcc message.)
 .PP
 .B send
 to send the Bcc message.)
 .PP

-If a `Dcc' field is encountered, the field will be removed
+If a `Dcc:' field is encountered, the field will be removed

 before sending the message. The Dcc recipient will receive the
 message as well, but without being mentioned in the recipient
 headers.
 before sending the message. The Dcc recipient will receive the
 message as well, but without being mentioned in the recipient
 headers.

@@ -86,7 +86,7 @@ can be used to specify one or more files that spost
 should take aliases from.
 .PP
 Aliasing is done on any address field. Those are:
 should take aliases from.
 .PP
 Aliasing is done on any address field. Those are:

-`From:', `To:', `Cc:', `Bcc:' and `Dcc',
+`From:', `To:', `Cc:', `Bcc:' and `Dcc:',

 or the `Resent\-xxx:' versions of these fields.
 .PP
 The
 or the `Resent\-xxx:' versions of these fields.
 .PP
 The

@@ -96,15 +96,17 @@ For example, the `\-v' switch will be added to the
 .B sendmail
 invocation.
 .PP
 .B sendmail
 invocation.
 .PP

-.B Spost
-puts the
+If you specify a `From:' line manually in the message draft,
+it will be used as provided.
+If there is no `From:' line in the draft,
+.B spost
+uses the

 .RI ` Default-From '
 .RI ` Default-From '

-profile entry in the `From:' line of the message.
-If `Default-From' is not set,
+profile entry, if set.
+Otherwise

 .B spost
 .B spost

-constructs the `From:' line of the
-message from the user's login name and the full name from the GECOS field
-of the passwd file.
+constructs the `From:' line from the user's login name
+and the full name from the GECOS field of the passwd file.

 An example is `From: Dan Harkless <dan>'.
 .PP
 If you set the
 An example is `From: Dan Harkless <dan>'.
 .PP
 If you set the

@@ -112,14 +114,15 @@ If you set the
 environment variable.
 Its value overrides the full name from the GECOS field.
 .PP
 environment variable.
 Its value overrides the full name from the GECOS field.
 .PP

-If you specify a `From:'
-line manually in the message draft.
-It will be used as provided.
-A `Sender:' header with the user's
-.B real
-address will be added, if the `From' line don't contain a address
-from the user
+A `Sender:' header will be added in two cases.
+First, if the `From:' line given in the draft contains one or
+more addresses, of which none is the user's own one, as defined by

 .RI ` Alternate-Mailboxes '.
 .RI ` Alternate-Mailboxes '.

+(The sender address will then be determined equally as described
+above for the absent `From:' header.)
+Second, if the `From:' line contains multiple addresses, of
+which at least one is the user's own address. The first own
+address will be used as the sender address.

 .PP
 Note that this applies equally to `Resent\-From:' lines
 in messages sent with
 .PP
 Note that this applies equally to `Resent\-From:' lines
 in messages sent with