# HG changeset patch
# User meillo@marmaro.de
# Date 1277107476 -7200
# Node ID 10d00e3235f22faabf43ec2fc016b0dd8972538e
# Parent  3e7136221104f83267c1b2662bac29957e579bd7
updated docs (online_file, mserver_iface)
- the default location of the online_file is /var/run/masqmail/masqmail-route
- the online file can and should (!) end with a newline
  (this once was different)
- marked the online detect method `mserver' as obsolete

diff -r 3e7136221104 -r 10d00e3235f2 INSTALL
--- a/INSTALL	Mon Jun 21 09:40:16 2010 +0200
+++ b/INSTALL	Mon Jun 21 10:04:36 2010 +0200
@@ -178,15 +178,19 @@
 possibilities:
 
 * if you are using the masqdialer system, you just have to set the
-  variables online_detect to mserver and mserver_iface to the interface
-  mserver is listening to.
+  variables online_detect to pipe and online_pipe to something like
+	/usr/bin/mservdetect localhost 222
+  if mserver is running on localhost and listens on port 222. See the
+  man page to mservdetect(1).
+
 * otherwise you have to add two commands in your ip-up script:
-	echo -n $6 > /tmp/connect_route
-	chmod 644 /tmp/connect_route
-  and you have to remove the file /tmp/connect_route in your ip-down script:
-	rm /tmp/connect_route.
+	echo "$6" >/var/run/masqmail/masqmail-route
+	chmod 644 /var/run/masqmail/masqmail-route
+  and you have to remove the file /var/run/masqmail/masqmail-route in
+  your ip-down script:
+	rm /var/run/masqmail/masqmail-route
   Then you have to set online_detect to file and online_file to
-  /tmp/connect_route.
+  /var/run/masqmail/masqmail-route
 
 See the route documentation for more.
 
diff -r 3e7136221104 -r 10d00e3235f2 man/masqmail.conf.5
--- a/man/masqmail.conf.5	Mon Jun 21 09:40:16 2010 +0200
+++ b/man/masqmail.conf.5	Mon Jun 21 10:04:36 2010 +0200
@@ -349,6 +349,8 @@
 When it is set to \fBmserver\fR, masqmail connects to the masqdialer server
 using the value of \fBmserver_iface\fR and asks it whether a connection exists and for the name,
 which should be the name of the current connection as defined with \fBconnect_route.\fIname\fR.
+\fBThe mserver detection method is OBSOLETE.\fR
+See mserver_iface for a note on how to replace it.
 
 No matter how masqmail detects the online status,
 only messages that are accepted at online time will be delivered using the connection.
@@ -361,7 +363,7 @@
 The file should only exist when there is currently a connection.
 Create it in your ip-up script with e.g.
 
-echo \-n <name> > /var/run/masqmail/masqmail-route
+echo "connection-name" >/var/run/masqmail/masqmail-route
 
 chmod 0644 /var/run/masqmail/masqmail-route
 
@@ -390,6 +392,14 @@
 .TP
 \fBmserver_iface = \fIinterface\fR
 
+\fBThis option is OBSOLETE\fP, use
+
+online_method=pipe
+
+online_pipe="/usr/bin/mservdetect localhost 222"
+
+instead.
+
 The interface the masqdialer server is listening to.
 Usually this will be "localhost:224" if mserver is running on the same host as masqmail.
 But using this option, you can also let masqmail run on another host by setting