Update location of Emacs on MS Windows FAQ

diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server
index 3a21733747d444d839f70d436bd58743b4bc3734..304251f3ce40b0e4217bfc16e3e41caecf2a4264 100644 (file)
--- a/admin/nt/README-ftp-server
+++ b/admin/nt/README-ftp-server
@@ -16,12 +16,6 @@ See the end of the file for license conditions.
   accustomed to compiling programs themselves.  Corresponding source
   can be found in the parent directory in emacs-24.3.tar.gz.
 
-  If you have access to the World Wide Web, I would recommend pointing
-  your favorite web browser to the following document (if you haven't
-  already):
-
-       http://www.gnu.org/software/emacs/windows/ntemacs.html
-
 * IMPORTANT LEGAL REMINDER
 
   If you want to redistribute any of the precompiled distributions of
@@ -230,16 +224,10 @@ See the end of the file for license conditions.
 
 * Further information
 
-  If you have access to the World Wide Web, I would recommend pointing
-  your favorite web browser to following the document (if you haven't
-  already):
-
-       http://www.gnu.org/software/emacs/windows/ntemacs.html
+  The Emacs on MS Windows FAQ is distributed with Emacs (info
+  manual "efaq-w32"), and at
 
-  This document serves as an FAQ and a source for further information
-  about the Windows port and related software packages. Note that as
-  most of the information in that FAQ is for earlier versions, so some
-  information may not be relevant to Emacs-24.3.
+       http://www.gnu.org/software/emacs/manual/efaq-w32.html
 
   In addition to the FAQ, there is a mailing list for discussing issues
   related to the Windows port of Emacs.  For information about the

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index ca620a15b4f5ebe214d39d8d54aa21fdd7761566..13851514c157e654d7ef78b65711bf093055a33f 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,7 @@
 2013-08-27  Glenn Morris  <rgm@gnu.org>
 
+       * efaq.texi (Emacs for MS-Windows): Update location of MS FAQ.
+
        * efaq.texi: Rename from faq.texi, to match its output files.
        * Makefile.in: Update for faq.texi name change.
 

diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 1354f68cc9fdace372f2a7a18e203f3c4fce6273..54e067d65bdf973cc8c4356ed157517bac9573c5 100644 (file)
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -3452,8 +3452,9 @@ lack certain features, such as the Emacs Lisp extension language.
 @cindex Emacs for MS-Windows
 @cindex Microsoft Windows, Emacs for
 
-There is a @uref{http://www.gnu.org/software/emacs/windows/ntemacs.html,
-separate FAQ} for Emacs on MS-Windows.  For MS-DOS, @pxref{Emacs for MS-DOS}.
+There is a separate FAQ for Emacs on MS-Windows,
+@pxref{Top,,,efaq-w32,FAQ for Emacs on MS Windows}.
+For MS-DOS, @pxref{Emacs for MS-DOS}.
 
 
 @node Emacs for GNUstep

diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 7556c23daee00da0577ad4c53b514d0504de081f..f241655deddaa219006b7090565ac41180210265 100644 (file)
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -3016,9 +3016,9 @@ You can enter M-f6 by typing ESC f6.
 *** MS-Windows 95/98/ME: subprocesses do not terminate properly.
 
 This is a limitation of the Operating System, and can cause problems
-when shutting down Windows. Ensure that all subprocesses are exited
-cleanly before exiting Emacs. For more details, see the FAQ at
-http://www.gnu.org/software/emacs/windows/.
+when shutting down Windows.  Ensure that all subprocesses are exited
+cleanly before exiting Emacs.  For more details, see the Emacs on MS
+Windows FAQ (info manual "efaq-w32").
 
 *** MS-Windows 95/98/ME: crashes when Emacs invokes non-existent programs.
 

diff --git a/nt/README b/nt/README
index b62dc0b746bf7bf326d05a5b00e64fb0dcd6899f..d3112ca50f128555cbabef397aca9ac2aa8f365e 100644 (file)
--- a/nt/README
+++ b/nt/README
@@ -67,10 +67,10 @@
 
 * Further information
 
-  There is a web page that serves as a FAQ for the Windows port of
-  Emacs (a.k.a. NTEmacs) at:
+  The FAQ for the MS Windows port of Emacs is distributed with Emacs
+  (info manual "efaq-w32"), and also available at
 
-       http://www.gnu.org/software/emacs/windows/ntemacs.html
+        http://www.gnu.org/software/emacs/manual/efaq-w32.html
 
   There is also a mailing list for discussing issues related to this
   port of Emacs.  For information about the list, see this Web page:
@@ -108,11 +108,7 @@
 
   Use the built in bug reporting functionality in Emacs so that it
   will be seen by the right people.  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.
-
+  report-emacs-bug to create and send the bug report.
 \f
 This file is part of GNU Emacs.
 

diff --git a/nt/README.W32 b/nt/README.W32
index a2881ce1914455b4de2aa8eee3e0fb7813c2c9a8..d81a308ae051c163a4bc485a308c28e2620f8039 100644 (file)
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -18,12 +18,6 @@ See the end of the file for license conditions.
   this file as part of the Emacs source distribution, please read
   those 2 files and not this one.
 
-  Answers to frequently asked questions, and further information about
-  this port of GNU Emacs and related software packages can be found via
-  http:
-
-       http://www.gnu.org/software/emacs/windows/
-
 * Preliminaries
 
   Along with this file should be six subdirectories (bin, etc, info,
@@ -242,14 +236,10 @@ See the end of the file for license conditions.
 
 * Further information
 
-  If you have access to the World Wide Web, I would recommend pointing
-  your favorite web browser to the following document (if you haven't
-  already):
-
-       http://www.gnu.org/software/emacs/windows/
+  The FAQ for the MS Windows port of Emacs is distributed with Emacs
+  (info manual "efaq-w32"), and also available at
 
-  This document serves as an FAQ and a source for further information
-  about the Windows port and related software packages.
+        http://www.gnu.org/software/emacs/manual/efaq-w32.html
 
   In addition to the FAQ, there is a mailing list for discussing issues
   related to the Windows port of Emacs.  For information about the