# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1108278753 0
# Node ID 681d4e4ca613e6e77153ebc9787915a8fee20ff5
# Parent  8f9cab9fa5332b457f2124e0049d089bee64e732
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.

diff -r 8f9cab9fa533 -r 681d4e4ca613 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Sun Feb 13 00:21:11 2005 +0000
+++ b/lisp/gnus/ChangeLog	Sun Feb 13 07:12:33 2005 +0000
@@ -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 -r 8f9cab9fa533 -r 681d4e4ca613 lisp/gnus/imap.el
--- a/lisp/gnus/imap.el	Sun Feb 13 00:21:11 2005 +0000
+++ b/lisp/gnus/imap.el	Sun Feb 13 07:12:33 2005 +0000
@@ -241,7 +241,11 @@
   :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)