Merge from origin/emacs-25

8ad0d7d ; Fix quoting in etc/NEWS
6b9dee1 Change Tramp version to "2.2.13.25.2"
62f2684 * lisp/emacs-lisp/autoload.el (update-directory-autoloads): F...
b2f32e4 Don't scan compiled module files for autoloads
9a758b4 Fix Bug#24698
baa8ba4 * lisp/subr.el (start-process): Doc fix.  (Bug#24693)
e535ca4 Fix display of vc-dir CVS file statuses in subdirectories
12da149 Update URL of MS-Windows optional DLLs
2331056 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac...
a4285bc * lisp/simple.el (process-menu-mode, list-processes--refresh)...
b0c447e * lisp/ibuf-ext.el (ibuffer-do-shell-command-file): Fix non-f...
cf3c19b * lisp/ibuffer.el (ibuffer): Improve 'other-window' case.  (B...

# Conflicts:
#	doc/misc/trampver.texi
#	etc/NEWS
#	lisp/net/tramp-sh.el
#	lisp/net/trampver.el

2 files changed, 15 insertions, 14 deletions

diff --git a/nt/INSTALL b/nt/INSTALL
index cd726cbecbb..7bf544cf6ea 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -634,12 +634,12 @@ build will run on Windows 9X and newer systems).
   To support XPM images (required for color tool-bar icons), you will
   need the libXpm library.  It is available from the ezwinports site,
   http://sourceforge.net/projects/ezwinports/files/ and from
-  http://alpha.gnu.org/gnu/emacs/pretest/windows/.
+  http://ftp.gnu.org/gnu/emacs/windows/.
 
   For PNG images, we recommend to use versions 1.4.x and later of
   libpng, because previous versions had security issues.  You can find
   precompiled libraries and headers on the ezwinports site and on
-  alpha.gnu.
+  ftp.gnu.org.
 
   Versions 1.4.0 and later of libpng are binary incompatible with
   earlier versions, so Emacs will only look for libpng libraries which
@@ -657,7 +657,7 @@ build will run on Windows 9X and newer systems).
   giflib, as it is much enhanced wrt previous versions.  You can find
   precompiled binaries and headers for giflib on the ezwinports site,
   http://sourceforge.net/projects/ezwinports/files/ and on
-  http://alpha.gnu.org/gnu/emacs/pretest/windows/.
+  http://ftp.gnu.org/gnu/emacs/windows/.
 
   Version 5.0.0 and later of giflib are binary incompatible with
   previous versions (the signatures of several functions have
@@ -671,7 +671,7 @@ build will run on Windows 9X and newer systems).
 
   For JPEG images, you will need libjpeg 6b or later, which will be
   called libjpeg-N.dll, jpeg62.dll, libjpeg.dll, or jpeg.dll.  You can
-  find these on the ezwinports site and on alpha.gnu.
+  find these on the ezwinports site and on ftp.gnu.org.
 
   TIFF images require libTIFF 3.0 or later, which will be called
   libtiffN.dll or libtiff-N.dll or libtiff.dll.  These can be found on
@@ -698,7 +698,7 @@ build will run on Windows 9X and newer systems).
     because the compiler needs to see their header files when building
     Emacs.
 
-    http://alpha.gnu.org/gnu/emacs/pretest/windows/
+    http://ftp.gnu.org/gnu/emacs/windows/
 
     More fat ports, from the MSYS2 project.
 
@@ -759,7 +759,7 @@ build will run on Windows 9X and newer systems).
 
   You can get pre-built binaries (including any required DLL and the
   header files) at http://sourceforge.net/projects/ezwinports/files/
-  and on http://alpha.gnu.org/gnu/emacs/pretest/windows/.
+  and on http://ftp.gnu.org/gnu/emacs/windows/.
 
 * Optional libxml2 support
 
@@ -781,7 +781,7 @@ build will run on Windows 9X and newer systems).
   (including any required DLL and the header files) is here:
 
      http://sourceforge.net/projects/ezwinports/files/
-     http://alpha.gnu.org/gnu/emacs/pretest/windows/
+     http://ftp.gnu.org/gnu/emacs/windows/
 
   For runtime support of libxml2, you will also need to install the
   libiconv "development" tarball, because the libiconv headers need to
@@ -797,7 +797,7 @@ build will run on Windows 9X and newer systems).
 
   Emacs can decompress text if compiled with the zlib library.
   Prebuilt binaries of zlib DLL (for 32-bit builds of Emacs) are
-  available from the ezwinports site and on alpha.gnu; see above for
+  available from the ezwinports site and on ftp.gnu.org; see above for
   the URLs.
 
   (This library is also a prerequisite for several image libraries, so
diff --git a/nt/README.W32 b/nt/README.W32
index e3f6094f9be..5bd87962650 100644
--- a/nt/README.W32
+++ b/nt/README.W32
@@ -140,8 +140,10 @@ See the end of the file for license conditions.
 
   1. http://sourceforge.net/projects/ezwinports/files/
      -- up-to-date builds, self-contained archives, only for 32-bit Emacs
-  2. Libraries from the MSYS2 project on alpha.gnu.org:
-     http://alpha.gnu.org/gnu/emacs/pretest/windows/.
+  2. Libraries from the MSYS2 project on ftp.gnu.org:
+     http://ftp.gnu.org/gnu/emacs/windows/emacs-NN-i686-deps.zip (32-bit)
+     http://ftp.gnu.org/gnu/emacs/windows/emacs-NN-x86_64-deps.zip (64-bit)
+     where NN is the Emacs version to which the libraries correspond.
   3. The MSYS2 project -- for 64-bit Emacs:
      http://msys2.github.io/
      https://sourceforge.net/projects/msys2/files/REPOS/MINGW/x86_64/
@@ -200,7 +202,7 @@ See the end of the file for license conditions.
 
   You can get pre-built binaries (including any dependency DLLs) at
   http://sourceforge.net/projects/ezwinports/files/ and on
-  http://alpha.gnu.org/gnu/emacs/pretest/windows/.
+  http://ftp.gnu.org/gnu/emacs/windows/
 
 * libxml2 support
 
@@ -214,8 +216,7 @@ See the end of the file for license conditions.
 
   You can get pre-built binaries (including any required DLL and the
   header files) at http://sourceforge.net/projects/ezwinports/files/ and
-  http://alpha.gnu.org/gnu/emacs/pretest/windows/.
-
+  http://ftp.gnu.org/gnu/emacs/windows/
 
 * zlib support
 
@@ -223,7 +224,7 @@ See the end of the file for license conditions.
   the zlib-decompress-region primitive.
 
   Prebuilt binaries of zlib DLL (for 32-bit builds of Emacs) are
-  available from the ezwinports site and on alpha.gnu; see above for
+  available from the ezwinports site and on ftp.gnu.org; see above for
   the URLs.  For the 64-bit DLL, see the instructions below for
   installing from MSYS2 site.