Merge branch 'master' into debian

1 files changed, 14 insertions, 5 deletions

diff --git a/imapsync.1 b/imapsync.1
index eda493a..f4f6965 100644
--- a/imapsync.1
+++ b/imapsync.1
@@ -71,7 +71,8 @@ Go back to step 2 if the server sent some updates in the meantime.
 Go back to step 1 to proceed with the next unsynchronized mailbox.
 
 .PP
-By default \fBimapsync\fR synchronizes each subscribed mailbox;
+By default \fBimapsync\fR synchronizes each mailbox listed by the
+\(lqLIST "" "*"\(rq IMAP command;
 providing extra arguments limits the synchronization to the given
 \fIMAILBOX\fRes only.
 
@@ -128,10 +129,9 @@ Try to be quiet.
 
 .TP
 .B \-\-debug
-Turn on debug mode.
-Note that all IMAP traffic (excluding literals) is then printed to the
-error output.  Depending on the chosen authentication mechanism,
-this might include authentication credentials.
+Turn on debug mode.  Debug messages are written to the given \fIlogfile\fR.
+Note that this include all IMAP traffic (except literals).  Depending on the
+chosen authentication mechanism, this might include authentication credentials.
 
 .TP
 .B \-h\fR, \fB\-\-help\fR
@@ -168,6 +168,11 @@ This option is only available in the default section.
 \(lq[remote]\(rq or \(lq[local]\(rq sections, in that order.
 
 .TP
+.I logfile
+A file name to use to log debug and informational messages.  This option is
+only available in the default section.
+
+.TP
 .I type
 One of \(lqimap\(rq, \(lqimaps\(rq or \(lqtunnel\(rq.
 \fItype\fR=imap and \fItype\fR=imaps are respectively used for IMAP and
@@ -246,6 +251,10 @@ Authorities, used for server certificate verification.
 .IP \[bu] 2
 Mailbox deletion and renaming are not very well tested yet.
 .IP \[bu]
+Using \fBimapsync\fR on two identical servers with a non-existent or
+empty database will duplicate each message due to absence of
+local/remote UID association.
+.IP \[bu]
 Detecting whether a mailbox has been renamed or deleted while
 \fBimapsync\fR wasn't running is done by looking for a mailbox with same
 UIDVALIDITY.  [RFC3501] describes the purpose of UIDVALIDITY as to let