Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-95

Merge from gnus--rel--5.10

Patches applied:

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

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-15
   Update from CVS: lisp/imap.el (imap-log): Doc fix.

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

2005-02-09  Kim F. Storm  <storm@cua.dk>

   Change Emacs release version from 21.4 to 22.1 throughout.
   Change Emacs development version from 21.3.50 to 22.0.50.

2005-02-08  Simon Josefsson  <jas@extundo.com>

   * lisp/gnus/imap.el (imap-log): Doc fix.

2 files changed, 14 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7a4b1e68e58..8923ae1116f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,12 @@
+2005-02-09  Kim F. Storm  <storm@cua.dk>
+
+        Change Emacs release version from 21.4 to 22.1 throughout.
+        Change Emacs development version from 21.3.50 to 22.0.50.
+
+2005-02-08  Simon Josefsson  <jas@extundo.com>
+
+        * imap.el (imap-log): Doc fix.
+
 2005-02-03  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-art.el (gnus-mime-inline-part): Show the raw contents if a
diff --git a/lisp/gnus/imap.el b/lisp/gnus/imap.el
index 18a7cdd090d..aba0e88b92f 100644
--- a/lisp/gnus/imap.el
+++ b/lisp/gnus/imap.el
@@ -241,7 +241,11 @@ encoded mailboxes which doesn't translate into ISO-8859-1."
   :type 'boolean)
 
 (defcustom imap-log nil
-  "If non-nil, a imap session trace is placed in *imap-log* buffer."
+  "If non-nil, a imap session trace is placed in *imap-log* buffer.
+Note that username, passwords and other privacy sensitive
+information (such as e-mail) may be stored in the *imap-log*
+buffer.  It is not written to disk, however.  Do not enable this
+variable unless you are comfortable with that."
   :group 'imap
   :type 'boolean)