X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2f8d6d437a189a7f0c059f0a30306c829a5e7cf6..1dd353b59d3feeaef262801cde4a023eed3c983e:/doc/plink.but

diff --git a/doc/plink.but b/doc/plink.but
index a5046394..cb92aa8e 100644
--- a/doc/plink.but
+++ b/doc/plink.but
@@ -1,4 +1,4 @@
-\versionid $Id: plink.but,v 1.12 2001/12/06 20:05:39 simon Exp $
+\versionid $Id: plink.but,v 1.15 2002/03/05 20:39:27 simon Exp $
 
 \C{plink} Using the command-line connection tool Plink
 
@@ -151,6 +151,9 @@ details:
 Then you can set up other programs to run this Plink command and
 talk to it as if it were a process on the server machine.
 
+You may also find it useful to use the \c{-batch} command-line
+option; see \k{plink-usage-options-batch}.
+
 \S{plink-usage-options} Options
 
 This section describes the command line options that Plink accepts.
@@ -200,6 +203,10 @@ on the Plink command line. This is \e{not recommended} for reasons
 of security. If you possibly can, we recommend you set up public-key
 authentication instead. See \k{pubkey} for details.
 
+Note that the \c{-pw} option only works when you are using the SSH
+protocol. Due to fundamental limitations of Telnet and Rlogin, these
+protocols do not support automated password authentication.
+
 \S2{plink-usage-options-user}\c{-l username} login with specified
 username
 
@@ -207,6 +214,18 @@ As described in \k{plink-usage-batch}, you can specify the user name
 to log in as on the remote server using the \c{-l} option. For
 example, \c{plink login.example.com -l fred}.
 
+\S2{plink-usage-options-batch}\c{-batch} avoid interactive prompts
+
+If you use the \c{-batch} option, Plink 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 Plink'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.
+
 \S2{plink-usage-options-cmdfile} \c{-m filename} read command from a
 file
 
@@ -295,6 +314,10 @@ a CVS command as in \k{plink-cvs}, for example:
 
 \c cvs -d :ext:user@hostname:/path/to/repository co module
 
+or (if you're using a saved session):
+
+\c cvs -d :ext:user@sessionname:/path/to/repository co module
+
 Select the folder you want to check out to with the \q{Change Folder}
 button, and click \q{OK} to check out your module.  Once you've got
 modules checked out, WinCVS will happily invoke plink from the GUI for