Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 135-137)

   - Update from CVS

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

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 5c11665..74c2ae6 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -2,6 +2,8 @@
 
        * gnus.texi (Mail Source Specifiers): Mention problem of duplicate
        mails with pop3-leave-mail-on-server.  Fix wording.
+       (Limiting): Improve gnus-summary-limit-to-articles.
+       (X-Face): Fix typo.
 
 2006-07-24  Richard Stallman  <rms@gnu.org>
 

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 446f389..ea74554 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -6432,9 +6432,9 @@ articles younger than that number of days.
 @item / n
 @kindex / n (Summary)
 @findex gnus-summary-limit-to-articles
-Limit the summary buffer to the current article
-(@code{gnus-summary-limit-to-articles}).  Uses the process/prefix
-convention (@pxref{Process/Prefix}).
+With prefix @samp{n}, limit the summary buffer to the next @samp{n}
+articles.  If not given a prefix, use the process marked articles
+instead.  (@code{gnus-summary-limit-to-articles}).
 
 @item / w
 @kindex / w (Summary)
@@ -22716,7 +22716,7 @@ The variable that controls this is the
 @code{gnus-article-x-face-command} variable.  If this variable is a
 string, this string will be executed in a sub-shell.  If it is a
 function, this function will be called with the face as the argument.
-If the @code{gnus-article-x-face-too-ugly} (which is a regexp) matches
+If @code{gnus-article-x-face-too-ugly} (which is a regexp) matches
 the @code{From} header, the face will not be shown.
 
 (Note: @code{x-face} is used in the variable/function names, not