cvs up -j1.12 -j1.13 blurb.but [svn merge -r4689:4690]

Note to Unix users.

[originally from svn r4691]

diff --git a/doc/blurb.but b/doc/blurb.but
index b8eab43482739a8d00dabbfc6732adf83ad847cd..f862a7d4abdd9f05aa2bad63b780b5683cca8e28 100644 (file)
--- a/doc/blurb.but
+++ b/doc/blurb.but
@@ -12,12 +12,19 @@ page</a>.</p>}
 \cfg{text-filename}{puttydoc.txt}
 \cfg{winhelp-filename}{putty.hlp}
 
-\preamble PuTTY is a free (MIT-licensed) Win32 Telnet and SSH
-client. This manual documents PuTTY, and its companion utilities
-PSCP, PSFTP, Plink, Pageant and PuTTYgen.
+PuTTY is a free (MIT-licensed) Win32 Telnet and SSH client. This
+manual documents PuTTY, and its companion utilities PSCP, PSFTP,
+Plink, Pageant and PuTTYgen.
+
+\e{Note to Unix users:} this manual currently primarily documents the
+Windows versions of the PuTTY utilities. Some options are therefore
+mentioned that are absent from the Unix version; the Unix version has
+features not described here; and the \cw{pterm} and command-line
+\cw{puttygen} utilities are not described at all. The only
+Unix-specific documentation that currently exists is the man pages.
 
 \copyright This manual is copyright 2001-2004 Simon Tatham. All
 rights reserved. You may distribute this documentation under the MIT
 licence. See \k{licence} for the licence text in full.
 
-\versionid $Id: blurb.but,v 1.11.2.1 2004/10/24 16:26:20 jacob Exp $
+\versionid $Id: blurb.but,v 1.11.2.2 2004/10/24 22:58:17 jacob Exp $