# HG changeset patch
# User meillo@marmaro.de
# Date 1279061722 -7200
# Node ID cd38f10532e749e8e3d2cd6c007c375fb6f74ff9
# Parent  c40bf27ddd938a6d6a8b31b0388ca052c52ecc97# Parent  15b3c71254cb9df0c01d230d6c88e1e173ed8bd5
merge

diff -r c40bf27ddd93 -r cd38f10532e7 man/masqmail.route.5
--- a/man/masqmail.route.5	Tue Jul 13 23:12:14 2010 +0200
+++ b/man/masqmail.route.5	Wed Jul 14 00:55:22 2010 +0200
@@ -51,7 +51,7 @@
 The reason for this is that masqmail is designed for non permanent internet connections,
 where such errors may occur quite often, and a bounce would be annoying.
 
-For the default local_net route is is set to true.
+For the default local_net route it is set to true.
 
 .TP
 \fBhelo_name\fR = \fIstring\fR
@@ -267,7 +267,15 @@
 
 Example for ssl tunneling:
 
-wrapper="/usr/bin/openssl s_client \-quiet \-connect pop.gmx.net:995 2>/dev/null"
+wrapper="/usr/bin/openssl s_client \-quiet \-crlf \-connect mail.gmx.net:465 2>/dev/null"
+
+Note: The above line works with masqmail,
+but listening on Port 465 for SSL-encrypted connections is deprecated.
+The modern way is STARTTLS (RFC-3207).
+This could be covered by the following command.
+Unfortunately, masqmail doesn't support that yet (as of 0.2.25).
+
+wrapper="/usr/bin/openssl s_client \-quiet \-crlf \-starttls smtp \-connect mail.gmx.net:25 2>/dev/null"
 
 .TP
 \fBpipe\fR = \fIcommand\fR