Final fixes to keyboard-interactive so it now works with packets

[sgt/putty] / doc / config.but

diff --git a/doc/config.but b/doc/config.but
index 49f1061..397a594 100644 (file)
--- a/doc/config.but
+++ b/doc/config.but
@@ -1,4 +1,4 @@
-\versionid $Id: config.but,v 1.33 2002/05/22 21:18:06 jacob Exp $
+\versionid $Id: config.but,v 1.35 2002/08/07 19:20:06 simon Exp $

 
 \C{config} Configuring PuTTY
 
 
 \C{config} Configuring PuTTY
 


@@ -569,9 +569,9 @@ an accented character. The choices of character are designed to be
 easy to remember; for example, composing \q{e} and \q{`} produces
 the \q{\u00e8{e-grave}} character.
 
 easy to remember; for example, composing \q{e} and \q{`} produces
 the \q{\u00e8{e-grave}} character.
 

-If you enable the \q{Application and AltGr act as Compose key}
-option, the Windows Application key and the AltGr key will both have
-this behaviour.
+If your keyboard has a Windows Application key, it acts as a Compose
+key in PuTTY. Alternatively, if you enable the \q{AltGr acts as
+Compose key} option, the AltGr key will become a Compose key.

 
 \S{config-ctrlalt} \q{Control-Alt is different from AltGr}
 
 
 \S{config-ctrlalt} \q{Control-Alt is different from AltGr}
 


@@ -592,6 +592,10 @@ If you uncheck this box, Ctrl-Alt will become a synonym for AltGr,
 so you can use it to type extra graphic characters if your keyboard
 has any.
 
 so you can use it to type extra graphic characters if your keyboard
 has any.
 

+(However, Ctrl-Alt will never act as a Compose key, regardless of the
+setting of \q{AltGr acts as Compose key} described in
+\k{config-compose}.)
+

 \H{config-bell} The Bell panel
 
 The Bell panel controls the terminal bell feature: the server's
 \H{config-bell} The Bell panel
 
 The Bell panel controls the terminal bell feature: the server's


@@ -1656,8 +1660,9 @@ version 1 or version 2. \#{FIXME: say something about this elsewhere?}
 PuTTY will attempt to use protocol 1 if the server you connect to
 does not offer protocol 2, and vice versa.
 
 PuTTY will attempt to use protocol 1 if the server you connect to
 does not offer protocol 2, and vice versa.
 

-If you select \q{2 only} here, PuTTY will only connect if the server
-you connect to offers SSH protocol version 2.
+If you select \q{1 only} or \q{2 only} here, PuTTY will only connect
+if the server you connect to offers the SSH protocol version you
+have specified.

 
 \S{config-ssh-macbug} \q{Imitate SSH 2 MAC bug}
 
 
 \S{config-ssh-macbug} \q{Imitate SSH 2 MAC bug}