From 56b80656edea14996f8b96abb18f6f276b4f56e9 Mon Sep 17 00:00:00 2001
From: Miles Bader <miles@gnu.org>
Date: Thu, 6 Dec 2007 00:47:08 +0000
Subject: Merge from gnus--rel--5.10

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-159
---
 man/ChangeLog |  9 +++++++++
 man/gnus.texi | 12 +++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'man')

diff --git a/man/ChangeLog b/man/ChangeLog
index b338c6e55d7..3393712ba0a 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-28  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus.texi (Fancy Mail Splitting): Fix description of splitting based
+	on body.
+
+2007-11-24  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus.texi (Fetching Mail): Remove obsolete `nnmail-spool-file'.
+
 2007-11-22  Francesco Potort,Al(B  <pot@gnu.org>
 
 	* maintaining.texi (Tag Syntax): Revert this change: "Now --members is
diff --git a/man/gnus.texi b/man/gnus.texi
index 3bce1de77b3..bcced071cc2 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -14123,14 +14123,12 @@ If non-@code{nil}, name of program for fetching new mail.  If
 @subsubsection Fetching Mail
 
 @vindex mail-sources
-@vindex nnmail-spool-file
 The way to actually tell Gnus where to get new mail from is to set
 @code{mail-sources} to a list of mail source specifiers
 (@pxref{Mail Source Specifiers}).
 
-If this variable (and the obsolescent @code{nnmail-spool-file}) is
-@code{nil}, the mail back ends will never attempt to fetch mail by
-themselves.
+If this variable is @code{nil}, the mail back ends will never attempt to
+fetch mail by themselves.
 
 If you want to fetch mail both from your local spool as well as a
 @acronym{POP} mail server, you'd say something like:
@@ -14339,9 +14337,9 @@ body of the messages:
         "string.group"))))
 @end lisp
 
-The buffer is narrowed to the message in question when @var{function}
-is run.  That's why @code{(widen)} needs to be called after
-@code{save-excursion} and @code{save-restriction} in the example
+The buffer is narrowed to the header of the message in question when
+@var{function} is run.  That's why @code{(widen)} needs to be called
+after @code{save-excursion} and @code{save-restriction} in the example
 above.  Also note that with the nnimap backend, message bodies will
 not be downloaded by default.  You need to set
 @code{nnimap-split-download-body} to @code{t} to do that
-- 
cgit v1.2.1