Skip to content

Commit

Permalink
Merge pull request #441 from AdguardTeam/edit-filter-policy
Browse files Browse the repository at this point in the history
edit filter policy and remove extra spaces from other files
  • Loading branch information
el-termikael authored Mar 25, 2024
2 parents 59f2fa2 + f410a1c commit 91154da
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion docs/adguard-for-android/installation.md
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

:::

## System requirements
## System requirements

**OS version:** Android 7.0 or higher

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ If you are using AdGuard in the *Local VPN* filtering mode, you cannot run other
- Use [AdGuard VPN](https://adguard-vpn.com/welcome.html) — its *Integrated mode* allows two apps to operate simultaneously
- Configure your VPN app to act as an [outbound proxy](../solving-problems/outbound-proxy.md) and set up a local outbound proxy using the parameters from the third-party app
- Switch to the *Automatic proxy* mode. When you do that, AdGuard will no longer use local VPN and will reconfigure iptables instead
- Switch to the *Manual proxy* mode. To do this, go to *Settings* *Filtering**Network**Routing mode*
- Switch to the *Manual proxy* mode. To do this, go to *Settings**Filtering**Network**Routing mode*

:::note Compatibility

Expand Down
2 changes: 1 addition & 1 deletion docs/adguard-for-android/solving-problems/tasker.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Or you can configure server parameters manually:

`server:[name]` where `[name]` is the name of the outbound proxy from the list.

Or you can configure remove parameters manually:
Or you can configure remove parameters manually:

`server:[type=…&host=…&port=…&username=…&password=…&udp=…&trust=…]`.

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 @@ -9,7 +9,7 @@ This article covers AdGuard for Mac, a multifunctional ad blocker that protects

:::

## System requirements
## System requirements

**Operating system version:** macOS 10.15 (64 bit) or higher

Expand Down
4 changes: 2 additions & 2 deletions docs/adguard-for-mac/solving-problems/icloud-private-relay.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This article covers AdGuard for Mac, a multifunctional ad blocker that protects

By default, AdGuard uses the "default route" which disables iCloud Private Relay.

Currently, AdGuard and iCloud Private Relay cannot work at the same time. AdGuard cannot block ads because iCloud Private Relay encrypts traffic before AdGuard can filter network connections. When iCloud Private Relay is active, any filtering (including local filtering) becomes impossible. Thus, AdGuard can't filter traffic or perform DNS filtering in Safari. Yet, AdGuard still filters traffic in other browsers. To keep using iCloud Private Relay, consider installing [AdGuard for Safari](https://adguard.com/adguard-safari/overview.html).
Currently, AdGuard and iCloud Private Relay cannot work at the same time. AdGuard cannot block ads because iCloud Private Relay encrypts traffic before AdGuard can filter network connections. When iCloud Private Relay is active, any filtering (including local filtering) becomes impossible. Thus, AdGuard can't filter traffic or perform DNS filtering in Safari. Yet, AdGuard still filters traffic in other browsers. To keep using iCloud Private Relay, consider installing [AdGuard for Safari](https://adguard.com/adguard-safari/overview.html).

The same applies to using any VPN apps on Mac: you have to choose between using iCloud Private Relay or a VPN service.

Expand Down Expand Up @@ -44,7 +44,7 @@ We recommend using AdGuard together with a more traditional VPN service such as

## Alternative solution

You can prevent AdGuard from using the "default route" by disabling the "default route". It can be done via Advanced Settings → `network.extension.monterey.force.split.tunnel`.
You can prevent AdGuard from using the "default route" by disabling the "default route". It can be done via Advanced Settings → `network.extension.monterey.force.split.tunnel`.

![Disable default route in advanced settings *border](https://cdn.adtidy.org/content/kb/ad_blocker/mac/mac_adguard_advanced_settings.jpg)

Expand Down
2 changes: 1 addition & 1 deletion docs/adguard-for-windows/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This article covers AdGuard for Windows, a multifunctional ad blocker that prote

:::

## System requirements
## System requirements

**Operating system:** Microsoft Windows 11, 10, 8.1, 8, 7, Vista.

Expand Down
20 changes: 10 additions & 10 deletions docs/general/ad-filtering/filter-policy.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ AdGuard ad-blocking filters include:
### The purpose of these filters

- **Base filter** is designed to block ads on English-language websites and those for which there is no separate filter. It also contains general filtering rules that apply to all sites regardless of language
- **Mobile Ads filter** blocks advertisements on mobile versions of websites and within mobile applications. There is no segmentation based on language
- **Mobile Ads filter** blocks advertisements on mobile versions of websites and within mobile apps. There is no segmentation based on language
- **Regional filters** follow the same policy as the **Base filter**, but limited to websites in certain languages

The goal of ad-blocking filters is to block all types of advertising on websites, applications, and certain devices that can load ads from the Internet:
Expand All @@ -59,11 +59,11 @@ The goal of ad-blocking filters is to block all types of advertising on websites
- Ads disguised as site content, which open pages with promoted products or unrelated content upon clicking
- Video ads — advertisement videos embedded within video content or in separate ad elements on websites and applications
- Interactive ads — ads with which users can interact (e.g., games and surveys, upon completion of which the advertised item opens)
- Interstitial ads — full-screen ads on mobile devices that cover the interface of the application or web browser
- Interstitial ads — full-screen ads on mobile devices that cover the interface of the app or web browser
- Ads leftovers that occupy large spaces or stand out against the background and attract visitors' attention (except barely discernible or unnoticeable ones)
- Anti-adblock advertising — alternative advertising displayed on the site when the main one is blocked
- Site’s own advertising, if it has been blocked by general filtering rules (see *Limitations and Exceptions*)
- Anti-adblock scripts that prevent site usage (see *Limitations and Exceptions*)
- Site’s own advertising, if it has been blocked by general filtering rules (see *Limitations and exceptions*)
- Anti-adblock scripts that prevent site usage (see *Limitations and exceptions*)
- Advertising injected by malware, if detailed information about its loading method or steps for reproduction is provided
- Unwanted mining — scripts that mine cryptocurrency without user consent

Expand Down Expand Up @@ -105,7 +105,7 @@ AdGuard tracking protection filters include:

**Tracking Protection filter** is designed to block trackers that collect users’ personal data and to improve users’ privacy.

What is blocks:
What it blocks:

- Analytics systems’ scripts
- Websites’ and applications’ own tracking scripts
Expand Down Expand Up @@ -134,7 +134,7 @@ Annoyance filters are designed to improve the usability of websites by blocking

**CMP (Consent Management Platform)** — software that helps websites comply with cookie usage rules. CMPs limit cookies usage until user consent is obtained, providing users with the option to accept certain cookies and manage privacy settings.

**Widget** — a user interface element that extends the functionality of a website. Web widgets are integrated into web pages and can include interactive elements such as buttons, forms, or banners. They can provide users with access to specific services or content without requiring navigation to other pages.
**Widget** — a user interface element that extends the functionality of a website. Web widgets are integrated into web pages and can include interactive elements such as buttons, forms, or banners. They can provide users with access to specific services or content without requiring navigation to other pages.

**Popup** — a window that appears above the current web page. It is intended to display additional information, advertisements, notifications, or data entry forms. Popups usually block the view of the main content of the page and require user action to close, which can be irritating.

Expand Down Expand Up @@ -182,15 +182,15 @@ This is a filter that blocks various popups on web pages that are not necessary

#### AdGuard Mobile App Banners filter

This is a filter that blocks banners and popups that encourage visitors to install mobile applications.
This is a filter that blocks banners and popups that encourage visitors to install mobile apps.

**Limitations and exceptions**

Banners located in the headers or in the menus of websites are not blocked if they are not animated and do not occupy a significant portion of usable space. If a banner is located in the footer, the decision is made by filter developers case-by-case. Usually, banners in the footer do not stand out against other elements and are not distracting.

#### AdGuard Widgets filter

This is a filter that blocks various widgets that are not essential for the functioning of the website or for interaction with it:
This is a filter that blocks various widgets that are not essential for the functioning of websites or for interaction with them:

- Widgets for content recommendations — related articles, similar websites, various personalized recommendations
- Chat widgets that are not integrated with the content and are not the main content of the page
Expand Down Expand Up @@ -250,7 +250,7 @@ This group contains filters that are not essential for blocking advertisements.

**Self-promotion of websites** refers to the banners of a website promoting goods and services owned by the site owner, for which they do not receive compensation from third parties.

For more details on these types of advertising, refer to the [article on Search ads](https://adguard.com/kb/general/ad-filtering/search-ads/).
For more details on these types of advertising, refer to the [article on search ads](https://adguard.com/kb/general/ad-filtering/search-ads/).

### Filters

Expand Down Expand Up @@ -287,5 +287,5 @@ This filter is intended for testing and debugging rules that potentially may bre

**Limitations and exceptions**

- Rules should not explicitly break websites’ functionality
- Rules should not intentionally break websites’ functionality
- Rules should not unblock advertisements or otherwise violate the Policy

0 comments on commit 91154da

Please sign in to comment.