Merge branch 'master' into agm-2737-per-app-config-cli

Author: el-termikael

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

@@ -155,6 +155,28 @@ You should remove Shadowsocks app from filtering before setting up the process (
     Proxy host | *127.0.0.1*
     Proxy port | *7891*
 
+### How to use AdGuard with WG Tunnel
+
+*The proxy mode was added in version 4.0. We presume that you already have WG Tunnel installed on your device and have added the WireGuard configuration.*
+
+1. Open WG Tunnel and go to **Settings** (the cog wheel at the bottom) → **App Mode** → **Proxy (experimental)**. This will set WG Tunnel to proxy mode.
+
+1. Open AdGuard and go to **App management**. Choose **WG Tunnel** and disable **Route traffic through AdGuard**. This will eliminate traffic looping.
+
+1. Then go to **Settings** → **Filtering** → **Network** → **Proxy** → **Proxy server**.
+
+1. Tap **Add proxy server** and fill in the fields:
+
+    Field      |  Value
+    -------    | ---------
+    Proxy type | *SOCKS5*
+    Proxy host | *127.0.0.1*
+    Proxy port | *25344*
+
+1. Tap **Save and select**.
+
+1. Enable the main proxy switch and AdGuard protection to route your device’s traffic through the proxy.
+
 ## Limitations
 
 However, at least one factor may prevent certain traffic from being routed through the outbound proxy, even after configuring the AdGuard proxy settings. That would be if the app itself isn't configured to send its traffic through AdGuard. To do it, you need to proceed to **App management**, choose the app, and turn on **Route traffic through AdGuard**.

docs/adguard-for-linux/cli-exclusions-and-filters.md

@@ -0,0 +1,75 @@
+---
+title: How to set app exclusions and custom filters
+sidebar_position: 5
+---
+
+In AdGuard CLI, it’s not possible to import app exclusions from other versions of the program. You can, however, manually create the required exclusions and filters by editing several configuration files in the app’s working directory.
+
+## How to add exclusions
+
+AdGuard CLI working directory:
+
+- Linux: `~/.local/share/adguard-cli/`
+- macOS: `~/Library/Application Support/adguard-cli/`
+
+Several key files are located in this folder:
+
+1. `browsers.yaml` — a list of browsers (Safari, Chrome, Firefox, etc.). Here you can enable or disable HTTPS filtering for individual browsers, or completely exclude them from filtering.
+
+**Example browsers.yaml (for Linux)**:
+
+```sh
+- name: firefox
+  action: default
+- name: chrome
+  action: default
+- name: chromium
+  action: default
+- name: brave
+  action: default
+```
+
+**Example `browsers.yaml` (for macOS)**:
+
+```sh
+- name: com.apple.Safari
+  action: default
+- name: com.google.Chrome
+  action: default
+- name: org.mozilla.firefox
+  action: default
+- name: com.brave.Browser
+  action: default
+```
+
+To disable HTTPS filtering, replace `default` with `bypass_https`. To completely exclude the app from filtering, replace `default` with `bypass`.
+
+1. `proxy.yaml` — the main configuration file. It has an apps section where exclusions for any other apps are set.
+
+**Example `proxy.yaml`**:
+
+```sh
+  - include-list: browsers.yaml
+  - name: '*vpn*'
+    action: 'bypass'          
+    skip_outbound_proxy: true
+  - name: '*'
+    action: 'bypass_https'   
+```
+
+:::note
+
+On **Linux**, specify the executable name (`chrome`, `firefox`, etc.). On **macOS**, specify the bundle ID, e.g., `com.google.Chrome`, `org.mozilla.firefox`.
+
+:::
+
+## How to add custom filters
+
+The working directory contains the `user.txt` file, where you can add your own blocking or allowing rules for websites. If you have your own list of rules in `.txt` format, connect it via `proxy.yaml`:
+
+```sh
+filters:
+  - 'flm://'
+  - 'user.txt'
+  - 'my_filter.txt' # connecting your own file
+```

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

@@ -1418,6 +1418,7 @@ These modifiers are able to completely change the behavior of basic rules.
 | [$removeparam](#removeparam-modifier) | ✅ | ✅ | ✅ [*[6]](#removeparam-modifier-limitations) | ✅ | ❌ | ❌ | ❌ |
 | [$replace](#replace-modifier) | ✅ | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ |
 | [$urltransform](#urltransform-modifier) | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
+| [$reason](#reason-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ |
 | [noop](#noop-modifier) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ |
 | [$empty 👎](#empty-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ |
 | [$mp4 👎](#mp4-modifier "deprecated") | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ |
@@ -3012,6 +3013,42 @@ Rules with the `$urltransform` modifier are supported by AdGuard for Windows, Ad
 
 :::
 
+#### **`$reason`** {#reason-modifier}
+
+The `$reason` modifier allows you to add a custom explanation message that will be displayed on the blocking page when a request is blocked by this rule.
+This modifier only works with the `$document` content-type modifier.
+
+**Character limitations and escaping requirements:**
+
+- There is no maximum length limit for the reason text
+- All characters are allowed in the reason text
+- Special characters (such as quotes, commas, and backslashes) must be properly escaped using the backslash (`\`)
+
+**Predefined localizable tokens:**
+
+Instead of custom text, you can use predefined tokens that will be automatically localized:
+
+- `malicious` — for malicious content
+- `tracker` — for tracking content
+- `disreputable` — for disreputable content
+
+**Examples**
+
+```adblock
+||example.com^$document,reason="Tracker"
+||example.com^$document,reason="Malicious site blocked by security filter"
+||ads.example.com^$document,reason="This site contains tracking scripts"
+||malware.example.com^$document,reason="Site blocked: \"Known malware distributor\""
+||tracking.example.com^$document,reason=disreputable
+||analytics.example.com^$document,reason=tracker
+```
+
+:::info Compatibility
+
+AdGuard for Windows, AdGuard for Mac, AdGuard for Android, and AdGuard for Linux with CoreLibs v1.20 or later support rules with the `$reason` modifier. AdGuard Content Blocker does not support these rules.
+
+:::
+
 #### **`noop`** {#noop-modifier}
 
 `noop` modifier does nothing and can be used solely to increase rules' readability. It consists of a sequence of underscore characters (`_`) of arbitrary length and can appear in a rule as often as needed.

docs/general/extensions.md

@@ -55,6 +55,24 @@ This script removes Google's tracking feature from the links in Google search re
 
 Its source code is [available on GitHub](https://github.com/Rob--W/dont-track-me-google). This userscript can be downloaded from [GreasyFork](https://greasyfork.org/en/scripts/428243-don-t-track-me-google) and installed in any AdGuard CoreLibs-based app.
 
+#### SponsorBlock
+
+SponsorBlock skips sponsored segments in YouTube videos. It saves time by jumping straight to the main content and removes interruptions from ads and self-promotions.
+
+:::info
+
+This userscript runs exclusively on our desktop applications, AdGuard for Windows and AdGuard for Mac.
+
+:::
+
+To try it out:
+
+1. Go to [https://mchangrh.github.io/sb.js/](https://mchangrh.github.io/sb.js/).
+1. Click **Generate link**.
+1. Copy the link that appears.
+1. Open AdGuard and go to **Extensions → Add extension → Import from file or URL**.
+1. Paste the copied link and confirm.
+
 #### tinyShield
 
 A userscript for people visiting Korean websites and some international websites. The tinyShield userscript blocks Ad-Shield ads and anti-adblocks. This userscript can be installed in AdGuard CoreLibs-based apps, Violentmonkey, Tampermonkey, and [quoid/userscripts](https://github.com/quoid/userscripts). Learn more about tinyShield and how to install it on [GitHub](https://github.com/List-KR/tinyShield).

i18n/be/docusaurus-plugin-content-docs/current/adguard-for-linux/cli-exclusions-and-filters.md

@@ -0,0 +1,75 @@
+---
+title: How to set app exclusions and custom filters
+sidebar_position: 5
+---
+
+In AdGuard CLI, it’s not possible to import app exclusions from other versions of the program. You can, however, manually create the required exclusions and filters by editing several configuration files in the app’s working directory.
+
+## How to add exclusions
+
+AdGuard CLI working directory:
+
+- Linux: `~/.local/share/adguard-cli/`
+- macOS: `~/Library/Application Support/adguard-cli/`
+
+Several key files are located in this folder:
+
+1. `browsers.yaml` — a list of browsers (Safari, Chrome, Firefox, etc.). Here you can enable or disable HTTPS filtering for individual browsers, or completely exclude them from filtering.
+
+**Example browsers.yaml (for Linux)**:
+
+```sh
+- name: firefox
+  action: default
+- name: chrome
+  action: default
+- name: chromium
+  action: default
+- name: brave
+  action: default
+```
+
+**Example `browsers.yaml` (for macOS)**:
+
+```sh
+- name: com.apple.Safari
+  action: default
+- name: com.google.Chrome
+  action: default
+- name: org.mozilla.firefox
+  action: default
+- name: com.brave.Browser
+  action: default
+```
+
+To disable HTTPS filtering, replace `default` with `bypass_https`. To completely exclude the app from filtering, replace `default` with `bypass`.
+
+1. `proxy.yaml` — the main configuration file. It has an apps section where exclusions for any other apps are set.
+
+**Example `proxy.yaml`**:
+
+```sh
+  - include-list: browsers.yaml
+  - name: '*vpn*'
+    action: 'bypass'          
+    skip_outbound_proxy: true
+  - name: '*'
+    action: 'bypass_https'   
+```
+
+:::note
+
+On **Linux**, specify the executable name (`chrome`, `firefox`, etc.). On **macOS**, specify the bundle ID, e.g., `com.google.Chrome`, `org.mozilla.firefox`.
+
+:::
+
+## How to add custom filters
+
+The working directory contains the `user.txt` file, where you can add your own blocking or allowing rules for websites. If you have your own list of rules in `.txt` format, connect it via `proxy.yaml`:
+
+```sh
+filters:
+  - 'flm://'
+  - 'user.txt'
+  - 'my_filter.txt' # connecting your own file
+```

i18n/bn/docusaurus-plugin-content-docs/current/adguard-browser-extension/compatibility.md

@@ -17,7 +17,7 @@ If you have the desktop version of AdGuard installed on your PC, it is better to
 
 ## AdGuard Browser Assistant
 
-![AdGuard Browser Assistant \*mobile\_border](https://cdn.adtidy.org/content/kb/ad_blocker/browser_extension/ad_blocker_browser_extension_assistant.png)
+![AdGuard Browser Assistant \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/browser_extension/ad_blocker_browser_extension_assistant.png)
 
 AdGuard Browser Assistant is a browser extension that works and feels just like AdGuard Browser Extension, but it's much lighter and doesn't interfere with the desktop apps. You can [read more about Browser Assistant for Windows](/adguard-for-windows/browser-assistant) or [Mac](/adguard-for-mac/features/browser-assistant), or [download it from our website](https://adguard.com/adguard-assistant/overview.html).
 

i18n/bn/docusaurus-plugin-content-docs/current/adguard-browser-extension/features/main-menu.md

@@ -11,7 +11,7 @@ This article is about the AdGuard Browser Extension, which safeguards only your
 
 The extension's main page can be accessed by clicking the extension's icon on the toolbar of your browser.
 
-![Main menu \*mobile\_border](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/ad_blocker_browser_extension_main.png)
+![Main menu \*mobile_border](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/ad_blocker_browser_extension_main.png)
 
 On the main page, you can hide any element on any page manually (a corresponding rule will be added to the _User rules_), open the _Filtering log_ to view the complete information about your browser's traffic and block requests on the go, or look at a website’s security report. Besides, you can submit a complaint about any website (for example, if there are missed ads on the page, our filter engineers will review the report and fix the problem) and see the statistics on applied blocking rules.
 

i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/ad-blocking.md

@@ -21,4 +21,4 @@ Basic protection effectively blocks ads on most websites. For more customized ad
 
 - Create user rules — AdGuard will apply them on specified websites. [Learn how to create your own user rules](/general/ad-filtering/create-own-filters)
 
-![Ad blocking \*mobile\_border](https://cdn.adtidy.org/blog/new/o44x5ad_blocking.png)
+![Ad blocking \*mobile_border](https://cdn.adtidy.org/blog/new/o44x5ad_blocking.png)

i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/browsing-security.md

@@ -13,11 +13,11 @@ The Browsing security module can be accessed by tapping the _Protection_ tab (se
 
 Browsing security protects you from visiting phishing and malicious websites. It also warns you about potential malware.
 
-![Browsing security \*mobile\_border](https://cdn.adtidy.org/blog/new/1y6a8browsing_security.png)
+![Browsing security \*mobile_border](https://cdn.adtidy.org/blog/new/1y6a8browsing_security.png)
 
 If you're about to visit a dangerous website, Browsing security will show you the following warning:
 
-![Browsing security warning \*mobile\_border](https://cdn.adtidy.org/blog/new/o8s3Screenshot_2023-06-29-15-49-01-514-edit_com.android.chrome.jpg)
+![Browsing security warning \*mobile_border](https://cdn.adtidy.org/blog/new/o8s3Screenshot_2023-06-29-15-49-01-514-edit_com.android.chrome.jpg)
 
 :::warning
 

i18n/bn/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/dns-protection.md

@@ -25,7 +25,7 @@ _DNS protection_ allows you to filter DNS requests with the help of a selected D
 
 - You can also block and unblock domains by creating user rules. You might need to consult our article about [DNS filtering rule syntax](https://adguard-dns.io/kb/general/dns-filtering-syntax/)
 
-![DNS protection \*mobile\_border](https://cdn.adtidy.org/blog/new/u8qtxdns_protection.png)
+![DNS protection \*mobile_border](https://cdn.adtidy.org/blog/new/u8qtxdns_protection.png)
 
 #### DNS server