Merge branch 'master' into outbound-proxy-md-fixes

docs/adguard-for-android/solving-problems/outbound-proxy.md

@@ -103,7 +103,7 @@ Now AdGuard will forward all traffic through Orbot. If you disable Orbot, Intern
 
 :::note
 
-You should remove Shadowsocks application from filtering before setting up the process (**Settings** → **Filtering** → **Apps** → **App management** → **Shadowsocks** → **Route traffic through AdGuard**) to avoid infinite loops and drops.
+You should remove Shadowsocks app from filtering before setting up the process (**App management** → **Shadowsocks** → **Route traffic through AdGuard**) to avoid infinite loops and drops.
 
 :::
 
@@ -125,9 +125,9 @@ You should remove Shadowsocks application from filtering before setting up the p
 
 *Here we presume that you are already a Clash client and have it installed on your device.*
 
-1. Open Clash and go to **Settings** → **Network** → **Route System Traffic**, then toggle the switch. This will set Clash to proxy mode.
+1. Open Clash and go to **Settings** → **Network** → **Route System Traffic** and toggle the switch. This will set Clash to proxy mode.
 2. Open AdGuard and go to **App management**. Choose **Clash For Android** and disable **Route traffic through AdGuard**. This will eliminate traffic looping.
-3. Then go to **Settings** → **Network** → **Proxy** → **Proxy server**. 
+3. Then go to **Settings** → **Filtering** → **Network** → **Proxy** → **Proxy server**. 
 4. Tap **Add proxy server** and fill in the fields:
 
     Field      |  Value

docs/adguard-for-windows/solving-problems/connection-not-trusted.md

@@ -51,6 +51,8 @@ If that doesn't help, follow the instructions for manually adding the AdGuard ce
 
 9) Check the *Trust this CA to identify websites* box and then lick *OK*.
 
