masqmail

diff man/masqmail.route.5 @ 311:e230bcd0f1c6

removed protocol option from route config It was somehow redundant. Now, if `pipe' is set, the protocol will be pipe, otherwise it'll be smtp. That's just natural.
author meillo@marmaro.de
date Sun, 24 Apr 2011 19:37:56 +0200
parents 95d536599fd7
children d596ac8b5afb
line diff
     1.1 --- a/man/masqmail.route.5	Sun Apr 24 19:14:38 2011 +0200
     1.2 +++ b/man/masqmail.route.5	Sun Apr 24 19:37:56 2011 +0200
     1.3 @@ -9,17 +9,15 @@
     1.4  This man page describes the syntax of the route configuration files of \fBmasqmail (8)\fR.
     1.5  Their usual locations are in \fI/etc/masqmail/\fR.
     1.6  
     1.7 +Mail will be sent with the SMTP protocol to its destination, unless
     1.8 +`pipe' is given.
     1.9 +In this case the message will be piped to the given program.
    1.10 +See option `pipe' below.
    1.11 +
    1.12 +
    1.13  .SH OPTIONS
    1.14  
    1.15  .TP
    1.16 -\fBprotocol\fR = \fIstring\fR
    1.17 -
    1.18 -\fIstring\fR can be one of `smtp' or `pipe', default is `smtp'.
    1.19 -If set to `smtp', mail will be sent with the SMTP protocol to its destination.
    1.20 -If set to `pipe', you also have to set `pipe' to a command, the message will then be piped to a program.
    1.21 -See option `pipe' below.
    1.22 -
    1.23 -.TP
    1.24  \fBmail_host\fR = \fIstring\fR
    1.25  
    1.26  This is preferably the mail server of your ISP.
    1.27 @@ -305,7 +303,6 @@
    1.28  .TP
    1.29  \fBpipe\fR = \fIcommand\fR
    1.30  
    1.31 -If set, and protocol is set to `pipe',
    1.32  \fIcommand\fR will be called and the message will be piped to its stdin.
    1.33  Purpose is to use gateways to uucp, fax, sms or whatever else.
    1.34  
    1.35 @@ -315,15 +312,15 @@
    1.36  .TP
    1.37  \fBpipe_fromline = \fIboolean\fR
    1.38  
    1.39 -If this is set, and protocol is set to `pipe',
    1.40 -a from line will be prepended to the output stream whenever a pipe command is called.
    1.41 +Only if `pipe' is used.
    1.42 +A from line will be prepended to the output stream whenever a pipe command is called.
    1.43  Default is false.
    1.44  
    1.45  .TP
    1.46  \fBpipe_fromhack = \fIboolean\fR
    1.47  
    1.48 -If this is set, and protocol is set to `pipe',
    1.49 -each line beginning with `From ' is replaced with `>From ' whenever a pipe command is called.
    1.50 +Only if `pipe' is used.
    1.51 +Each line beginning with `From ' is replaced with `>From ' whenever a pipe command is called.
    1.52  You probably want this if you have set \fBpipe_fromline\fR above.
    1.53  Default is false.
    1.54