Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-173
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-174
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-175
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-176
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-177
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-178
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-179
   Update from erc--emacs--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-180
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-181
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-182
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-183
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-184
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-185
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-186
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-187
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-65
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-66
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-67
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-68
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-69
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-70
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-71
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-72
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-542

5 files changed, 9 insertions, 9 deletions

diff --git a/admin/make-announcement b/admin/make-announcement
index cc9d68726a1..dd55efe360b 100755
--- a/admin/make-announcement
+++ b/admin/make-announcement
@@ -30,6 +30,7 @@ if [ "$answer" ]; then newtag=$answer; fi
 exec > $outfile
 
 cat <<EOF
+
 There is a new pretest available in
 
   <ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-$NEW.tar.gz>
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 10fca7e84ac..0fcba5b40c8 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -69,7 +69,7 @@ For each step, check for possible errors.
     ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, at
     ftp://ftp.gnu.org/gnu/emacs/ for a release.
 
-14. For a pretest, let Richard Stallman know about the new pretest and
+14. For a pretest, let Richard Stallman <rms@gnu.org> know about the new pretest and
     tell him to announce it using the announcement you prepared.  Remind
     him to set a Reply-to header to <emacs-pretest-bug@gnu.org>.
     For a release, Richard should prepare the announcement himself,
diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32
index 14c723129b4..9c9875b44d4 100644
--- a/admin/nt/README-UNDUMP.W32
+++ b/admin/nt/README-UNDUMP.W32
@@ -5,7 +5,7 @@ Emacs for Windows NT/2000/XP and Windows 95/98/Me.  This distribution
 supplements the standard dumped precompiled distribution of Emacs, which
 you can download from:
 
-        ftp://ftp.gnu.org/gnu/windows/emacs/
+        ftp://ftp.gnu.org/gnu/emacs/windows/
 
 If you do not have the "bin" distribution, then you will need to
 download it before you can use this undumped version.  Also note that
diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index 667f7caa8e9..e351d025309 100644
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -118,7 +118,7 @@
   Programs for handling the distribution file formats can be found in
   the utilities directory: 
 
-    ftp://ftp.gnu.org/gnu/windows/emacs/utilities
+    http://mirrors.sunsite.dk/gnu/windows/emacs/utilities/
 
   For gzipped tar files, you will need either gunzip.exe and tar.exe
   together, or djtarnt.exe.  djtarnt.exe can also unpack .zip files.  I
@@ -226,7 +226,7 @@
   related to the Windows port of Emacs.  For information about the
   list, see this Web page:
 
-        http://mail.gnu.org/mailman/listinfo/help-emacs-windows
+        http://lists.gnu.org/mailman/listinfo/help-emacs-windows
 
   To ask questions on the mailing list, send email to
   help-emacs-windows@gnu.org.  (You don't need to subscribe for that.)
diff --git a/admin/nt/README.W32 b/admin/nt/README.W32
index a3435541d7e..4b2cc4edc98 100644
--- a/admin/nt/README.W32
+++ b/admin/nt/README.W32
@@ -4,7 +4,7 @@
   of GNU Emacs for Windows NT/2000/XP and Windows 95/98/Me.  This
   distribution can be found on the ftp.gnu.org server and its mirrors:
 
-        ftp://ftp.gnu.org/gnu/windows/emacs/
+        ftp://ftp.gnu.org/gnu/emacs/windows/
 
   This server contains other distributions, including the full Emacs
   source distribution and the lisp source distribution, as well as older
@@ -12,10 +12,9 @@
 
   Answers to frequently asked questions, and further information about
   this port of GNU Emacs and related software packages can be found via
-  http or ftp:
+  http:
 
         http://www.gnu.org/software/emacs/windows/ntemacs.html
-        ftp://ftp.gnu.org/gnu/windows/emacs/docs/ntemacs.html
 
 * Preliminaries
 
@@ -138,12 +137,12 @@
   related to the Windows port of Emacs.  For information about the
   list, see this Web page:
 
-        http://mail.gnu.org/mailman/listinfo/help-emacs-windows
+        http://lists.gnu.org/mailman/listinfo/help-emacs-windows
 
   To ask questions on the mailing list, send email to
   help-emacs-windows@gnu.org.  (You don't need to subscribe for that.)
   To subscribe to the list or unsubscribe from it, fill the form you
-  find at http://mail.gnu.org/mailman/listinfo/help-emacs-windows as
+  find at http://lists.gnu.org/mailman/listinfo/help-emacs-windows as
   explained there.
 
   Another valuable source of information and help which should not be