Skip to content

Commit 563908f

Browse files
authored
Merge branch 'master' into agm-2731-add-info-spa
2 parents e464b33 + f240004 commit 563908f

File tree

122 files changed

+3306
-1026
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+3306
-1026
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Blocking rules with [`$important`](#important-modifier) modifier can override ex
103103

104104
![Cosmetic rule](https://cdn.adtidy.org/content/kb/ad_blocker/general/5_cosmetic_rules.svg)
105105

106-
Cosmetic rules are based on using a special language named CSS, which every browser understands. Basically, it adds a new CSS style to the website which purpose is to hide particular elements. You can learn more about CSS in general [here](https://developer.mozilla.org/en-US/docs/Learn/CSS/Introduction_to_CSS/Selectors).
106+
Cosmetic rules are based on using a special language named CSS, which every browser understands. Basically, it adds a new CSS style to the website which purpose is to hide particular elements. You can [learn more about CSS](https://developer.mozilla.org/en-US/docs/Learn/CSS/Introduction_to_CSS/Selectors) in general.
107107

108108
AdGuard [extends CSS](#extended-css-selectors) and lets filters developers handle much more complicated cases. However, to use these extended rules, you need to be fluent in regular CSS.
109109

@@ -2293,7 +2293,7 @@ For the requests matching a `$permissions` rule, AdGuard strengthens response's
22932293
1. A comma that separates multiple features **MUST** be escaped — see examples below.
22942294
2. A pipe character (`|`) can be used instead of a comma to separate features.
22952295

2296-
The list of available directives is available [here](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Permissions-Policy#directives).
2296+
Available directives are listed in the [Permissions Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Permissions-Policy#directives) article.
22972297

22982298
`$permissions` value can be empty in the case of exception rules — see examples below.
22992299

@@ -4262,7 +4262,7 @@ example.org$$div[some_attribute]
42624262
42634263
This rule removes all `div` elements with the attribute `some_attribute` on `example.org` and all its subdomains. So, the both `div` elements from the example above will be removed.
42644264
4265-
### Special attributes
4265+
### Special attributes {#html-filtering-rules--special-attributes}
42664266
42674267
In addition to usual attributes, which value is every element checked for, there is a set of special attributes that change the way a rule works. Below there is a list of these attributes:
42684268
@@ -4375,9 +4375,9 @@ The `min-length` special attribute must not appear in a selector to the left of
43754375
43764376
:::
43774377
4378-
### Pseudo-classes
4378+
### Pseudo-classes {#html-filtering-rules--pseudo-classes}
43794379
4380-
#### `:contains()`
4380+
#### `:contains()` {#html-filtering-rules--contains}
43814381
43824382
##### Syntax
43834383
@@ -4630,7 +4630,7 @@ More information about trusted scriptlets can be found [on GitHub](https://githu
46304630
46314631
Each rule can be modified using the modifiers described in the following paragraphs.
46324632
4633-
**Syntax** {#non-basic-rules-modifiers-syntax}
4633+
**Syntax**
46344634
46354635
```text
46364636
rule = "[$" modifiers "]" [rule text]

i18n/be/docusaurus-plugin-content-docs/current/adguard-for-android/features/protection/tracking-protection.md

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,72 +9,72 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro
99

1010
:::
1111

12-
The Tracking protection module can be accessed by tapping the _Protection_ tab (second-left icon at the bottom of the screen) and then selecting _Tracking protection_.
12+
To access the Tracking protection module, tap the _Protection_ tab (the second icon from the bottom of the screen) and then select _Tracking protection_.
1313

14-
_Tracking protection_ (formerly known as _Stealth Mode_) prevents websites from collecting information about you, such as your IP addresses, information about your browser and operating system, screen resolution, and the page you came or were redirected from. It can also block cookies that websites use to mark your browser, save your personal settings and user preferences, or recognize you on your next visit.
14+
_Tracking protection_ (formerly _Stealth Mode_) prevents websites from collecting information about you, such as your IP address, information about your browser and operating system, screen resolution, and the page you came or were redirected from. It can also block cookies that websites use to mark your browser, save your personal settings and user preferences, or recognize you on your next visit.
1515

16-
![Tracking protection \*mobile_border](https://cdn.adtidy.org/blog/new/y5fuztracking_protection.png)
16+
![Tracking protection \*mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/features/tracking_protection.png)
1717

18-
_Tracking protection_ has three pre-configured levels of privacy protection (_Standard_, _High_, and _Extreme_) and one user-defined level (_Custom_).
18+
_Tracking protection_ has three pre-configured privacy protection levels (_Standard_, _High_, and _Extreme_) and one user-defined level (_Custom_).
1919

2020
Here are the active features of the pre-configured levels:
2121

2222
1. **Standard**
2323

24-
a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools
24+
a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools
2525

26-
b. _Ask websites not to track you_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity
26+
b. _Ask websites not to track me_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity
2727

28-
c. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending information about its version and modifications to Google domains (including DoubleClick and Google Analytics)
28+
c. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending information about its version and modifications to Google domains (including DoubleClick and Google Analytics)
2929

3030
2. **High**
3131

32-
a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools
32+
a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools
3333

34-
b. _Remove tracking parameters from URLs_. This feature uses _AdGuard URL Tracking filter_ to remove tracking parameters, such as `utm_*` and `fb_ref`, from page URLs
34+
b. _Remove tracking parameters from URLs_. This feature uses _AdGuard URL Tracking filter_ to remove tracking parameters, such as `utm_*` and `fb_ref`, from page URLs
3535

36-
c. _Hide your search queries_. This feature hides queries for websites visited from a search engine
36+
c. _Hide search queries_. This feature hides your searches from websites visited through search engine results
3737

38-
d. _Ask websites not to track you_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity
38+
d. _Ask websites not to track me_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity
3939

40-
e. _Self-destruction of third-party cookies_. This feature limits the lifetime of third-party cookies to 180 minutes
40+
e. _Delete third-party cookies_. This feature limits the lifetime of third-party cookies to 180 minutes and prevents advertisers from tracking your behavior across multiple pages
4141

42-
:::caution
42+
:::caution
4343

44-
This feature deletes all third-party cookies after their forced expiration. This includes your logins through social networks or other third-party services. You may need to re-log in to some websites periodically or experience other cookie-related issues. To block only tracking cookies, use the _Standard_ protection level.
44+
This feature deletes all third-party cookies after their forced expiration. This includes your logins through social networks or other third-party services. You may need to re-log in to some websites periodically or experience other cookie-related issues. To block only tracking cookies, use the _Standard_ protection level.
4545

46-
:::
46+
:::
4747

48-
f. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending its version and modifications information to Google domains (including DoubleClick and Google Analytics)
48+
f. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending its version and modifications information to Google domains (including DoubleClick and Google Analytics)
4949

5050
3. **Extreme** (formerly known as _Ultimate_)
5151

52-
a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools
52+
a. _Block trackers_. This feature uses _AdGuard Tracking Protection filter_ to protect you from online counters and web analytics tools
5353

54-
b. _Remove tracking parameters from URLs_. This feature uses _AdGuard URL Tracking filter_ to remove tracking parameters, such as `utm_*` and `fb_ref`, from page URLs
54+
b. _Remove tracking parameters from URLs_. This feature uses _AdGuard URL Tracking filter_ to remove tracking parameters, such as `utm_*` and `fb_ref`, from page URLs
5555

56-
c. _Hide your search queries_. This feature hides queries for websites visited from a search engine
56+
c. _Hide search queries_. This feature hides your searches from websites visited through search engine results
5757

58-
d. _Ask websites not to track you_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity
58+
d. _Ask websites not to track me_. This feature sends the [Global Privacy Control](https://globalprivacycontrol.org/) and [Do Not Track](https://en.wikipedia.org/wiki/Do_Not_Track) signals to the websites you visit, asking web apps to disable tracking of your activity
5959

60-
e. _Self-destruction of third-party cookies_. This feature limits the lifetime of third-party cookies to 180 minutes
60+
e. _Delete third-party cookies_. This feature limits the lifetime of third-party cookies to 180 minutes and prevents advertisers from tracking your behavior across multiple pages
6161

62-
:::caution
62+
:::caution
6363

64-
This feature deletes all third-party cookies after their forced expiration. This includes your logins through social networks or other third-party services. You may need to re-log in to some websites periodically or experience other cookie-related issues. To block only tracking cookies, use the _Standard_ protection level.
64+
This feature deletes all third-party cookies after their forced expiration. This includes your logins through social networks or other third-party services. You may need to re-log in to some websites periodically or experience other cookie-related issues. To block only tracking cookies, use the _Standard_ protection level.
6565

66-
:::
66+
:::
6767

68-
f. _Block WebRTC_. This feature blocks WebRTC, a known vulnerability that can leak your real IP address even if you use a proxy or VPN
68+
f. _Block WebRTC_. This feature blocks WebRTC that can leak your real IP address even if you use a proxy or VPN. Some messengers, streaming platforms, or games may stop working properly
6969

70-
g. _Block Push API_. This feature prevents your browsers from receiving push messages from servers
70+
g. _Block Push API_. This feature blocks push notifications from websites
7171

72-
h. _Block Location API_. This feature prevents browsers from accessing your GPS data and determining your location
72+
h. _Block Location API_. This feature prevents browsers from accessing your GPS data and determining your location
7373

74-
i. _Hide Referer from third parties_. This feature prevents third parties from knowing which websites you visit. It hides the HTTP header that contains the URL of the initial page and replaces it with a default or custom one that you can set
74+
i. _Hide Referer from third parties_. This feature prevents third parties from knowing which websites you visit. It hides the HTTP header that contains the URL of the initial page and replaces it with a default or custom one that you can set
7575

76-
j. _Hide your User-Agent_. This feature removes identifying information from the User-Agent header, which typically includes the name and version of the browser, the operating system, and language settings
76+
j. _Hide User-Agent_. This feature removes identifying information from the User-Agent header, which typically includes the name and version of the browser, the operating system, and language settings
7777

78-
k. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending its version and modifications information to Google domains (including DoubleClick and Google Analytics)
78+
k. _Remove X-Client-Data header_. This feature prevents Google Chrome from sending its version and modifications information to Google domains (including DoubleClick and Google Analytics)
7979

80-
You can tweak individual settings in _Tracking protection_ and come up with a custom configuration. Every setting has a description that will help you understand its role. [Read more about what the various _Tracking protection_ settings do](/general/stealth-mode) and utilize them cautiously, as some may interfere with the functionality of websites and browser extensions.
80+
You can tweak individual settings in _Tracking protection_ to create a custom configuration. Each setting has a description to help you understand its purpose. [Read more about various _Tracking protection_ settings](/general/stealth-mode) and use them cautiously, as some may interfere with the functionality of websites and browser extensions.

i18n/be/docusaurus-plugin-content-docs/current/adguard-for-linux/settings.md

Lines changed: 84 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ Use the `config` command to configure AdGuard for Linux. Subcommands:
7777

7878
- `show`: Show the current configuration in `proxy.yaml`
7979

80-
![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png)
80+
![Current setup \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/activation7.png)
8181

8282
- `set`: Configure an option in `proxy.yaml`
83-
- `listen_ports.http_proxy`: HTTP listening port
84-
- `proxy_mode`: Proxy mode (`manual` or `auto`)
83+
- `listen_ports.http_proxy`: HTTP listening port
84+
- `proxy_mode`: Proxy mode (`manual` or `auto`)
8585

8686
- `get`: Get the current status of the above options
8787

@@ -91,15 +91,15 @@ Use the `filters` command to configure AdGuard for Linux. Subcommands:
9191

9292
- `list`: List installed filters
9393

94-
- `--all`: View all filters
94+
- `--all`: View all filters
9595

96-
![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png)
96+
![Filter list \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/filter-list.png)
9797

9898
- `install`: Install a filter. Enter the URL of the filter you want to install
9999

100100
- `enable`: Enable a filter. Enter the name or ID of the filter
101101

102-
![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png)
102+
![Enable filters \*border](https://cdn.adtidy.org/content/Kb/ad_blocker/linux/built-in-filters.png)
103103

104104
- `disable`: Disable a filter. Enter the name or ID of the filter
105105

@@ -112,10 +112,86 @@ There are two ways to make the proxy server listen on a different interface:
112112

113113
1. Run `adguard-cli config set listen_address <address>` where `<address>` is the address to listen on.
114114
2. Edit the config file directly:
115-
- To determine the location of the config file, run `adguard-cli config show | grep "Config location"`.
116-
- Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`.
115+
- To determine the location of the config file, run `adguard-cli config show | grep "Config location"`.
116+
- Look for the `listen_address` key and set its value accordingly. To listen on all available network interfaces, set the listen address to `0.0.0.0` or `::`.
117117

118118
If the listen address is set to anything other than `127.0.0.1`, then proxy client authentication is required. AdGuard CLI will not start unless proxy authentication is configured:
119119

120120
- When running `adguard-cli config set listen_address <address>` where `<address>` is not `127.0.0.1`, AdGuard CLI will prompt for a username and password if proxy authentication is not already configured.
121121
- When editing the config file directly, look for the `listen_auth`key. Set the `enabled` sub-key to `true`, and `username` and `password` to non-empty values.
122+
123+
## Configure outbound proxy
124+
125+
You can configure `outbound_proxy` if you want AdGuard CLI to work through another proxy server.
126+
127+
There are two ways to configure it:
128+
129+
### 1. Configure via URL (recommended)
130+
131+
Instead of setting each option step by step, you can set all parameters in a single line using a URL:
132+
133+
```sh
134+
adguard-cli config set outbound_proxy https://user:pass@host:port
135+
```
136+
137+
:::info
138+
139+
Supported modes are HTTP, HTTPS, SOCKS4, and SOCKS5.
140+
141+
:::
142+
143+
You can also quickly enable or disable `outbound_proxy`:
144+
145+
```sh
146+
adguard-cli config set outbound_proxy false
147+
```
148+
149+
Or quickly clear the settings:
150+
151+
```sh
152+
adguard-cli config set outbound_proxy ""
153+
```
154+
155+
### 2. Configure individual parameters
156+
157+
The ability to adjust specific parameters is also available:
158+
159+
```sh
160+
adguard-cli config set outbound_proxy.enabled true
161+
adguard-cli config set outbound_proxy.host localhost
162+
adguard-cli config set outbound_proxy.port 3128
163+
adguard-cli config set outbound_proxy.username user
164+
adguard-cli config set outbound_proxy.password pass
165+
```
166+
167+
Disable certificate verification for HTTPS proxies:
168+
169+
```sh
170+
adguard-cli config set outbound_proxy.trust_any_certificate true
171+
```
172+
173+
Enable SOCKS5 proxy for UDP traffic:
174+
175+
```sh
176+
adguard-cli config set outbound_proxy.udp_through_socks5_enabled true
177+
```
178+
179+
:::note
180+
181+
If your SOCKS5 proxy does not support UDP, connections may fail.
182+
183+
:::
184+
185+
### Checking the current configuration
186+
187+
To view the current `outbound_proxy` configuration, enter:
188+
189+
```sh
190+
adguard-cli config show outbound_proxy
191+
```
192+
193+
:::info Compatibility
194+
195+
Configuring `outbound_proxy` via URL is available starting from AdGuard for Linux v1.1.26 nightly and v1.1 stable release.
196+
197+
:::

i18n/be/docusaurus-plugin-content-docs/current/adguard-for-mac/features/stealth.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ This article is about AdGuard for Mac, a multifunctional ad blocker that protect
99

1010
:::
1111

12-
## Advanced privacy protection
12+
## Tracking protection
1313

14-
![Stealth Mode](https://cdn.adtidy.org/content/kb/ad_blocker/mac/stealth.png)
14+
![Stealth Mode](https://cdn.adtidy.org/content/kb/ad_blocker/mac/tracking_protection.png)
1515

16-
_Advanced privacy protection_ protects your privacy by deleting cookies, UTM tags, online counters, and analytics systems. It doesn’t let websites collect your IP address, device and browser parameters, search queries, and personal information. [Learn more about Stealth Mode settings](/general/stealth-mode)
16+
_Tracking protection_ (formerly Stealth Mode) safeguards your privacy by deleting cookies, UTM tags, online counters, and analytics systems. It prevents websites from collecting your IP address, device and browser parameters, search queries, and personal information. [Learn more about Tracking protection settings](/general/stealth-mode)

0 commit comments

Comments
 (0)