X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2e85c969d67eb14a07314802d4ac5dd63eef660b..2ac3322ef9bc032ad942753a56696764aa0b0f74:/doc/config.but?ds=sidebyside

diff --git a/doc/config.but b/doc/config.but
index 1d83ade2..e01eb2ac 100644
--- a/doc/config.but
+++ b/doc/config.but
@@ -1213,6 +1213,24 @@ its name manually (\c{CP866} for example) in the list box. If the
 underlying version of Windows has the appropriate translation table
 installed, PuTTY will use it.
 
+\S{config-cjk-ambig-wide} \q{Treat CJK ambiguous characters as wide}
+
+\cfg{winhelp-topic}{translation.cjkambigwide}
+
+There are \I{East Asian Ambiguous characters}some Unicode characters
+whose width is not well-defined. In most contexts, such characters
+should be treated as single-width for the purposes of wrapping and so
+on; however, in some CJK contexts, they are better treated as
+double-width for historical reasons, and some server-side applications
+may expect them to be displayed as such. Setting this option will
+cause PuTTY to take the double-width interpretation. 
+
+If you use legacy CJK applications, and you find your lines are
+wrapping in the wrong places, or you are having other display
+problems, you might want to play with this setting.
+
+This option only has any effect in UTF-8 mode (see \k{config-charset}).
+
 \S{config-cyr} \q{Caps Lock acts as Cyrillic switch}
 
 \cfg{winhelp-topic}{translation.cyrillic}
@@ -2391,8 +2409,8 @@ experimental feature, and may encounter several problems:
 \cw{XDM-AUTHORIZATION-1}, so they will not know what to do with the
 data PuTTY has provided.
 
-\b This authentication mechanism will only work in SSH-2. In SSH
-v1, the SSH server does not tell the client the source address of
+\b This authentication mechanism will only work in SSH-2. In SSH-1,
+the SSH server does not tell the client the source address of
 a forwarded connection in a machine-readable format, so it's
 impossible to verify the \cw{XDM-AUTHORIZATION-1} data.
 
@@ -2670,7 +2688,7 @@ to talking to OpenSSH.
 
 This is an SSH-2-specific bug.
 
-\S{config-ssh-bug-pksessid2} \q{Misuses the session ID in PK auth}
+\S{config-ssh-bug-pksessid2} \q{Misuses the session ID in SSH-2 PK auth}
 
 \cfg{winhelp-topic}{ssh.bugs.pksessid2}
 
@@ -2688,7 +2706,7 @@ SSH-2 public-key authentication will fail.
 
 This is an SSH-2-specific bug.
 
-\S{config-ssh-bug-rekey} \q{Handles key re-exchange badly}
+\S{config-ssh-bug-rekey} \q{Handles SSH-2 key re-exchange badly}
 
 \cfg{winhelp-topic}{ssh.bugs.rekey2}