Document that -i etc now accept public key files.

(This was added in 4204a53.)

diff --git a/doc/config.but b/doc/config.but
index 5107858c5f54d4f52c2b06927c21466738817108..5fe81bfeb2ec137a6497a28a1d37d4ccaa26e8f7 100644 (file)
--- a/doc/config.but
+++ b/doc/config.but
@@ -2729,11 +2729,15 @@ private key in another format that you want to use with PuTTY, see
 \k{puttygen-conversions}.
 
 You can use the authentication agent \i{Pageant} so that you do not
-need to explicitly configure a key here; see \k{pageant}. If a file
-is specified here with Pageant running, PuTTY will first try asking
-Pageant to authenticate with that key, and ignore any other keys
-Pageant may have. If that fails, PuTTY will ask for a passphrase as
-normal.
+need to explicitly configure a key here; see \k{pageant}.
+
+If a private key file is specified here with Pageant running, PuTTY
+will first try asking Pageant to authenticate with that key, and
+ignore any other keys Pageant may have. If that fails, PuTTY will ask
+for a passphrase as normal. You can also specify a \e{public} key file
+in this case (in RFC 4716 or OpenSSH format), as that's sufficient to
+identify the key to Pageant, but of course if Pageant isn't present
+PuTTY can't fall back to using this file itself.
 
 \H{config-ssh-auth-gssapi} The \i{GSSAPI} panel
 

diff --git a/doc/man-pl.but b/doc/man-pl.but
index b597b83f923cb8370a11c7693b7ef6c6f1d993ef..bda8abd3d947ea97f4406c3805e0adc4ecab2781 100644 (file)
--- a/doc/man-pl.but
+++ b/doc/man-pl.but
@@ -137,9 +137,15 @@ tunnel all their connections. Only works in SSH.
 
 \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}
 

diff --git a/doc/man-pscp.but b/doc/man-pscp.but
index 1b95d4d243f9c3af6015d7196e80dc24e5153c32..b225f22a127fdcda40be77a567cbe87c3e759bfb 100644 (file)
--- 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}
 

diff --git a/doc/man-psft.but b/doc/man-psft.but
index 0194779a7c26a269fee37f34ddcf78d679d571e6..961262b9987fdecb18e38a9b72f68c11d7ed8c86 100644 (file)
--- a/doc/man-psft.but
+++ b/doc/man-psft.but
@@ -79,9 +79,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}
 

diff --git a/doc/man-putt.but b/doc/man-putt.but
index 67bcba83c0fa9338c42b8ce5edc4d880323a2f7e..72094495e533ea15be2f55af63d68a772f8b75ce 100644 (file)
--- a/doc/man-putt.but
+++ b/doc/man-putt.but
@@ -232,9 +232,13 @@ pseudo-terminal at the server end.
 
 \dt \cw{\-i} \e{keyfile}
 
-\dd Specify a private key file to use for user authentication. For SSH-2
-keys, this key file must be in PuTTY's format, not OpenSSH's or
-anyone else's.
+\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}
 

diff --git a/doc/using.but b/doc/using.but
index 5448b81ad13cc8cf56e1119aa2baa555f191972e..893c1d7e37fdbe2562e50c8b7134a204fb8af026 100644 (file)
--- a/doc/using.but
+++ b/doc/using.but
@@ -894,6 +894,10 @@ The \c{-i} option allows you to specify the name of a private key
 file in \c{*.\i{PPK}} format which PuTTY will use to authenticate with the
 server. This option is only meaningful if you are using SSH.
 
+If you are using Pageant, you can also specify a \e{public} key file
+(in RFC 4716 or OpenSSH format) to identify a specific key file to use.
+(This won't work if you're not running Pageant, of course.)
+
 For general information on \i{public-key authentication}, see
 \k{pubkey}.