--- /usr/share/doc/postgresql-7.4.3/FAQ_MSWIN.orig	2004-06-17 13:02:43.001000000 +0100
+++ /usr/share/doc/postgresql-7.4.3/FAQ_MSWIN	2004-08-23 12:05:44.528857400 +0100
@@ -1,10 +1,12 @@
 How to install PostgreSQL on Windows
 ====================================
 
-$Date: 2004/03/05 19:57:20 $
+$Date: 2004-08-23 12:59:17 $
 
 PostgreSQL requires the appropriate subset of Cygwin DLLs to be
 installed in order that it functions under Windows.
+Recent PostgreSQL releases require at least CYGWIN v1.5 
+with cygserver support, replacing ipc-daemon2.
 
 This document assumes that you do not have Cygwin already installed
 on your system.  If that is not the case, then you will need to
@@ -26,37 +28,45 @@
     Cygwin.
 
 3.  Once the download and install process is complete, open a Cygwin
-    shell and do the following for a basic installation:
+    shell and do the basic cygwin installation:
 
-    3a.  Start ipc-daemon2 for shared memory support.  To do this,
-         enter the command "ipc-daemon2 &".  This program
-         needs to be running anytime you start the PostgreSQL server
-         (postmaster) or initialize a database (initdb).
+    Read the cygwin specific installation instruction. There is
+    described how to start the cygserver daemon, initialize the
+    database, and start the postmaster daemon.
 
-    3b.  Use the initdb command to create a new database cluster.  An
-         example command would be:
+	less /usr/share/doc/Cygwin/postgresql-<VERSION>.README
 
-            initdb -D /usr/local/pgsql/data -W -E LATIN1
+    In short:
 
-         Which will create a cluster in the /usr/local/pgsql/data
-         directory, will prompt for a superuser password and will
-         set the default database encoding to LATIN1.
+	3a. Install and configure cygserver. The CYGWIN variable 
+	    must contain "server".
 
-    3c.  Start up the postmaster.  Use a command similar to the
-         following:
+	    $ cygserver-config
 
-            postmaster -D /usr/local/pgsql/data
+	3b. Start cygserver:
 
-         This will start the postmaster, and if successful you will
-         see some initial log entries, and an entry "LOG: database
-         system is ready".
+	    $ cygserver &
+
+	3c. Initialize PostgreSQL:
+
+	    $ initdb -D /usr/share/postgresql/data
+
+	3d. Start the PostgreSQL postmaster:
+
+	    $ postmaster -D /usr/share/postgresql/data &
+
+	3e. Connect to PostgreSQL:
+
+	    $ psql template1
+
+	3f. Examine /var/log/postmaster.log
 
 4.  You are now running a PostgreSQL server on your Windows machine.
 
-5.  It is possible to install ipc-daemon2 and the postmaster as
+5.  It is possible to install cygserver and the postmaster as
     Windows NT services.  For information on how to do this, please
-    refer to the README document included with Cygwin PostgreSQL.  It
-    is installed in the /usr/share/doc/Cygwin directory.
+    refer to the same README document included with Cygwin PostgreSQL.  
+    It is installed in the /usr/share/doc/Cygwin directory.
 
 Building from source
 --------------------