summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-10-30 23:28:20 +0000
committerMiles Bader <miles@gnu.org>2007-10-30 23:28:20 +0000
commit771f48f0638f4832c882b2eab1bbc11e36ed5cf5 (patch)
treeebfdbe401ce99224f689dd02ead0b54ce662c8c0
parentba69b876ac836a88877dab99e6fc2352dd36c855 (diff)
parent5c3a9e4c5ef80b09c9f85cc5e864bdfd6c81c45b (diff)
downloademacs-771f48f0638f4832c882b2eab1bbc11e36ed5cf5.tar.gz
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
-rw-r--r--doc/emacs/ChangeLog8
-rw-r--r--doc/misc/gnus.texi7
2 files changed, 13 insertions, 2 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index f0b413aa6a2..37ee660577a 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -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 --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index ccadcc084d8..61b1913081e 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -28423,8 +28423,11 @@ Gnus will work.
@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