merge upstream 0.69 tag

https://git.tartarus.org/?p=simon/putty.git;a=commit;h=b1829b81b5c0d12dcc91f6b50b0b4d83c3df6a8e

5 files changed, 64 insertions, 41 deletions

diff --git a/DOC/CONFIG.BUT b/DOC/CONFIG.BUT
index e36f0bfc..269dbdc1 100644
--- a/DOC/CONFIG.BUT
+++ b/DOC/CONFIG.BUT
@@ -2507,7 +2507,7 @@ used:
 
 Disabling data-based rekeys entirely is a bad idea.  The \i{integrity},
 and to a lesser extent, \i{confidentiality} of the SSH-2 protocol depend
-in part on rekeys occuring before a 32-bit packet sequence number
+in part on rekeys occurring before a 32-bit packet sequence number
 wraps around.  Unlike time-based rekeys, data-based rekeys won't occur
 when the SSH connection is idle, so they shouldn't cause the same
 problems.  The SSH-1 protocol, incidentally, has even weaker integrity
@@ -2898,6 +2898,13 @@ the \q{User-supplied GSSAPI library path} field, and move the
 \q{User-supplied GSSAPI library} option in the preference list to
 make sure it is selected before anything else.
 
+On Windows, such libraries are files with a \I{DLL}\cw{.dll}
+extension, and must have been built in the same way as the PuTTY
+executable you're running; if you have a 32-bit DLL, you must run a
+32-bit version of PuTTY, and the same with 64-bit (see
+\k{faq-32bit-64bit}). On Unix, shared libraries generally have a
+\cw{.so} extension.
+
 \H{config-ssh-tty} The TTY panel
 
 The TTY panel lets you configure the remote pseudo-terminal.
@@ -2927,24 +2934,17 @@ the remote pseudo-terminal. These usually control the server's
 expectation of the local terminal's behaviour.
 
 If your server does not have sensible defaults for these modes, you
-may find that changing them here helps. If you don't understand any of
-this, it's safe to leave these settings alone.
+may find that changing them here helps, although the server is at
+liberty to ignore your changes. If you don't understand any of this,
+it's safe to leave these settings alone.
 
 (None of these settings will have any effect if no pseudo-terminal
 is requested or allocated.)
 
-You can add or modify a mode by selecting it from the drop-down list,
-choosing whether it's set automatically or to a specific value with
-the radio buttons and edit box, and hitting \q{Add}. A mode (or
-several) can be removed from the list by selecting them and hitting
-\q{Remove}. The effect of the mode list is as follows:
-
-\b If a mode is not on the list, it will not be specified to the
-server under any circumstances.
-
-\b If a mode is on the list:
-
-\lcont{
+You can change what happens for a particular mode by selecting it in
+the list, choosing one of the options and specifying the exact value
+if necessary, and hitting \q{Set}. The effect of the options is as
+follows:
 
 \b If the \q{Auto} option is selected, the PuTTY tools will decide
 whether to specify that mode to the server, and if so, will send
@@ -2959,12 +2959,13 @@ modes from the local terminal, if any.
 
 }
 
+\b If \q{Nothing} is selected, no value for the mode will not be
+specified to the server under any circumstances.
+
 \b If a value is specified, it will be sent to the server under all
 circumstances. The precise syntax of the value box depends on the
 mode.
 
-}
-
 By default, all of the available modes are listed as \q{Auto},
 which should do the right thing in most circumstances.
 
@@ -3001,18 +3002,22 @@ character or turn it off entirely.
 
 \b Boolean modes such as \cw{ECHO} and \cw{ICANON} can be specified in
 PuTTY in a variety of ways, such as \cw{true}/\cw{false},
-\cw{yes}/\cw{no}, and \cw{0}/\cw{1}.
+\cw{yes}/\cw{no}, and \cw{0}/\cw{1}. (Explicitly specifying a value of
+\cw{no} is different from not sending the mode at all.)
 
 \b The boolean mode \I{IUTF8 terminal mode}\cw{IUTF8} signals to the
 server whether the terminal character set is \i{UTF-8} or not.
-If this is set incorrectly, actions like backspace may behave
-incorrectly in some circumstances. However, setting this is not usually
+If this is set incorrectly, keys like backspace may do the wrong thing
+in some circumstances. However, setting this is not usually
 sufficient to cause servers to expect the terminal to be in UTF-8 mode;
 POSIX servers will generally require the locale to be set (by some
 server-dependent means), although many default to UTF-8. Also,
-\#{circa 2016} many servers (particularly older servers) do not honour
-this mode sent over SSH. When set to \q{Auto}, this follows the
-local configured character set (see \k{config-charset}).
+since this mode was added to the SSH protocol much later than the
+others, \#{circa 2016} many servers (particularly older servers) do
+not honour this mode sent over SSH; indeed, a few poorly-written
+servers object to its mere presence, so you may find you need to set
+it to not be sent at all. When set to \q{Auto}, this follows the local
+configured character set (see \k{config-charset}).
 
 \b Terminal speeds are configured elsewhere; see \k{config-termspeed}.
 
diff --git a/DOC/FAQ.BUT b/DOC/FAQ.BUT
index ba0d5321..42f965b2 100644
--- a/DOC/FAQ.BUT
+++ b/DOC/FAQ.BUT
@@ -215,17 +215,12 @@ seems to be working so far.
 Currently, release versions of PuTTY tools only run on Windows
 systems and Unix.
 
