Added a framework for importing foreign key formats, and implemented

[u/mdw/putty] / doc / pubkey.but

diff --git a/doc/pubkey.but b/doc/pubkey.but
index 987a876..4840aee 100644 (file)
--- a/doc/pubkey.but
+++ b/doc/pubkey.but
@@ -1,4 +1,4 @@
-\versionid $Id: pubkey.but,v 1.12 2001/12/12 18:45:56 simon Exp $
+\versionid $Id: pubkey.but,v 1.14 2002/05/11 16:45:29 simon Exp $
 
 \C{pubkey} Using public keys for SSH authentication
 
@@ -63,6 +63,8 @@ supported by PuTTY are described in \k{puttygen-keytype}.
 
 \H{pubkey-puttygen} Using PuTTYgen, the PuTTY key generator
 
+\cfg{winhelp-topic}{puttygen.general}
+
 PuTTYgen is a key generator. It generates pairs of public and private
 keys to be used with PuTTY, PSCP, and Plink, as well as the PuTTY
 authentication agent, Pageant (see \k{pageant}).  PuTTYgen generates
@@ -337,13 +339,13 @@ accept your public key for authentication:
 
 \b If your server is using the SSH 1 protocol, you should change
 into the \c{.ssh} directory and open the file \c{authorized_keys}
-with your favorite editor. (You may have to create this file if this
-is the first key you have put in it). Then switch to the PuTTYgen
-window, select all of the text in the \q{Public key for pasting into
-authorized_keys file} box (see \k{puttygen-pastekey}), and copy it
-to the clipboard (\c{Ctrl+C}). Then, switch back to the PuTTY window
-and insert the data into the open file, making sure it ends up all
-on one line. Save the file.
+with your favourite editor. (You may have to create this file if
+this is the first key you have put in it). Then switch to the
+PuTTYgen window, select all of the text in the \q{Public key for
+pasting into authorized_keys file} box (see \k{puttygen-pastekey}),
+and copy it to the clipboard (\c{Ctrl+C}). Then, switch back to the
+PuTTY window and insert the data into the open file, making sure it
+ends up all on one line. Save the file.
 
 \b If your server is OpenSSH and is using the SSH 2 protocol, you
 should follow the same instructions, except that in earlier versions