From 445036bb9882485133750a14a5b3da30efeae2df Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Mon, 21 Mar 2016 21:09:23 +0100
Subject: [PATCH] Remove Mingw.org from FAQ, or replace with Mingw-w64.

	* faq-api.xml: Change MingW to Mingw-w64.
	* faq-programming.xml: Ditto.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
---
 winsup/doc/faq-api.xml         |  5 +++--
 winsup/doc/faq-programming.xml | 18 +++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/winsup/doc/faq-api.xml b/winsup/doc/faq-api.xml
index b52ad22e1..993274a33 100644
--- a/winsup/doc/faq-api.xml
+++ b/winsup/doc/faq-api.xml
@@ -264,8 +264,9 @@ direct calls to Winsock functions.  If you use Cygwin, use the POSIX API.
 <question><para>I don't want Unix sockets, how do I use normal Win32 winsock?</para></question>
 <answer>
 
-<para>You don't.  Look for the MingW project to port applications using
-native Win32/Winsock functions.
+<para>You don't.  Look for the Mingw-w64 project to port applications using
+native Win32/Winsock functions.  Cross compilers packages to build Mingw-w64
+targets are available in the Cygwin distro.
 </para>
 </answer></qandaentry>
 
diff --git a/winsup/doc/faq-programming.xml b/winsup/doc/faq-programming.xml
index 18557c0d1..07846903c 100644
--- a/winsup/doc/faq-programming.xml
+++ b/winsup/doc/faq-programming.xml
@@ -90,8 +90,8 @@ Windows, while `long' on 64 bit Cygwin is 8 bytes.</para>
   ReadFile (HANDLE, LPVOID, DWORD, LPDWORD, LPOVERLAPPED);
 </screen>
 
-<para>In the 32 bit Cygwin and Mingw environments, as well as in the 64 bit
-Mingw environment, it is no problem to substitute DWORD with unsigned
+<para>In the 32 bit Cygwin and Mingw-w64 environments, as well as in the 64 bit
+Mingw-w64 environment, it is no problem to substitute DWORD with unsigned
 long:</para>
 
 <screen>
@@ -478,14 +478,10 @@ as well as the User's Guide section
 <question><para>How do I compile a Win32 executable that doesn't use Cygwin?</para></question>
 <answer>
 
-<para>The compilers provided by the <literal>mingw-gcc</literal>,
-<literal>mingw64-i686-gcc</literal>, and <literal>mingw64-x86_64-gcc</literal>
-packages link against standard Microsoft DLLs instead of Cygwin. This is
-desirable for native Windows programs that don't need a UNIX emulation layer.
-</para>
-<para>This is not to be confused with 'MinGW' (Minimalist GNU for Windows),
-which is a completely separate effort.  That project's home page is
-<ulink url="http://www.mingw.org/index.shtml"/>.
+<para>The compilers provided by the <literal>mingw64-i686-gcc</literal> and
+<literal>mingw64-x86_64-gcc</literal> packages link against standard Microsoft
+DLLs instead of Cygwin. This is desirable for native Windows programs that
+don't need a UNIX emulation layer.
 </para>
 </answer></qandaentry>
 
@@ -549,7 +545,7 @@ have our own Win32 headers which are pretty complete.
 </answer></qandaentry>
 
 <qandaentry id="faq.programming.msvs-mingw">
-<question><para>How do I use <literal>cygwin1.dll</literal> with Visual Studio or MinGW?</para></question>
+<question><para>How do I use <literal>cygwin1.dll</literal> with Visual Studio or Mingw-w64?</para></question>
 <answer>
 
 <para>Before you begin, note that Cygwin is licensed under the GNU GPL (as