Index: trunk/docs/HOWTO-samhain-on-windows.html
===================================================================
--- trunk/docs/HOWTO-samhain-on-windows.html	(revision 591)
+++ trunk/docs/HOWTO-samhain-on-windows.html	(revision 1)
@@ -135,6 +135,5 @@
 <b>Cygwin</b> POSIX emulation layer, and how to install it as a service. 
 These instructions have been written by Kris Dom,
-who has tested this on WinXP Professional, with additions by Geries Handal
-and Jorge Morgado.
+who has tested this on WinXP Professional.
 </p>
 <div class="block">
@@ -151,6 +150,5 @@
 logging) because Interix does not provide some of the required functionality 
 to build the email module. This issue should be fixed as of samhain 
-version 2.0.7 (not tested).<br />
-[Based on information kindly provided by Geries Handal].
+version 2.0.7 (not tested).<br />[Based on information kindly provided by Geries Handal].
 </p>
 </div>
@@ -194,21 +192,4 @@
 </li>
 </ul>
-<div class="block">
-<p>
-You don't need to download and install All packages. It is enough to keep
-the Default and then add the following additional packages:
-</p>
-<p>
-  Category Devel -> gcc: C compiler upgrade helper<br/>
-  Category Devel -> make: The GNU version of the 'make' utility<br/>
-  Category Libs  -> minires: A simple synchronous non caching stub resolver<br/>
-</p>
-<p>
-When selecting these packages, Cygwin installer will automatically add
-other packages based on their dependencies.
-The package minires is only necessary for a minimal Cygwin installation
-(below). [Kindly pointed out by Jorge Morgado].
-</p>
-</div>
 
 <h3>Cygwin installation</h3>
@@ -273,12 +254,4 @@
 <li>Configure:<br />
 &nbsp; &nbsp;<tt>$ ./configure --enable-xml-log=yes --with-tmp-dir=/usr/local/tmp --with-config-file=/usr/local/etc/samhainrc --with-log-file=/usr/local/log/samhain.log --with-pid-file=/usr/local/var/samhain.pid --with-state-dir=/usr/local/var</tt><br />
-<div class="block">
-<p>
-In my experience, the paths given in the 'configure' command should refer to
-the Cygwin filesystem view, i.e. <tt>/cygdrive/c/...</tt>, otherwise
-samhain may not work from a pure DOS shell, and may not run as a Windows 
-service [Rainer Wichmann].
-</p>
-</div>
 </li>
 <li>Make the binary:<br />
@@ -328,28 +301,4 @@
  </li>
  </ul>
-</li>
-<li>
-Files needed from c:\Cygwin\bin to create the /etc/passwd and /etc/group files:
- <ul>
- <li>
- mkpasswd.exe
- </li>
- <li>
- mkgroup.exe
- </li>
- </ul>
-<p>
-To generate these files on a minimal Cygwin installation execute - on a
-Windows Command Prompt:
-</p><p>
-&nbsp; &nbsp;<tt>mkdir c:\etc</tt><br />
-&nbsp; &nbsp;<tt>path\to\mkpasswd.exe -l > c:\etc\passwd</tt><br />
-&nbsp; &nbsp;<tt>path\to\mkgroup.exe -l > c:\etc\group</tt>
-</p><p>
-IMPORTANT NOTE: You should re-create these two files, each time the
-Windows users and groups accounts database changes. Failing to do this
-might generate critical log messages (depending on your configuration
-file).
-</p>
 </li>
 <li>
@@ -382,6 +331,6 @@
   </li>
   <li>Under the newly created &quot;Parameters&quot; key, add a new String 
-  value called &quot;Application&quot;.<br />
-  &nbsp; &nbsp;The value for &quot;Application&quot;
+  value called &quot;Applications&quot;.<br />
+  &nbsp; &nbsp;The value for &quot;Applications&quot;
   should be &quot;c:\usr\local\sbin\samhain.exe&quot;.</li>
   </ul>
@@ -399,28 +348,4 @@
 </li>
 </ul>
-<div class="block">
-<p>
-It seems that start/stop/restart the service does not work if samhain 
-is configured to run as a daemon, because the Windows service manager
-cannot track the forked daemon process.
-</p>
-<p>Therefore, if you run Samhain as a Windows service, it might be better
-to configure it as a 'normal' process which does not fork a daemon:
-<ul>
-  <li>
-    Set 'Daemon = no' in the samhainrc configuration file.
-  </li>
-  <li>
-    Edit the key HKEY_LOCAL_MACHINE-&gt;SYSTEM-&gt;CurrentControlSet-&gt;Services-&gt;Samhain->Parameters to add a string value named 'AppParameters', with
-    the value '--forever'.
-  </li>
-</ul>
-[Rainer Wichmann].
-</p>
-</div>
-<p>
-Also see <a href="http://support.microsoft.com/kb/q137890/">http://support.microsoft.com/kb/q137890/</a> for information regarding the creation of a 
-user-defined service.
-</p>
 <p>
 Note: the first time I tried to install samhain as an NT service, I first
@@ -429,67 +354,4 @@
 Samhain as a service.
 </p>
-
-
-<h2>Troubleshooting samhain</h2>
-
-<p>
-[Rainer Wichmann] I had some problems at first getting it to run as a 
-Windows service. Some tips:
-<ul>
-  <li>
-    Running samhain from a pure DOS shell (outside the Cygwin environment) 
-    helps to identify problems, in particular if it refuses to start
-    as a Windows service.
-  </li>
-  <li>
-    I found it neccessary to put the <tt>cygwin1.dll</tt> DLL into the
-    same directory as the <tt>samhain.exe</tt> executable. Also, you
-    can use the command <tt>ldd ./samhain.exe</tt> to identify further
-    Cygwin-specific DLL that may be required (if any).
-  </li>
-  <li>
-    Also, I found it neccessary to use Cygwin-style paths 
-    (<tt>/cygdrive/c/...</tt>) in the './configure ..' command when
-    compiling samhain.
-  </li>
-</ul>
-</p>
-    
-<p>
-[Tip from Jorge Morgado] If you, like me, have a Windows server not part of any domain and (for
-security reasons) you even turn off DNS resolution, you might probably get
-the following error when initializing the baseline database:
-</p>
-<pre>
-  ---------   sh_unix.c  ---   1487 ---------
-  According to uname, your nodename is yourcomputername, but your resolver
-  library cannot resolve this nodename to a FQDN.
-  Rather, it resolves this to yourcomputername.
-  For more information, see the entry about self-resolving under
-  'Most frequently' in the FAQ that you will find in the docs/ subdirectory
-  ----------------------------------------------
-</pre>
-<p>
-To fix this problem open the Registry Editor and create the following
-entries under the key
-HKLM\System\CurrentControlSet\Services\Tcpip\Parameters
-</p>
-<p>
-<tt>
-Name: Domain<br/>
-Type: REG_SZ<br/>
-Data: your.domain.name
-</tt>
-</p><p>
-<tt>
-Name: NV Domain<br/>
-Type: REG_SZ<br/>
-Data: your.domain.name
-</tt>
-</p><p>
-The NV Domain registry value contains the computer's primary DNS suffix
-while the Domain registry value contains the computer's primary DNS
-domain. This will make the warning message go away.
-</p>
 </div>
 </body>
