From e40ae565c2750863a827636fc69a1be1c8c6fee8 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 24 Dec 2004 19:20:18 +0000
Subject: [PATCH] Improve Win32 install instructions.

---
 doc/src/sgml/install-win32.sgml |  9 +++++----
 doc/src/sgml/installation.sgml  | 17 ++++++++++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/doc/src/sgml/install-win32.sgml b/doc/src/sgml/install-win32.sgml
index acbfa2bb12..dc5a689bf0 100644
--- a/doc/src/sgml/install-win32.sgml
+++ b/doc/src/sgml/install-win32.sgml
@@ -1,9 +1,9 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/install-win32.sgml,v 1.20 2004/12/24 18:37:26 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/install-win32.sgml,v 1.21 2004/12/24 19:20:18 momjian Exp $
 -->
 
 <chapter id="install-win32">
- <title>Installation on <productname>Windows</productname></title>
+ <title>Client-Only Installation on <productname>Windows</productname></title>
 
  <indexterm>
   <primary>installation</primary>
@@ -12,8 +12,9 @@ $PostgreSQL: pgsql/doc/src/sgml/install-win32.sgml,v 1.20 2004/12/24 18:37:26 mo
 
  <para>
   Although <productname>PostgreSQL</productname> is written for
-  Unix-like operating systems and compiles under
-  <productname>MinGW</productname>, the C client library
+  Unix-like operating systems and can be built using
+  <productname>MinGW</productname> and
+  <productname>Cygwin</productname>, the C client library
   (<application>libpq</application>) and the interactive terminal
   (<application>psql</application>) can be compiled using other Windows
   tool sets. Makefiles are included in the source distribution for
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index a6a9740269..143e51d3dc 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.219 2004/12/24 19:12:36 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.220 2004/12/24 19:20:18 momjian Exp $ -->
 
 <chapter id="installation">
  <title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -120,10 +120,17 @@ su - postgres
        <secondary>on Windows</secondary>
       </indexterm>
 
-      To build on <productname>Windows NT</> or <productname>Windows
-      2000</> you need the <productname>Cygwin</> and
-      <productname>cygipc</> packages. See the file
-      <filename>doc/FAQ_MSWIN</> for details.
+      To build on <productname>NT</>-based versions of
+      <productname>Windows</> like Windows XP and 2003 see
+      <filename>doc/FAQ_MINGW</>. For earlier <productname>Windows</>
+      releases see <filename>doc/FAQ_CYGWIN</>.
+
+      To build <productname>Windows</> client-only interfaces using
+      tools like <productname>Visual C++</> and <productname>Borland
+      C++</> see
+      <![%standalone-include[the documentation chapter "Client-Only
+      Installation on Windows"]]> <![%standalone-ignore[<xref
+      linkend="install-win32">]]>.
      </para>
     </listitem>
    </itemizedlist>
-- 
2.40.0