X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/421406a46c2afcbfbb2ae69e9aa4b256db80e283..5462f4596108c4309fb69b4e57aa1e59d7100908:/doc/pageant.but

diff --git a/doc/pageant.but b/doc/pageant.but
index 0fe59407..698908cc 100644
--- a/doc/pageant.but
+++ b/doc/pageant.but
@@ -42,6 +42,10 @@ automatically from Pageant, and use it to authenticate. You can now
 open as many PuTTY sessions as you like without having to type your
 passphrase again.
 
+(PuTTY can be configured not to try to use Pageant, but it will try
+by default. See \k{config-ssh-tryagent} and
+\k{using-cmdline-agentauth} for more information.)
+
 When you want to shut down Pageant, click the right button on the
 Pageant icon in the System tray, and select \q{Exit} from the menu.
 Closing the Pageant main window does \e{not} shut down Pageant.
@@ -123,6 +127,10 @@ If you're starting Pageant from the Windows GUI, you can arrange this
 by editing the properties of the \i{Windows shortcut} that it was
 started from.
 
+If Pageant is already running, invoking it again with the options
+below causes actions to be performed with the existing instance, not a
+new one.
+
 \S{pageant-cmdline-loadkey} Making Pageant automatically load keys
 on startup
 
@@ -135,6 +143,9 @@ command line might then look like:
 If the keys are stored encrypted, Pageant will request the
 passphrases on startup.
 
+If Pageant is already running, this syntax loads keys into the
+existing Pageant.
+
 \S{pageant-cmdline-command} Making Pageant run another program
 
 You can arrange for Pageant to start another program once it has
@@ -249,7 +260,7 @@ as long as they want.
 However, the sysadmin of the server machine can always pretend to be
 you \e{on that machine}. So if you forward your agent to a server
 machine, then the sysadmin of that machine can access the forwarded
-agent connection and request signatures from your public keys, and
+agent connection and request signatures from your private keys, and
 can therefore log in to other machines as you. They can only do this
 to a limited extent - when the agent forwarding disappears they lose
 the ability - but using Pageant doesn't actually \e{prevent} the