1.1 --- a/man/masqmail.conf.5	Thu Jul 08 14:04:39 2010 +0200
     1.2 +++ b/man/masqmail.conf.5	Thu Jul 08 22:01:33 2010 +0200
     1.3 @@ -357,7 +357,7 @@
     1.4  \fBonline_detect = \fIstring\fR
     1.5  
     1.6  Defines the method masqmail uses to detect whether there is currently an online connection.
     1.7 -It can have the values \fIfile\fR, \fIpipe\fR, or \fImserver\fR.
     1.8 +It can have the values \fIfile\fR or \fIpipe\fR.
     1.9  
    1.10  When it is set to \fIfile\fR, masqmail first checks for the existence of \fBonline_file\fR
    1.11  (see below) and if it exists, it reads it.
    1.12 @@ -367,12 +367,6 @@
    1.13  When it is set to \fIpipe\fR, masqmail calls the executable given by the
    1.14  \fBonline_pipe\fR option (see below) and reads the current online status from its standard output.
    1.15  
    1.16 -When it is set to \fImserver\fR, masqmail connects to the masqdialer server
    1.17 -using the value of \fBmserver_iface\fR and asks it whether a connection exists and for the name,
    1.18 -which should be the name of the current connection as defined with \fBconnect_route.\fIname\fR.
    1.19 -\fBThe mserver detection method is OBSOLETE.\fR
    1.20 -See mserver_iface for a note on how to replace it.
    1.21 -
    1.22  No matter how masqmail detects the online status,
    1.23  only messages that are accepted at online time will be delivered using the connection.
    1.24  The spool still has to be emptied with masqmail \fB\-qo\fIconnection\fR.
    1.25 @@ -416,21 +410,14 @@
    1.26  Example: \fI/bin/echo foo\fR
    1.27  (This tells masqmail to be always online with connection `foo'.)
    1.28  
    1.29 -.TP
    1.30 -\fBmserver_iface = \fIinterface\fR
    1.31 -
    1.32 -\fBThis option is OBSOLETE\fP, use
    1.33 +For querying a masqdialer server
    1.34 +(= asking it whether a connection exists and what its name is)
    1.35 +use:
    1.36  
    1.37  online_method=pipe
    1.38  
    1.39 -online_pipe="/usr/bin/mservdetect localhost 222"
    1.40 +online_pipe="/usr/bin/mservdetect localhost 224"
    1.41  
    1.42 -instead.
    1.43 -
    1.44 -The interface the masqdialer server is listening to.
    1.45 -Usually this will be "localhost:224" if mserver is running on the same host as masqmail.
    1.46 -But using this option, you can also let masqmail run on another host by setting
    1.47 -\fBmserver_iface\fR to another hostname, e.g. "foo:224".
    1.48  
    1.49  .TP
    1.50  \fBget.\fIname\fR = \fIfile\fR