Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 150-152)

   - Update from CVS

2006-10-13  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>

   * lisp/gnus/mm-uu.el (mm-uu-pgp-signed-extract-1): Use RFC 2440 definition of
   "blank line" when searching for end of armor headers.

2006-10-11  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gmm-utils.el (gmm-write-region): Fix variable name.

2006-10-10  Reiner Steib  <Reiner.Steib@gmx.de>

   * lisp/gnus/gmm-utils.el (gmm-write-region): New function based on compatibility
   code from `mm-make-temp-file'.

   * lisp/gnus/mm-util.el (mm-make-temp-file): Use `gmm-write-region'.

   * lisp/gnus/nnmaildir.el (nnmaildir--update-nov)
   (nnmaildir-request-replace-article, nnmaildir-request-accept-article):
   Use `gmm-write-region'.

2006-10-13  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>

   * man/gnus.texi (Other modes): Fix typo. Add alternative index entry for
   gnus-dired-attach.
   (Selecting a Group): Fix typo.

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

2 files changed, 9 insertions, 2 deletions

diff --git a/man/ChangeLog b/man/ChangeLog
index 8542e0c6067..4eb3f6b0018 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-13  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+        * gnus.texi (Other modes): Fix typo.  Add alternative index entry for
+        gnus-dired-attach.
+        (Selecting a Group): Fix typo.
+
 2006-10-12  Roberto Rodr,Am(Bguez  <lanubeblanca@googlemail.com>
 
         * widget.texi: Fix typos (tiny change)
diff --git a/man/gnus.texi b/man/gnus.texi
index 86f52fded7b..a929bb2b208 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -2139,7 +2139,7 @@ If @code{gnus-auto-select-first} is non-@code{nil}, select an article
 automatically when entering a group with the @kbd{SPACE} command.
 Which article this is is controlled by the
 @code{gnus-auto-select-subject} variable.  Valid values for this
-variable is:
+variable are:
 
 @table @code
 
@@ -24471,7 +24471,7 @@ Save table: (spam-stat-save)
 @subsection Dired
 @cindex dired
 
-@code{gnus-dired-minor-mode} provided some useful functions for dired
+@code{gnus-dired-minor-mode} provides some useful functions for dired
 buffers.  It is enabled with
 @lisp
 (add-hook 'dired-mode-hook 'turn-on-gnus-dired-mode)
@@ -24480,6 +24480,7 @@ buffers.  It is enabled with
 @table @kbd
 @item C-c C-m C-a
 @findex gnus-dired-attach
+@cindex attachments, selection via dired
 Send dired's marked files as an attachment (@code{gnus-dired-attach}).
 You will be prompted for a message buffer.