updates to docs and win32 makefile for MS-Windows.
(cherry picked from commit aee311a97a2b11ab4b555943ae0e49fb21c449ff)

Conflicts:

	doc/adminguide/installation.sgml