*** empty log message ***

[~andy/fetchmail] / fetchmail.man

diff --git a/fetchmail.man b/fetchmail.man
index a1f293dadc65c3e84d0c22dd55691e7f5549a0dd..3896971ca9b8e42cdee9a3c3fbb506b6d0c31bc8 100644 (file)
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -291,7 +291,7 @@ SMTP listener is impossible.  If \fIfetchmail\fR is running as root,
 it sets its userid to that of the target user while delivering mail
 through an MDA.  Some possible MDAs are "/usr/sbin/sendmail -oem -f %F
 %T", "/usr/bin/deliver" and "/usr/bin/procmail -d %T" (but the latter
-is usually redundant as).  it's what SMTP listeners usually forward
+is usually redundant as it's what SMTP listeners usually forward
 to).  Local delivery addresses will be inserted into the MDA command
 wherever you place a %T; the mail message's From address will be
 inserted where you place an %F.  Do \fInot\fR use an MDA invocation
@@ -365,8 +365,14 @@ overrides any limits set in your run control file.
 This option does not work with ETRN.
 .TP
 .B -e, --expunge
-(keyword: expunge)
-When talking to an IMAP server, 
+(keyword: expunge) 
+Arrange for deletions to be made final after a given number of
+messages.  Under POP2 or POP3, fetchmail cannot make deletions final
+without sending QUIT and ending the session -- with this option on,
+fetchmail will break a long mail retrieval session into multiple
+subsessions, sending QUIT after each sub-session. This is a good
+defense against line drops on POP3 servers that do not do the
+equivalent of a QUIT on hangup.  Under IMAP,
 .I fetchmail
 normally issues an EXPUNGE command after each deletion in order to
 force the deletion to be done immediately.  This is safest when your
@@ -377,10 +383,9 @@ server pretty hard, so if your connection is reliable it is good to do
 expunges less frequently.  If you specify this option to an integer N,
 it tells
 .I fetchmail
-to only issue expunges on every Nth delete.  An argument
-of zero suppresses expunges entirely (so no expunges at all will be
-done until the end of run). 
-This option does not work with ETRN, POP2, or POP3.
+to only issue expunges on every Nth delete.  An argument of zero
+suppresses expunges entirely (so no expunges at all will be done until
+the end of run).  This option does not work with ETRN.
 .SS Authentication Options
 .TP
 .B \-u name, --username name
@@ -1116,7 +1121,7 @@ dropstatus        \&      T{
 Strip Status and X-Mozilla-Status lines out of incoming mail
 T}
 mimedecode     \&      T{
-Convert quoted-printable to 8-bit in MIME messages
+Convert quoted-printable to 8-bit in MIME messages (default)
 T}
 no keep        -K      T{
 Delete seen messages from server (default)
@@ -1143,7 +1148,7 @@ no dropstatus     \&      T{
 Don't drop Status headers (default)
 T}
 no mimedecode  \&      T{
-Don't convert quoted-printable to 8-bit in MIME messages (default)
+Don't convert quoted-printable to 8-bit in MIME messages
 T}
 limit          -l      T{
 Set message size limit
@@ -1152,10 +1157,10 @@ warnings        -w      T{
 Set message size warning interval
 T}
 batchlimit     -b      T{
-Max # messages to fetch in single connect
+Max # messages to forward in single connect
 T}
 fetchlimit     -B      T{
-Max # messages to forward in single connect
+Max # messages to fetch in single connect
 T}
 expunge        -e      T{
 Perform an expunge on every #th message (IMAP only)
@@ -1712,6 +1717,8 @@ Fatal DNS error.  Fetchmail encountered an error while performing
 a DNS lookup at startup and could not proceed.
 .IP 12
 BSMTP batch file could not be opened.
+.IP 13
+Poll terminated by a fetch limit (see the --fetchlimit option).
 .IP 23
 Internal error.  You should see a message on standard error with
 details.
@@ -1755,11 +1762,12 @@ lock file to help prevent concurrent runs (root mode, Linux systems).
 lock file to help prevent concurrent runs (root mode, systems without /var/run).
 
 .SH ENVIRONMENT
-For correct initialization, 
-.I fetchmail
-requires either that both the USER and HOME environment variables are
-correctly set, or that \fBgetpwuid\fR(3) be able to retrieve a password
-entry from your user ID.
+If either the LOGNAME or USER and the variable is correctly set
+(e.g. the corresponding UID matches the session user ID) then that
+name is used as the default local name.  Otherwise \fBgetpwuid\fR(3)
+mudst be able to retrieve a password entry for the session ID (this
+elaborate logic is designed to handle the case of multiple names per
+userid gracefully).
 
 .SH SIGNALS
 If a
@@ -1831,7 +1839,7 @@ POP2:
 RFC 937
 .TP 5
 POP3:
-RFC 1081, RFC 1225, RFC 1460, RFC 1725, RFC 1939
+RFC 1081, RFC 1225, RFC 1460, RFC 1725, RFC 1939, RFC 2449
 .TP 5
 APOP:
 RFC 1460, RFC 1725, RFC 1939
@@ -1843,7 +1851,7 @@ IMAP2/IMAP2BIS:
 RFC 1176, RFC 1732
 .TP 5
 IMAP4:
-RFC 1730, RFC 1731, RFC 1732, RFC 2060, RFC 2061
+RFC 1730, RFC 1731, RFC 1732, RFC 2060, RFC 2061, RFC 2195
 .TP 5
 ETRN:
 RFC 1985