From c1b7e84f7a711f36450fd4e59595786780b5bef1 Mon Sep 17 00:00:00 2001 From: SeverAnna Date: Wed, 9 Aug 2023 15:36:30 +0300 Subject: [PATCH 1/3] update big-sur-issues.md --- docs/adguard-for-mac/solving-problems/big-sur-issues.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-mac/solving-problems/big-sur-issues.md b/docs/adguard-for-mac/solving-problems/big-sur-issues.md index ae273aa92cc..16d6118bc8d 100644 --- a/docs/adguard-for-mac/solving-problems/big-sur-issues.md +++ b/docs/adguard-for-mac/solving-problems/big-sur-issues.md @@ -151,7 +151,7 @@ In Big Sur v11.1+, there are no known conflicts between AdGuard and Surge proxy. ![Configuring an upstream Surge proxy *border](https://cdn.adtidy.org/content/kb/ad_blocker/mac/surge.jpg) -Now go to *AdGuard menu → Advanced → Advanced Settings...* and set the *Value* area of the `upstream.proxy` setting to `socks5://localhost:6153` or `http://localhost:6152`, depending on which type of proxy you want to use. Notice that you need to use **port** value that's indicated in the **Events** area of the **Activity** tab in your Surge client. +Now go to *Preferences → Network → Outbound proxy* and set the *Value* area of the `upstream.proxy` setting to `socks5://localhost:6153` or `http://localhost:6152`, depending on which type of proxy you want to use. Notice that you need to use **port** value that's indicated in the **Events** area of the **Activity** tab in your Surge client. If you chose SOCKS5 protocol, you also need to set the value of the `upstream.proxy.socks5udp` setting in AdGuard Advanced Settings to `true` to make AdGuard route UDP traffic to the proxy server. From b8a0dbac25fcad1dee78f0b4d8f5c7138a02ba06 Mon Sep 17 00:00:00 2001 From: Helen Date: Thu, 10 Aug 2023 18:46:39 +0300 Subject: [PATCH 2/3] update instructions --- .../solving-problems/big-sur-issues.md | 38 ++++++++----------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/docs/adguard-for-mac/solving-problems/big-sur-issues.md b/docs/adguard-for-mac/solving-problems/big-sur-issues.md index 16d6118bc8d..fd037ffff20 100644 --- a/docs/adguard-for-mac/solving-problems/big-sur-issues.md +++ b/docs/adguard-for-mac/solving-problems/big-sur-issues.md @@ -92,25 +92,13 @@ Now AdGuard can filter local proxies (mostly) without any problems. If you encou ::: -To configure an upstream proxy in AdGuard for Mac in Big Sur, open AdGuard's settings *Preferences → Network → Outbound proxy*. Click the *Value* area of the `upstream.proxy` setting to configure a proxy. - -Enter a string that looks like `scheme://user:password@host:port`, where - -* `scheme` is either `http`, `https`, `socks4` or `socks5`, depending on your proxy type, - -If you use `socks5` proxy type, set the value of the `upstream.proxy.socks5udp` setting to `true` to make AdGuard route UDP traffic to the proxy server. - -* `user` and `password` are corresponding username and password of your proxy (if needed). Ignore either or both when not applicable, -* `host` is the IP address of your proxy server, -* `port` is the desired port number to be used by the proxy server. - -:::note Example - -`socks5://localhost:6322` will configure a SOCKS5 local proxy that listens to port 6322 and doesn't require a username or a password. - -::: - -Click *Apply* to make AdGuard route all traffic that went through it to the configured proxy server. +To configure an upstream proxy in AdGuard for Mac in Big Sur: +1. Open AdGuard's settings  *Preferences → Network → Outbound proxy*. +2. Choose HTTP, HTTPS, SOCKS4 or SOCKS5, depending on your proxy type. +3. Fill in the fields: + * `host` is the IP address of your proxy server, + * `port` is the desired port number to be used by the proxy server, + * `user` and `password` are corresponding username and password of your proxy (if needed). Ignore either or both when not applicable. If you run into any problems, please contact our tech support at support@adguard.com. @@ -149,11 +137,15 @@ Because Shadowsocks uses SOCKS5, you also need to set the value of the `upstream In Big Sur v11.1+, there are no known conflicts between AdGuard and Surge proxy. If you are using an older version of Big Sur (prior to 11.1), check that **System Proxy** in the bottom right corner is disabled. Otherwise, Surge won't work with AdGuard. On the other hand, **Enhanced Mode** can be enabled without causing a conflict in any Big Sur version. -![Configuring an upstream Surge proxy *border](https://cdn.adtidy.org/content/kb/ad_blocker/mac/surge.jpg) - -Now go to *Preferences → Network → Outbound proxy* and set the *Value* area of the `upstream.proxy` setting to `socks5://localhost:6153` or `http://localhost:6152`, depending on which type of proxy you want to use. Notice that you need to use **port** value that's indicated in the **Events** area of the **Activity** tab in your Surge client. +![Configuring an upstream Surge proxy *border](https://cdn.adtidy.org/content/kb/ad_blocker/mac/outbound-proxy.png) -If you chose SOCKS5 protocol, you also need to set the value of the `upstream.proxy.socks5udp` setting in AdGuard Advanced Settings to `true` to make AdGuard route UDP traffic to the proxy server. +Now go to *Preferences → Network → Outbound proxy* and fill in the fields. +For SOCKS5 proxy type: + * `host`: localhost + * `port`: 6153 +For HTTP proxy type: + * `host`: localhost + * `port`: 6152 ## Alternatives to using a Network Extension From 5d9a02772a8894dd4cd4cad92f4368dd2a7f00aa Mon Sep 17 00:00:00 2001 From: Helen <58733007+el-termikael@users.noreply.github.com> Date: Fri, 11 Aug 2023 14:13:45 +0300 Subject: [PATCH 3/3] fix markdownlint errors --- .../solving-problems/big-sur-issues.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/adguard-for-mac/solving-problems/big-sur-issues.md b/docs/adguard-for-mac/solving-problems/big-sur-issues.md index 7103628f7c2..e8128581756 100644 --- a/docs/adguard-for-mac/solving-problems/big-sur-issues.md +++ b/docs/adguard-for-mac/solving-problems/big-sur-issues.md @@ -92,12 +92,13 @@ Now AdGuard can filter local proxies (mostly) without any problems. If you encou ::: To configure an upstream proxy in AdGuard for Mac in Big Sur: + 1. Open AdGuard's settings  *Preferences → Network → Outbound proxy*. 2. Choose HTTP, HTTPS, SOCKS4 or SOCKS5, depending on your proxy type. 3. Fill in the fields: - * `host` is the IP address of your proxy server, - * `port` is the desired port number to be used by the proxy server, - * `user` and `password` are corresponding username and password of your proxy (if needed). Ignore either or both when not applicable. + - `host` is the IP address of your proxy server, + - `port` is the desired port number to be used by the proxy server, + - `user` and `password` are corresponding username and password of your proxy (if needed). Ignore either or both when not applicable. If you run into any problems, please contact our tech support at support@adguard.com. @@ -140,11 +141,12 @@ In Big Sur v11.1+, there are no known conflicts between AdGuard and Surge proxy. Now go to *Preferences → Network → Outbound proxy* and fill in the fields. For SOCKS5 proxy type: - * `host`: localhost - * `port`: 6153 + +- `host`: localhost +- `port`: 6153 For HTTP proxy type: - * `host`: localhost - * `port`: 6152 +- `host`: localhost +- `port`: 6152 ## Alternatives to using a Network Extension