Rejig the Translation panel controls and documentation to remove the emphasis

on received data. Experiment and suggestion suggest that the character set
configuration applies equally to keystrokes sent to the server, or at least
that that's close enough to being true that we should document it as a first
approximation.

git-svn-id: http://svn.tartarus.org/sgt/putty@8209 cda61777-01e9-0310-a592-d414129be87e

diff --git a/config.c b/config.c
index 60d98360a8360dfb1ffaa749ceb6b27d87fdbba9..67a018fe51590165a8c8d820122f814be7f793ca 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1577,8 +1577,8 @@ void setup_config_box(struct controlbox *b, int midsession,
                  "Options controlling character set translation");
 
     s = ctrl_getset(b, "Window/Translation", "trans",
-                   "Character set translation on received data");
-    ctrl_combobox(s, "Received data assumed to be in which character set:",
+                   "Character set translation");
+    ctrl_combobox(s, "Remote character set:",
                  'r', 100, HELPCTX(translation_codepage),
                  codepage_handler, P(NULL), P(NULL));
 

diff --git a/doc/config.but b/doc/config.but
index 1209678d81a81f9cfe03486243197ba4a05036c9..750f188c5ee3e097ed999c10c4a0ddd4d55fa74f 100644 (file)
--- a/doc/config.but
+++ b/doc/config.but
@@ -1240,13 +1240,17 @@ the character set understood by PuTTY.
 
 During an interactive session, PuTTY receives a stream of 8-bit
 bytes from the server, and in order to display them on the screen it
-needs to know what character set to interpret them in.
-
-There are a lot of character sets to choose from. The \q{Received
-data assumed to be in which character set} option lets you select
-one. By default PuTTY will attempt to choose a character set that is
-right for your \i{locale} as reported by Windows; if it gets it wrong,
-you can select a different one using this control.
+needs to know what character set to interpret them in. Similarly,
+PuTTY needs to know how to translate your keystrokes into the encoding
+the server expects. Unfortunately, there is no satisfactory
+mechanism for PuTTY and the server to communicate this information,
+so it must usually be manually configured.
+
+There are a lot of character sets to choose from. The \q{Remote
+character set} option lets you select one. By default PuTTY will
+attempt to choose a character set that is right for your \i{locale} as
+reported by Windows; if it gets it wrong, you can select a different
+one using this control.
 
 A few notable character sets are:
 
@@ -1263,9 +1267,10 @@ Euro symbol.
 line-drawing characters, you can select \q{\i{CP437}}.
 
 \b PuTTY also supports \i{Unicode} mode, in which the data coming from
-the server is interpreted as being in the \i{UTF-8} encoding of Unicode.
-If you select \q{UTF-8} as a character set you can use this mode.
-Not all server-side applications will support it.
+the server is interpreted as being in the \i{UTF-8} encoding of Unicode,
+and keystrokes are sent UTF-8 encoded. If you select \q{UTF-8} as a
+character set you can use this mode. Not all server-side applications
+will support it.
 
 If you need support for a numeric \i{code page} which is not listed in
 the drop-down list, such as code page 866, then you can try entering