Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 321, 333)

   - Merge from gnus--rel--5.10

 * 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-start.el (gnus-subscribe-options-newsgroup-method): Doc fix.

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 30f41ce..60026a9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/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-07-10  Daiki Ueno <ueno@unixuser.org>
 
        * mml1991.el (mml1991-function-alist): Add epg.

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 8791fb2..7bc9c2b 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/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)