Merge branch 'pre-0.64'

[PuTTY.git] / doc / config.but

diff --git a/doc/config.but b/doc/config.but
index 360b502ba96c2a759ebcdba205fd86f349754db1..0f8175f2bcec550dc44e43e8172d8cee2a8d47b9 100644 (file)
--- a/doc/config.but
+++ b/doc/config.but
@@ -2514,12 +2514,10 @@ The text describing a host key can be in one of the following formats:
 Event Log and host key dialog boxes, i.e. sixteen 2-digit hex numbers
 separated by colons.
 
 Event Log and host key dialog boxes, i.e. sixteen 2-digit hex numbers
 separated by colons.
 

-\b A base64-encoded blob describing an SSH-2 public key in the
-standard way. This can be found in OpenSSH's one-line public key
-format, or by concatenating all the lines of the public key section in
-one of PuTTY's \cw{.ppk} files. Alternatively, you can load a key into
-PuTTYgen, and paste out the OpenSSH-format public key line it
-displays.
+\b A base64-encoded blob describing an SSH-2 public key in
+OpenSSH's one-line public key format. How you acquire a public key in
+this format is server-dependent; on an OpenSSH server it can typically
+be found in a location like \c{/etc/ssh/ssh_host_rsa_key.pub}.

 
 If this box contains at least one host key or fingerprint when PuTTY
 makes an SSH connection, then PuTTY's automated host key management is
 
 If this box contains at least one host key or fingerprint when PuTTY
 makes an SSH connection, then PuTTY's automated host key management is


@@ -3029,7 +3027,9 @@ needed with \q{Dynamic}), enter a hostname and port number separated
 by a colon, in the \q{Destination} box. Connections received on the
 source port will be directed to this destination. For example, to
 connect to a POP-3 server, you might enter
 by a colon, in the \q{Destination} box. Connections received on the
 source port will be directed to this destination. For example, to
 connect to a POP-3 server, you might enter

-\c{popserver.example.com:110}.
+\c{popserver.example.com:110}. (If you need to enter a literal
+\i{IPv6 address}, enclose it in square brackets, for instance
+\cq{[::1]:2200}.)

 
 \b Click the \q{Add} button. Your forwarding details should appear
 in the list box.
 
 \b Click the \q{Add} button. Your forwarding details should appear
 in the list box.