1.1 --- a/man/masqmail.8	Wed Dec 01 17:29:52 2010 -0300
     1.2 +++ b/man/masqmail.8	Wed Dec 01 18:27:46 2010 -0300
     1.3 @@ -128,54 +128,14 @@
     1.4  .TP
     1.5  \fB\-m\fR
     1.6  
     1.7 -Same as \fB\-om\fR, see below.
     1.8 +``Me too''
     1.9 +This switch is ignored as,
    1.10 +masqmail never excludes the sender from any alias expansions.
    1.11 +
    1.12 +\fB\-m\fP is an ancient alias for \fB\-om\fP.
    1.13  Kept for compatibility.
    1.14  
    1.15  .TP
    1.16 -\fB\-oem\fR
    1.17 -
    1.18 -Currently this option makes masqmail behave such:
    1.19 -
    1.20 -If the \fB\-oi\fR ist not also given, always return with a non zero return code.
    1.21 -
    1.22 -It seems as if this current behavior is not like it should be.
    1.23 -
    1.24 -In exim this option makes it behave such:
    1.25 -
    1.26 -.in +4
    1.27 -.ll -4
    1.28 -If an error is detected while a non-SMTP message is being received
    1.29 -(for example, a malformed address),
    1.30 -the error is reported to the sender in a mail message.
    1.31 -Exim exits with a non-zero return code then,
    1.32 -no matter if the error message was successful or not.
    1.33 -(In exim, -oee is similar but exim returns successful
    1.34 -if the error message had been sent successful.)
    1.35 -.ll
    1.36 -.in
    1.37 -
    1.38 -The mutt wiki writes about ``sendmail -oi -oem'':
    1.39 -
    1.40 -.in +4
    1.41 -.ll -4
    1.42 -The mail server (in this case sendmail) will receive the message in input,
    1.43 -and will parse it. In case of a malformed message, it will send an error
    1.44 -message to the user to whom belongs the MUA trasmitting the message
    1.45 -(e.g. user@localhost.localdomain), and it will exit with a non zero exit code:
    1.46 -the -oem flag forces the returning of a non zero exit code even in
    1.47 -the case the error message has been successfully sent to the local server.
    1.48 -.ll
    1.49 -.in
    1.50 -
    1.51 -Masqmail's behavior is different in that:
    1.52 -First, it does not send such error messages.
    1.53 -Second, return non-zero whenever -oem is set (but -oi not).
    1.54 -Third, -oi overrules -oem, though as it seems the two options 
    1.55 -should not affect each other.
    1.56 -(Their relationship is just that -oem does only affect non-SMTP
    1.57 -messages on stdin, which is the typical use of -oi.)
    1.58 -
    1.59 -.TP
    1.60  \fB\-odb\fR
    1.61  
    1.62  ``Deliver in Background''
    1.63 @@ -195,18 +155,13 @@
    1.64  
    1.65  A dot as a single character in a line does not terminate the message.
    1.66  
    1.67 -.TP
    1.68 -\fB\-om\fR
    1.69 -
    1.70 -``Me too''
    1.71 -Masqmail never excludes the sender from any alias expansions,
    1.72 -like if this switch is always set.
    1.73 -Specifying this switch changes nothing.
    1.74 +The same as \fB\-i\fP.
    1.75  
    1.76  .TP
    1.77  \fB\-oXXX\fR
    1.78  
    1.79 -Any other switch starting with `-o' is ignored.
    1.80 +Any other switch starting with `\-o' is ignored.
    1.81 +This especially affects \-om, \-oem, \-oee.
    1.82  
    1.83  .TP
    1.84  \fB\-q [\fIinterval\fB]\fR