Merge from emacs--rel--22

[bpt/emacs.git] / admin / nt / README.W32

diff --git a/admin/nt/README.W32 b/admin/nt/README.W32
index a801c8f..4b2cc4e 100644 (file)
--- a/admin/nt/README.W32
+++ b/admin/nt/README.W32
@@ -1,14 +1,10 @@
-           Emacs for Windows NT and Windows 95/98/2000/XP
+                          Emacs for Windows
 
-                            Version 21.1
-
-                         November 18, 2001
-               
   This README file describes how to set up and run a precompiled version
-  of GNU Emacs for Windows NT and Windows 95/98/2000/XP.  This
+  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/latest/
+       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
@@ -16,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
 
@@ -142,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
@@ -173,23 +168,20 @@
   invoking Emacs with the "-q --no-site-file" options.
 
   If you decide that it is a bug in Emacs that might be specific to the
-  Windows port, send a message to the ntemacs-users@cs.washington.edu
+  Windows port, send a message to the "help-emacs-windows@gnu.org"
   mailing list describing the bug, the version of Emacs that you are
   using, and the operating system that you are running on (Windows NT,
-  2000, 95 or 98 including service pack level if known).  If the bug is
-  related to subprocesses, also specify which shell you are using (e.g.,
-  include the values of `shell-file-name' and `shell-explicit-file-name'
-  in your message).
+  2000, 95, 98, etc. including service pack level if known).  If the bug
+  is related to subprocesses, also specify which shell you are using
+  (e.g., include the values of `shell-file-name' and
+  `shell-explicit-file-name' in your message).
 
   If you think the bug is not specific to the Windows port of Emacs,
-  then it is better to mail the bug report to bug-gnu-emacs@gnu.org so
+  then it is better to mail the bug report to "bug-gnu-emacs@gnu.org" so
   that it will be seen by the right people.  If Emacs has been set up to
   send mail, you can use the command M-x report-emacs-bug to create and
   send the bug report, but in some cases there is a function to report
   bugs in a specific package; e.g. M-x gnus-bug for Gnus, M-x
   c-submit-bug-report for C/C++/Java mode, etc.
 
-  Enjoy.
-
-  Andrew Innes
-  (andrewi@gnu.org)
+  Enjoy!