X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/717c214c024c09a3e0da43105a9f494b6dcbd44b..9d07b2dbb00ae3ad178ec06d560ba54c1ad08b87:/doc/pscp.but

diff --git a/doc/pscp.but b/doc/pscp.but
index 26bb8790..5da247df 100644
--- a/doc/pscp.but
+++ b/doc/pscp.but
@@ -1,4 +1,4 @@
-\versionid $Id: pscp.but,v 1.14 2001/09/22 15:36:44 simon Exp $
+\versionid $Id: pscp.but,v 1.20 2001/12/31 16:15:19 simon Exp $
 
 \#FIXME: Need examples
 
@@ -7,6 +7,10 @@
 \i{PSCP}, the PuTTY Secure Copy client, is a tool for transferring files
 securely between computers using an SSH connection.
 
+If you have an SSH 2 server, you might prefer PSFTP (see \k{psftp})
+for interactive use. PSFTP does not in general work with SSH 1
+servers, however.
+
 \H{pscp-starting} Starting PSCP
 
 PSCP is a command line application.  This means that you cannot just
@@ -226,7 +230,19 @@ Since specifying passwords in scripts is a bad idea for security
 reasons, you might want instead to consider using public-key
 authentication; see \k{pscp-pubkey}.
 
-\S{pscp-pubkey} Return value
+\S2{pscp-usage-options-batch}\c{-batch} avoid interactive prompts
+
+If you use the \c{-batch} option, PSCP will never give an
+interactive prompt while establishing the connection. If the
+server's host key is invalid, for example (see \k{gs-hostkey}), then
+the connection will simply be abandoned instead of asking you what
+to do next.
+
+This may help PSCP's behaviour when it is used in automated
+scripts: using \c{-batch}, if something goes wrong at connection
+time, the batch job will fail rather than hang.
+
+\S{pscp-retval} Return value
 
 PSCP returns an \cw{ERRORLEVEL} of zero (success) only if the files
 were correctly transferred. You can test for this in a batch file,
@@ -245,8 +261,8 @@ Firstly, PSCP can use PuTTY saved sessions in place of hostnames
 
 \b Run PuTTY, and create a PuTTY saved session (see
 \k{config-saving}) which specifies your private key file (see
-\k{config-auth}). You will probably also want to specify a username
-to log in as (see \k{config-username}).
+\k{config-ssh-privkey}). You will probably also want to specify a
+username to log in as (see \k{config-username}).
 
 \b In PSCP, you can now use the name of the session instead of a
 hostname: type \c{pscp sessionname:file localfile}, where
@@ -267,6 +283,4 @@ For more general information on public-key authentication, see
 
 Lars Gunnarson has written a graphical interface for PSCP.  You can
 get it from his web site, at
-\W{http://members.surfeu.at/lgunnars/daplay/}{members.surfeu.at}.
-\# \W{http://www.i-tree.org/}{www.i-tree.org}.
-\# update this if the original site ever returns.
+\W{http://www.i-tree.org/}{www.i-tree.org}.