From 33f4c8303f78f0c6035779f731d6a668b01b8c16 Mon Sep 17 00:00:00 2001 From: Jacob Nevins Date: Sat, 11 Feb 2017 23:30:52 +0000 Subject: [PATCH] Document proxy logging control. (This was added in 7c65b9c57.) --- config.c | 2 +- doc/config.but | 19 +++++++++++++++++++ doc/index.but | 5 +++++ windows/winhelp.h | 1 + 4 files changed, 26 insertions(+), 1 deletion(-) diff --git a/config.c b/config.c index ceeab877..59d01e74 100644 --- 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 7c42175c..e36f0bfc 100644 --- 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 756312d5..b07f77c0 100644 --- 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 65fc0362..761c8c76 100644 --- 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" -- 2.45.2