Merge from origin/emacs-25

[gnu-emacs] / nt / README

diff --git a/nt/README b/nt/README
index 14c89a0a17cc8757cfe8ed8e73c077562d2dc33c..6d00ed43c111996644d48521250d56e2e5540b66 100644 (file)
--- a/nt/README
+++ b/nt/README
@@ -1,6 +1,6 @@
             Emacs for Windows NT/2000 and Windows 95/98/ME
 
             Emacs for Windows NT/2000 and Windows 95/98/ME
 

-  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.
 
   This directory contains support for compiling and running GNU Emacs on
   See the end of the file for license conditions.
 
   This directory contains support for compiling and running GNU Emacs on


@@ -78,13 +78,19 @@
 
 * Further information
 
 
 * 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

 
 

-  There is also a mailing list for discussing issues related to this
-  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://mail.gnu.org/mailman/listinfo/help-emacs-windows
 
 
        http://mail.gnu.org/mailman/listinfo/help-emacs-windows