Merge changes made in Gnus trunk.

2012-01-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 * gnus.texi (Group Parameters): Note precedence.
2012-01-04  Chris Gray  <chrismgray@gmail.com>  (tiny change)
 * mm-decode.el (mm-shr): Check that `gnus-summary-buffer' really is a
 live buffer.
2012-01-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 * nnir.el (nnir-retrieve-headers): Protect against the article not
 existing on the server (bug#10335).
2012-01-04  Wolfgang Jenkner  <wjenkner@inode.at>  (tiny change)
 * gnus-agent.el (gnus-agent-load-local): Recompute
 gnus-agent-article-local on changing method.
2012-01-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 * gnus.el (gnus-parameters): Note precedence.
2012-01-04  Leo  <sdl.web@gmail.com>
 * nndraft.el (nndraft-update-unread-articles): Don't move point around
 in the group buffer.

2 files changed, 8 insertions, 2 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 30c4b01d3fa..21aef5c5a9a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.texi (Group Parameters): Note precedence.
+
 2012-01-03  Eric Schulte  <eric.schulte@gmx.com>
 
         * org.texi (Noweb reference syntax): Adding documentation of
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 76bfbc4bb52..6523dc9528c 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -3187,8 +3187,10 @@ For example:
          (broken-reply-to . t))))
 @end lisp
 
-String value of parameters will be subjected to regexp substitution, as
-the @code{to-group} example shows.
+The first clause that matches the group name will be used.
+
+Parameters that are strings will be subjected to regexp substitution,
+as the @code{to-group} example shows.
 
 @vindex gnus-parameters-case-fold-search
 By default, whether comparing the group name and one of those regexps