From 9eebe001d9809be34561025cf149124396fccdb0 Mon Sep 17 00:00:00 2001 From: Cory Knox Date: Fri, 23 Feb 2024 16:09:35 -0800 Subject: [PATCH] (#954) Clarify Proxy Bypass Settings Clarify that Chocolatey treats the proxy bypass settings as a comma separated list of regular expressions. --- input/en-us/configuration.md | 2 +- input/en-us/guides/usage/proxy-settings-for-chocolatey.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/input/en-us/configuration.md b/input/en-us/configuration.md index 42ffa63ab1b..f46081c16af 100644 --- a/input/en-us/configuration.md +++ b/input/en-us/configuration.md @@ -29,7 +29,7 @@ Config settings are adjusted using `choco config set --name="''" * `proxy` = **' '** - Explicit proxy location. * `proxyUser` = **' '** - Optional proxy user. * `proxyPassword` = **' '** - Optional proxy password. Encrypted. -* `proxyBypassList` = **' '** - Optional proxy bypass list. Comma separated. +* `proxyBypassList` = **' '** - Optional regex proxy bypass list. Comma separated. * `proxyBypassOnLocal` = **'true'** - Bypass proxy for local connections. ### Timeouts diff --git a/input/en-us/guides/usage/proxy-settings-for-chocolatey.md b/input/en-us/guides/usage/proxy-settings-for-chocolatey.md index 7dd658757d1..d8f41349b7f 100644 --- a/input/en-us/guides/usage/proxy-settings-for-chocolatey.md +++ b/input/en-us/guides/usage/proxy-settings-for-chocolatey.md @@ -98,7 +98,7 @@ Chocolatey will automatically pick up the following environment variables if the * `http_proxy`. * `https_proxy`. -* `no_proxy`. +* `no_proxy` - Chocolatey will treat this as a comma separated list of regex values. ## Explicit Proxy Settings @@ -110,7 +110,7 @@ You can simply configure up to 5 settings and Chocolatey will use a proxy server choco config set --name="'proxy'" --value="''" choco config set --name="'proxyUser'" --value="''" #optional choco config set --name="'proxyPassword'" --value="''" # optional, will be encrypted in the configuration file -choco config set --name="'proxyBypassList'" --value="''" # optional +choco config set --name="'proxyBypassList'" --value="''" # optional choco config set --name="'proxyBypassOnLocal'" --value="'true'" # optional ~~~~ @@ -134,7 +134,7 @@ Results in the following items being added to the config file: You can pass proxy information at runtime with each command. See https://github.com/chocolatey/choco/issues/1173 -`--proxy="'value'" --proxy-user="''" --proxy-password="''" --proxy-bypass-list="''" --proxy-bypass-on-local` +`--proxy="'value'" --proxy-user="''" --proxy-password="''" --proxy-bypass-list="''" --proxy-bypass-on-local` ## What to do if My Proxy is Socks?