From: yamaoka <yamaoka>
Date: Tue, 8 Feb 2005 22:00:50 +0000 (+0000)
Subject: Synch to No Gnus 200502081954.
X-Git-Tag: t-gnus-6_17_4-quimby-~568
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c778cae4b1b58f7eee4fa1cd3ffc1408d02d7ab7;p=elisp%2Fgnus.git-

Synch to No Gnus 200502081954.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa2beec..436b46b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-08  Simon Josefsson  <jas@extundo.com>
+
+	* imap.el (imap-log): Doc fix.
+
 2005-02-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-art.el (gnus-mime-inline-part): Decode parts according to
diff --git a/lisp/imap.el b/lisp/imap.el
index 9277a09..63ae762 100644
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -235,7 +235,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)
 
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 41016db..d9a4d5b 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-08  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* gnus.texi (Spam ELisp Package Configuration Examples):
+	"training.ham" should be "training.spam"
+
 2005-02-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* message.texi (Mail Variables): Fix the default value for
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 268e2b4..4323c3e 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -22440,7 +22440,7 @@ Package Global Variables}) を付けます。グループを出るとき、それらの記事
 
 私の ham フォルダで、認識されなかった spam メール (否定の失敗) を見たと
 きはいつでも、私は単に @kbd{S x} (@code{gnus-summary-mark-as-spam}) を叩
-きます。グループを出るとき、それらのメッセージは @samp{training.ham} に
+きます。グループを出るとき、それらのメッセージは @samp{training.spam} に
 移されます。
 @end itemize
 
diff --git a/texi/gnus.texi b/texi/gnus.texi
index fb162a7..86e27a8 100644
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -23342,7 +23342,7 @@ an excellent tool for filtering those unwanted mails for me.)
 In my ham folders, I just hit @kbd{S x}
 (@code{gnus-summary-mark-as-spam}) whenever I see an unrecognized spam
 mail (false negative).  On group exit, those messages are moved to
-@samp{training.ham}.
+@samp{training.spam}.
 @end itemize
 
 @subsubheading Reporting spam articles in Gmane groups with @code{spam-report.el}