From f8387c281f2a73343fcca9e599d29bd93ece4524 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Tue, 8 Mar 2016 17:43:14 +0100
Subject: [PATCH] pullimap: improve doc.

---
 interimap.1 | 2 +-
 pullimap    | 2 +-
 pullimap.1  | 8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/interimap.1 b/interimap.1
index e23b953..a73117b 100644
--- 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 0e31a90..d2de66f 100755
--- 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 52a6152..746e2ff 100644
--- 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.)
-- 
2.39.2