Document proxy logging control.

(This was added in 7c65b9c57.)

diff --git a/config.c b/config.c
index ceeab8771338c93ab7cf864e80a8e097adeddb19..59d01e7479cded42d6e0384b7f1bac8b6c306d85 100644 (file)
--- a/config.c
+++ b/config.c
@@ -2122,7 +2122,7 @@ void setup_config_box(struct controlbox *b, int midsession,
 
        ctrl_radiobuttons(s, "Print proxy diagnostics "
                           "in the terminal window", 'r', 5,
-                         HELPCTX(proxy_main),
+                         HELPCTX(proxy_logging),
                          conf_radiobutton_handler,
                          I(CONF_proxy_log_to_term),
                          "No", I(FORCE_OFF),

diff --git a/doc/config.but b/doc/config.but
index 7c42175c2e51b7d65d3312de8de0344264e70a3b..e36f0bfc96222726bb1278c2cb352d1a4a6ec4fa 100644 (file)
--- a/doc/config.but
+++ b/doc/config.but
@@ -2103,6 +2103,25 @@ port. Note that if you do not include the \c{%user} or \c{%pass}
 tokens in the Telnet command, then the \q{Username} and \q{Password}
 configuration fields will be ignored.
 
+\S{config-proxy-logging} Controlling \i{proxy logging}
+
+\cfg{winhelp-topic}{proxy.logging}
+
+Often the proxy interaction has its own diagnostic output; this is
+particularly the case for local proxy commands.
+
+The setting \q{Print proxy diagnostics in the terminal window} lets
+you control how much of the proxy's diagnostics are printed to the main
+terminal window, along with output from your main session.
+
+By default (\q{No}), proxy diagnostics are only sent to the Event Log;
+with \q{Yes} they are also printed to the terminal, where they may get
+mixed up with your main session. \q{Only until session starts} is a
+compromise; proxy messages will go to the terminal window until the main
+session is deemed to have started (in a protocol-dependent way), which
+is when they're most likely to be interesting; any further proxy-related
+messages during the session will only go to the Event Log.
+
 \H{config-telnet} The \i{Telnet} panel
 
 The Telnet panel allows you to configure options that only apply to

diff --git a/doc/index.but b/doc/index.but
index 756312d515470f47815536695fa82c2a0853f3cc..b07f77c0aa185fe59ceef680301c2de92a07a78e 100644 (file)
--- a/doc/index.but
+++ b/doc/index.but
@@ -867,3 +867,8 @@ saved sessions from
 \IM{Windows process ACL} Windows process ACL
 \IM{Windows process ACL} process ACL (Windows)
 \IM{Windows process ACL} ACL, process (Windows)
+
+\IM{proxy logging} proxy logging
+\IM{proxy logging} logging, proxy
+\IM{proxy logging} diagnostic, proxy
+\IM{proxy logging} standard error, proxy

diff --git a/windows/winhelp.h b/windows/winhelp.h
index 65fc03624e08a82b5ec27a04228a7506b5670986..761c8c76ad2dafabe54ece28e1a34e3a65ff4865 100644 (file)
--- a/windows/winhelp.h
+++ b/windows/winhelp.h
@@ -87,6 +87,7 @@
 #define WINHELP_CTX_proxy_dns "proxy.dns:config-proxy-dns"
 #define WINHELP_CTX_proxy_auth "proxy.auth:config-proxy-auth"
 #define WINHELP_CTX_proxy_command "proxy.command:config-proxy-command"
+#define WINHELP_CTX_proxy_logging "proxy.logging:config-proxy-logging"
 #define WINHELP_CTX_telnet_environ "telnet.environ:config-environ"
 #define WINHELP_CTX_telnet_oldenviron "telnet.oldenviron:config-oldenviron"
 #define WINHELP_CTX_telnet_passive "telnet.passive:config-ptelnet"