pullimap: improve doc.

diff --git a/interimap.1 b/interimap.1
index e23b953be11f19302412418689f7d7223a006636..a73117b553ccc620f9e7af75818042b1e9c4c23c 100644 (file)
--- a/interimap.1
+++ b/interimap.1
@@ -298,7 +298,7 @@ advertising it.
 the \(lq[remote]\(rq section.)
 
 .TP
-.I null-stderr
+.I null\-stderr
 Whether to redirect \fIcommand\fR's standard error to \(lq/dev/null\(rq
 for type \fItype\fR=tunnel.
 (Default: \(lqNO\(rq.)

diff --git a/pullimap b/pullimap
index 0e31a90e1cc80a4197537a8fb104701475b97818..d2de66f0c5d5a0bebb9c75670d2c392a0054a640 100755 (executable)
--- a/pullimap
+++ b/pullimap
@@ -221,7 +221,7 @@ sub smtp_send(@) {
 $CONF->{'logger-fd'} = \*STDERR if $CONFIG{debug};
 my $IMAP = do {
     my %config = (%$CONF, %CONFIG{qw/quiet debug/}, name => $ARGV[0]);
-    $config{keepalive} = 1 if defined $CONFIG{idle} and $config{type} ne 'tunnel';
+    $config{keepalive} = 1 if defined $CONFIG{idle};
     Net::IMAP::InterIMAP::->new( %config );
 };
 

diff --git a/pullimap.1 b/pullimap.1
index 52a6152b53e101494122d669547f188be7680e7b..746e2ffbcebf3c50d92ef7031ba8f33c01e0a6c5 100644 (file)
--- a/pullimap.1
+++ b/pullimap.1
@@ -12,8 +12,7 @@ PullIMAP \- Pull mails from an IMAP mailbox and deliver them to a SMTP session
 .PP
 .B PullIMAP\fR retrieves messages from an IMAP mailbox and deliver them
 to a SMTP or LMTP transmission channel.
-It can also remove delivered messages after a configurable retention
-period.
+It can also remove old messages after a configurable retention period.
 
 .PP
 A statefile is used to keep track of the mailbox's UIDVALIDITY and
@@ -33,6 +32,7 @@ environment variable is unset.
 Don't exit after a successful poll; instead, keep the connection open
 and issue IDLE commands (requires an IMAP server supporting RFC 2177) to
 watch for updates in the mailbox.
+This also sets SO_KEEPALIVE on the socket.
 Each IDLE is terminated after at most \fIseconds\fR (29 minutes by
 default) to avoid being logged out for inactivity.
 
@@ -113,6 +113,8 @@ Message recipient.
 Retention period (in days), after which messages are removed from the
 IMAP server.  (The value is at best 24h accurate due to IMAP SEARCH
 criterion ignoring time and timezone.)
+If \fIpurge\-after\fR is set to \(lq0\(rq then messages are deleted
+immediately after delivery.
 
 .TP
 .I type
@@ -180,7 +182,7 @@ advertising it.
 (Default: \(lqYES\(rq.)
 
 .TP
-.I null-stderr
+.I null\-stderr
 Whether to redirect \fIcommand\fR's standard error to \(lq/dev/null\(rq
 for type \fItype\fR=tunnel.
 (Default: \(lqNO\(rq.)