Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 197-199)

   - Merge from emacs--devo--0
   - Update from CVS

2007-01-28  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>

   * lisp/gnus/nnslashdot.el (nnslashdot-request-article): Update end-of-article
   regexp.

2007-01-24  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/uudecode.el (uudecode-string-to-multibyte): New function emulating
   string-to-multibyte.
   (uudecode-decode-region-internal): Use it.

2007-01-28  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>

   * man/gnus.texi (Batching Agents): Fix example. Reported by Tassilo Horn
   <tassilo@member.fsf.org>.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-621

2 files changed, 6 insertions, 1 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 87dd059ecd0..b4f9a2ee48c 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -3,6 +3,11 @@
         * frames.texi (Secondary Selection): Window clicked does not matter
         when mouse-yank-at-point is non-nil.
 
+2007-01-28  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+        * gnus.texi (Batching Agents): Fix example.  Reported by Tassilo Horn
+        <tassilo@member.fsf.org>.
+
 2007-01-27  Eli Zaretskii  <eliz@gnu.org>
 
         * msdog.texi (ls in Lisp): Document ls-lisp-format-time-list and
diff --git a/man/gnus.texi b/man/gnus.texi
index 80a9e47c74b..625549890ae 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -19040,7 +19040,7 @@ following incantation:
 
 @example
 #!/bin/sh
-emacs -batch -l ~/.emacs -l ~/.gnus.el gnus-agent-batch >/dev/null 2>&1
+emacs -batch -l ~/.emacs -l ~/.gnus.el -f gnus-agent-batch >/dev/null 2>&1
 @end example