+![Certificate settings — checkbox](https://cdn.adtidy.org/content/kb/ad_blocker/windows/solving-problems/cert_checkbox.jpg)
+
 You've successfully installed AdGuard certificate. Restart the browser and the error should go away.
 
 ## Yandex.Browser certificate warning

docs/general/ad-filtering/create-own-filters.md

@@ -1481,6 +1481,12 @@ This is basically a Firewall-like rule allowing to fully block or unblock access
 
 We recommend to get acquainted with this [article](#regexp-support) for better understanding of regular expressions.
 
+:::caution Restrictions
+
+The `$network` modifier can only be used in rules together with the `$app` and `$important` modifiers, and not with any other modifiers.
+
+:::
+
 **Examples**
 
 * `174.129.166.49:3478^$network` blocks access to `174.129.166.49:3478` (but not to `174.129.166.49:34788`).

docs/general/stealth-mode.md

@@ -21,9 +21,9 @@ Some options may not be available depending on the particular product due to OS
 
 When you get directed to a website from Google, Yahoo, or any other search engine, this option hides the search query that you used to find that website.
 
-### Send Do-Not-Track header {#donottrack}
+### Ask websites not to track you {#donottrack}
 
-It sends a Do-Not-Track (DNT) HTTP header to queried websites, thus requiring web apps to disable tracking of your activity.
+Sends the [Global Privacy Control](https://globalprivacycontrol.org/#gpc-spec) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) requests to the websites you visit.
 
 ### Strip tracking parameters from URLs
 

i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/solving-problems/outbound-proxy.md

@@ -103,13 +103,13 @@ Now AdGuard will forward all traffic through Orbot. If you disable Orbot, Intern
 
 :::note
 
-You should remove Shadowsocks application from filtering before setting up the process (**Settings** → **Filtering** → **Apps** → **App management** → **Shadowsocks** → **Route traffic through AdGuard**) to avoid infinite loops and drops.
+You should remove Shadowsocks app from filtering before setting up the process (**App management** → **Shadowsocks** → **Route traffic through AdGuard**) to avoid infinite loops and drops.
 
 :::
 
 1. Open AdGuard and go to **Settings** → **Filtering** → **Network** → **Proxy** → **Proxy server**.
 
-2. Tap the **Add proxy server** and fill the fields:
+2. Tap the **Add proxy server** and fill in the fields:
 
     | Field      | Value       |
     | ---------- | ----------- |
@@ -121,6 +121,21 @@ You should remove Shadowsocks application from filtering before setting up the p
 
 4. Enable the main Proxy switch and AdGuard protection to route your device's traffic through the proxy.
 
+### How to use AdGuard with Clash
+
+*Here we presume that you are already a Clash client and have it installed on your device.*
+
+1. Open Clash and go to **Settings** → **Network** → **Route System Traffic** and toggle the switch. This will set Clash to proxy mode.
+2. Open Adguard and go to **App management**. Choose **Clash For Android** and disable **Route traffic through AdGuard**. This will eliminate traffic looping.
+3. Then go to **Settings** → **Filtering** → **Network** → **Proxy** → **Proxy server**.
+4. Tap **Add proxy server** and fill in the fields:
+
+    | Field      | Value       |
+    | ---------- | ----------- |
+    | Proxy type | *SOCKS5*    |
+    | Proxy host | *127.0.0.1* |
+    | Proxy port | *7891*      |
+
 ## Limitations
 
 There is a factor that can prevent certain traffic from being routed through the outgoing proxy. AdGuard will only re-route traffic that goes through it. Basically, it means apps that have **Ad blocking** flag enabled in the **Apps Management** tab.

i18n/be/docusaurus-plugin-content-docs/current/adguard-for-windows/solving-problems/connection-not-trusted.md

@@ -49,6 +49,8 @@ If that doesn't help, follow the instructions for manually adding the AdGuard ce
 
 9) Check the *Trust this CA to identify websites* box and then lick *OK*.
 
+![Certificate settings — checkbox](https://cdn.adtidy.org/content/kb/ad_blocker/windows/solving-problems/cert_checkbox.jpg)
+
 You've successfully installed AdGuard certificate. Restart the browser and the error should go away.
 
 ## Yandex.Browser certificate warning

i18n/be/docusaurus-plugin-content-docs/current/general/ad-filtering/create-own-filters.md

@@ -1459,6 +1459,12 @@ This is basically a Firewall-like rule allowing to fully block or unblock access
 
 We recommend to get acquainted with this [article](#regexp-support) for better understanding of regular expressions.
 
+:::caution Restrictions
+
+The `$network` modifier can only be used in rules together with the `$app` and `$important` modifiers, and not with any other modifiers.
+
+:::
+
 **Examples**
 
 * `174.129.166.49:3478^$network` blocks access to `174.129.166.49:3478` (but not to `174.129.166.49:34788`).

i18n/be/docusaurus-plugin-content-docs/current/general/stealth-mode.md

@@ -21,9 +21,9 @@ Some options may not be available depending on the particular product due to OS
 
 When you get directed to a website from Google, Yahoo, or any other search engine, this option hides the search query that you used to find that website.
 
-### Send Do-Not-Track header {#donottrack}
+### Ask websites not to track you {#donottrack}
 
-It sends a Do-Not-Track (DNT) HTTP header to queried websites, thus requiring web apps to disable tracking of your activity.
+Sends the [Global Privacy Control](https://globalprivacycontrol.org/#gpc-spec) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) requests to the websites you visit.
 
 ### Strip tracking parameters from URLs
 

i18n/be/docusaurus-plugin-content-docs/current/guides/collect-har-file.md

@@ -11,53 +11,53 @@ To create a HAR file in Chrome:
 
 1. Go to the URL where the issue occurs. Do not reproduce the issue yet.
 
-2. Open ***Developer Tools***:
+2. Open **Developer Tools**:
 
-- From menu: ***Menu → More Tools → Developer Tools***.
-- Keyboard: ***Ctrl+Shift+C***, or ***Ctrl+Alt+I***, or ***⌥+⌘+I for Mac***.
+- From menu: **Menu → More Tools → Developer Tools**.
+- Keyboard: **Ctrl+Shift+C**, or **Ctrl+Alt+I**, or **⌥+⌘+I for Mac**.
 
-3. Click on the ***Network tab***.
+3. Click on the **Network tab**.
 
 4. Locate the round button at the top left of the Network tab and confirm it is in red recording mode. If it's grey, click to turn red to start recording.
 
-5. Use the ***clear*** button (the circle button with a line through it next to the record button) to clear all previous activity.
+5. Use the **Clear** button (the circle button with a line through it next to the record button) to clear all previous activity.
 
-6. Select the ***Preserve log*** check box on the Network tab.
+6. Select the **Preserve log** check box on the Network tab.
 
-7. Check the ***Disable cache*** check box.
+7. Check the **Disable cache** check box.
 
 ![Chrome](https://cdn.adtidy.org/content/Kb/ad_blocker/guides/chrome.png)
 
 8. Reproduce the steps that create the issue.
 
-9. Save session as a .har file by right-clicking the grid and selecting ***Save as HAR with content***.
+9. Save session as a .har file by right-clicking the grid and selecting **Save as HAR with content**.
 
 10. Forward to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well.
 
 ## Edge {#edge}
 
 1. Go to the URL where the issue occurs. Do not reproduce the issue yet.
 
-2. Open ***Developer Tools***:
+2. Open **Developer Tools**:
 
-- From menu: ***Menu → More Tools → Developer Tools***.
-- Keyboard: ***Ctrl+Shift+C***, or ***Ctrl+Alt+I***, or ***⌥+⌘+I for Mac***.
+- From menu: **Menu → More Tools → Developer Tools**.
+- Keyboard: **Ctrl+Shift+C**, or **Ctrl+Alt+I**, or **⌥+⌘+I for Mac**.
 
-3. Click on the ***Network tab***.
+3. Click on the **Network tab**.
 
 4. Locate the round button at the top left of the Network tab and confirm it is in red recording mode. If it's grey, click to turn red to start recording.
 
-5. Use the ***clear*** button (the circle button with a line through it next to the record button) to clear all previous activity.
+5. Use the **Clear** button (the circle button with a line through it next to the record button) to clear all previous activity.
 
-6. Select the ***Preserve log*** check box on the Network tab.
+6. Select the **Preserve log** check box on the Network tab.
 
-7. Check the ***Disable cache*** check box.
+7. Check the **Disable cache** check box.
 
 ![edge](https://cdn.adtidy.org/content/Kb/ad_blocker/guides/edge.png)
 
 8. Reproduce the steps that create the issue.
 
-9. Save session as a .har file by right-clicking the grid and selecting ***Save as HAR with content***.
+9. Save session as a .har file by right-clicking the grid and selecting **Save as HAR with content**.
 
 10. Forward to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well.
 
@@ -67,24 +67,24 @@ To create a HAR file in Firefox:
 
 1. Go to the URL where the issue occurs. Do not reproduce the issue yet.
 
-2. Open Developer Tools in ***Network*** mode:
-- From menu: ***Menu→Web Developer→Network***.
-- Keyboard: ***Ctrl+Shift+C***, or **⌥+⌘+E (Mac)**.
+2. Open Developer Tools in **Network** mode:
+- From menu: **Menu → Web Developer → Network**.
+- Keyboard: **Ctrl+Shift+C**, or **⌥+⌘+E (Mac)**.
 
-3. Note the ***play/pause*** button at the top left of the Network tab.
+3. Note the **Play/Pause** button at the top left of the Network tab.
 - Button should be in play mode.
 
-4. If any information is currently displayed in the grid, clear by clicking the ***delete trash can*** button next to the play/pause button.
+4. If any information is currently displayed in the grid, clear by clicking the **Delete trash can** button next to the play/pause button.
 
-5. Select the ***Persist Logs*** check box on the Network tab.
+5. Select the **Persist Logs** check box on the Network tab.
 
-6. Check the ***Disable cache*** check box.
+6. Check the **Disable cache** check box.
 
 ![firefox](https://cdn.adtidy.org/content/Kb/ad_blocker/guides/firefox.png)
 
 7. Reproduce the steps that create the issue.
 
-8. Save session as a .har file by right-clicking the grid and selecting ***Save all as HAR***.
+8. Save session as a .har file by right-clicking the grid and selecting **Save all as HAR**.
 
 9. Forward to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well.
 
@@ -94,75 +94,79 @@ To create a HAR file in Internet Explorer 11:
 
 1. Go to the URL where the issue occurs. Do not reproduce the issue yet.
 
-2. Open Developer Tools in ***Network*** mode:
-- From Tools cog wheel menu: ***Developer Tools*** → ***Network tab***.
-- Keyboard: ***F12→Network*** tab.
+2. Open Developer Tools in **Network** mode:
+- From Tools cog wheel menu: **Developer Tools** → **Network tab**.
+- Keyboard: **F12 → Network** tab.
 
-3. Note the start profiling session ***Play*** button and stop profiling ***Stop*** button at top left of Network tab.
-- Play button will be gray when recording and Stop button will be red. Put in ***Play*** mode.
+3. Note the start profiling session **Play** button and stop profiling **Stop** button at top left of Network tab.
+- Play button will be gray when recording and Stop button will be red. Put in **Play** mode.
 
-4. Clear any session info appearing in the lower grid using the ***Clear session*** button on Network tab. Hover over icons to see names.
-- ***Clear session*** button is a three line icon with an x on it.
+4. Clear any session info appearing in the lower grid using the **Clear session** button on Network tab. Hover over icons to see names.
+- **Clear session** button is a three line icon with an x on it.
 
-5. Check the ***Disable cache*** check box.
+5. Check the **Disable cache** check box.
 
 6. Reproduce the steps that create the issue.
 
-7. Save session as a .har file by clicking on the ***Save disk*** button (Export as HAR) on Network tab.
+7. Save session as a .har file by clicking on the **Save disk** button (Export as HAR) on Network tab.
 
 8. Forward to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well.
 
 ## Safari {#safari}
 
 To create a HAR file in Safari:
 
-1. Check the Safari menu bar at the top of the screen for a ***Develop*** menu. Check the checkbox at the bottom next to ***Show Develop menu in menu bar***.
-- If not visible, turn it on by going to ***Safari→Preferences→Advanced***.
+1. Check the Safari menu bar at the top of the screen for a **Develop** menu.
+- If not visible, turn it on by going to **Safari → Settings → Advanced**.
+- Check the checkbox at the bottom next to **Show Develop menu in menu bar**.
 
 2. Go to the URL where the issue occurs. Do not reproduce the issue yet.
 
-3. Open ***Network*** tab in Web Inspector:
-- From menu: ***Develop→Show Web Inspector→Network***.
-- Keyboard: ***⌥+⌘+I→Network***
+3. Open **Network** tab in Web Inspector:
+- From menu: **Develop → Show Web Inspector → Network**.
+- Keyboard: **⌥+⌘+I→Network**
 
-4. Check ***Preserve Log*** checkbox on right side of the Network tabs.
+4. Check **Preserve Log** checkbox on left side of the Network tabs, within the **Other filter options...** menu.
 
-5. Clear current Network items by clicking the ***delete Trash*** icon at the far right of Network tabs.
+![safari](https://cdn.adtidy.org/content/kb/ad_blocker/safari/preserve-log.png)
 
-6. Check the ***Disable cache*** check box.
+5. Clear current Network items by clicking the **Delete Trash** icon at the far right of Network tabs.
+- Keyboard: **⌘+K**
+
+6. Check the **Disable caches** check box.
 
 7. Reproduce the steps that create the issue.
 
-8. Save session as a .har file by clicking the ***Export*** icon next to ***Preserve Log***.
+8. Save session as a .har file by clicking the **Export** icon next to the **Delete Trash** icon.
 
 9. Forward to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, too.
 
 ## Android {#android}
 
 To create HAR files, follow these steps:
 
-1. Open AdGuard and go to ***Settings***.
+1. Open AdGuard and go to **Settings**.
 
-2. Choose ***Advanced*** in the menu.
+2. Choose **Advanced** in the menu.
 
-3. Choose ***Low Level Settings***
+3. Choose **Low Level Settings**
 
 4. Activate `pref.har.capture` (you will have to restart the protection).
 
 5. Now reproduce the problem — open the app, perform the necessary actions to make the ad appear.
 
 6. Now turn `pref.har.capture` off again.
 
-7. Go back and tap ***Export logs and system info*** → ***Save***.
+7. Go back and tap **Export logs and system info** → **Save**.
 
 ## Windows {#windows}
 
-1. Open ***Settings*** → ***General settings*** → ***Advanced settings** and scroll down.
+1. Open **Settings*** → **General settings** → **Advanced settings** and scroll down.
 
-2. Check the ***Enable HAR writing*** box.
+2. Check the **Enable HAR writing** box.
 
 3. Reproduce the problem.
 
-4. Go to ***General settings*** → Click on ***Export logs*** → ***Save***.
+4. Go to **General settings** → Click **Export logs** → **Save**.
 
 5. Disable HAR writing by unchecking the corresponding box.