New enum constant ERROR clashed with a macro in MinGW's wingdi.h.

[sgt/putty] / doc / errors.but

diff --git a/doc/errors.but b/doc/errors.but
index b3898ca..771c7ec 100644 (file)
--- a/doc/errors.but
+++ b/doc/errors.but
@@ -15,6 +15,8 @@ bug (see \k{feedback}) and we will add documentation for it.
 \H{errors-hostkey-absent} \q{The server's host key is not cached in
 the registry}
 
 \H{errors-hostkey-absent} \q{The server's host key is not cached in
 the registry}
 

+\cfg{winhelp-topic}{errors.hostkey.absent}
+

 This error message occurs when PuTTY connects to a new SSH server.
 Every server identifies itself by means of a host key; once PuTTY
 knows the host key for a server, it will be able to detect if a
 This error message occurs when PuTTY connects to a new SSH server.
 Every server identifies itself by means of a host key; once PuTTY
 knows the host key for a server, it will be able to detect if a


@@ -36,6 +38,8 @@ See \k{gs-hostkey} for more information on host keys.
 
 \H{errors-hostkey-wrong} \q{WARNING - POTENTIAL SECURITY BREACH!}
 
 
 \H{errors-hostkey-wrong} \q{WARNING - POTENTIAL SECURITY BREACH!}
 

+\cfg{winhelp-topic}{errors.hostkey.changed}
+

 This message, followed by \q{The server's host key does not match
 the one PuTTY has cached in the registry}, means that PuTTY has
 connected to the SSH server before, knows what its host key
 This message, followed by \q{The server's host key does not match
 the one PuTTY has cached in the registry}, means that PuTTY has
 connected to the SSH server before, knows what its host key


@@ -69,7 +73,8 @@ this, let us know and we'll move it up our priority list.
 ... below the configured warning threshold}
 
 This occurs when the SSH server does not offer any ciphers which you
 ... below the configured warning threshold}
 
 This occurs when the SSH server does not offer any ciphers which you

-have configured PuTTY to consider strong enough.
+have configured PuTTY to consider strong enough. By default, PuTTY
+puts up this warning only for single-DES encryption.

 
 See \k{config-ssh-encryption} for more information on this message.
 
 
 See \k{config-ssh-encryption} for more information on this message.
 


@@ -247,7 +252,7 @@ of \c{su} do it automatically.
 abort}
 
 This is a generic error produced by the Windows network code when it
 abort}
 
 This is a generic error produced by the Windows network code when it

-decides that your network connection is dead. For example, it might
+kills an established connection for some reason. For example, it might

 happen if you pull the network cable out of the back of an
 Ethernet-connected computer, or if Windows has any other similar
 reason to believe the entire network has become unreachable.
 happen if you pull the network cable out of the back of an
 Ethernet-connected computer, or if Windows has any other similar
 reason to believe the entire network has become unreachable.


@@ -272,6 +277,10 @@ connection out. See \k{faq-idleout} in the FAQ for more details. You
 may be able to improve the situation by using keepalives; see
 \k{config-keepalive} for details on this.
 
 may be able to improve the situation by using keepalives; see
 \k{config-keepalive} for details on this.
 

+Note that Windows can produce this error in some circumstances without
+seeing a connection reset from the server, for instance if the
+connection to the network is lost.
+

 \H{errors-connrefused} \q{Network error: Connection refused}
 
 This error means that the network connection PuTTY tried to make to
 \H{errors-connrefused} \q{Network error: Connection refused}
 
 This error means that the network connection PuTTY tried to make to