Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-621

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-51
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-52
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-53
   Merge from emacs--cvs-trunk--0

2004-10-15  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/pop3.el (pop3-leave-mail-on-server): Describe possible problems
   in the doc string.

   * lisp/gnus/message.el (message-ignored-news-headers)
   (message-ignored-supersedes-headers)
   (message-ignored-resent-headers)
   (message-forward-ignored-headers): Improve custom type.

2004-10-15  Simon Josefsson  <jas@extundo.com>

   * lisp/gnus/pop3.el (top-level): Don't require nnheader.
   (pop3-read-timeout): Add.
   (pop3-accept-process-output): Add.
   (pop3-read-response, pop3-retr): Use it.

2004-10-11  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/message.el (message-bury): Use `window-dedicated-p'.

2004-10-15  Reiner Steib  <Reiner.Steib@gmx.de>

   * man/gnus.texi (New Features): Add 5.11.

   * man/message.texi (Resending): Remove wrong default value.

   * man/gnus.texi (Mail Source Specifiers): Describe possible problems
   of `pop3-leave-mail-on-server'.  Add `pop3-movemail' and
   `pop3-leave-mail-on-server' to the index.

2004-10-15  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/message.texi (Canceling News): Add how to set a password.

3 files changed, 31 insertions, 6 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 8aec01712ef..784dd505f9a 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,17 @@
+2004-10-15  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (New Features): Add 5.11.
+
+        * message.texi (Resending): Remove wrong default value.
+
+        * gnus.texi (Mail Source Specifiers): Describe possible problems
+        of `pop3-leave-mail-on-server'.  Add `pop3-movemail' and
+        `pop3-leave-mail-on-server' to the index.
+
+2004-10-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * message.texi (Canceling News): Add how to set a password.
+
 2004-10-12  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus-faq.texi ([5.9]): Improve code for reply-in-news.
diff --git a/man/gnus.texi b/man/gnus.texi
index a62e9bcf149..ca9045bf5b9 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -885,7 +885,7 @@ New Features
 * Red Gnus::                    Third time best---Gnus 5.4/5.5.
 * Quassia Gnus::                Two times two is four, or Gnus 5.6/5.7.
 * Pterodactyl Gnus::            Pentad also starts with P, AKA Gnus 5.8/5.9.
-* Oort Gnus::                   It's big.  It's far out.  Gnus 5.10.
+* Oort Gnus::                   It's big.  It's far out.  Gnus 5.10/5.11.
 
 Customization
 
@@ -13538,10 +13538,16 @@ and says what authentication scheme to use.  The default is
 
 @end table
 
+@vindex pop3-movemail
+@vindex pop3-leave-mail-on-server
 If the @code{:program} and @code{:function} keywords aren't specified,
 @code{pop3-movemail} will be used.  If the
 @code{pop3-leave-mail-on-server} is non-@code{nil} the mail is to be
-left on the POP server after fetching.
+left on the @acronym{POP} server after fetching when using
+@code{pop3-movemail}.  Note that POP servers maintain no state
+information between sessions, so what the client believes is there and
+what is actually there may not match up.  If they do not, then the whole
+thing can fall apart and leave you with a corrupt mailbox.
 
 Here are some examples.  Fetch from the default @acronym{POP} server,
 using the default user name, and default fetcher:
@@ -25050,7 +25056,7 @@ actually are people who are using Gnus.  Who'd'a thunk it!
 * Red Gnus::                    Third time best---Gnus 5.4/5.5.
 * Quassia Gnus::                Two times two is four, or Gnus 5.6/5.7.
 * Pterodactyl Gnus::            Pentad also starts with P, AKA Gnus 5.8/5.9.
-* Oort Gnus::                   It's big.  It's far out.  Gnus 5.10.
+* Oort Gnus::                   It's big.  It's far out.  Gnus 5.10/5.11.
 @end menu
 
 These lists are, of course, just @emph{short} overviews of the
diff --git a/man/message.texi b/man/message.texi
index 6a52698ddb5..25f1d12d33b 100644
--- a/man/message.texi
+++ b/man/message.texi
@@ -224,7 +224,13 @@ only you can cancel your own messages, which is nice.  The downside
 is that if you lose your @file{.emacs} file (which is where Gnus
 stores the secret cancel lock password (which is generated
 automatically the first time you use this feature)), you won't be
-able to cancel your message.
+able to cancel your message.  If you yourself want to manage a password,
+you can put something like the following in your @file{~/.gnus.el} file:
+
+@lisp
+(setq canlock-password "Salam Shalom"
+      canlock-password-for-verify canlock-password)
+@end lisp
 
 Whether to insert the header or not is controlled by the
 @code{message-insert-canlock} variable.
@@ -309,8 +315,7 @@ and resend the message in the current buffer to that address.
 
 @vindex message-ignored-resent-headers
 Headers that match the @code{message-ignored-resent-headers} regexp will
-be removed before sending the message.  The default is
-@samp{^Return-receipt}.
+be removed before sending the message.
 
 
 @node Bouncing