Merge from gnus--rel--5.10

Patches applied:

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

   - Merge from emacs--rel--22
   - Update from CVS

2007-10-27  Emanuele Giaquinta  <e.giaquinta@glauco.it>  (tiny change)

   * man/gnus-faq.texi ([5.12]): Remove reference to discontinued service.

2007-10-27  Reiner Steib  <Reiner.Steib@gmx.de>

   * man/gnus.texi (Troubleshooting): Adjust Gnus version number.

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-140

diff --git a/man/ChangeLog b/man/ChangeLog
index 882ebff1cecb53636749140275f9bb1301c4d000..5d222f408fc434f83840c0771874c0f7c7b9f76f 100644 (file)
--- a/man/ChangeLog
+++ b/man/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  Nick Roberts  <nickrob@snap.net.nz>
 
        * building.texi (Watch Expressions): Describe gdb-delete-out-of-scope.

diff --git a/man/gnus-faq.texi b/man/gnus-faq.texi
index 6bfb34776270fd1bd77b3622a851c102386e93ca..3aee3f2511314125b3ab9c2395612e698b215cdd 100644 (file)
--- a/man/gnus-faq.texi
+++ b/man/gnus-faq.texi
@@ -1676,10 +1676,7 @@ you to use something like
 yourUserName.userfqdn.provider.net, or you can use
 somethingUnique.yourdomain.tld if you own the domain
 yourdomain.tld, or you can register at a service which
-gives private users a FQDN for free, e.g.  
-@uref{http://www.stura.tu-freiberg.de/~dlx/addfqdn.html}.
-(Sorry but this website is in German, if you know of an
-English one offering the same, drop me a note).
+gives private users a FQDN for free.
 
 Finally you can tell Gnus not to generate a Message-ID
 for News at all (and letting the server do the job) by saying

diff --git a/man/gnus.texi b/man/gnus.texi
index 0c9765d92b6a10cc1fc47598174f1a9737c7e1f8..3bce1de77b398382d70cbf784a08ad4dab68c3c0 100644 (file)
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -27826,8 +27826,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