Synch to No Gnus 200411152211.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index acb4a68..6107491 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-15  Jesper Harder  <harder@ifa.au.dk>
+
+       * pop3.el (pop3-leave-mail-on-server): Don't quote nil in
+       docstrings.
+
 2004-11-15  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * nntp.el (nntp-request-update-info): Return nil if

diff --git a/lisp/pop3.el b/lisp/pop3.el
index cd75469..418da1f 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -133,12 +133,12 @@ values are 'apop."
 (defcustom pop3-leave-mail-on-server nil
   "*Non-nil if the mail is to be left on the POP server after fetching.
 
-If the `pop3-leave-mail-on-server' is non-`nil' the mail is to be
-left on the POP server after fetching.  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."
+If `pop3-leave-mail-on-server' is non-nil the mail is to be left
+on the POP server after fetching.  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."
   :version "21.4" ;; Oort Gnus
   :type 'boolean
   :group 'pop3)