# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1193786900 0
# Node ID 0fca3c9fc445d6db4444e32e681d57449c7c7601
# Parent  d93ce6f797f62b93b06c2f8ee6a4b06e5ccac6f9# Parent  d9c9787ef62269862b6726bef6c269ceee47ecce
Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 140)

   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 264-265)

   - Update from CVS

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

diff -r d93ce6f797f6 -r 0fca3c9fc445 doc/emacs/ChangeLog
--- a/doc/emacs/ChangeLog	Tue Oct 30 23:28:12 2007 +0000
+++ b/doc/emacs/ChangeLog	Tue Oct 30 23:28:20 2007 +0000
@@ -1,3 +1,11 @@
+2007-10-27  Emanuele Giaquinta  <e.giaquinta@glauco.it>  (tiny change)
+
+	* gnus-faq.texi ([5.12]): Remove reference to discontinued service.
+
+2007-10-27  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus.texi (Troubleshooting): Adjust Gnus version number.
+
 2007-10-30  Glenn Morris  <rgm@gnu.org>
 
 	* misc.texi (Directory Tracking): Explain a bit more about
diff -r d93ce6f797f6 -r 0fca3c9fc445 doc/misc/gnus.texi
--- a/doc/misc/gnus.texi	Tue Oct 30 23:28:12 2007 +0000
+++ b/doc/misc/gnus.texi	Tue Oct 30 23:28:20 2007 +0000
@@ -28423,8 +28423,11 @@
 
 @item
 Try doing an @kbd{M-x gnus-version}.  If you get something that looks
-like @samp{Gnus v5.10.6} you have the right files loaded.  Otherwise
-you have some old @file{.el} files lying around.  Delete these.
+like @c
+@samp{Gnus v5.10.8} @c Adjust ../Makefile.in if you change this line!
+@c
+you have the right files loaded.  Otherwise you have some old @file{.el}
+files lying around.  Delete these.
 
 @item
 Read the help group (@kbd{G h} in the group buffer) for a