# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1197781468 0
# Node ID 19f495ba0a8de4808f688680111fdb70d97b21f4
# Parent  a1667b17853a47d3fed80e6a56937c4228e2da28
Merge from gnus--rel--5.10

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-164

diff -r a1667b17853a -r 19f495ba0a8d lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Sat Dec 15 22:45:39 2007 +0000
+++ b/lisp/gnus/ChangeLog	Sun Dec 16 05:04:28 2007 +0000
@@ -1,3 +1,16 @@
+2007-12-14  Johan Bockg,Ae(Brd  <bojohan@gnu.org>
+
+	* gnus-sum.el (gnus-summary-mark-unread-as-read)
+	(gnus-summary-mark-read-and-unread-as-read)
+	(gnus-summary-mark-current-read-and-unread-as-read)
+	(gnus-summary-mark-unread-as-ticked): Doc fix.
+	`gnus-mark-article-hook', not `gnus-summary-mark-article-hook'.
+
+2007-12-14  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus-sum.el (gnus-summary-prev-article): Fix doc string.  Reported by
+	Christoph Conrad <christoph.conrad@gmx.de>.
+
 2007-12-03  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* message.el (message-ignored-supersedes-headers): Add "X-ID".
diff -r a1667b17853a -r 19f495ba0a8d lisp/gnus/gnus-sum.el
--- a/lisp/gnus/gnus-sum.el	Sat Dec 15 22:45:39 2007 +0000
+++ b/lisp/gnus/gnus-sum.el	Sun Dec 16 05:04:28 2007 +0000
@@ -7492,7 +7492,7 @@
 	(gnus-summary-article-subject))))
 
 (defun gnus-summary-prev-article (&optional unread subject)
-  "Select the article after the current one.
+  "Select the article before the current one.
 If UNREAD is non-nil, only unread articles are selected."
   (interactive "P")
   (gnus-summary-next-article unread subject t))
@@ -10393,12 +10393,12 @@
   (gnus-summary-mark-forward (- n) gnus-unread-mark))
 
 (defun gnus-summary-mark-unread-as-read ()
-  "Intended to be used by `gnus-summary-mark-article-hook'."
+  "Intended to be used by `gnus-mark-article-hook'."
   (when (memq gnus-current-article gnus-newsgroup-unreads)
     (gnus-summary-mark-article gnus-current-article gnus-read-mark)))
 
 (defun gnus-summary-mark-read-and-unread-as-read (&optional new-mark)
-  "Intended to be used by `gnus-summary-mark-article-hook'."
+  "Intended to be used by `gnus-mark-article-hook'."
   (let ((mark (gnus-summary-article-mark)))
     (when (or (gnus-unread-mark-p mark)
 	      (gnus-read-mark-p mark))
@@ -10406,7 +10406,7 @@
 				 (or new-mark gnus-read-mark)))))
 
 (defun gnus-summary-mark-current-read-and-unread-as-read (&optional new-mark)
-  "Intended to be used by `gnus-summary-mark-article-hook'."
+  "Intended to be used by `gnus-mark-article-hook'."
   (let ((mark (gnus-summary-article-mark)))
     (when (or (gnus-unread-mark-p mark)
 	      (gnus-read-mark-p mark))
@@ -10414,7 +10414,7 @@
 				 (or new-mark gnus-read-mark)))))
 
 (defun gnus-summary-mark-unread-as-ticked ()
-  "Intended to be used by `gnus-summary-mark-article-hook'."
+  "Intended to be used by `gnus-mark-article-hook'."
   (when (memq gnus-current-article gnus-newsgroup-unreads)
     (gnus-summary-mark-article gnus-current-article gnus-ticked-mark)))
 
diff -r a1667b17853a -r 19f495ba0a8d man/ChangeLog
--- a/man/ChangeLog	Sat Dec 15 22:45:39 2007 +0000
+++ b/man/ChangeLog	Sun Dec 16 05:04:28 2007 +0000
@@ -1,3 +1,7 @@
+2007-12-14  Sven Joachim  <svenjoac@gmx.de>
+
+	* gnus.texi (Score Variables): Fix typo.
+
 2007-12-15  Richard Stallman  <rms@gnu.org>
 
 	* files.texi (Auto Save): Clarify definition of auto-saving.
diff -r a1667b17853a -r 19f495ba0a8d man/gnus.texi
--- a/man/gnus.texi	Sat Dec 15 22:45:39 2007 +0000
+++ b/man/gnus.texi	Sun Dec 16 05:04:28 2007 +0000
@@ -19900,7 +19900,7 @@
 @vindex gnus-score-uncacheable-files
 @cindex score cache
 All score files are normally cached to avoid excessive re-loading of
-score files.  However, if this might make your Emacs grow big and
+score files.  However, this might make your Emacs grow big and
 bloated, so this regexp can be used to weed out score files unlikely
 to be needed again.  It would be a bad idea to deny caching of
 @file{all.SCORE}, while it might be a good idea to not cache