Document telnet_keyboard more completely, cross-reference from "Special

Commands" section, and tweak option description in code.

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

diff --git a/config.c b/config.c
index d3d76f5..146fb58 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1428,12 +1428,12 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
                              I(offsetof(Config, passive_telnet)),
                              "Passive", I(1), "Active", I(0), NULL);
        }
-       ctrl_checkbox(s, "Keyboard sends telnet Backspace and Interrupt", 'k',
+       ctrl_checkbox(s, "Keyboard sends Telnet special commands", 'k',
                      HELPCTX(telnet_specialkeys),
                      dlg_stdcheckbox_handler,
                      I(offsetof(Config,telnet_keyboard)));
-       ctrl_checkbox(s, "Return key sends telnet New Line instead of ^M",
-                     NO_SHORTCUT, HELPCTX(telnet_newline),
+       ctrl_checkbox(s, "Return key sends Telnet New Line instead of ^M",
+                     'm', HELPCTX(telnet_newline),
                      dlg_stdcheckbox_handler,
                      I(offsetof(Config,telnet_newline)));
     }

diff --git a/doc/config.but b/doc/config.but
index 9216b84..2556a38 100644 (file)
--- a/doc/config.but
+++ b/doc/config.but
@@ -1,4 +1,4 @@
-\versionid $Id: config.but,v 1.89 2004/09/17 14:26:39 jacob Exp $
+\versionid $Id: config.but,v 1.90 2004/09/22 22:15:25 jacob Exp $
 
 \C{config} Configuring PuTTY
 
@@ -1795,16 +1795,26 @@ get through certain types of firewall and Telnet proxy server. If
 you have confusing trouble with a firewall, you could try enabling
 passive mode to see if it helps.
 
-\S{config-telnetkey} \q{Keyboard sends telnet Backspace and Interrupt}
+\S{config-telnetkey} \q{Keyboard sends Telnet special commands}
 
 \cfg{winhelp-topic}{telnet.specialkeys}
 
-If this box is checked, the Backspace key on the keyboard will send
-the Telnet special backspace code, and Control-C will send the
-Telnet special interrupt code. You probably shouldn't enable this
+If this box is checked, several key sequences will have their normal
+actions modified:
+
+\b the Backspace key on the keyboard will send the \I{Erase Character,
+Telnet special command}Telnet special backspace code;
+
+\b Control-C will send the Telnet special \I{Interrupt Process, Telnet
+special command}Interrupt Process code;
+
+\b Control-Z will send the Telnet special \I{Suspend Process, Telnet
+special command}Suspend Process code.
+
+You probably shouldn't enable this
 unless you know what you're doing.
 
-\S{config-telnetnl} \q{Return key sends telnet New Line instead of ^M}
+\S{config-telnetnl} \q{Return key sends Telnet New Line instead of ^M}
 
 \cfg{winhelp-topic}{telnet.newline}
 

diff --git a/doc/using.but b/doc/using.but
index 0c34d97..240f7ce 100644 (file)
--- a/doc/using.but
+++ b/doc/using.but
@@ -1,4 +1,4 @@
-\versionid $Id: using.but,v 1.31 2004/09/20 22:10:09 jacob Exp $
+\versionid $Id: using.but,v 1.32 2004/09/22 22:15:25 jacob Exp $
 
 \C{using} Using PuTTY
 
@@ -136,6 +136,11 @@ The following special commands are available in Telnet:
 
 \b \I{Erase Character, Telnet special command}Erase Character
 
+\lcont{
+PuTTY can also be configured to send this when the Backspace key is
+pressed; see \k{config-telnetkey}.
+}
+
 \b \I{Erase Line, Telnet special command}Erase Line
 
 \b \I{Go Ahead, Telnet special command}Go Ahead
@@ -152,8 +157,18 @@ Should have no effect.
 
 \b \I{Interrupt Process, Telnet special command}Interrupt Process
 
+\lcont{
+PuTTY can also be configured to send this when Ctrl-C is typed; see
+\k{config-telnetkey}.
+}
+
 \b \I{Suspend Process, Telnet special command}Suspend Process
 
+\lcont{
+PuTTY can also be configured to send this when Ctrl-Z is typed; see
+\k{config-telnetkey}.
+}
+
 \b \I{End Of Record, Telnet special command}End Of Record
 
 \b \I{End Of File, Telnet special command}End Of File