X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=doc%2Fpageant.but;h=698908cc38a695363f19f457d05f1a5fc6c781ad;hb=cc66c86e7311c97db09da989c340ba3108c9e14f;hp=548aa8bf44281262706fe26be315e7f272593462;hpb=c2abdbc3601acbe2bd2fed4d9ae2ca49b3f0fade;p=PuTTY.git

diff --git a/doc/pageant.but b/doc/pageant.but
index 548aa8bf..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