Merge from gnus--rel--5.10

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

4 files changed, 27 insertions, 9 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 83449d6f005..0e6fc13939d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-18  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-draft.el (gnus-draft-send-message): Mention process/prefix
+        convention in doc string.
+
 2007-12-14  Johan Bockg,Ae(Brd  <bojohan@gnu.org>
 
         * gnus-sum.el (gnus-summary-mark-unread-as-read)
diff --git a/lisp/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el
index 287d71844af..49b1343af8c 100644
--- a/lisp/gnus/gnus-draft.el
+++ b/lisp/gnus/gnus-draft.el
@@ -117,7 +117,8 @@
      message-send-actions)))
 
 (defun gnus-draft-send-message (&optional n)
-  "Send the current draft."
+  "Send the current draft(s).
+Obeys the standard process/prefix convention."
   (interactive "P")
   (let* ((articles (gnus-summary-work-articles n))
          (total (length articles))
diff --git a/man/ChangeLog b/man/ChangeLog
index d66d7ac7793..6159a91c8fa 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,12 @@
+2007-12-18  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus.texi (Group Parameters): Reorder the text and add a note about
+        `gnus-parameters' near the beginning of the node.
+
+2007-12-17  IRIE Tetsuya  <irie@t.email.ne.jp>  (tiny change)
+
+        * gnus.texi (Score File Editing): Fix function name.
+
 2007-12-27  Richard Stallman  <rms@gnu.org>
 
         * text.texi (Formatted Text): Improve menu tag.
diff --git a/man/gnus.texi b/man/gnus.texi
index 5ced5e29a99..747421959cb 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -2717,6 +2717,15 @@ newsgroups.
 @cindex group parameters
 
 The group parameters store information local to a particular group.
+
+Use the @kbd{G p} or the @kbd{G c} command to edit group parameters of a
+group.  (@kbd{G p} presents you with a Lisp-based interface, @kbd{G c}
+presents you with a Customize-like interface.  The latter helps avoid
+silly Lisp errors.)  You might also be interested in reading about topic
+parameters (@pxref{Topic Parameters}).
+Additionally, you can set group parameters via the
+@code{gnus-parameters} variable, see below.
+
 Here's an example group parameter list:
 
 @example
@@ -3083,12 +3092,6 @@ expired.
 
 @end table
 
-Use the @kbd{G p} or the @kbd{G c} command to edit group parameters of a
-group.  (@kbd{G p} presents you with a Lisp-based interface, @kbd{G c}
-presents you with a Customize-like interface.  The latter helps avoid
-silly Lisp errors.)  You might also be interested in reading about topic
-parameters (@pxref{Topic Parameters}).
-
 @vindex gnus-parameters
 Group parameters can be set via the @code{gnus-parameters} variable too.
 But some variables, such as @code{visible}, have no effect (For this
@@ -20333,9 +20336,9 @@ additional commands:
 
 @item C-c C-c
 @kindex C-c C-c (Score)
-@findex gnus-score-edit-done
+@findex gnus-score-edit-exit
 Save the changes you have made and return to the summary buffer
-(@code{gnus-score-edit-done}).
+(@code{gnus-score-edit-exit}).
 
 @item C-c C-d
 @kindex C-c C-d (Score)