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

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 122-124)

   - Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp.
   - Update from CVS

2005-09-22  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/spam-report.el (spam-report-url-ping-plain): Use
   gnus-extended-version as User-Agent.

   * lisp/gnus/gnus-agent.el (gnus-agent-synchronize-flags): Explain why the
   default value is nil.

2005-09-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>

   * lisp/gnus/gnus-agent.el (gnus-agent-synchronize-flags): Switch the
   default to nil, to be able to use Gnus at all.  If the default
   switches to something else, then the function should be fixed not
   be exceedingly slow.

2005-09-19  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/mm-url.el (mm-url-decode-entities): Fix regexp.

2005-09-22  Katsumi Yamaoka  <yamaoka@jpl.org>

   * man/gnus.texi (Mail): Fix gnus-confirm-mail-reply-to-news entry.

2 files changed, 11 insertions, 5 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 442c575134a..ee31882a963 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-22  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus.texi (Mail): Fix gnus-confirm-mail-reply-to-news entry.
+
 2005-09-20  Emanuele Giaquinta  <emanuele.giaquinta@gmail.com>  (tiny change)
 
         * text.texi (Paragraphs): Correction about Paragraph-Indent Text mode.
diff --git a/man/gnus.texi b/man/gnus.texi
index df3b4bf706b..c6b11716ba0 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -11431,13 +11431,15 @@ that have none when you do a @kbd{a}.
 
 @item gnus-confirm-mail-reply-to-news
 @vindex gnus-confirm-mail-reply-to-news
-This can also be a function receiving the group name as the only
-parameter which should return non-@code{nil} if a confirmation is
-needed, or a regular expression matching group names, where
-confirmation is should be asked for.
+If non-@code{nil}, Gnus will ask you for a confirmation when you are
+about to reply to news articles by mail.  If it is @code{nil}, nothing
+interferes in what you want to do.  This can also be a function
+receiving the group name as the only parameter which should return
+non-@code{nil} if a confirmation is needed, or a regular expression
+matching group names, where confirmation should be asked for.
 
 If you find yourself never wanting to reply to mail, but occasionally
-press R anyway, this variable might be for you.
+press @kbd{R} anyway, this variable might be for you.
 
 @item gnus-confirm-treat-mail-like-news
 @vindex gnus-confirm-treat-mail-like-news