# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1152849036 0
# Node ID 30b1a277cc548691235a6e9652c46d018ab41536
# Parent  3d0d6e217db9e7380584756c8da96aa153fd8413
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

diff -r 3d0d6e217db9 -r 30b1a277cc54 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Fri Jul 14 02:29:50 2006 +0000
+++ b/lisp/gnus/ChangeLog	Fri Jul 14 03:50:36 2006 +0000
@@ -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 -r 3d0d6e217db9 -r 30b1a277cc54 lisp/gnus/gnus-start.el
--- a/lisp/gnus/gnus-start.el	Fri Jul 14 02:29:50 2006 +0000
+++ b/lisp/gnus/gnus-start.el	Fri Jul 14 03:50:36 2006 +0000
@@ -313,8 +313,8 @@
 
 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)