New FAQ entry for 32-bit vs 64-bit.

diff --git a/doc/config.but b/doc/config.but
index e36f0bfc96222726bb1278c2cb352d1a4a6ec4fa..04c9cd7065d64294f8d71bed88899d75d03fc375 100644 (file)
--- a/doc/config.but
+++ b/doc/config.but
@@ -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.
 
 \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.
 \H{config-ssh-tty} The TTY panel
 
 The TTY panel lets you configure the remote pseudo-terminal.

diff --git a/doc/faq.but b/doc/faq.but
index d9db786414ea5400384b36c118a44c9706495cd4..6c41bd4affd792d50294c391df90345686f25e41 100644 (file)
--- a/doc/faq.but
+++ b/doc/faq.but
@@ -223,14 +223,9 @@ PuTTY runs on versions of Windows from Windows 95 onwards (but not
 the 16-bit Windows 3.1; see \k{faq-win31}),
 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 16-bit Windows 3.1; see \k{faq-win31}),
 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.
-\#{XXX-REVIEW-BEFORE-RELEASE: 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.}
+\#{XXX-REVIEW-BEFORE-RELEASE: 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.)
 
 (We used to also provide executables for Windows for the Alpha
 processor, but stopped after 0.58 due to lack of interest.)


@@ -588,6 +583,29 @@ of quotes in the obvious way:
 \c pscp "local file" user@host:
 \c pscp user@host:"remote file" .
 
 \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
+\#{XXX-REVIEW-BEFORE-RELEASE (first released in 0.XX)}
+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
 \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 b07f77c0aa185fe59ceef680301c2de92a07a78e..1e71234f772ea1b82b0d84d6e6137d56529499d4 100644 (file)
--- a/doc/index.but
+++ b/doc/index.but
@@ -861,6 +861,9 @@ saved sessions from
 
 \IM{SYSTEM32} \cw{SYSTEM32} directory, on Windows
 
 
 \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
 
 \IM{64-bit Windows} 64-bit Windows
 \IM{64-bit Windows} Windows, 64-bit