Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 113-114)

   - Merge from emacs--devo--0
   - Update from CVS

2006-07-14  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>

   * lisp/gnus/gnus-start.el (gnus-subscribe-options-newsgroup-method): Doc fix.

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

2 files changed, 6 insertions, 2 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 195b778d223..825a8bce003 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-14  Andreas Seltenreich  <uwi7@rz.uni-karlsruhe.de>
+
+        * gnus-start.el (gnus-subscribe-options-newsgroup-method): Doc fix.
+
 2006-06-26  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * gnus-diary.el (gnus-user-format-function-d)
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 00defe58943..134078638c6 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -313,8 +313,8 @@ If, for instance, you want to subscribe to all newsgroups in the
 
 options -n no.all alt.all
 
-Gnus will the subscribe all new newsgroups in these hierarchies with
-the subscription method in this variable."
+Gnus will then subscribe all new newsgroups in these hierarchies
+with the subscription method in this variable."
   :group 'gnus-group-new
   :type '(radio (function-item gnus-subscribe-randomly)
                 (function-item gnus-subscribe-alphabetically)