Document recent changes.

svn path=/trunk/; revision=385

3 files changed, 21 insertions, 7 deletions

diff --git a/INSTALL b/INSTALL
index 4c191f1a..f90b09d3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -59,7 +59,17 @@ at version 3.0b6 or later, do this
 
 (cd ~; mv ~/.poprc ~/.fetchmailrc)
 
-in order to migrate.
+in order to migrate.  Be aware that some of popclient's unnecessary 
+options have been removed (see the NOTES file for explanation).  You
+can't deliver to a local mail file anymore, and using an MDA for delivery
+is discouraged.  If you throw those options away, fetchmail will now forward
+your mail into your system's normal Internet-mail delivery path.
+
+If you use an MDA with popclient or an older version of fetchmail that
+requires %s in the MDA string in order to substitute in a local
+delivery address, remove it.  One consequences of the internal changes
+to support multi-drop mailboxes is that local delivery addresses will
+be appended to the end of the command in the obvious way.
 
 5. TEST
 
diff --git a/NEWS b/NEWS
index 9d19d43b..717a5300 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,11 @@ features --
   lists and multidrop mailboxes.  See the man page for details (and note
   the caveat in the BUGS AND KNOWN PROBLEMS section).
 
+* If you use an MDA, the internal changes to support multi-drop mailboxes
+  require that you *remove* the %s at the end of your MDA string.  Local 
+  delivery addresses will be appended to the end of the command in the
+  obvious way.
+
 * The first message from a query now includes the number of old messages
   when this can be determined (that is not under POP2).
 
diff --git a/fetchmail.man b/fetchmail.man
index 0cfb5af0..c7017595 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -70,11 +70,10 @@ You can force mail to be passed to an MDA directly (rather than
 forwarded to port 25) with the -mda or -m
 option (this can be useful if you don't want to run sendmail as an
 SMTP listener for security or other reasons).  
-Some possible MDAs are "/usr/sbin/sendmail -oem %s",
-"/usr/lib/sendmail -oem %s",
-"/usr/bin/formail", and "/usr/bin/deliver %s" (if the MDA command contains
-%s, that escape will be expanded into your username on the client
-machine). If \fIfetchmail\fR is running as root, it sets its userid to
+Some possible MDAs are "/usr/sbin/sendmail -oem",
+"/usr/lib/sendmail -oem", "/usr/bin/formail", and "/usr/bin/deliver". 
+Local delivery addresses will be appended to the MDA command. 
+If \fIfetchmail\fR is running as root, it sets its userid to
 that of the target user while delivering mail through an MDA.
 .TP
 .B \-F, --flush
@@ -522,7 +521,7 @@ string in double quotes.  Thus:
 .nf
   server mail.provider.net with proto pop3:
         user jsmith there has password "u can't krak this"
-                    is jws here and wants mda "/bin/mail %s"
+                    is jws here and wants mda "/bin/mail"
 .fi
 
 You may have an initial server description headed by the keyword