Better documentation.

svn path=/trunk/; revision=1070

3 files changed, 25 insertions, 18 deletions

diff --git a/Makefile.in b/Makefile.in
index 4a612887..16c8717a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@
 # If you're running QNX, we can't assume a working autoconf.
 # So just uncomment all the lines marked QNX.
 
-VERS=3.9.6
+VERS=3.9.7
 
 # Ultrix 2.2 make doesn't expand the value of VPATH.
 srcdir = @srcdir@
diff --git a/NEWS b/NEWS
index ce2df64f..7f529b74 100644
--- a/NEWS
+++ b/NEWS
@@ -37,7 +37,7 @@ pl 3.9.7 ():
 * Parse more different variants of IMAP "UNSEEN" message.
 * Handle zero-length messages correctly.
 
-There are 252 people on the fetchmail-friends list.
+There are 250 people on the fetchmail-friends list.
 
 pl 3.9.6 (Wed May 28 18:28:35 EDT 1997):
 * Fix the libc6 configuration stuff (thanks to Jesse Thilo).
diff --git a/fetchmail.man b/fetchmail.man
index 354322aa..97a697e6 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -468,15 +468,6 @@ or
 .B --logfile
 option was used.
 .PP
-The \fI/etc/syslog.conf\fR file might contain the following to log
-all messages from \fIfetchmail\fR to a single file:
-.PP
-.RS
-!fetchmail
-.br
-*.*               /var/log/fetchmail
-.RE
-.PP
 The 
 .B \-N
 or --nodetach option suppresses detachment of the daemon process
@@ -545,19 +536,35 @@ instead, it asks the server's SMTP listener to start a queue flush
 to the client via SMTP.  Therefore it sends only undelivered messages.
 
 .SH SPAM FILTERING
-Newer versions of
+Many SMTP listeners allow administrators to set up `spam filters' that
+block unsolicited email from specified domains.  A MAIL FROM line that
+triggers this feature will elicit an SMTP response which
+(unfortunately) varies according to the listener.
+.PP
+Newer versions of 
 .I sendmail
-allow administrators to set up `spam filters' that block unsolicited email
-from specified domains.  A MAIL FROM line that triggers this feature
-will elicit an SMTP response with an error code of 571.  The
+return an error code of 571.  This return value
+is blessed by RFC1893 as "Delivery not authorized, message refused".
+.PP
+According to current drafts of the replacement for RFC821, the correct
+thing to return in this situation is 550 "Requested action not taken:
+mailbox unavailable" (the draft adds "[E.g., mailbox not found, no
+access, or command rejected for policy reasons].").
+.PP
+The
+.I exim
+MTA returns 501 "Syntax error in parameters or arguments" , but will
+move to 550 soon.
+.PP
+The
 .I fetchmail
-code recognizes this error and discards the message.  This is the
+code recognizes any of these error codes and discards the message.  This is the
 .I only
 circumstance under which fetchmail ever discards mail.
 .P
 If
 .I fetchmail
-is fetching from an IMAP server, the 571 response will be detected and
+is fetching from an IMAP server, the antispam response will be detected and
 the message rejected immediately after the headers have been fetched,
 without reading the message body.  Thus, you won't pay for downloading 
 spam message bodies.
@@ -1130,7 +1137,7 @@ elm(1), mail(1), sendmail(8), popd(8), imapd(8)
 .SH APPLICABLE STANDARDS
 .TP 5
 SMTP/ESMTP:
-RFC 821, RFC 1869, RFC 1652, RFC 1870, RFC 1985
+RFC 821, RFC 1869, RFC 1652, RFC 1870, RFC1983, RFC 1985
 .TP 5
 mail:
 RFC 822