From f588e34363cf14d643222397d9fe0e927203e191 Mon Sep 17 00:00:00 2001 From: puglieri Date: Wed, 2 Oct 2024 12:30:51 -0300 Subject: [PATCH 1/8] Update mv3-version.md --- docs/adguard-browser-extension/mv3-version.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-browser-extension/mv3-version.md b/docs/adguard-browser-extension/mv3-version.md index 49e489f90d8..8ae7a514789 100644 --- a/docs/adguard-browser-extension/mv3-version.md +++ b/docs/adguard-browser-extension/mv3-version.md @@ -55,7 +55,7 @@ The maximum number of simultaneously enabled filters is **50**. **Dynamic rules:** a strict cap of **5,000** rules is imposed, which includes a maximum of 1,000 regex rules. -If this limit is exceeded, only **5,000 converted rules** will be applied in the following order: first allowlist, then user rules, and finally — custom filters. +If this limit is exceeded, only **5,000 converted rules** will be applied in the following order: first allowlist, then user rules, custom filters, and finally — Quick Fixes rules. > **Converted rules** are rules that have been transformed > to [DNR format] using the [declarative converter][github-declarative-converter]. From de537221c34d9d51c9e70500634f1b8c9a2fc73b Mon Sep 17 00:00:00 2001 From: puglieri <112409628+puglieri@users.noreply.github.com> Date: Thu, 3 Oct 2024 08:57:30 -0300 Subject: [PATCH 2/8] Update mv3-version.md --- docs/adguard-browser-extension/mv3-version.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-browser-extension/mv3-version.md b/docs/adguard-browser-extension/mv3-version.md index 8ae7a514789..d8c72047890 100644 --- a/docs/adguard-browser-extension/mv3-version.md +++ b/docs/adguard-browser-extension/mv3-version.md @@ -55,7 +55,7 @@ The maximum number of simultaneously enabled filters is **50**. **Dynamic rules:** a strict cap of **5,000** rules is imposed, which includes a maximum of 1,000 regex rules. -If this limit is exceeded, only **5,000 converted rules** will be applied in the following order: first allowlist, then user rules, custom filters, and finally — Quick Fixes rules. +If this limit is exceeded, only **5,000 converted rules** will be applied in the following order: first allowlist, then user rules, custom filters, and finally — Quick Fixes filter. > **Converted rules** are rules that have been transformed > to [DNR format] using the [declarative converter][github-declarative-converter]. From 8c41f21238c6c5b18bdb6ffed756808e03ba3ced Mon Sep 17 00:00:00 2001 From: puglieri <112409628+puglieri@users.noreply.github.com> Date: Thu, 3 Oct 2024 09:10:48 -0300 Subject: [PATCH 3/8] Update mv3-version.md --- docs/adguard-browser-extension/mv3-version.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-browser-extension/mv3-version.md b/docs/adguard-browser-extension/mv3-version.md index d8c72047890..d614b074294 100644 --- a/docs/adguard-browser-extension/mv3-version.md +++ b/docs/adguard-browser-extension/mv3-version.md @@ -55,7 +55,7 @@ The maximum number of simultaneously enabled filters is **50**. **Dynamic rules:** a strict cap of **5,000** rules is imposed, which includes a maximum of 1,000 regex rules. -If this limit is exceeded, only **5,000 converted rules** will be applied in the following order: first allowlist, then user rules, custom filters, and finally — Quick Fixes filter. +If this limit is exceeded, only **5,000 converted rules** will be applied in the following order: first allowlist, then user rules, custom filters, and finally — Quick Fixes filterы. > **Converted rules** are rules that have been transformed > to [DNR format] using the [declarative converter][github-declarative-converter]. From bee1b0d1d7c3da51208f1a9c1def54db542fe06d Mon Sep 17 00:00:00 2001 From: puglieri <112409628+puglieri@users.noreply.github.com> Date: Thu, 3 Oct 2024 10:24:12 -0300 Subject: [PATCH 4/8] Update mv3-version.md --- docs/adguard-browser-extension/mv3-version.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-browser-extension/mv3-version.md b/docs/adguard-browser-extension/mv3-version.md index d614b074294..203a43698d3 100644 --- a/docs/adguard-browser-extension/mv3-version.md +++ b/docs/adguard-browser-extension/mv3-version.md @@ -55,7 +55,7 @@ The maximum number of simultaneously enabled filters is **50**. **Dynamic rules:** a strict cap of **5,000** rules is imposed, which includes a maximum of 1,000 regex rules. -If this limit is exceeded, only **5,000 converted rules** will be applied in the following order: first allowlist, then user rules, custom filters, and finally — Quick Fixes filterы. +If this limit is exceeded, only **5,000 converted rules** will be applied in the following order: first allowlist, then user rules, custom filters, and finally — Quick Fixes filters. > **Converted rules** are rules that have been transformed > to [DNR format] using the [declarative converter][github-declarative-converter]. From 85ea0d0b396fcc2b4d07c14525cc04ded36a0273 Mon Sep 17 00:00:00 2001 From: puglieri <112409628+puglieri@users.noreply.github.com> Date: Thu, 3 Oct 2024 11:35:42 -0300 Subject: [PATCH 5/8] Update docs/adguard-browser-extension/mv3-version.md Co-authored-by: Slava <45171506+slavaleleka@users.noreply.github.com> --- docs/adguard-browser-extension/mv3-version.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-browser-extension/mv3-version.md b/docs/adguard-browser-extension/mv3-version.md index 203a43698d3..d8c72047890 100644 --- a/docs/adguard-browser-extension/mv3-version.md +++ b/docs/adguard-browser-extension/mv3-version.md @@ -55,7 +55,7 @@ The maximum number of simultaneously enabled filters is **50**. **Dynamic rules:** a strict cap of **5,000** rules is imposed, which includes a maximum of 1,000 regex rules. -If this limit is exceeded, only **5,000 converted rules** will be applied in the following order: first allowlist, then user rules, custom filters, and finally — Quick Fixes filters. +If this limit is exceeded, only **5,000 converted rules** will be applied in the following order: first allowlist, then user rules, custom filters, and finally — Quick Fixes filter. > **Converted rules** are rules that have been transformed > to [DNR format] using the [declarative converter][github-declarative-converter]. From 660f0c86fd69c45290f08d9ab8a28ca20369ddda Mon Sep 17 00:00:00 2001 From: Slava Leleka Date: Thu, 3 Oct 2024 21:27:05 +0300 Subject: [PATCH 6/8] fix removeparam restriction section --- docs/general/ad-filtering/create-own-filters.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/general/ad-filtering/create-own-filters.md b/docs/general/ad-filtering/create-own-filters.md index 66a357d6b28..2f5384d06ae 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -2384,8 +2384,6 @@ Rules with `$removeheader` modifier are supported by AdGuard for Windows, AdGuar Rules with `$removeparam` modifier are intended to strip query parameters from requests' URLs. Please note that such rules are only applied to `GET`, `HEAD`, `OPTIONS`, and sometimes `POST` requests. -`$removeparam` rules that do not have any [content type modifiers](#content-type-modifiers) will match only requests where content type is `document`. - **Syntax** **Basic syntax** @@ -2551,10 +2549,11 @@ With these rules, specified UTM parameters will be removed from any request save :::caution Restrictions -- Rules with `$removeparam` modifier can be used [**only in trusted filters**](#trusted-filters). -- `$removeparam` rules are compatible with [basic modifiers](#basic-rules-basic-modifiers), -[content-type modifiers](#content-type-modifiers), and with `$important` and `$app` modifiers. -Rules with any other modifiers are considered invalid and will be discarded. +1. Rules with `$removeparam` modifier can be used [**only in trusted filters**](#trusted-filters). +1. `$removeparam` rules are compatible with [basic modifiers](#basic-rules-basic-modifiers), + [content-type modifiers](#content-type-modifiers), and with `$important` and `$app` modifiers. + Rules with any other modifiers are considered invalid and will be discarded. +1. `$removeparam` rules that do not have any [content type modifiers](#content-type-modifiers) will match only requests where content type is `document`. ::: From aee76ccc9317385e3548420092ba844c815d8c7e Mon Sep 17 00:00:00 2001 From: Slava Leleka Date: Fri, 4 Oct 2024 19:31:10 +0300 Subject: [PATCH 7/8] fix after review --- .../ad-filtering/create-own-filters.md | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/docs/general/ad-filtering/create-own-filters.md b/docs/general/ad-filtering/create-own-filters.md index 2f5384d06ae..216ec281013 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -1569,7 +1569,7 @@ preroll.ts :::caution Restrictions -- `$hls` rules are only allowed [**in trusted filters**](#trusted-filters). +- Rules with the `$hls` modifier can only be used [**in trusted filters**](#trusted-filters). - `$hls` rules are compatible with the modifiers `$domain`, `$third-party`, `$strict-third-party`, `$strict-first-party`, `$app`, `$important`, `$match-case`, and `$xmlhttprequest` only. - `$hls` rules only apply to HLS playlists, which are UTF-8 encoded text starting with the line `#EXTM3U`. Any other response will not be modified by these rules. @@ -2312,7 +2312,7 @@ In case of multiple `$removeheader` rules matching a single request, we will app :::caution Restrictions -This type of rules can be used [**only in trusted filters**](#trusted-filters). +This type of rules can only be used [**in trusted filters**](#trusted-filters). 1. In order to avoid compromising the security `$removeheader` cannot remove headers from the list below: - `access-control-allow-origin` @@ -2549,11 +2549,9 @@ With these rules, specified UTM parameters will be removed from any request save :::caution Restrictions -1. Rules with `$removeparam` modifier can be used [**only in trusted filters**](#trusted-filters). -1. `$removeparam` rules are compatible with [basic modifiers](#basic-rules-basic-modifiers), - [content-type modifiers](#content-type-modifiers), and with `$important` and `$app` modifiers. - Rules with any other modifiers are considered invalid and will be discarded. -1. `$removeparam` rules that do not have any [content type modifiers](#content-type-modifiers) will match only requests where content type is `document`. +1. Rules with the `$removeparam` modifier can only be used [**in trusted filters**](#trusted-filters). +1. `$removeparam` rules are compatible with [basic modifiers](#basic-rules-basic-modifiers), [content-type modifiers](#content-type-modifiers), and with the `$important` and `$app` modifiers. Rules with any other modifiers are considered invalid and will be discarded. +1. `$removeparam` rules without [content type modifiers](#content-type-modifiers) will only match requests where the content type is `document`. ::: @@ -2632,7 +2630,7 @@ http://regexr.com/3cesk :::caution Restrictions -Rules with `$replace` modifier can be used [**only in trusted filters**](#trusted-filters). +Rules with the `$replace` modifier can only be used [**in trusted filters**](#trusted-filters). ::: @@ -2727,7 +2725,7 @@ the request to `https://example.com/firstpath` will be blocked. :::caution Restrictions -Rules with the `$urltransform` modifier can be used [**only in trusted filters**](#trusted-filters). +Rules with the `$urltransform` modifier can only be used [**in trusted filters**](#trusted-filters). ::: @@ -4156,7 +4154,7 @@ In other cases it is better to change the original rule, using domain restrictio :::caution Restrictions -JavaScript rules can be used [**only in trusted filters**](#trusted-filters). +JavaScript rules can only be used [**in trusted filters**](#trusted-filters). ::: @@ -4285,7 +4283,7 @@ Trusted scriptlets are not compatible with other ad blockers except AdGuard. :::caution Restrictions -Trusted scriptlets rules can be used [**only in trusted filters**](#trusted-filters). +Trusted scriptlets rules can only be used [**in trusted filters**](#trusted-filters). ::: From b74e5fc873f685f263c4a281ac5824bd9ca3c1b6 Mon Sep 17 00:00:00 2001 From: puglieri <112409628+puglieri@users.noreply.github.com> Date: Mon, 7 Oct 2024 06:07:12 -0300 Subject: [PATCH 8/8] Update docs/adguard-browser-extension/mv3-version.md Co-authored-by: Helen <58733007+el-termikael@users.noreply.github.com> --- docs/adguard-browser-extension/mv3-version.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-browser-extension/mv3-version.md b/docs/adguard-browser-extension/mv3-version.md index d8c72047890..51b258c5671 100644 --- a/docs/adguard-browser-extension/mv3-version.md +++ b/docs/adguard-browser-extension/mv3-version.md @@ -55,7 +55,7 @@ The maximum number of simultaneously enabled filters is **50**. **Dynamic rules:** a strict cap of **5,000** rules is imposed, which includes a maximum of 1,000 regex rules. -If this limit is exceeded, only **5,000 converted rules** will be applied in the following order: first allowlist, then user rules, custom filters, and finally — Quick Fixes filter. +If this limit is exceeded, only **5,000 converted rules** will be applied in the following order: first Allowlist, then User rules, Custom filters, and finally — Quick Fixes filter. > **Converted rules** are rules that have been transformed > to [DNR format] using the [declarative converter][github-declarative-converter].