Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/AG-29404
Browse files Browse the repository at this point in the history
  • Loading branch information
ngorskikh committed Feb 27, 2024
2 parents 4dcf4f7 + 4e2f5a2 commit 096e476
Show file tree
Hide file tree
Showing 49 changed files with 586 additions and 260 deletions.
2 changes: 1 addition & 1 deletion docs/adguard-browser-extension/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ In the *About* section, you can find infos about the current version, links to t

## Extension’s main menu {#main-menu}

The extension's main page can be accessed by clicking on the extension's icon on the toolbar of your browser.
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)

Expand Down
2 changes: 1 addition & 1 deletion docs/adguard-content-blocker/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ sidebar_position: 2

:::info

This article is about AdGuard Content Blocker, which only safeguards your Samsung Internet browser or Yandex Browser. To protect your entire device, [download the AdGuard app](https://agrd.io/download-kb-adblock)
This article is about AdGuard Content Blocker, which only safeguards the Samsung Internet browser and the Yandex Browser. To protect your entire device, [download the AdGuard app](https://agrd.io/download-kb-adblock)

:::

Expand Down
2 changes: 1 addition & 1 deletion docs/adguard-content-blocker/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ sidebar_position: 1

:::info

This article is about AdGuard Content Blocker, which only safeguards your Samsung Internet browser or Yandex Browser. To protect your entire device, [download the AdGuard app](https://agrd.io/download-kb-adblock)
This article is about AdGuard Content Blocker, which only safeguards the Samsung Internet browser and Yandex Browser. To protect your entire device, [download the AdGuard app](https://agrd.io/download-kb-adblock)

:::

Expand Down
4 changes: 2 additions & 2 deletions docs/adguard-for-android/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ That’s why you can only install AdGuard for Android manually. To use the app o

![Installing apps from unknown sources *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_4.png)

You will then be asked to read AdGuard's *License Agreement* and *Privacy Policy*. You can also participate in product development. To do this, check the boxes for *Send crash reports automatically* and *Send technical and interaction data*. Then tap *Continue*.
You will then be asked to read AdGuard's *License agreement* and *Privacy policy*. You can also participate in product development. To do this, check the boxes for *Send crash reports automatically* and *Send technical and interaction data*. Then tap *Continue*.

![Privacy Policy *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_3.png)
![Privacy policy *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_3.png)

1. **Create a local VPN**. In order to filter all traffic directly on your device and not route it through a remote server, AdGuard needs to establish a VPN connection.

Expand Down
10 changes: 5 additions & 5 deletions docs/adguard-for-android/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This article covers AdGuard for Android, a multifunctional ad blocker that prote

:::note Disclaimer

AdGuard for Android is not to be confused with AdGuard Content Blocker. AdGuard Content Blocker is an app available in Google Play that has truncated functionality to meet restrictions imposed by the store. AdGuard for Android, on the contrary, is a powerful application to block ads, manage applications, and perform other roles that will be described in this article. The only place it can be downloaded from is [the AdGuard website](https://adguard.com/adguard-android/overview.html).
AdGuard for Android is not to be confused with AdGuard Content Blocker. AdGuard Content Blocker is an app available in Google Play that has truncated functionality to meet restrictions imposed by the store. AdGuard for Android, on the contrary, is a powerful app to block ads, manage applications, and perform other roles that will be described in this article. The only place it can be downloaded from is [the AdGuard website](https://adguard.com/adguard-android/overview.html).

:::

Expand Down Expand Up @@ -191,7 +191,7 @@ If you're about to visit a dangerous website, Browsing Security will show you th

![Browsing Security warning *mobile_border](https://cdn.adtidy.org/blog/new/o8s3Screenshot_2023-06-29-15-49-01-514-edit_com.android.chrome.jpg)

> Please note that AdGuard for Android is not an antivirus program. It neither stops viruses from downloading nor deletes already downloaded ones. To fully protect your device, we recommend using AdGuard in conjunction with an antivirus tool.
> Please note that AdGuard for Android is not an antivirus program. It neither stops viruses from downloading nor deletes already downloaded ones. To fully protect your device, we recommend using AdGuard in conjunction with an antivirus.
Browsing Security is safe: AdGuard does not know what websites you visit. It uses hash prefixes instead of URLs to check website security.

Expand Down Expand Up @@ -252,7 +252,7 @@ You can tap a request to view its details and add a blocking or unblocking rule.

### Data usage

This section shows the amount of downloaded, uploaded, and saved traffic for the selected time period and data type. Tap *saved*, *uploaded*, or *downloaded* to view the graph of data usage over time.
This section shows the amount of downloaded and uploaded data and saved traffic for the selected time period and data type. Tap *saved*, *uploaded*, or *downloaded* to view the graph of data usage over time.

### Apps

Expand All @@ -270,7 +270,7 @@ This section displays companies that your device reaches out to. What does it me

### DNS statistics

This section shows data about the requests handled by *DNS protection*. You can see the total number of requests sent and how many were blocked by AdGuard in figures and graphs. You'll also find statistics on the amount of traffic saved, downloaded, and uploaded.
This section shows data about the requests handled by *DNS protection*. You can see the total number of requests sent and how many were blocked by AdGuard in figures and graphs. You'll also find statistics on the amount of traffic saved and data downloaded and uploaded.

### Battery usage

Expand Down Expand Up @@ -449,7 +449,7 @@ You can get access to these features by [purchasing a license](https://adguard.c
Due to security measures of the Android OS, some AdGuard features are only available on rooted devices. Here's the list of them:

- **HTTPS filtering in most apps** requires [installing a CA certificate into the system store](#security-certificates), as most apps do not trust certificates in the user store. Installing a certificate into the system store is only possible on rooted devices
- The [**Automatic proxy** routing mode](#routing-mode) requires root access due to Android's limitations on system-wide traffic filtering
- The [**Automatic proxy** routing mode](#routing-mode) requires root access due to Android's restrictions on system-wide traffic filtering
- The **Manual proxy** routing mode requires root access on Android 10 and above as it's no longer possible to determine the name of the app associated with a connection filtered by AdGuard

## Assistant
Expand Down
8 changes: 4 additions & 4 deletions docs/adguard-for-android/solving-problems/background-work.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Now launch the active apps manager by swiping up from the bottom of the screen a

![Xiaomi *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/background-work/xiaomi6.jpeg)

Tap and hold it until a special menu pops up. Select a lock icon.
Tap and hold it until a menu pops up. Select a lock icon.

![Xiaomi *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/background-work/xiaomi7en.jpeg)

Expand Down Expand Up @@ -355,7 +355,7 @@ Meizu has almost the same approach to the background process limitations as Huaw

## Nokia

Nokia devices running Android 9+ have **The Evenwell Power saver** disabled, which was the main culprit for killing bacground processes. If AdGuard still gets killed on your Nokia phone, check out the [legacy instruction](https://dontkillmyapp.com/hmd-global).
Nokia devices running Android 9+ have **The Evenwell Power saver** disabled, which was the main culprit for killing background processes. If AdGuard still gets killed on your Nokia phone, check out the [legacy instruction](https://dontkillmyapp.com/hmd-global).

### Nokia 1 (Android Go)

Expand All @@ -367,7 +367,7 @@ Nokia devices running Android 9+ have **The Evenwell Power saver** disabled, whi

1. Enable **USB debugging** within Developer options on your phone;

1. Uninstall the **com.evenwell.emm** package via the following adb commands:
1. Uninstall the **com.evenwell.emm** package via the following ADB commands:

`adb shell`
`pm uninstall --user 0 com.evenwell.emm`
Expand Down Expand Up @@ -423,7 +423,7 @@ An alternative, more permanent solution for more tech-savvy users:

1. Enable **USB debugging** within Developer options on your phone;

1. Uninstall the **com.evenwell.powersaving.g3** package via the following adb commands:
1. Uninstall the **com.evenwell.powersaving.g3** package via the following ADB commands:

`adb shell`
`pm uninstall --user 0 com.evenwell.powersaving.g3`
Expand Down
4 changes: 2 additions & 2 deletions docs/adguard-for-android/solving-problems/battery.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ First, let us lay down a bit of theory and links with necessary data.

*radio.active=* 100-300mA additional consumption in mAh caused by data exchange over Mobile network.

*cpu.active=* 100-200mA additional consumption in mAh caused by CPU work.
*cpu.active=* 100-200mA additional consumption in mAh caused by CPU load.

1. AdGuard by itself almost doesn't consume any traffic, so for the sake of evaluating battery resource consumption let's get rid of 'Mobile/WiFi packets' and stcik to 'CPU'.
1. AdGuard by itself almost doesn't consume any traffic, so for the sake of evaluating power consumption let's get rid of 'Mobile/Wi-Fi packets' and stick to 'CPU'.

Formula to calculate the consumption:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ This method will only work on **rooted** devices.

:::

1. [Install and configure](https://www.xda-developers.com/install-adb-windows-macos-linux/) adb;
1. [Install and configure](https://www.xda-developers.com/install-adb-windows-macos-linux/) ADB;
On the Windows platform, **Samsung** owners may need to install [this utility](https://developer.samsung.com/mobile/android-usb-driver.html).

1. Activate the **developer mode** and enable **USB debugging**:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This article covers AdGuard for Android, a multifunctional ad blocker that prote

:::caution

Changing *Low-level settings* can cause problems with the performance of AdGuard, may break the Internet connection or compromise your security and privacy. You should only open this section if you are sure of what you are doing or our support-team has asked you about it.
Changing *Low-level settings* can cause problems with the performance of AdGuard, may break the Internet connection or compromise your security and privacy. This section should only be opened if you know what you are doing, or you were asked to do so by our support team.

:::

Expand All @@ -39,7 +39,7 @@ If this setting is enabled, AdGuard will detect search domains and automatically

#### Bootstrap upstreams

Bootstrap DNS for DoH, DoT, and DoQ servers. The *Automatic DNS* - the system DNS or AdGuard DNS - is used by default. By selecting *Custom DNS*, you can list IPv4 and IPv6 server addresses to use as bootstrap upstreams.
Bootstrap DNS for DoH, DoT, and DoQ servers. The *Automatic DNS* the system DNS or AdGuard DNS is used by default. By selecting *Custom DNS*, you can list IPv4 and IPv6 server addresses to use as bootstrap upstreams.

#### Blocking mode for adblock-style rules

Expand Down Expand Up @@ -198,7 +198,7 @@ If this setting is enabled, AdGuard will create a file `timestamp.pcap` (for ins

#### Include Wi-Fi gateway in VPN routes

If this setting is enabled, the gateway IP addresses will be added to to VPN routes when on Wi-Fi.
If this setting is enabled, the gateway IP addresses will be added to VPN routes when on Wi-Fi.

#### IPv4 address

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This article covers AdGuard for Android, a multifunctional ad blocker that prote

:::

To be able to [filter HTTPS traffic](/general/https-filtering/what-is-https-filtering.md) (which is extremely important as most ads use HTTPS), AdGuard needs to install a certificate into your device's user storage. On older versions of Android OS this was done automatically, but on Android 11 and later users have to install it manually.
To be able to [filter HTTPS traffic](/general/https-filtering/what-is-https-filtering.md) (which is extremely important as most ads use HTTPS), AdGuard needs to install a certificate into your device's user storage. On older versions of the Android OS this was done automatically, but on Android 11 and later users have to install it manually.

![Certificate *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/manual-certificate/g.gif)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ This approach is available starting from **AdGuard v3.5 nightly 6**. If you're u

:::

1. [Install and configure](https://www.xda-developers.com/install-adb-windows-macos-linux/) adb;
1. [Install and configure](https://www.xda-developers.com/install-adb-windows-macos-linux/) ADB;
On the Windows platform, **Samsung** owners may need to install [this utility](https://developer.samsung.com/mobile/android-usb-driver.html).

1. Connect your device using a **USB cable** to the computer or laptop on which you installed **ADB**;
Expand Down Expand Up @@ -86,7 +86,7 @@ To solve this issue, you need to disable this feature.
- Open **Settings**;
- Press **Advanced**;
- Scroll down and press **Dual messenger**;
- Disable the **Dual messenger** for all applications;
- Disable the **Dual messenger** for all apps;
- Lock the device for 5 minutes;
- Unlock the screen and try again to create the VPN profile.

Expand All @@ -95,5 +95,5 @@ To solve this issue, you need to disable this feature.
- Open **Settings**;
- Choose **General** tab;
- Scroll down and press **Dual app**;
- Remove all applications from the list;
- Remove all apps from the list;
- Reboot your device.
6 changes: 3 additions & 3 deletions docs/adguard-for-ios/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Learn [how to create your own ad filters](/general/ad-filtering/create-own-filte

### Allowlist {#allowlist}

The third section of the *Safari protection* screen. If you want to disable ad blocking on a certain website, Allowlist will be of help. It allows you to add domains and subdomains to exlcusions. AdGuard for iOS has an Import/Export feature, so the allowlist from one device can be easily transferred to another.
The third section of the *Safari protection* screen. If you want to disable ad blocking on a certain website, Allowlist will be of help. It allows you to add domains and subdomains to exclusions. AdGuard for iOS has an Import/Export feature, so the allowlist from one device can be easily transferred to another.

### DNS protection {#dns-protection}

Expand Down Expand Up @@ -129,7 +129,7 @@ The *Advanced protection* only works on iOS 15 and later versions. If you are us

### Compatibility with AdGuard VPN {#compatibility}

In most cases, the ad blocker and the VPN application cannot work together, simply because there are certain system limitations. Nevertheless we've managed to find a solution to befriend [AdGuard VPN](https://adguard-vpn.com/) and AdGuard Ad Blocker. For your convenience we've added the *AdGuard VPN* block to the *Protection* section, so you can easily switch between two apps.
In most cases, the ad blocker and the VPN app cannot work together, simply because there are certain system limitations. Nevertheless, we've managed to find a solution to befriend [AdGuard VPN](https://adguard-vpn.com/) and AdGuard Ad Blocker. In the *Protection* section, you can easily switch between two apps.

### Assistant {#assistant}

Expand All @@ -140,7 +140,7 @@ Assistant is a tool that helps you manage filtering in Safari right from the bro
To see it, do the following: open Safari and tap the arrow-in-a-box symbol. Then scroll down to AdGuard/AdGuard Pro (depending on the app you use) and tap it to fetch a window with several options:

1. **Enable on this page.** Turn the switch off to add the current domain to the Allowlist.
2. **Block an element on this page.** Tap it to enter the 'Element blocking' mode: choose any element on the page, adjust the size by tapping 'plus' or 'minus', preview if necessary and then tap the checkmark icon to confirm. The selected element will be hidden from the page and a corresponding rule will be added to User rules. Remove or disable it there to revert the change.
2. **Block an element on this page.** Tap it to enter the 'Element blocking' mode: choose any element on the page, adjust the size by tapping '+' or '', preview if necessary and then tap the checkmark icon to confirm. The selected element will be hidden from the page and a corresponding rule will be added to User rules. Remove or disable it to revert the change.
3. **Report an issue on this page.** Opens a web reporting tool that will help you send a report to our support team in just a few taps. Use it if you noticed a missed ad or an incorrect blocking on the page.

:::tip
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This article covers AdGuard for iOS, a multifunctional ad blocker that protects

:::caution

Changing *Low-level settings* can cause problems with the performance of AdGuard, may break the Internet connection or compromise your security and privacy. You should only open this section if you are sure of what you are doing or our support-team has asked you about it.
Changing *Low-level settings* can cause problems with the performance of AdGuard, may break the Internet connection or compromise your security and privacy. This section should only be opened if you know what you are doing, or you were asked to do so by our support team.

:::

Expand Down
2 changes: 1 addition & 1 deletion docs/adguard-for-mac/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Go to the Applications section. Find AdGuard there, right-click it and choose **

![Run Activity Monitor](https://cdn.adtidy.org/content/kb/ad_blocker/mac/22.jpg)

1. Stop the process which is being run under the user (not the one run under root). To do so, click the process and then click X on the upper left. Confirm it in the dialogue window.
1. Stop the process which is being run under the user (not the one run under root). To do so, click the process and then click X on the upper left. Confirm the action in the dialogue window.

![Confirm](https://cdn.adtidy.org/content/kb/ad_blocker/mac/33.jpg)

Expand Down
4 changes: 2 additions & 2 deletions docs/adguard-for-mac/solving-problems/advanced-settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@ Removes the Encrypted Client Hello parameters from responses.

`stealth.antidpi.http.split.fragment.size`

Adjusts the size of the HTTP request fragmentation. Accepted values: 1–1500. If an invalid size is specified, the system will use the default value.
Adjusts the size of the HTTP request fragmentation. Valid values: 1–1500. If an invalid size is specified, the system will use the default value.

`stealth.antidpi.clienthello.split.fragment.size`

This option specifies the size of TCP packet fragmentation, which helps avoid deep packet inspection. Accepted values: 1–1500. If an invalid size is specified, the system will use the default value.
This option specifies the size of TCP packet fragmentation, which helps avoid deep packet inspection. Valid values: 1–1500. If an invalid size is specified, the system will use the default value.

`stealth.antidpi.http.space.juggling`

Expand Down
2 changes: 1 addition & 1 deletion docs/adguard-for-mac/solving-problems/big-sur-issues.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ For a deeper understanding of this problem, read [this article](../protect-mail-

**Recommended solution**

At this point, we recommend using a more traditional VPN service, such as AdGuard VPN, instead of the new Apple's privacy features.
At this point, we recommend using a more traditional VPN service, such as [AdGuard VPN](https://adguard-vpn.com/), instead of the newer Apple privacy features.

### Monterey 12, Big Sur 11.6 and later: currently existing problems

Expand Down
Loading

0 comments on commit 096e476

Please sign in to comment.