-As of 0.68, the supplied PuTTY executables run on versions of
-Windows from XP onwards, up to and including Windows 10; and we
-know of no reason why PuTTY should not continue to work on
-future versions of Windows.
-
-The 32-bit Windows executables we provide for the \q{\i{x86}}
-processor architecture should also work fine on 64-bit processors
-that are backward-compatible with that architecture. The 64-bit
-executables will only work on 64-bit versions of Windows. They
-will run somewhat faster than 32-bit executables would on the
-same processor, but will consume slightly more memory.
+As of 0.68, the supplied PuTTY executables run on versions of Windows
+from XP onwards, up to and including Windows 10; and we know of no
+reason why PuTTY should not continue to work on future versions of
+Windows. We provide 32-bit and 64-bit Windows executables; see
+\k{faq-32bit-64bit} for discussion of the compatibility issues around
+that.
 
 (We used to also provide executables for Windows for the Alpha
 processor, but stopped after 0.58 due to lack of interest.)
@@ -283,13 +278,10 @@ expect our Unix port to be the right thing for everybody.
 
 \S{faq-wince}{Question} Will there be a port to Windows CE or PocketPC?
 
-We have done some work on such a port, but it only reached an early
+We once did some work on such a port, but it only reached an early
 stage, and certainly not a useful one. It's no longer being actively
 worked on.
 
-However, there's a third-party port at
-\W{http://www.pocketputty.net/}\c{http://www.pocketputty.net/}.
-
 \S{faq-win31}{Question} Is there a port to \i{Windows 3.1}?
 
 PuTTY is a 32-bit application from the ground up, so it won't run on
@@ -424,7 +416,8 @@ put your chosen pathname in the Registry, at
 
 You can ask PuTTY to delete all this data; see \k{faq-cleanup}.
 
-On Unix, PuTTY stores all of this data in a directory \cw{~/.putty}.
+On Unix, PuTTY stores all of this data in a directory \cw{~/.putty}
+by default.
 
 \H{faq-howto} HOWTO questions
 
@@ -584,6 +577,28 @@ of quotes in the obvious way:
 \c pscp "local file" user@host:
 \c pscp user@host:"remote file" .
 
+\S{faq-32bit-64bit}{Question} Should I run the 32-bit or the
+64-bit version?
+
+If you're not sure, the \I{32-bit Windows}32-bit version is generally
+the safe option. It will run perfectly well on all processors and on
+all versions of Windows that PuTTY supports. PuTTY doesn't require to
+run as a 64-bit application to work well, and having a 32-bit PuTTY on
+a 64-bit system isn't likely to cause you any trouble.
+
+The 64-bit version (first released in 0.68) will only run if you have
+a 64-bit processor \e{and} a \I{64-bit Windows}64-bit edition of
+Windows (both of these things are likely to be true of any recent
+Windows PC). It will run somewhat faster (in particular, the
+cryptography will be faster, especially during link setup), but it
+will consume slightly more memory.
+
+If you need to use an external \i{DLL} for GSSAPI authentication, that
+DLL may only be available in a 32-bit or 64-bit form, and that will
+dictate the version of PuTTY you need to use. (You will probably know
+if you're doing this; see \k{config-ssh-auth-gssapi-libraries} in the
+documentation.)
+
 \H{faq-trouble} Troubleshooting
 
 \S{faq-incorrect-mac}{Question} Why do I see \q{Incorrect MAC
diff --git a/DOC/INDEX.BUT b/DOC/INDEX.BUT
index b07f77c0..1e71234f 100644
--- a/DOC/INDEX.BUT
+++ b/DOC/INDEX.BUT
@@ -861,6 +861,9 @@ saved sessions from
 
 \IM{SYSTEM32} \cw{SYSTEM32} directory, on Windows
 
+\IM{32-bit Windows} 32-bit Windows
+\IM{32-bit Windows} Windows, 32-bit
+\IM{32-bit Windows} x86 (32-bit processor architecture)
 \IM{64-bit Windows} 64-bit Windows
 \IM{64-bit Windows} Windows, 64-bit
 
diff --git a/DOC/PLINK.BUT b/DOC/PLINK.BUT
index 351e13ea..153982e0 100644
--- a/DOC/PLINK.BUT
+++ b/DOC/PLINK.BUT
@@ -41,7 +41,7 @@ use Plink:
 
 \c Z:\sysosd>plink
 \c Plink: command-line connection utility
-\c Release 0.68
+\c Release 0.69
 \c Usage: plink [options] [user@]host [command]
 \c        ("host" can also be a PuTTY saved session name)
 \c Options:
diff --git a/DOC/PSCP.BUT b/DOC/PSCP.BUT
index 27643a46..30a47f83 100644
--- a/DOC/PSCP.BUT
+++ b/DOC/PSCP.BUT
@@ -39,7 +39,7 @@ use PSCP:
 
 \c Z:\owendadmin>pscp
 \c PuTTY Secure Copy client
-\c Release 0.68
+\c Release 0.69
 \c Usage: pscp [options] [user@]host:source target
 \c        pscp [options] source [source...] [user@]host:target
 \c        pscp [options] -ls [user@]host:filespec