Merge from origin/emacs-25

[gnu-emacs] / nt / README.W32

diff --git a/nt/README.W32 b/nt/README.W32
index c4e4cf351d427cb0937ac4032ce0cbe37f086c7e..71a0738969a071ca499fd3652a49bb667128f406 100644 (file)
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -1,4 +1,4 @@
-Copyright (C) 2001-2014 Free Software Foundation, Inc.
+Copyright (C) 2001-2016 Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
                           Emacs for Windows
@@ -21,13 +21,16 @@ See the end of the file for license conditions.
 
 * Preliminaries
 
-  Along with this file should be four subdirectories (bin, libexec,
-  share, and var).
+  The binary distribution has these top-level directories:
+  + bin
+  + libexec
+  + share
+  + var
 
 * Setting up Emacs
 
-  To install Emacs, simply unpack all the files into a directory of
-  your choice.  To complete the installation process, you can
+  To install Emacs, simply unpack the binary package into a directory
+  of your choice.  To complete the installation process, you can
   optionally run the program addpm.exe in the bin subdirectory.  This
   will put an icon for Emacs in the Start Menu under
   "Start -> Programs -> Gnu Emacs".
@@ -220,7 +223,7 @@ See the end of the file for license conditions.
   key in HKEY_CURRENT_USER.  Just delete the whole Software\GNU\Emacs
   key.
 
-  The Start menu entry can be removed by right-clicking on the Task bar
+  The Start menu entry can be removed by right-clicking on the Taskbar
   and selecting Properties, then using the Remove option on the Start
   Menu Programs page.  (If you installed under an account with
   administrator privileges, then you need to click the Advanced button
@@ -262,14 +265,19 @@ See the end of the file for license conditions.
 
 * Further information
 
-  The FAQ for the MS Windows port of Emacs is distributed with Emacs
-  (info manual "efaq-w32"), and also available at
+  The Emacs User manual describes Windows-specific issues in the
+  appendix named "Emacs and Microsoft Windows/MS-DOS".  You can read
+  it in Emacs by typing
 
-        http://www.gnu.org/software/emacs/manual/efaq-w32.html
+        C-h r g Microsoft Windows RET
 
-  In addition to the FAQ, there is a mailing list for discussing issues
-  related to the Windows port of Emacs.  For information about the
-  list, see this Web page:
+  This appendix is also available (as part of the entire manual) at
+
+        http://www.gnu.org/software/emacs/manual/html_mono/emacs.html#Microsoft-Windows
+
+  In addition to the manual, there is a mailing list for discussing
+  issues related to the Windows port of Emacs.  For information about
+  the list, see this Web page:
 
        http://lists.gnu.org/mailman/listinfo/help-emacs-windows