Integrate unfix.org's IPv6 patches up to level 10, with rather a lot

[u/mdw/putty] / doc / pscp.but

diff --git a/doc/pscp.but b/doc/pscp.but
index 7c913ca..4485b9b 100644 (file)
--- a/doc/pscp.but
+++ b/doc/pscp.but
@@ -1,4 +1,4 @@
-\versionid $Id: pscp.but,v 1.28 2004/05/22 11:09:31 simon Exp $
+\define{versionidpscp} \versionid $Id$
 
 \#FIXME: Need examples
 
@@ -55,13 +55,14 @@ use PSCP:
 \c   -l user   connect with specified username
 \c   -pw passw login with specified password
 \c   -1 -2     force use of particular SSH protocol version
+\c   -4 -6     force use of IPv4 or IPv6
 \c   -C        enable compression
 \c   -i key    private key file for authentication
 \c   -batch    disable all interactive prompts
 \c   -unsafe   allow server-side wildcards (DANGEROUS)
 \c   -V        print version information
-\c   -scp      force use of SCP protocol
 \c   -sftp     force use of SFTP protocol
+\c   -scp      force use of SCP protocol
 
 (PSCP's interface is much like the Unix \c{scp} command, if you're
 familiar with that.)
@@ -241,9 +242,10 @@ security issue described in \k{pscp-usage-basics}.
 
 The newer SFTP protocol, which is usually associated with SSH 2
 servers, is specified in a more platform independent way, and leaves
-issues such as wildcard syntax up to the client. This makes it more
-consistent across platforms, more suitable for scripting and
-automation, and avoids security issues with wilcard matching.
+issues such as wildcard syntax up to the client. (PuTTY's SFTP
+wildcard syntax is described in \k{psftp-wildcards}.) This makes it
+more consistent across platforms, more suitable for scripting and
+automation, and avoids security issues with wildcard matching.
 
 Normally PSCP will attempt to use the SFTP protocol, and only fall
 back to the SCP protocol if SFTP is not available on the server.