Merge branch 'master' into issue-565-add-info-certificate

.github/workflows/build-deploy.yml

@@ -51,16 +51,18 @@ jobs:
           echo "User-Agent: *\nDisallow: /" > build/robots.txt
 
       - name: Install Wrangler
+        if: github.event.pull_request.head.repo.fork == false
         run: npm install -g wrangler
 
       - name: Deploy to Cloudflare Pages
+        if: github.event.pull_request.head.repo.fork == false
         run: npx wrangler pages deploy ./build --project-name="${{ env.PAGES_PROJECT }}" --branch ${{ env.BRANCH_NAME }}
         env:
           CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_WORKERS_API_TOKEN }}
           CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_WORKERS_ACCOUNT_ID }}
 
       - name: Add comment to Pull Request
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
         uses: actions/github-script@v6
         with:
           script: |

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 filter.
 
 > **Converted rules** are rules that have been transformed
 > to [DNR format] using the [declarative converter][github-declarative-converter].
@@ -66,33 +66,33 @@ If this limit is exceeded, only **5,000 converted rules** will be applied in the
 
 Here's how a rule with a basic modifier is converted to a declarative rule:
 
-    ```bash
-    ||example.org^$script,third-party,domain=example.com
-    ```
+```adblock
+||example.org^$script,third-party,domain=example.com
+```
 
 is converted to
 
-    ```bash
-    [
-        {
-            "id": 1,
-            "action": {
-                "type": "block"
-            },
-            "condition": {
-                "urlFilter": "||example.org^",
-                "domainType": "thirdParty",
-                "initiatorDomains": [
-                    "example.com"
-                ],
-                "resourceTypes": [
-                    "script"
-                ]
-            },
-            "priority": 302
-        }
-    ]
-    ```
+```json
+[
+    {
+        "id": 1,
+        "action": {
+            "type": "block"
+        },
+        "condition": {
+            "urlFilter": "||example.org^",
+            "domainType": "thirdParty",
+            "initiatorDomains": [
+                "example.com"
+            ],
+            "resourceTypes": [
+                "script"
+            ]
+        },
+        "priority": 302
+    }
+]
+```
 
 More examples can be found on [GitHub][github-declarative-converter-examples].
 

docs/adguard-browser-extension/solving-problems/debug-rules.md

@@ -69,7 +69,7 @@ These instructions are also meant for problematic cases where you want to modify
 
 1. Click *Load unpacked*:
 
-    ![Load unacked](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/load_unpacked.png)
+    ![Load unpacked](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/load_unpacked.png)
 
 1. Select the extension directory and click `Select`:
 

docs/adguard-for-windows/features/extensions.md

@@ -9,7 +9,7 @@ This article covers AdGuard for Windows, a multifunctional ad blocker that prote
 
 :::
 
-AdGuard can significantly broaden website functionality working as a [user script manager](/general/userscripts). AdGuard Users can add their own scripts, as well as manage existing ones.
+AdGuard can significantly extend website functionality by working as a [userscript manager](/general/extensions.md). AdGuard users can add their own scripts as well as manage existing ones.
 
 ![Extensions *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/userscripts.png)
 

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`
@@ -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,9 @@ 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 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`.
 
 :::
 
@@ -2633,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).
 
 :::
 
@@ -2728,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).
 
 :::
 
@@ -4157,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).
 
 :::
 
@@ -4286,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).
 
 :::