diff --git a/doc/FAQ_MSWIN b/doc/FAQ_MSWIN
index ffd008561c5b7ff6d87ed83abb5a3680c28bbe39..f4760824f4e4cec0640a064cb8d6c2e4ddf57e9a 100644
--- a/doc/FAQ_MSWIN
+++ b/doc/FAQ_MSWIN
@@ -1,67 +1,41 @@
-* You can get the most recent version of this from
-* http://people.freebsd.org/~kevlo/postgres/portNT.html.
+How do I installing PostgreSQL on Windows NT or Windows 2000?
+=============================================================
+$Date: 2001/01/22 22:54:07 $
-* Problem reports can be sent to pgsql-ports@postgresql.org.
+1. Install the Cygwin package.
-How do I install the PostgreSQL server on Windows NT or Windows 2000?
-=====================================================================
+ The Cygwin package provides a UNIX-like API on top of the Win32
+ API. It is available at <http://sources.redhat.com/cygwin/>.
+ The 1.1.x series is recommended (1.1.7 was the latest at the time
+ of this writing); using 1.0 or B20 might require extra efforts.
+ For B20 you also need to download the separate crypt library at the
+ same location.
- Porting PostgreSQL to Windows 2000 installation procedures
-
- Thanks to Daniel Horak, JasonTishler ,Joost Kraaijeveld and Pete
- Formanfor their helps.
- Without them, I cannot port Postgres to Windows 2000 successfully.
- ______________________________________________________________________
-
- * Install the lastest verion(1.1.5) of Cygwin
-
- 1. Click on the "Install Cygwin now" link on the
- http://sources.redhat.com/cygwinwebpage.
- This downloads setup.exe to your system.
- 2. Run setup and answer all of the questions. Please
- choose a mirror sitefor your download.
- * Install Charles Wilson's Cygwin32 IPC package
-
- 1. Download the precompiled binary
- http://www.neuro.gatech.edu/users/cwilson/cygutils/V1.1/cygipc/cygipc-
- 1.07-1.tar.gzin"/" directory.
- 2. tar zxvf cygipc-1.07-1.tar.gz
- * Install PostgreSQL 7.0.3
-
- 1. Download PostgreSQL 7.0.3 sourcecode in /usr/src.
- 2. tar zxvf postgresql-7.0.3.tar.gz
- 3. mkdir -p /usr/local/pgsql/{bin,include,lib,data}
- 4. cd /usr/src/postgresql-7.0.3/src/win32
- 5. cp endian.h /usr/include
- cp tcp.h /usr/include/netinet
- 6. Apply Jason Tishler's patches in
- /usr/src/postgresql-7.0.3, then run 'patch -p1 <patch.diff'.
- Note that some browsers convert the patch to a text
- mode file (i.e., CRNL line endings)
- during the save operation which causes patch to reject
- all hunks.
- 7. cd /usr/src/postgresql-7.0.3/src, then run
- './configure'
- 8. make; make install
- 9. cp/usr/local/pgsql/lib/pq.dll /usr/local/pgsql/bin
- 10. Usingany editor to create .bashrc in / directory as
- belows:
- PATH=$PATH:/usr/local/pgsql/bin:/usr/local/bin
- PGDATA=/usr/local/pgsql/data
- PGLIB=/usr/local/pgsql/lib
- LD_LIBRARY_PATH=/usr/local/pgsql/lib:/usr/local/lib
- export LD_LIBRARY_PATH PATH PGDATA PGLIB
- 11. source/.bashrc, then run 'initdb'
- Note that the owner of the DB system have to be
- different from root/administrator
- 12. Editthe file /usr/local/pgsql/data/pg_hba.conf, such as:
-
- host all 163.17.11.109 255.255.255.0
- trust
-
- 13. ipc-daemon&
- 14. postmaster-i&
- 15. Run' psql -h host_name template1'. It's easy, huh :-)
-
-
- Last updated: 01/05/2001 Author: KevinLo
+2. Install the cygipc package, available at
+ <http://www.neuro.gatech.edu/users/cwilson/cygutils/V1.1/cygipc/>.
+ Do not use versions prior to 1.04, they will not work.
+
+3. Optional: The "Andy Piper Tools" at <http://www.xemacs.freeserve.co.uk/>
+ are a collection of pre-compiled libraries and utilities that you
+ might find useful -- especially on Cygwin B20.
+
+4. The Cygwin bin directory has to be placed in the path before the
+ Windows program directories, because the sort.exe has to be taken
+ from Cygwin, not Windows.
+
+5. Start `ipc-daemon &' (background process) from the cygipc package.
+ This program needs to be running anytime you start the PostgreSQL
+ server (postmaster).
+
+6. Proceed according to the INSTALL file. (./configure; make; etc.)
+
+NOTE: There are two issues with Cygwin's current UNIX domain socket
+support:
+
+1. psql (and other clients) will hang if postmaster is not running and
+ the socket file (e.g., /tmp/.s.PGSQL.5432) exists.
+
+2. Cygwin's AF_UNIX sockets are really implemented as AF_INET sockets
+ so they are inherently insecure.
+
+Problem reports can be sent to <pgsql-ports@postgresql.org>.
diff --git a/doc/src/FAQ/FAQ_MSWIN.html b/doc/src/FAQ/FAQ_MSWIN.html
deleted file mode 100644
index 46786255d2e5d0d189ec9b1a026bf733958e891f..0000000000000000000000000000000000000000
--- a/doc/src/FAQ/FAQ_MSWIN.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-
- <meta http-equiv="Content-Type" content="text/html; charset=big5">
-
- <meta name="GENERATOR" content="Mozilla/4.75 [zh_TW] (X11; U; FreeBSD 4.1-20001023-STABLE i386) [Netscape]">
- <title>Porting PostgreSQL to Windows 2000 procedures</title>
-</head>
-<body text="#000000" bgcolor="#ffffff" link="#0000ee" vlink="#551a8b" alink="#ff0000">
-* You can get the most recent version of this from
-http://people.freebsd.org/~kevlo/postgres/portNT.html.
-<P>
-* Problem reports can be sent to pgsql-ports@postgresql.org.
-<P>
-<center>
-<h1>Porting PostgreSQL to Windows 2000 installation procedures</h1>
-</center>
-Thanks to <a href="mailto:horak@mmp.plzen-city.cz">Daniel Horak</a>, <a href="mailto:Jason.Tishler@dothill.com">
-JasonTishler</a> ,<a href="mailto:JKraaijeveld@askesis.nl">Joost Kraaijeveld
-</a>and <a href="mailto:gsez020@kryten.bedford.waii.com">Pete Forman</a>for
-their helps.<br>
-Without them, I cannot port Postgres to Windows 2000 successfully.<br>
-<hr width="100%">
-<ul>
- <li><b>Install the lastest verion(1.1.5) of Cygwin</b></li>
-</ul>
- 1.
-Click on the "Install Cygwin now" link on the <a href="http://sources.redhat.com/cygwin">
-http://sources.redhat.com/cygwin</a>webpage.<br>
-
-This downloads setup.exe to your system.<br>
- 2.
-Run setup and answer all of the questions. Please choose a mirror sitefor
-your download.
-<ul>
- <li><b>Install Charles Wilson's Cygwin32 IPC package</b></li>
-</ul>
- 1.
-Download the precompiled binary <a href="http://www.neuro.gatech.edu/users/cwilson/cygutils/V1.1/cygipc/cygipc-1.07-1.tar.gz">
-http://www.neuro.gatech.edu/users/cwilson/cygutils/V1.1/cygipc/cygipc-1.07-1.tar.gz</a>in"/" directory.
-<br>
- 2.
-tar zxvf cygipc-1.07-1.tar.gz
-<ul>
- <li><b>Install PostgreSQL 7.0.3</b></li>
-</ul>
- 1.
-Download PostgreSQL 7.0.3 <a href="ftp://ftp.postgresql.org/pub/v7.0.3/postgresql-7.0.3.tar.gz">
-sourcecode </a>in /usr/src.<br>
- 2.
-tar zxvf postgresql-7.0.3.tar.gz<br>
- 3.
-mkdir -p /usr/local/pgsql/{bin,include,lib,data}<br>
- 4.
-cd /usr/src/postgresql-7.0.3/src/win32<br>
- 5.
-cp endian.h /usr/include<br>
-
-cp tcp.h /usr/include/netinet<br>
- 6. Apply <a href="mailto:Jason.Tishler@dothill.com">
-Jason Tishler</a>'s<a href="http://people.freebsd.org/~kevlo/postgres/patch.diff">
-patches </a>in /usr/src/postgresql-7.0.3, then run 'patch -p1 <patch.diff'.
-<br>
- <b>Note that
-some browsers convert the patch to a text mode file (i.e., CRNL line endings)
-<br>
- during the save operation
-which causes patch to reject all hunks.</b><br>
- 7. cd /usr/src/postgresql-7.0.3/src,
-then run './configure'<br>
- 8. make; make install<br>
- 9. cp/usr/local/pgsql/lib/pq.dll
-/usr/local/pgsql/bin<br>
- 10. Usingany editor to create .bashrc
-in / directory as belows:<br>
-
-PATH=$PATH:/usr/local/pgsql/bin:/usr/local/bin<br>
-
-PGDATA=/usr/local/pgsql/data<br>
-
-PGLIB=/usr/local/pgsql/lib<br>
-
-LD_LIBRARY_PATH=/usr/local/pgsql/lib:/usr/local/lib<br>
-
-export LD_LIBRARY_PATH PATH PGDATA PGLIB<br>
- 11. source/.bashrc, then run 'initdb'
-<br>
-
-<i>Note that the owner of the DB system have to be different from root/administrator</i>
-<br>
- 12. Editthe file /usr/local/pgsql/data/pg_hba.conf,
-such as:
-<p>
-host all
-163.17.11.109 255.255.255.0 trust</p>
-<p> 13. ipc-daemon&<br>
- 14. postmaster-i&<br>
- 15. Run' psql -h host_name template1'.
-It's easy, huh :-)<br>
- <br>
- <br>
-</p>
-<center>
-<p><i><font size="+1">Last updated: 01/05/2001 Author:<a href="mailto:kevlo@FreeBSD.org">
-KevinLo</a></font></i></p>
-</center>
-</body>
-</html>