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

diff --git a/doc/pageant.but b/doc/pageant.but
index 548aa8bf..f25119dd 100644
--- a/doc/pageant.but
+++ b/doc/pageant.but
@@ -1,5 +1,3 @@
-\define{versionidpageant} \versionid $Id$
-
 \C{pageant} Using \i{Pageant} for authentication
 
 \cfg{winhelp-topic}{pageant.general}
@@ -42,6 +40,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.
@@ -62,14 +64,16 @@ The large list box in the Pageant main window lists the private keys
 that are currently loaded into Pageant. The list might look
 something like this:
 
-\c ssh1    1024 22:c3:68:3b:09:41:36:c3:39:83:91:ae:71:b2:0f:04 k1
-\c ssh-rsa 1023 74:63:08:82:95:75:e1:7c:33:31:bb:cb:00:c0:89:8b k2
+\c ssh-rsa 2048 22:d6:69:c9:22:51:ac:cb:b9:15:67:47:f7:65:6d:d7 k1
+\c ssh-dss 2048 e4:6c:69:f3:4f:fc:cf:fc:96:c0:88:34:a7:1e:59:d7 k2
 
 For each key, the list box will tell you:
 
 \b The type of the key. Currently, this can be \c{ssh1} (an RSA key
 for use with the SSH-1 protocol), \c{ssh-rsa} (an RSA key for use
-with the SSH-2 protocol), or \c{ssh-dss} (a DSA key for use with
+with the SSH-2 protocol), \c{ssh-dss} (a DSA key for use with
+the SSH-2 protocol), \c{ecdsa-sha2-*} (an ECDSA key for use with
+the SSH-2 protocol), or \c{ssh-ed25519} (an Ed25519 key for use with
 the SSH-2 protocol).
 
 \b The size (in bits) of the key.
@@ -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,10 +260,10 @@ 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 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
+agent connection and request signatures from any of 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
 sysadmin (or hackers) on the server from doing this.
 
 Therefore, if you don't trust the sysadmin of a server machine, you