X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=doc%2Fman-pscp.but;h=b225f22a127fdcda40be77a567cbe87c3e759bfb;hb=145ecf611238c4f1e39d89d3eee40319a2c54fe8;hp=e549279b9e70a274a23242546122f80dc600d6c8;hpb=addf6219bd9406f54b81139d7dfc8b6501ecd81a;p=PuTTY.git

diff --git a/doc/man-pscp.but b/doc/man-pscp.but
index e549279b..b225f22a 100644
--- a/doc/man-pscp.but
+++ b/doc/man-pscp.but
@@ -91,9 +91,15 @@ commands such as \q{\c{w}}).
 
 \dd Enable SSH compression.
 
-\dt \cw{-i} \e{path}
+\dt \cw{-i} \e{keyfile}
 
-\dd Private key file for user authentication.
+\dd Private key file for user authentication. For SSH-2 keys, this key
+file must be in PuTTY's PPK format, not OpenSSH's format or anyone
+else's.
+
+\lcont{ If you are using an authentication agent, you can also specify
+a \e{public} key here (in RFC 4716 or OpenSSH format), to identify
+which of the agent's keys to use. }
 
 \dt \cw{\-hostkey} \e{key}
 
@@ -103,7 +109,9 @@ a base64-encoded blob in OpenSSH's one-line format.
 
 \lcont{ Specifying this option overrides automated host key
 management; \e{only} the key(s) specified on the command-line will be
-accepted, and the host's key will not be cached. }
+accepted (unless a saved session also overrides host keys, in which
+case those will be added to), and the host key cache will not be
+written. }
 
 \dt \cw{-scp}
 
@@ -113,6 +121,20 @@ accepted, and the host's key will not be cached. }
 
 \dd Force use of SFTP protocol.
 
+\dt \cw{\-sshlog} \e{logfile}
+
+\dt \cw{\-sshrawlog} \e{logfile}
+
+\dd These options make \cw{pscp} log protocol details to a file.
+(Some of these may be sensitive, although by default an effort is made
+to suppress obvious passwords.)
+
+\lcont{
+\cw{\-sshlog} logs decoded SSH packets and other events (those that
+\cw{\-v} would print). \cw{\-sshrawlog} additionally logs the raw
+encrypted packet data.
+}
+
 \S{pscp-manpage-more-information} MORE INFORMATION
 
 For more information on \cw{pscp} it's probably best to go and look at