From 2e21ccedd5bea3c725056c532fcf3a6288f5601e Mon Sep 17 00:00:00 2001 From: Elena Ter-Mikaelyan Date: Sat, 2 Dec 2023 00:45:15 +0300 Subject: [PATCH 01/48] fix 1/8 pages with unresolved comments --- docs/adguard-browser-extension/overview.md | 2 +- .../solving-problems/background-work.md | 8 +++--- .../solving-problems/battery.md | 4 +-- .../solving-problems/firefox-certificates.md | 2 +- .../multiple-user-profiles.md | 2 +- docs/adguard-for-ios/overview.md | 6 ++-- docs/adguard-for-mac/installation.md | 2 +- .../solving-problems/advanced-settings.md | 4 +-- .../manual-certificate-installation.md | 2 +- .../common-installer-errors.md | 2 +- .../connection-not-trusted.md | 6 +++- .../solving-problems/system-logs.md | 2 +- docs/general/ad-filtering/filter-policy.md | 2 +- docs/general/ad-filtering/search-ads.md | 2 +- docs/general/https-filtering/known-issues.md | 2 +- .../what-is-https-filtering.md | 2 +- docs/general/license/what-is.md | 4 +-- docs/guides/collect-har-file.md | 28 +++++++++---------- docs/guides/minidump.md | 2 +- docs/guides/proxy-certificate.md | 14 +++++----- docs/guides/report-website.md | 4 +-- 21 files changed, 53 insertions(+), 49 deletions(-) diff --git a/docs/adguard-browser-extension/overview.md b/docs/adguard-browser-extension/overview.md index 22bc28620e4..e2dd8d276ca 100644 --- a/docs/adguard-browser-extension/overview.md +++ b/docs/adguard-browser-extension/overview.md @@ -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) diff --git a/docs/adguard-for-android/solving-problems/background-work.md b/docs/adguard-for-android/solving-problems/background-work.md index a04678684aa..f05801ca4c8 100644 --- a/docs/adguard-for-android/solving-problems/background-work.md +++ b/docs/adguard-for-android/solving-problems/background-work.md @@ -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) @@ -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) @@ -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` @@ -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` diff --git a/docs/adguard-for-android/solving-problems/battery.md b/docs/adguard-for-android/solving-problems/battery.md index 8d5d79be1c1..f3b1cf86caa 100644 --- a/docs/adguard-for-android/solving-problems/battery.md +++ b/docs/adguard-for-android/solving-problems/battery.md @@ -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: diff --git a/docs/adguard-for-android/solving-problems/firefox-certificates.md b/docs/adguard-for-android/solving-problems/firefox-certificates.md index e9965391a9c..4a37c6f034c 100644 --- a/docs/adguard-for-android/solving-problems/firefox-certificates.md +++ b/docs/adguard-for-android/solving-problems/firefox-certificates.md @@ -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**: diff --git a/docs/adguard-for-android/solving-problems/multiple-user-profiles.md b/docs/adguard-for-android/solving-problems/multiple-user-profiles.md index addf894eb72..6f563e471da 100644 --- a/docs/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/docs/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -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**; diff --git a/docs/adguard-for-ios/overview.md b/docs/adguard-for-ios/overview.md index 394daa1dc59..c1100b347a0 100644 --- a/docs/adguard-for-ios/overview.md +++ b/docs/adguard-for-ios/overview.md @@ -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} @@ -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} @@ -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 diff --git a/docs/adguard-for-mac/installation.md b/docs/adguard-for-mac/installation.md index 419ca3c9a75..cd8db8f5992 100644 --- a/docs/adguard-for-mac/installation.md +++ b/docs/adguard-for-mac/installation.md @@ -96,7 +96,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) diff --git a/docs/adguard-for-mac/solving-problems/advanced-settings.md b/docs/adguard-for-mac/solving-problems/advanced-settings.md index e8a01db4d07..54707c8bea2 100644 --- a/docs/adguard-for-mac/solving-problems/advanced-settings.md +++ b/docs/adguard-for-mac/solving-problems/advanced-settings.md @@ -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` diff --git a/docs/adguard-for-mac/solving-problems/manual-certificate-installation.md b/docs/adguard-for-mac/solving-problems/manual-certificate-installation.md index e0b31cfc693..3eb6f01d2a4 100644 --- a/docs/adguard-for-mac/solving-problems/manual-certificate-installation.md +++ b/docs/adguard-for-mac/solving-problems/manual-certificate-installation.md @@ -17,7 +17,7 @@ To manually install the certificate into Firefox-like browser: 2. Go to "Privacy & Security" — "Certificates" - 3. Click on "View Certificates" + 3. Click "View Certificates" 4. Navigate to the "Authorities" tab and click the "Import..." button diff --git a/docs/adguard-for-windows/solving-problems/common-installer-errors.md b/docs/adguard-for-windows/solving-problems/common-installer-errors.md index 7a6bdc4f4f3..deef08b9e4e 100644 --- a/docs/adguard-for-windows/solving-problems/common-installer-errors.md +++ b/docs/adguard-for-windows/solving-problems/common-installer-errors.md @@ -81,7 +81,7 @@ The error sounds scarier than it actually is. In reality, this is a rather gener 4) Click *OK* to go back to *Properties* dialog. Then click *Advanced*. 5) Click *Change Permissions*. 6) On *Permissions* tab, double-click *Administrators*. - 7) Select *This folder, subfolders and files* for *Applies to* field and tick all the available *Basic permissions*. After that hit *OK*. + 7) Select *This folder, subfolders and files* for *Applies to* field and check all the available *Basic permissions*. After that hit *OK*. 8) Do the same operation above (from item 7) for *SYSTEM*. 9) Click *OK* all the way out. Try installing AdGuard again. diff --git a/docs/adguard-for-windows/solving-problems/connection-not-trusted.md b/docs/adguard-for-windows/solving-problems/connection-not-trusted.md index eccf7fbba9d..7b216708d36 100644 --- a/docs/adguard-for-windows/solving-problems/connection-not-trusted.md +++ b/docs/adguard-for-windows/solving-problems/connection-not-trusted.md @@ -29,7 +29,11 @@ If that doesn't help, follow the instructions for manually adding the AdGuard ce 1. Go to [http://local.adguard.org/cert](http://local.adguard.org/cert) and click the *Download* button. The browser should start downloading **cert.cer** file. ->You can also open the download page by clicking on the link via the AdGuard app at *Settings → Network → HTTPS filtering*. +:::note + +You can also open the download page by clicking the link via the AdGuard app at *Settings → Network → HTTPS filtering*. + +::: ![Certificate settings](https://cdn.adtidy.org/content/kb/ad_blocker/windows/solving-problems/link.jpeg) diff --git a/docs/adguard-for-windows/solving-problems/system-logs.md b/docs/adguard-for-windows/solving-problems/system-logs.md index 21f3d502527..fab116f95fe 100644 --- a/docs/adguard-for-windows/solving-problems/system-logs.md +++ b/docs/adguard-for-windows/solving-problems/system-logs.md @@ -27,7 +27,7 @@ To analyze and diagnose different problems that may potentially arise, the AdGua - Right-click *Application* and in the drop-down menu select *Save All Events As...* - - Select a name and where to save, click *Save*. Select *Display information for the following languages*. You need to tick the box next to *English*. Click *OK*. + - Select a name and where to save, click *Save*. Select *Display information for the following languages*. You need to check the checkbox next to *English*. Click *OK*. - Open *System*: *Event Viewer (Local)* → *Windows Logs* → *System*. diff --git a/docs/general/ad-filtering/filter-policy.md b/docs/general/ad-filtering/filter-policy.md index b60d44a4c4c..778ddeedfc4 100644 --- a/docs/general/ad-filtering/filter-policy.md +++ b/docs/general/ad-filtering/filter-policy.md @@ -24,7 +24,7 @@ These equally apply to rules in all filters. ## Ad filters -This part describes the AdGuard Base filter, the Mobile Ads filter, and the following language-specific filters: Russian, German, Dutch, Spanish/Portuguese, Japanese, Turkish, Chinese, and French. +This part describes the AdGuard Base filter, the Mobile Ads filter, and the following language-specific filters: Chinese, Dutch, French, German, Japanese, Russian, Spanish/Portuguese, and Turkish. **What shall these filters block?** diff --git a/docs/general/ad-filtering/search-ads.md b/docs/general/ad-filtering/search-ads.md index 1a4268ee302..d67553c15c4 100644 --- a/docs/general/ad-filtering/search-ads.md +++ b/docs/general/ad-filtering/search-ads.md @@ -3,7 +3,7 @@ title: Search ads and self-promotion sidebar_position: 3 --- -**Disclosure.** While AdGuard provides an option to show some ads, we do not have any 'acceptable ads' program like Adblock Plus and some other ad blockers, where they take money for leaving certain ads unblocked. This is not our case. We do not get paid for showing any of the ads, and we do not use the term 'acceptable' for a reason: the ads we might show may be, in fact, useful and not just 'acceptable'. All of this applies only to search ads and self-promotion ads. +**Disclosure.** While AdGuard provides an option to show some ads, we do not have any 'acceptable ads' program like Adblock Plus and some other ad blockers, where they take money for leaving certain ads unblocked. This isn't our way of doing business. We do not get paid for showing any of the ads, and we do not use the term 'acceptable' for a reason: the ads we might show may be, in fact, useful and not just 'acceptable'. All of this applies only to search ads and self-promotion ads. You can turn off the display of these ads at any time. Furthermore, we will explain which ads qualify for this definition. diff --git a/docs/general/https-filtering/known-issues.md b/docs/general/https-filtering/known-issues.md index b2e0d66a0cf..177ca1855f8 100644 --- a/docs/general/https-filtering/known-issues.md +++ b/docs/general/https-filtering/known-issues.md @@ -9,7 +9,7 @@ Understanding this article may require some basic knowledge about encryption, TL First, look at this simple diagram that shows the general structure of the HTTPS protocol: -![What is HTTPS filtering](https://cdn.adtidy.org/public/Adguard/Blog/https/what_is_https_filtering.png) +![What is HTTPS filtering?](https://cdn.adtidy.org/public/Adguard/Blog/https/what_is_https_filtering.png) AdGuard copies properties of the TLS connection that your browser uses: diff --git a/docs/general/https-filtering/what-is-https-filtering.md b/docs/general/https-filtering/what-is-https-filtering.md index 0cd1f57fe4f..582fafe55cf 100644 --- a/docs/general/https-filtering/what-is-https-filtering.md +++ b/docs/general/https-filtering/what-is-https-filtering.md @@ -11,7 +11,7 @@ Using HTTPS is highly advantageous because encrypted traffic is protected agains The diagram below describes the difference between plain HTTP protocol and secure HTTPS protocol. -![What is HTTPS](https://cdn.adtidy.org/public/Adguard/Blog/https/what_is_https.png) +![What is HTTPS?](https://cdn.adtidy.org/public/Adguard/Blog/https/what_is_https.png) ### What is a security certificate? diff --git a/docs/general/license/what-is.md b/docs/general/license/what-is.md index f72b7f5a3c3..2f2a0f48cd4 100644 --- a/docs/general/license/what-is.md +++ b/docs/general/license/what-is.md @@ -1,9 +1,9 @@ --- -title: What is an AdGuard license +title: What is an AdGuard license? sidebar_position: 1 --- -## What is an AdGuard license +## What is an AdGuard license? A license is a permission to use the AdGuard product, provided in accordance with the [End User License Agreement](https://adguard.com/eula.html). If bound to an email address, AdGuard licenses can be found in the user's [AdGuard account](https://my.adguard.com/). diff --git a/docs/guides/collect-har-file.md b/docs/guides/collect-har-file.md index 9786bdeb170..f02ce81426f 100644 --- a/docs/guides/collect-har-file.md +++ b/docs/guides/collect-har-file.md @@ -7,7 +7,7 @@ HAR files help our technical support teams troubleshoot complex issues. To creat ## Chrome {#chrome} -To create a HAR file in Chrome: +To create a HAR file in Chrome, follow these steps: 1. Go to the URL where the issue occurs. Do not reproduce the issue yet. @@ -16,7 +16,7 @@ To create a HAR file in Chrome: - From menu: **Menu → More Tools → Developer Tools**. - Keyboard: **Ctrl+Shift+C**, or **Ctrl+Alt+I**, or **⌥+⌘+I for Mac**. -1. Click on the **Network tab**. +1. Click the **Network tab**. 1. Locate the round button at the top left of the Network tab and confirm it is in red recording mode. If it's grey, click to turn red to start recording. @@ -32,7 +32,7 @@ To create a HAR file in Chrome: 1. Save session as a .har file by right-clicking the grid and selecting **Save as HAR with content**. -1. Forward to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well. +1. Send to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well. ## Edge {#edge} @@ -43,7 +43,7 @@ To create a HAR file in Chrome: - From menu: **Menu → More Tools → Developer Tools**. - Keyboard: **Ctrl+Shift+C**, or **Ctrl+Alt+I**, or **⌥+⌘+I for Mac**. -1. Click on the **Network tab**. +1. Click the **Network tab**. 1. Locate the round button at the top left of the Network tab and confirm it is in red recording mode. If it's grey, click to turn red to start recording. @@ -59,11 +59,11 @@ To create a HAR file in Chrome: 1. Save session as a .har file by right-clicking the grid and selecting **Save as HAR with content**. -1. Forward to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well. +1. Send to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well. ## Firefox {#firefox} -To create a HAR file in Firefox: +To create a HAR file in Firefox, follow these steps: 1. Go to the URL where the issue occurs. Do not reproduce the issue yet. @@ -76,7 +76,7 @@ To create a HAR file in Firefox: - Button should be in play mode. -1. If any information is currently displayed in the grid, clear by clicking the **Delete trash can** button next to the play/pause button. +1. If any information is currently displayed in the grid, clear by clicking the **Empty trash can** button next to the play/pause button. 1. Select the **Persist Logs** check box on the Network tab. @@ -88,11 +88,11 @@ To create a HAR file in Firefox: 1. Save session as a .har file by right-clicking the grid and selecting **Save all as HAR**. -1. Forward to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well. +1. Send to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well. ## Internet Explorer 11 {#ie11} -To create a HAR file in Internet Explorer 11: +To create a HAR file in Internet Explorer 11, follow these steps: 1. Go to the URL where the issue occurs. Do not reproduce the issue yet. @@ -113,13 +113,13 @@ To create a HAR file in Internet Explorer 11: 1. Reproduce the steps that create the issue. -1. Save session as a .har file by clicking on the **Save disk** button (Export as HAR) on Network tab. +1. Save session as a .har file by clicking the **Save to disk** button (Export as HAR) on Network tab. -1. Forward to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well. +1. Send to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well. ## Safari {#safari} -To create a HAR file in Safari: +To create a HAR file in Safari, follow these steps: 1. Check the Safari menu bar at the top of the screen for a **Develop** menu. @@ -131,7 +131,7 @@ To create a HAR file in Safari: 1. Open **Network** tab in Web Inspector: - From menu: **Develop → Show Web Inspector → Network**. - - Keyboard: **⌥+⌘+I→Network** + - Keyboard: **⌥+⌘+I → Network** 1. Check **Preserve Log** checkbox on left side of the Network tabs, within the **Other filter options...** menu. @@ -147,7 +147,7 @@ To create a HAR file in Safari: 1. Save session as a .har file by clicking the **Export** icon next to the **Delete Trash** icon. -1. Forward to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, too. +1. Send to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, too. ## Android {#android} diff --git a/docs/guides/minidump.md b/docs/guides/minidump.md index 6dc35dcdc20..41fb15bc461 100644 --- a/docs/guides/minidump.md +++ b/docs/guides/minidump.md @@ -5,7 +5,7 @@ sidebar_position: 8 Almost all Windows users are familiar with the [Blue Screen of Death (BSoD)](https://en.wikipedia.org/wiki/Blue_screen_of_death) error unfortunately. BSoD occurs when the Windows system encounters problems that can affect safe system operation, such as problems with third-party driver code, hardware, or Microsoft code. To solve the blue screen error, users can use a minidump file. -## What is Minidump file +## What is Minidump file? A minidump file is a file that contains the information about the nature of the system crash. It is created just before the blue screen appears and it has the minimum amount of useful information that can be used to solve the problem. The minidump file usually has a *.dmp* extension. diff --git a/docs/guides/proxy-certificate.md b/docs/guides/proxy-certificate.md index a65fd28f513..b217056c6d8 100644 --- a/docs/guides/proxy-certificate.md +++ b/docs/guides/proxy-certificate.md @@ -27,11 +27,11 @@ Depending on the operation system of your device (Windows/Mac/Android/iOS), foll 4. Click the **Download** button. -5. Transfer the downloaded **cert.cer** file to the device which traffic you want to route through AdGuard. +5. Transfer the downloaded **cert.cer** file to the device whose traffic you want to route through AdGuard. 6. On that device, press the **Win** button, type `Manage computer certificates` and press **Enter**. -7. On the *Certificates - Local Computer* page, find the *Trusted Root Certification* → *Certificates* folder. +7. On the *Certificates - Local Computer* page, find the *Trusted Root Certification Authorities* → *Certificates* folder. 8. Right-click the *Certificates* folder and click **All Tasks** → **Import**. @@ -71,7 +71,7 @@ Depending on the operation system of your device (Windows/Mac/Android/iOS), foll 4. Click the **Download** button. -5. Transfer the downloaded **cert.cer** file to the device which traffic you want to route through AdGuard. +5. Transfer the downloaded **cert.cer** file to the device whose traffic you want to route through AdGuard. 6. Double-click the downloaded certificate file. @@ -91,7 +91,7 @@ Depending on the operation system of your device (Windows/Mac/Android/iOS), foll 14. Click **Details...** and navigate to the **Proxies** tab. -15. Tick two checkboxes: *Web proxy (HTTP)* and *Secure web proxy (HTTPS)*. In the **Server** field, enter the noted IP address of your computer (step 1). In the **Port** field, enter the port chosen in the network settings of the AdGuard desktop app. +15. Check two checkboxes: *Web proxy (HTTP)* and *Secure web proxy (HTTPS)*. In the **Server** field, enter the noted IP address of your computer (step 1). In the **Port** field, enter the port chosen in the network settings of the AdGuard desktop app. ### Android {#android} @@ -103,7 +103,7 @@ Depending on the operation system of your device (Windows/Mac/Android/iOS), foll 4. Click the **Download** button. -5. Transfer the downloaded **cert.cer** file to the device which traffic you want to route through AdGuard. +5. Transfer the downloaded **cert.cer** file to the device whose traffic you want to route through AdGuard. 6. Locate and tap the previously downloaded **cert.cer** certificate to open the file. @@ -123,11 +123,11 @@ Depending on the operation system of your device (Windows/Mac/Android/iOS), foll 4. Click the **Download** button. -5. Transfer the downloaded **cert.cer** file to the device which traffic you want to route through AdGuard. +5. Transfer the downloaded **cert.cer** file to the device whose traffic you want to route through AdGuard. 6. Open **Settings** → **Security** → **Encryption & Credentials** → **Install a certificate**. Android devices do not trust certificates by default so there will be a warning when you choose **CA certificate**. Tap **Install anyway**. -7. Open **Settings** → **Profile Donwloaded** and tap **Install** in the top right corner. Enter your password and confirm the installation. Tap **Done**. +7. Open **Settings** → **Profile Downloaded** and tap **Install** in the top right corner. Enter your password and confirm the installation. Tap **Done**. 8. Go to **Settings** → **General** → **About** → **Certificate Trust Settings**. Enable the switch beside *Adguard Personal CA*. The certificate is now installed. diff --git a/docs/guides/report-website.md b/docs/guides/report-website.md index e433242ac91..8f4d2e5c3b0 100644 --- a/docs/guides/report-website.md +++ b/docs/guides/report-website.md @@ -26,8 +26,8 @@ To report a reinsertion of an ad or incorrect displaying of a website, you need ### Browser extension {#extension} -- Open the browser extension settings by clicking on the corresponding icon; -- Click on **Report an issue**: +- Open the browser extension settings by clicking the corresponding icon; +- Click **Report an issue**: ![extension_issue *mobile_border](https://cdn.adtidy.org/blog/new/5si74extension.png) From 0d4b52c2ac60116aaa9ae895f7da67ec4e5c0251 Mon Sep 17 00:00:00 2001 From: Elena Ter-Mikaelyan Date: Sat, 2 Dec 2023 01:09:46 +0300 Subject: [PATCH 02/48] 2.5/8 --- docs/adguard-content-blocker/installation.md | 2 +- docs/adguard-content-blocker/overview.md | 2 +- docs/adguard-for-android/overview.md | 20 +++++++++---------- .../solving-problems/low-level-settings.md | 4 ++-- .../multiple-user-profiles.md | 4 ++-- .../solving-problems/low-level-settings.md | 2 +- .../protection-cannot-be-enabled.md | 2 +- docs/adguard-for-safari/installation.md | 2 +- docs/adguard-for-windows/overview.md | 10 +++++----- docs/general/account/2fa.md | 2 +- .../ad-filtering/create-own-filters.md | 2 +- .../tracking-filter-statistics.md | 2 +- docs/general/license/legacy.md | 4 ++-- docs/guides/report-website.md | 2 +- .../contribute/translate/plural-forms.md | 4 ++-- 15 files changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/adguard-content-blocker/installation.md b/docs/adguard-content-blocker/installation.md index ac70147dca9..ee78be182dd 100644 --- a/docs/adguard-content-blocker/installation.md +++ b/docs/adguard-content-blocker/installation.md @@ -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) ::: diff --git a/docs/adguard-content-blocker/overview.md b/docs/adguard-content-blocker/overview.md index 9a588a84180..7e0fb36db75 100644 --- a/docs/adguard-content-blocker/overview.md +++ b/docs/adguard-content-blocker/overview.md @@ -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 the Yandex Browser. To protect your entire device, [download the AdGuard app](https://agrd.io/download-kb-adblock) ::: diff --git a/docs/adguard-for-android/overview.md b/docs/adguard-for-android/overview.md index 1d7b620dd23..403cdbacc79 100644 --- a/docs/adguard-for-android/overview.md +++ b/docs/adguard-for-android/overview.md @@ -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). ::: @@ -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 solution. Browsing Security is safe: AdGuard does not know what websites you visit. It uses hash prefixes instead of URLs to check website security. @@ -224,15 +224,15 @@ From the context menu, you can also access the app's stats. ![App management: Chrome. Context menu *mobile_border](https://cdn.adtidy.org/blog/new/4z85achome_management_context_menu.png) -### Problem-free and problematic apps +### Compatible and incompatible apps -By default, only problem-free apps are routed through AdGuard and filtered. These are the apps that still work properly when filtering is enabled. +By default, only compatible apps are routed through AdGuard and filtered. These are the apps that still work properly when filtering is enabled. -Problematic apps, such as Download Manager, radio, system apps with UID 1000 and 1001 (for example, Google Play services) may work incorrectly when routed through AdGuard. That's why you may see the following warning when trying to route or filter all apps: +Incompatible apps, such as Download Manager, radio, system apps with UID 1000 and 1001 (for example, Google Play services) may work incorrectly when routed through AdGuard. That's why you may see the following warning when trying to route or filter all apps: ![Route all apps dialog *mobile_border](https://cdn.adtidy.org/blog/new/6du8jiroute_all.png) -To ensure proper operation of all apps installed on your device, we strongly recommend that you route only problem-free apps through AdGuard. You can see the full list of apps not recommended for filtering in *Settings* → *General* → *Advanced* → *Low-level settings* → *Protection* → *Excluded apps*. +To ensure proper operation of all apps installed on your device, we strongly recommend that you route only compatible apps through AdGuard. You can see the full list of apps not recommended for filtering in *Settings* → *General* → *Advanced* → *Low-level settings* → *Protection* → *Excluded apps*. ## Statistics @@ -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 @@ -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 @@ -446,10 +446,10 @@ You can get access to these features by [purchasing a license](https://adguard.c ### Rooted vs non-rooted devices -Due to additional security measures of Android apps, some AdGuard features are only available on rooted devices. Here's the list of them: +Due to additional security measures of 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 diff --git a/docs/adguard-for-android/solving-problems/low-level-settings.md b/docs/adguard-for-android/solving-problems/low-level-settings.md index 45304ae0180..1beaf2dd0bd 100644 --- a/docs/adguard-for-android/solving-problems/low-level-settings.md +++ b/docs/adguard-for-android/solving-problems/low-level-settings.md @@ -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. ::: @@ -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 diff --git a/docs/adguard-for-android/solving-problems/multiple-user-profiles.md b/docs/adguard-for-android/solving-problems/multiple-user-profiles.md index 6f563e471da..4954c818ae9 100644 --- a/docs/adguard-for-android/solving-problems/multiple-user-profiles.md +++ b/docs/adguard-for-android/solving-problems/multiple-user-profiles.md @@ -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. @@ -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. diff --git a/docs/adguard-for-ios/solving-problems/low-level-settings.md b/docs/adguard-for-ios/solving-problems/low-level-settings.md index 116be7f2224..5667afb6dc9 100644 --- a/docs/adguard-for-ios/solving-problems/low-level-settings.md +++ b/docs/adguard-for-ios/solving-problems/low-level-settings.md @@ -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. ::: diff --git a/docs/adguard-for-mac/solving-problems/protection-cannot-be-enabled.md b/docs/adguard-for-mac/solving-problems/protection-cannot-be-enabled.md index 554021c3c8c..1209f00ef6e 100644 --- a/docs/adguard-for-mac/solving-problems/protection-cannot-be-enabled.md +++ b/docs/adguard-for-mac/solving-problems/protection-cannot-be-enabled.md @@ -19,4 +19,4 @@ If AdGuard Protection cannot be enabled for some reason, perform the following s 4. Open the Terminal again, type `ls -al /Library/StagedExtensions/Library/Application\ Support/com.adguard.adguard/` and execute. You should receive the following: `No such file or directory`. -5. Start AdGuard, type in login and password when prompted. +5. Start AdGuard and enter your login information when prompted. diff --git a/docs/adguard-for-safari/installation.md b/docs/adguard-for-safari/installation.md index 33a4a727a69..1dfb65ea115 100644 --- a/docs/adguard-for-safari/installation.md +++ b/docs/adguard-for-safari/installation.md @@ -19,7 +19,7 @@ AdGuard for Safari is a free app presented on the App Store. To install it on yo 1. Press *Get* → *Install* → *Open*. -1. To set up AdGuard for Safari, enable the AdGuard extensions in the Safari settings. In a notification, click *Fix it*. In an opened window, check the boxes next to AdGuard extensions. +1. To set up AdGuard for Safari, enable the AdGuard extensions in the Safari settings. When a notification appears, click *Fix it*. In an opened window, check the boxes next to AdGuard extensions. ![Notification: Some extensions are disabled](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adguard-for-safari-notification.png) diff --git a/docs/adguard-for-windows/overview.md b/docs/adguard-for-windows/overview.md index d1f145e3b7c..e0a77b448cd 100644 --- a/docs/adguard-for-windows/overview.md +++ b/docs/adguard-for-windows/overview.md @@ -61,13 +61,13 @@ To learn everything about Stealth Mode and its many options, [read this article] ### Browsing Security -Browsing Security gives strong protection against malicious and fishing websites. No, AdGuard for Windows is not an antivirus. It will neither stop the download of a virus when it's already started, nor delete the already existing ones. But it will warn you if you're about to proceed to a website whose domain has been added to our "untrusted sites" database, or to download a file from such website. You can find more information about how this module works in the [dedicated article](/general/browsing-security). +Browsing Security gives strong protection against malicious and phishing websites. No, AdGuard for Windows is not an antivirus. It will neither stop the download of a virus when it's already started, nor delete the already existing ones. But it will warn you if you're about to proceed to a website whose domain has been added to our "untrusted sites" database, or to download a file from such website. You can find more information about how this module works in the [dedicated article](/general/browsing-security). In this module you can - enable notifications to block requests to malicious and phishing sites, - activate sound notifications, -- agree to submit anonymous security-related info to the AdGuard server to help us keep the malicious and fishing websites database up to date. +- agree to submit anonymous security-related info to the AdGuard server to help us keep the malicious and phishing websites database up to date. ![Browsing Security *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/browsing-security.png) @@ -83,7 +83,7 @@ In the DNS protection module of AdGuard for Windows you can select the DNS serve ### Parental Control -There are numerous websites access to which should be restricted if the PC is used by children. This task is accomplished by Parental Control. +There are several websites to which access should be restricted from a PC used by children. This task is accomplished by Parental Control. ![Parental Control *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/parental-control.png) @@ -121,7 +121,7 @@ AdGuard Assistant is Legacy Assistant that you may use if the [new Assistant](.. This is a custom extension designed to fight the technique of re-inserting blocked ads — the so-called ad blocker circumvention/ad reinjection. Both are advanced anti-ad blocker methods that continue to rise in popularity among advertisers. -AdGuard Extra is essentially a mini-program that changes the way pages work,and it does so in such a way that it becomes much more difficult for sites to use the above-mentioned functions to bypass blockers. +AdGuard Extra is essentially a mini-program that changes the way pages work in such a way that it becomes much more difficult for sites to use the above-mentioned methods to bypass blockers. **AdGuard Popup Blocker** @@ -151,7 +151,7 @@ How does AdGuard VPN work? Without going into technical details, we can say that - hides your real whereabouts and helps you stay anonymous - changes your IP address to protect your data from tracking -- encrypts your traffic to make it unreachable to scammers +- encrypts your traffic to make it unintelligible to outsiders - lets you configure where to use VPN and where not to (exclusions feature) To get more information about AdGuard VPN dive into the [AdGuard VPN Knowledge Base](https://adguard-vpn.com/kb/). diff --git a/docs/general/account/2fa.md b/docs/general/account/2fa.md index 448f4838250..c78a4b3ad84 100644 --- a/docs/general/account/2fa.md +++ b/docs/general/account/2fa.md @@ -3,7 +3,7 @@ title: Two-factor authentication sidebar_position: 3 --- -Two-factor authentication (or 2FA) is an authentication method that requires an additional piece of evidence from the user to log in, on top of the usual login and password pair. This is done for security purposes. Websites usually offer such 2FA methods as a code sent by SMS or a special authenticator app. +Two-factor authentication (or 2FA) is an authentication method that requires an additional piece of evidence from the user to log in, on top of the usual username and password pair. This is done for security purposes. Websites usually offer such 2FA methods as a code sent by SMS or a special authenticator app. We see adding a 2FA option as a benefit. We also understand that enforcing it may irritate some users. That's why we made it optional for your personal account on adguard.com — by default, 2FA is disabled when you register a new account. You can enable it manually in the settings. As for the currently available authentication methods, we use the tried and tested one: an authenticator app for Android or iOS. You can use almost any such app, and there are plenty of them. diff --git a/docs/general/ad-filtering/create-own-filters.md b/docs/general/ad-filtering/create-own-filters.md index 71e12579199..29e9e1d4732 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -163,7 +163,7 @@ Browser detects a blocked request as completed with an error. modifiers = [modifier0, modifier1[, ...[, modifierN]]] ``` -- **`pattern`** — an address mask. Every request URL is collated to this mask. You can also use special characters in the template, their description is [below](#basic-rules-special-characters). Note that AdGuard trims URLs to a length of 4096 characters in order to speed up matching and avoid issues with ridiculously long URLs. +- **`pattern`** — an address mask. Every request URL is collated to this mask. In the template, you can also use the special characters described [below](#basic-rules-special-characters). Note that AdGuard trims URLs to a length of 4096 characters in order to speed up matching and avoid issues with ridiculously long URLs. - **`@@`** — a marker that is used in rules of exception. To turn off filtering for a request, start your rule with this marker. - **`modifiers`** — parameters that "clarify" the basic rule. Some of them limit the rule scope and some can completely change they way it works. diff --git a/docs/general/ad-filtering/tracking-filter-statistics.md b/docs/general/ad-filtering/tracking-filter-statistics.md index 30c38eb5a09..74b38cb605f 100644 --- a/docs/general/ad-filtering/tracking-filter-statistics.md +++ b/docs/general/ad-filtering/tracking-filter-statistics.md @@ -37,7 +37,7 @@ The list is created based on the website's visit statistics since the last time The collected statistics will be sent periodically to our server for analysis and filter optimization. -It's important to note that all the statistics we get are averaged and anonymized. We don't use these statistics for any purpose other than optimizing the filters, and we do not sell this data to third parties. You can read about our Privacy Policy [here](https://adguard.com/privacy.html). +It's important to note that all the statistics we get are averaged and anonymized. We don't use these statistics for any purpose other than optimizing the filters, and we do not sell this data to third parties. You can read about it in our [Privacy Policy](https://adguard.com/privacy.html). ### What does tracking filter rules statistics fraught with? diff --git a/docs/general/license/legacy.md b/docs/general/license/legacy.md index 10557aad18b..af685e9fd56 100644 --- a/docs/general/license/legacy.md +++ b/docs/general/license/legacy.md @@ -11,7 +11,7 @@ Initially licenses of the following types were available to activate AdGuard pro **Standard** — for desktop applications AdGuard for Windows/AdGuard for Mac -**Mobile** — for mobile applications AdGuard for Android/AdGuard for iOS +**Mobile** — for mobile apps AdGuard for Android/AdGuard for iOS **Premium** — a license that combines desktop + mobile application @@ -27,7 +27,7 @@ For all types (Standard, Mobile, Premium) there were options for a Yearly and Li In October 2019 AdGuard switched to the new licensing system: from then on, licenses can still be purchased for 1 year or Lifetime, but their types have become **Personal** (for up to 3 devices) or **Family** (for up to 9 devices). -One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal License can be installed on Android, Mac and iOS, just like on two Windows computers and an Apple tablet, etc.** +One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal License can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet, etc.** ## What happened to the outdated licenses? diff --git a/docs/guides/report-website.md b/docs/guides/report-website.md index 8f4d2e5c3b0..2904d221e3d 100644 --- a/docs/guides/report-website.md +++ b/docs/guides/report-website.md @@ -137,7 +137,7 @@ where **example.com** is an example site name that needs to be replaced by your 1. Disable **Stealth Mode**; 2. If this solved the problem, turn the module on and turn off the **Stealth Mode** options one by one. This is done to detect which filters are "breaking" the page; -3. If you have managed to to detect which setting "breaks" a page, you should inform the developers when filling out the form (see above). In this case, it is desirable to return to the initial settings; +3. If you have managed to detect which setting "breaks" a page, you should inform the developers when filling out the form (see above). In this case, it is desirable to return to the initial settings; 4. In case of failure (issue not solved), turn to section **Extensions**. ### **Extensions** diff --git a/docs/miscellaneous/contribute/translate/plural-forms.md b/docs/miscellaneous/contribute/translate/plural-forms.md index 8a50cecd703..91c5a63e706 100644 --- a/docs/miscellaneous/contribute/translate/plural-forms.md +++ b/docs/miscellaneous/contribute/translate/plural-forms.md @@ -30,7 +30,7 @@ Let’s draw a small parallel between English and Polish for better understandin Now it is clear that the Polish *'godzinę'* (hour) has three different forms, whereas the English word changes its form with given numbers only twice. -Except for Polish, there are a lot of other languages that have three plural forms and more, such as Russian, Serbian, Slovak, Czech etc. But not all of them obey the same rule. That's why it is so important to know how many plural forms your language contains and how you can apply them. +Except for Polish, there are a lot of other languages that have three plural forms and more, such as Russian, Serbian, Slovak, Czech etc. But not all of them obey the same rule. That's why it's so important to know how many plurals your language has, as well as their correct usage. ## Where can you learn about the number of plural forms? {#where-to-learn} @@ -92,7 +92,7 @@ Please be attentive when translating these strings and approving them. If you ha ### 4. Strings with templates separated by the vertical bar sign {#4type} -This is the most complicated type of AdGuard strings which is mostly used in `AdGuard Websites` project. +This is the most complicated type of AdGuard strings which is mostly used in the `AdGuard Websites` project. Pay close attention to a vertical bar sign between the sentences and **%count%** placeholders in original phrases — this will help you identify phrases where translations require the use of plural forms. From e1761363b036d30fa359785885c95bd643dc3cc4 Mon Sep 17 00:00:00 2001 From: Elena Ter-Mikaelyan Date: Wed, 6 Dec 2023 20:05:24 +0300 Subject: [PATCH 03/48] more fixes --- .../solving-problems/big-sur-issues.md | 2 +- .../solving-problems/icloud-private-relay.md | 4 +- .../solving-problems/protect-mail-activity.md | 6 +- .../ad-filtering/create-own-filters.md | 136 +++++++++--------- docs/guides/take-screenshot.md | 6 +- 5 files changed, 77 insertions(+), 77 deletions(-) diff --git a/docs/adguard-for-mac/solving-problems/big-sur-issues.md b/docs/adguard-for-mac/solving-problems/big-sur-issues.md index d4fa20710ff..033ef225fc5 100644 --- a/docs/adguard-for-mac/solving-problems/big-sur-issues.md +++ b/docs/adguard-for-mac/solving-problems/big-sur-issues.md @@ -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. +Using a more traditional VPN service, such as AdGuard VPN, instead of the newer Apple privacy features is currently recommended. ### Monterey 12, Big Sur 11.6 and later: currently existing problems diff --git a/docs/adguard-for-mac/solving-problems/icloud-private-relay.md b/docs/adguard-for-mac/solving-problems/icloud-private-relay.md index 4189ab14d17..8571dbae618 100644 --- a/docs/adguard-for-mac/solving-problems/icloud-private-relay.md +++ b/docs/adguard-for-mac/solving-problems/icloud-private-relay.md @@ -26,11 +26,11 @@ On Big Sur, AdGuard developed "split-tunnel" rules to avoid creating the "defaul On Monterey, iCloud Private Relay got introduced. Privacy features of the Mail app also use Private Relay servers. -As a result, AdGuard can't work together with iCloud Private Relay and the Mail app privacy features: +As a consequence, AdGuard can't work together with iCloud Private Relay and the Mail app privacy features: 1. iCloud Private Relay is applied to connections at the library level — before they reach the socket level, where AdGuard operates. 2. iCloud Private Relay uses QUIC, which AdGuard can't filter in filtered apps because HTTP/3 filtering is not yet available. -3. As AdGuard blocks QUIC, including iCloud Private Relay traffic — otherwise, ad blocking is impossible. +3. Consequently, AdGuard blocks QUIC, including iCloud Private Relay traffic — otherwise, ad blocking is impossible. 4. When you use iCloud Private Relay and switch AdGuard into the "split-tunnel" mode, you can't open websites in Safari. 5. To work around this issue for Monterey, we apply the "default route" rule. When Private Relay sees that rule, it disables itself automatically. So, AdGuard works seamlessly on Monterey, but iCloud Private Relay gets disabled. diff --git a/docs/adguard-for-mac/solving-problems/protect-mail-activity.md b/docs/adguard-for-mac/solving-problems/protect-mail-activity.md index 828bc351ce6..21631ad39e7 100644 --- a/docs/adguard-for-mac/solving-problems/protect-mail-activity.md +++ b/docs/adguard-for-mac/solving-problems/protect-mail-activity.md @@ -28,11 +28,11 @@ On Big Sur, AdGuard used "split-tunnel" rules to avoid creating the "default rou On Monterey, iCloud Private Relay got introduced. Privacy features of Mail.app also use Private Relay servers. -As a result, AdGuard can't work together with iCloud Private Relay and Mail.app privacy features: +As a consequence, AdGuard can't work together with iCloud Private Relay and Mail app privacy features: 1. iCloud Private Relay is applied to connections at the library level - before they reach the socket level, where AdGuard operates. 2. iCloud Private Relay uses QUIC, which AdGuard can't filter because HTTP/3 filtering is not yet available. -3. As AdGuard blocks QUIC, including iCloud Private Relay traffic - otherwise, ad blocking is impossible. +3. Consequently, AdGuard blocks QUIC, including iCloud Private Relay traffic – otherwise, ad blocking is impossible. 4. When you use iCloud Private Relay and switch AdGuard into the "split-tunnel" mode, you can't open websites in Safari. 5. To work around this issue for Monterey, we apply the "default route" rule. When Private Relay sees that rule, it disables itself automatically. So, AdGuard works seamlessly on Monterey, but iCloud Private Relay gets disabled. @@ -42,4 +42,4 @@ We keep searching for a solution to this issue. One of the options is implementi ## Recommended solution -At this point, we recommend using a more traditional VPN service, such as [AdGuard VPN](https://adguard-vpn.com/), instead of the new Apple's privacy features. +Using a more traditional VPN service, such as [AdGuard VPN](https://adguard-vpn.com/), instead of the newer Apple privacy features is currently recommended. diff --git a/docs/general/ad-filtering/create-own-filters.md b/docs/general/ad-filtering/create-own-filters.md index 29e9e1d4732..2839ffab25a 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -163,7 +163,7 @@ Browser detects a blocked request as completed with an error. modifiers = [modifier0, modifier1[, ...[, modifierN]]] ``` -- **`pattern`** — an address mask. Every request URL is collated to this mask. In the template, you can also use the special characters described [below](#basic-rules-special-characters). Note that AdGuard trims URLs to a length of 4096 characters in order to speed up matching and avoid issues with ridiculously long URLs. +- **`pattern`** — an address mask. Every request URL is collated to this mask. In the template, you can also use the special characters described [below](#basic-rules-special-characters). Note that AdGuard truncates URLs to a length of 4096 characters in order to speed up matching and avoid issues with ridiculously long URLs. - **`@@`** — a marker that is used in rules of exception. To turn off filtering for a request, start your rule with this marker. - **`modifiers`** — parameters that "clarify" the basic rule. Some of them limit the rule scope and some can completely change they way it works. @@ -460,9 +460,9 @@ If you want the rule not to be applied to certain domains, start a domain name w **`$domain` modifier matching target domain:** -In some cases the `$domain` modifier can match not only the referrer domain, but also the target domain. This happens when all of the following is true: +In some cases the `$domain` modifier can match not only the referrer domain, but also the target domain. This happens when all the following conditions are met: -1. The request has `document` content type +1. The request has the `document` content type 1. The rule pattern does not match any particular domains 1. The rule pattern does not contain regular expressions 1. The `$domain` modifier contains only excluded domains, e.g. `$domain=~example.org|~example.com` @@ -529,7 +529,7 @@ where: - **`string`** — a sequence of characters. It is matched against the header value lexicographically; - **`regexp`** — a regular expression, starts and ends with `/`. The pattern works the same way as in the basic URL rules, but the characters `/`, `$` and `,` must be escaped with `\`. -The modifier `":" h_value` part may be omitted. In that case, the modifier matches the header name only. +The modifier part, `":" h_value`, may be omitted. In that case, the modifier matches the header name only. **Examples** @@ -546,7 +546,7 @@ Rules with the `$header` modifier are supported by AdGuard for Windows, Mac, and #### **`$important`** {#important-modifier} -The `$important` modifier applied to a rule increases its priority over any other rule without `$important` modifier. Even over basic exception rules. +The `$important` modifier applied to a rule increases its priority over rules without the identical modifier. Even over basic exception rules. Go to [rules priorities](#rule-priorities) for more details. @@ -649,7 +649,7 @@ If there is a `$~third-party` modifier, the rule is only applied to the requests **`$~third-party`:** -- `||domain.com$~third-party` — this rule is applied to `domain.com`, but not to the other domains. Example of a request that is not a third-party request: `http://domain.com/icon.ico`. +- `||domain.com$~third-party` — this rule is applied exclusively to `domain.com`. Example of a non third-party request: `http://domain.com/icon.ico`. :::note @@ -870,7 +870,7 @@ The rule applies only to WebRTC connections. **Examples** -- `||example.com^$webrtc,domain=example.org` blocks webRTC connections to `example.com` for `example.org`. +- `||example.com^$webrtc,domain=example.org` blocks webRTC connections to `example.com` from `example.org`. - `@@*$webrtc,domain=example.org` disables the RTC wrapper for `example.org`. ### Exception rules modifiers {#exception-modifiers} @@ -937,7 +937,7 @@ Disables specific userscripts or all userscripts for a given domain. $extension[="userscript_name1"[|"userscript_name2"[|"userscript_name3"[...]]]] ``` -`userscript_name(i)` stands for a specific userscript name to be disabled by the modifier. The modifier can contain any number of userscript names or not contain them at all. In the latter case the modifier disables all the userscripts. +`userscript_name(i)` stands for a specific userscript name to be disabled by the modifier. The modifier can contain any number of userscript names or none. In the latter case the modifier disables all the userscripts. Userscript names usually contain spaces or other special characters, which is why you should enclose the name in quotes. Both single (`'`) and double (`"`) ASCII quotes are supported. Multiple userscript names should be separated with a pipe (`|`). However, if a userscript name is a single word without any special characters, it can be used without quotes. @@ -996,7 +996,7 @@ Disables the Stealth Mode module for all corresponding pages and requests. $stealth [= opt1 [| opt2 [| opt3 [...]]]] ``` -`opt(i)` stand for certain Stealth Mode options disabled by the modifier. The modifier can contain any number of options (see below) or not contain them at all. In the latter case the modifier disables all the Stealth Mode features. +`opt(i)` stand for certain Stealth Mode options disabled by the modifier. The modifier can contain any number of options (see below) or none. In the latter case the modifier disables all the Stealth Mode features. The list of the available modifier options: @@ -1031,7 +1031,7 @@ Blocking cookies and removing tracking parameters is achieved by using rules wit :::caution Restrictions -- Modifier options should be lowercase, i.e. `$stealth=DPI` will be rejected. +- Modifier options must be lowercase, i.e. `$stealth=DPI` will be rejected. - Modifier options cannot be negated, i.e. `$stealth=~3p-cookie` will be rejected. ::: @@ -1280,7 +1280,7 @@ Here's how it works: :::caution Restrictions -`$cookie` rules support a limited list of modifiers: `$domain`, `$~domain`, `$important`, `$third-party`, and `$~third-party`. +`$cookie` rules support three types of modifiers: `$domain`, `$~domain`, `$important`, `$third-party`, and `$~third-party`. ::: @@ -1300,7 +1300,7 @@ In order to use this type of rules, it is required to have the basic understandi ::: -For the requests matching a `$csp` rule, we will strengthen response security policy by enhancing the content security policy, similar to the content security policy of the `$csp` modifier contents. `$csp` rules are applied independently from any other rule type. Other basic rules have no influence on it **save for document-level exceptions** (see the examples section below). +For the requests matching a `$csp` rule, we will strengthen response security policy by enhancing the content security policy, similar to the content security policy of the `$csp` modifier contents. `$csp` rules are applied independently from any other rule type. **Only document-level exceptions** can influence it (see the examples section), but no other basic rules. **Multiple rules matching a single request** @@ -1392,7 +1392,7 @@ Some points specific to the operation of `$hls` rules: 1. When a segment is removed, all of the tags that apply only to that segment are also removed 1. When there is a tag that applies to multiple segments, and all of those segments are removed, the tag is also removed 1. Since there is no way to recognize different kinds of tags by syntax, we recognize all of the tags specified by the RFC, plus some non-standard tags that we have seen in the field. Any lines starting with `#` and not recognized as a tag are passed through without modification, and are not matched against the rules -1. We do not match tags that apply to the whole playlist, and `$hls` rules can not be used to remove them, since `$hls` rules are intended for removing segments. If you know what you are doing, you can use `$replace` rules to remove or rewrite just a single tag from the playlist +1. Tags will not be matched if they apply to the entire playlist, and `$hls` rrules cannot be used to remove them, as these rule types are intended for segment removals. If you know what you are doing, you can use `$replace` rules to remove or rewrite just a single tag from the playlist **An example of a transformation done by the rules:** @@ -1721,7 +1721,7 @@ This is basically a Firewall-like rule allowing to fully block or unblock access 1. `$network` rules match **IP addresses only**! You cannot use them to block or unblock access to a domain. 2. To match an IPv6 address, you have to use the collapsed syntax, e.g. use `[2001:4860:4860::8888]$network` instead of `[2001:4860:4860:0:0:0:0:8888]$network`. -3. An allowlist `$network` rule makes AdGuard bypass data to the matching endpoint, e.g. there will be no further filtering at all. +3. An allowlist `$network` rule makes AdGuard bypass data to the matching endpoint, hence there will be no further filtering at all. 4. If the IP part starts and ends with `/` character, it is treated as a regular expression. We recommend to get acquainted with this [article](#regexp-support) for better understanding of regular expressions. @@ -1757,7 +1757,7 @@ In order to use this type of rules, it is required to have a basic understanding ::: -For the requests matching a `$permissions` rule, AdGuard strengthens response's permissions policy by adding an additional permission policy equal to the `$permissions` modifier contents. `$permissions` rules are applied independently from any other rule type. Other basic rules have no influence on it **save for document-level exceptions** (see the examples section). +For the requests matching a `$permissions` rule, AdGuard strengthens response's permissions policy by adding an additional permission policy equal to the `$permissions` modifier contents. `$permissions` rules are applied independently from any other rule type. **Only document-level exceptions** can influence it (see the examples section), but no other basic rules. **Multiple rules matching a single request.** @@ -1781,7 +1781,7 @@ The list of the available directives is available [here](https://developer.mozil :::caution Restrictions 1. Characters forbidden in the `$permissions` value: `$` -1. `$permissions` is compatible with the limited list of modifiers: `$domain`, `$important`, and `$subdocument` +1. `$permissions` is compatible with three types of modifiers: `$domain`, `$important`, and `$subdocument` ::: @@ -2126,7 +2126,7 @@ You will need some knowledge of regular expressions to use `$replace` modifier. - `$replace` rules apply to any text response, but will not apply to binary (`media`, `image`, `object`, etc.). - `$replace` rules do not apply if the size of the original response is more than 3MB. -- `$replace` rules have a higher priority than other basic rules (**including** exception rules). So if a request corresponds to two different rules one of which has the `$replace` modifier, this rule will be applied. +- `$replace` rules have a higher priority than other basic rules (**including** exception rules). So if a request matches two different rules one of which has the `$replace` modifier, this rule will be applied. - Document-level exception rules with `$content` or `$document` modifiers do disable `$replace` rules for requests matching them. - Other document-level exception rules (`$generichide`, `$elemhide` or `$jsinject` modifiers) are applied alongside `$replace` rules. It means that you can modify the page content with a `$replace` rule and disable cosmetic rules there at the same time. @@ -2269,7 +2269,7 @@ The concept of rule priorities becomes increasingly important in light of Manife ::: -#### Priority computation +#### Priority calculation To calculate priority, we've categorized modifiers into different groups. These groups are ranked based on their priority, from lowest to highest. A modifier that significantly narrows the scope of a rule adds more weight to its total priority. Conversely, if a rule applies to a broader range of requests, its priority decreases. @@ -2537,9 +2537,9 @@ Element hiding rules are not dependent on each other. If there is a rule `exampl **Examples** -- `example.com##div.textad` — hides a `div` with a class `textad` at `example.com` and all subdomains. +- `example.com##div.textad` — hides a `div` with the class `textad` at `example.com` and all subdomains. - `example.com,example.org###adblock` — hides an element with attribute `id` equals `adblock` at `example.com`, `example.org` and all subdomains. -- `~example.com##.textad` — hides an element with a class `textad` at all domains, except `example.com` and its subdomains. +- `~example.com##.textad` — hides an element with the class `textad` at all domains, except `example.com` and its subdomains. **Limitations** @@ -2577,7 +2577,7 @@ We recommend to use this kind of exceptions only if it is not possible to change ### CSS rules {#cosmetic-css-rules} -Sometimes, simple hiding of an element is not enough to deal with advertising. For example, blocking an advertising element can just break the page layout. In this case AdGuard can use rules that are much more flexible than hiding rules. With this rules you can basically add any CSS styles to the page. +Sometimes, simple hiding of an element is not enough to deal with advertising. For example, blocking an advertising element can just break the page layout. In this case AdGuard can use rules that are much more flexible than hiding rules. With these rules you can basically add any CSS styles to the page. **Syntax** @@ -2588,7 +2588,7 @@ domains = [domain0, domain1[, ...[, domainN]]] - **`selector`** — [CSS selector](https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_Started/Selectors), that defines the elements we want to apply the style to. - **`domains`** — domain restriction for the rule. Same principles as in [element hiding rules](#elemhide-syntax). -- **`style`** — CSS style, that we want to apply to selected elements. +- **`style`** — desired CSS style to apply to selected elements. **Examples** @@ -2681,13 +2681,13 @@ We **strongly recommend** using these markers any time when you use an extended - `example.net#?#.banner:matches-css(width: 360px)` — this rule blocks all `.banner` elements with the style property `width: 360px`. The rule applies only to `example.net` and its subdomains. - `example.net#@?#.banner:matches-css(width: 360px)` — this rule will disable the previous rule. -You can apply standard CSS selectors using the ExtendedCss library by using a rule marker `#?#`, e.g. `#?#div.banner`. +You can apply standard CSS selectors using the ExtendedCss library by using the rule marker `#?#`, e.g. `#?#div.banner`. Learn more about [how to debug extended selectors](#selectors-debugging-mode). :::note -Some pseudo-classes do not require selector before it. Still adding a [universal selector](https://www.w3.org/TR/selectors-4/#the-universal-selector) `*` makes an extended selector easier to read, even though it has no effect on the matching behavior. So selector `#block :has(> .inner)` works exactly like `#block *:has(> .inner)` but second one is more obvious. +Some pseudo-classes do not require selector before it. Still adding the [universal selector](https://www.w3.org/TR/selectors-4/#the-universal-selector) `*` makes an extended selector easier to read, even though it has no effect on the matching behavior. So selector `#block :has(> .inner)` works exactly like `#block *:has(> .inner)` but second one is more obvious. Pseudo-class names are case-insensitive, e.g. `:HAS()` works as `:has()`. Still the lower-case names are used commonly. @@ -2706,7 +2706,7 @@ Draft CSS 4.0 specification describes the [`:has()` pseudo-class](https://www.w3 :::note -Rules with the `:has()` pseudo-class should use the [native implementation of `:has()`](https://developer.mozilla.org/en-US/docs/Web/CSS/:has) if they use `##` marker and if it is possible, i.e. with no other extended selectors inside. To force applying of ExtendedCss rules with `:has()`, use `#?#`/`#$?#` marker explicitly. +Rules with the `:has()` pseudo-class must use the [native implementation of `:has()`](https://developer.mozilla.org/en-US/docs/Web/CSS/:has) if they use `##` marker and if it is possible, i.e. with no other extended selectors inside. To force applying of ExtendedCss rules with `:has()`, use `#?#`/`#$?#` marker explicitly. ::: @@ -2726,7 +2726,7 @@ Synonyms `:-abp-has()` is supported by ExtendedCss for better compatibility. [target]:has(selector) ``` -- `target` — optional, standard or extended CSS selector, can be missed for checking *any* element +- `target` — optional, standard or extended CSS selector, can be skipped for checking *any* element - `selector` — required, standard or extended CSS selector The pseudo-class `:has()` selects the `target` elements that fit to the `selector`. Also the `selector` can start with a combinator. @@ -2742,7 +2742,7 @@ Usage of the `:has()` pseudo-class is [restricted for some cases (2, 3)](https:/ Native `:has()` pseudo-class does not allow `:has()`, `:is()`, `:where()` inside `:has()` argument to avoid increasing the `:has()` invalidation complexity ([case 1](https://bugs.chromium.org/p/chromium/issues/detail?id=669058#c54)). But ExtendedCss did not have such limitation earlier and filter lists already contain such rules, so we have not added this limitation to ExtendedCss and allow to use `:has()` inside `:has()` as it was possible before. To use it, just force ExtendedCss usage by setting `#?#`/`#$?#` rule marker. -Native implementation does not allow any usage of `:scope` inside `:has()` argument ([[1]](https://github.com/w3c/csswg-drafts/issues/7211), [[2]](https://github.com/w3c/csswg-drafts/issues/6399)). Still, there are some such rules in filter lists: `div:has(:scope a)` which we continue to support by simply converting them to `div:has(> a)`, as it used to be done previously. +Native implementation does not allow any usage of `:scope` inside the `:has()` argument ([[1]](https://github.com/w3c/csswg-drafts/issues/7211), [[2]](https://github.com/w3c/csswg-drafts/issues/6399)). Still, there are some such rules in filter lists: `div:has(:scope a)` which we continue to support by simply converting them to `div:has(> a)`, as it used to be done previously. **Examples** @@ -2824,7 +2824,7 @@ Synonyms `:-abp-contains()` and `:has-text()` are supported for better compatibi [target]:contains(match) ``` -- `target` — optional, standard or extended CSS selector, can be missed for checking *any* element +- `target` — optional, standard or extended CSS selector, can be skipped for checking *any* element - `match` — required, string or regular expression for matching element `textContent`. Regular expression flags are supported. **Examples** @@ -2838,7 +2838,7 @@ For such DOM:
Not selected
``` -the element `div#match` can be selected by any on these extended selectors: +the element `div#match` can be selected by any of these extended selectors: ```adblock ! plain text @@ -2874,7 +2874,7 @@ The `:matches-css()` pseudo-class allows to match the element by its current sty [target]:matches-css([pseudo-element, ] property: pattern) ``` -- `target` — optional, standard or extended CSS selector, can be missed for checking *any* element +- `target` — optional, standard or extended CSS selector, can be skipped for checking *any* element - `pseudo-element` — optional, valid standard pseudo-element, e.g. `before`, `after`, `first-line`, etc. - `property` — required, a name of CSS property to check the element for - `pattern` — required, a value pattern that is using the same simple wildcard matching as in the basic url filtering rules OR a regular expression. For this type of matching, AdGuard always does matching in a case-insensitive manner. In the case of a regular expression, the pattern looks like `/regexp/`. @@ -2934,7 +2934,7 @@ is supported but **not recommended**. #### Pseudo-class `:matches-attr()` {#extended-css-matches-attr} -The `:matches-attr()` pseudo-class allows to select an element by its attributes, especially if they are randomized. +The `:matches-attr()` pseudo-class allows selecting an element by its attributes, especially if they are randomized. **Syntax** @@ -2942,7 +2942,7 @@ The `:matches-attr()` pseudo-class allows to select an element by its attributes [target]:matches-attr("name"[="value"]) ``` -- `target` — optional, standard or extended CSS selector, can be missed for checking *any* element +- `target` — optional, standard or extended CSS selector, can be skipped for checking *any* element - `name` — required, simple string *or* string with wildcard *or* regular expression for attribute name matching - `value` — optional, simple string *or* string with wildcard *or* regular expression for attribute value matching @@ -2990,7 +2990,7 @@ Regexp patterns **do not support** flags. #### Pseudo-class `:matches-property()` {#extended-css-property} -The `:matches-property()` pseudo-class allows to select an element by matching its properties. +The `:matches-property()` pseudo-class allows selecting an element by matching its properties. **Syntax** @@ -2998,13 +2998,13 @@ The `:matches-property()` pseudo-class allows to select an element by matching i [target]:matches-property("name"[="value"]) ``` -- `target` — optional, standard or extended CSS selector, can be missed for checking *any* element +- `target` — optional, standard or extended CSS selector, can be skipped for checking *any* element - `name` — required, simple string *or* string with wildcard *or* regular expression for element property name matching - `value` — optional, simple string *or* string with wildcard *or* regular expression for element property value matching **Escaping special characters** -For **regexp** patterns `"` and `\` should be escaped, e.g. `div:matches-property(prop=/[\\w]{4}/)`. +For **regexp** patterns `"` and `\` must be escaped, e.g. `div:matches-property(prop=/[\\w]{4}/)`. :::note @@ -3065,7 +3065,7 @@ Regexp patterns **do not support** flags. #### Pseudo-class `:xpath()` {#extended-css-xpath} -The `:xpath()` pseudo-class allows to select an element by evaluating an XPath expression. +The `:xpath()` pseudo-class allows selecting an element by evaluating an XPath expression. **Syntax** @@ -3213,7 +3213,7 @@ selector { remove: true; } The `:remove()` pseudo-class is limited to work properly only at the end of selector. -For applying the `:remove()` pseudo-class to any element, a [universal selector](https://www.w3.org/TR/selectors-4/#the-universal-selector) `*` should be used. Otherwise such extended selector may be considered as invalid, e.g. `.banner > :remove()` is not valid for removing any child element of `banner` class element, so it should look like `.banner > *:remove()`. +For applying the `:remove()` pseudo-class to any element, the [universal selector](https://www.w3.org/TR/selectors-4/#the-universal-selector) `*` should be used. Otherwise such extended selector may be considered as invalid, e.g. `.banner > :remove()` is not valid for removing any child element of `banner` class element, so it should look like `.banner > *:remove()`. If the `:remove()` pseudo-class or the `remove` pseudo-property is used, all style properties are ignored except for the [`debug` pseudo-property](#selectors-debug-mode). @@ -3229,7 +3229,7 @@ div[class]:has(> a > img) { remove: true; } :::note -Rules with the `remove` pseudo-property should use `#$?#` marker: `$` for CSS-style rule syntax, `?` for ExtendedCss syntax. +Rules with the `remove` pseudo-property must use `#$?#` marker: `$` for CSS-style rule syntax, `?` for ExtendedCss syntax. ::: @@ -3243,14 +3243,14 @@ The `:is()` pseudo-class allows to match any element that can be selected by any [target]:is(selectors) ``` -- `target` — optional, standard or extended CSS selector, can be missed for checking *any* element -- `selectors` — [*forgiving selector list*](https://drafts.csswg.org/selectors-4/#typedef-forgiving-selector-list) of standard or extended selectors. For extended selectors only compound selectors are supported, not complex. +- `target` — optional, standard or extended CSS selector, can be skipped for checking *any* element +- `selectors` — [*forgiving selector list*](https://drafts.csswg.org/selectors-4/#typedef-forgiving-selector-list) of standard or extended selectors. For extended selectors, only compound selectors are supported, not complex. ##### `:is()` limitations {#extended-css-is-limitations} -Rules with the `:is()` pseudo-class should use the [native implementation of `:is()`](https://developer.mozilla.org/en-US/docs/Web/CSS/:is) if rules use `##` marker and it is possible, i.e. with no other extended selectors inside. To force applying ExtendedCss rules with `:is()`, use `#?#`/`#$?#` marker explicitly. +Rules with the `:is()` pseudo-class must use the [native implementation of `:is()`](https://developer.mozilla.org/en-US/docs/Web/CSS/:is) if rules use `##` marker and it is possible, i.e. with no other extended selectors inside. To force applying ExtendedCss rules with `:is()`, use `#?#`/`#$?#` marker explicitly. -If the `:is()` pseudo-class argument `selectors` is an extended selector, due to the way how the `:is()` pseudo-class is implemented in ExtendedCss v2.0, it is impossible to apply it to the top DOM node which is `html`, i.e. `#?#html:is()` does not work. So if `target` is not defined or defined as a [universal selector](https://www.w3.org/TR/selectors-4/#the-universal-selector) `*`, the extended pseudo-class applying is limited to **`html`'s children**, e.g. rules `#?#:is(...)` and `#?#*:is(...)` are parsed as `#?#html *:is(...)`. Please note that there is no such limitation for a standard selector argument, i.e. `#?#html:is(.locked)` works fine. +If the `:is()` pseudo-class argument `selectors` is an extended selector, due to the way how the `:is()` pseudo-class is implemented in ExtendedCss v2.0, it is impossible to apply it to the top DOM node which is `html`, i.e. `#?#html:is()` does not work. So if `target` is not defined or defined as the [universal selector](https://www.w3.org/TR/selectors-4/#the-universal-selector) `*`, the extended pseudo-class applying is limited to **`html`'s children**, e.g. rules `#?#:is(...)` and `#?#*:is(...)` are parsed as `#?#html *:is(...)`. Please note that there is no such limitation for a standard selector argument, i.e. `#?#html:is(.locked)` works fine. [Complex selectors](https://www.w3.org/TR/selectors-4/#complex) with extended pseudo-classes are not supported as `selectors` argument for `:is()` pseudo-class, only [compound ones](https://www.w3.org/TR/selectors-4/#compound) are allowed. Check examples below for more details. @@ -3290,14 +3290,14 @@ The `:not()` pseudo-class allows to select elements which are *not matched* by s [target]:not(selectors) ``` -- `target` — optional, standard or extended CSS selector, can be missed for checking *any* element +- `target` — optional, standard or extended CSS selector, can be skipped for checking *any* element - `selectors` — list of standard or extended selectors ##### `:not()` limitations {#extended-css-not-limitations} -Rules with the `:not()` pseudo-class should use the [native implementation of `:not()`](https://developer.mozilla.org/en-US/docs/Web/CSS/:not) if rules use `##` marker and it is possible, i.e. with no other extended selectors inside. To force applying ExtendedCss rules with `:not()`, use `#?#`/`#$?#` marker explicitly. +Rules with the `:not()` pseudo-class must use the [native implementation of `:not()`](https://developer.mozilla.org/en-US/docs/Web/CSS/:not) if rules use `##` marker and it is possible, i.e. with no other extended selectors inside. To force applying ExtendedCss rules with `:not()`, use `#?#`/`#$?#` marker explicitly. -If the `:not()` pseudo-class argument `selectors` is an extended selector, due to the way how the `:not()` pseudo-class is implemented in ExtendedCss v2.0, it is impossible to apply it to the top DOM node which is `html`, i.e. `#?#html:not()` does not work. So if `target` is not defined or defined as a [universal selector](https://www.w3.org/TR/selectors-4/#the-universal-selector) `*`, the extended pseudo-class applying is limited to **`html`'s children**, e.g. rules `#?#:not(...)` and `#?#*:not(...)` are parsed as `#?#html *:not(...)`. Please note that there is no such limitation for a standard selector argument, i.e. `#?#html:not(.locked)` works fine. +If the `:not()` pseudo-class argument `selectors` is an extended selector, due to the way how the `:not()` pseudo-class is implemented in ExtendedCss v2.0, it is impossible to apply it to the top DOM node which is `html`, i.e. `#?#html:not()` does not work. So if `target` is not defined or defined as the [universal selector](https://www.w3.org/TR/selectors-4/#the-universal-selector) `*`, the extended pseudo-class applying is limited to **`html`'s children**, e.g. rules `#?#:not(...)` and `#?#*:not(...)` are parsed as `#?#html *:not(...)`. Please note that there is no such limitation for a standard selector argument, i.e. `#?#html:not(.locked)` works fine. The `:not()` is considered as a standard CSS pseudo-class inside the argument of the [`:upward()` pseudo-class](#extended-css-upward) because `:upward()` supports only standard selectors. @@ -3395,7 +3395,7 @@ This special attribute may become unsupported in the future. Prefer using the `: This is the most frequently used special attribute. It limits selection with those elements whose innerHTML code contains the specified substring. -You should use `""` to escape `"`, for instance: +You must use `""` to escape `"`, for instance: `$$script[tag-content="alert(""this is ad"")"]` For example, take a look at this HTML code: @@ -3428,13 +3428,13 @@ This special attribute may become unsupported in the future. Prefer using the `: This special attribute works almost like `tag-content` and allows you to check the innerHTML code of the document. Rule will check if HTML code of the element fits to the [search pattern](https://en.wikipedia.org/wiki/Glob_(programming)). -You should use `""` to escape `"`, for instance: +You must use `""` to escape `"`, for instance: `$$script[wildcard=""banner""]` For example: `$$script[wildcard="*banner*text*"]` -It will check, if the code of element contains two consecutive substrings `banner` and `text`. +It checks if the element code contains the two consecutive substrings `banner` and `text`. :::caution Limitations @@ -3692,7 +3692,7 @@ modifiers = modifier0[, modifier1[, ...[, modifierN]]] For example, `[$domain=example.com,app=test_app]##selector`. -In the modifiers values of the following characters must be escaped: `[`, `]`, `,`, and `\` (unless +In the modifiers values, the following characters must be escaped: `[`, `]`, `,`, and `\` (unless it is used for the escaping). Use `\` to escape them. For example, an escaped bracket looks like this: `\]`. @@ -3718,8 +3718,8 @@ The modifier's behavior and syntax perfectly match the corresponding [basic rule **Examples** -- `[$app=org.example.app]example.com##.textad` hides a `div` with a class `textad` at `example.com` and all subdomains in requests sent from the `org.example.app` Android app. -- `[$app=~org.example.app1|~org.example.app2]example.com##.textad` hides a `div` with a class `textad` at `example.com` and all subdomains in requests sent from any app except `org.example.app1` and `org.example.app2`. +- `[$app=org.example.app]example.com##.textad` hides a `div` with the class `textad` at `example.com` and all subdomains in requests sent from the `org.example.app` Android app. +- `[$app=~org.example.app1|~org.example.app2]example.com##.textad` hides a `div` with the class `textad` at `example.com` and all subdomains in requests sent from any app except `org.example.app1` and `org.example.app2`. - `[$app=com.apple.Safari]example.org#%#//scriptlet('prevent-setInterval', 'check', '!300')` applies scriptlet `prevent-setInterval` only in Safari browser on Mac. - `[$app=org.example.app]#@#.textad` disables all `##.textad` rules for all domains while using `org.example.app`. @@ -3736,7 +3736,7 @@ The modifier's behavior and syntax perfectly match the corresponding [basic rule **Examples** -- `[$domain=example.com]##.textad` — hides a `div` with a class `textad` at `example.com` and all subdomains. +- `[$domain=example.com]##.textad` — hides a `div` with the class `textad` at `example.com` and all subdomains. - `[$domain=example.com|example.org]###adblock` — hides an element with attribute `id` equals `adblock` at `example.com`, `example.org` and all subdomains. - `[$domain=~example.com]##.textad` — this rule hides `div` elements of the class `textad` for all domains, except `example.com` and its subdomains. @@ -3746,7 +3746,7 @@ There are 2 ways to specify domain restrictions for non-basic rules: 2. the modifier approach is to specify domains via `$domain` modifier: `[$domain=example.com]##.textad`. But rules with mixed style domains restriction are considered invalid. So, for example, the rule -`[$domain=example.org]example.com##.textad` will be rejected. +`[$domain=example.org]example.com##.textad` will be ignored. :::info Compatibility @@ -3774,14 +3774,14 @@ If `pattern` is not set for `$path`, rule will apply only on the main page of we **Examples** -- `[$path=page.html]##.textad` hides a `div` with a class `textad` at `/page.html` or `/page.html?` or `/sub/page.html` or `/another_page.html` -- `[$path=/page.html]##.textad` hides a `div` with a class `textad` at `/page.html` or `/page.html?` or `/sub/page.html` of any domain but not at `/another_page.html` -- `[$path=|/page.html]##.textad` hides a `div` with a class `textad` at `/page.html` or `/page.html?` of any domain but not at `/sub/page.html` -- `[$path=/page.html|]##.textad` hides a `div` with a class `textad` at `/page.html` or `/sub/page.html` of any domain but not at `/page.html?` -- `[$path=/page*.html]example.com##.textad` hides a `div` with a class `textad` at `/page1.html` or `/page2.html` or any other path matching `/page<...>.html` of `example.com` -- `[$path]example.com##.textad` hides a `div` with a class `textad` at the main page of `example.com` -- `[$domain=example.com,path=/page.html]##.textad` hides a `div` with a class `textad` at `page.html` of `example.com` and all subdomains but not at `another_page.html` -- `[$path=/\\/(sub1|sub2)\\/page\\.html/]##.textad` hides a `div` with a class `textad` at both `/sub1/page.html` and `/sub2/page.html` of any domain (please note the [escaped special characters](#non-basic-rules-modifiers-syntax)) +- `[$path=page.html]##.textad` hides a `div` with the class `textad` at `/page.html` or `/page.html?` or `/sub/page.html` or `/another_page.html` +- `[$path=/page.html]##.textad` hides a `div` with the class `textad` at `/page.html` or `/page.html?` or `/sub/page.html` of any domain but not at `/another_page.html` +- `[$path=|/page.html]##.textad` hides a `div` with the class `textad` at `/page.html` or `/page.html?` of any domain but not at `/sub/page.html` +- `[$path=/page.html|]##.textad` hides a `div` with the class `textad` at `/page.html` or `/sub/page.html` of any domain but not at `/page.html?` +- `[$path=/page*.html]example.com##.textad` hides a `div` with the class `textad` at `/page1.html` or `/page2.html` or any other path matching `/page<...>.html` of `example.com` +- `[$path]example.com##.textad` hides a `div` with the class `textad` at the main page of `example.com` +- `[$domain=example.com,path=/page.html]##.textad` hides a `div` with the class `textad` at `page.html` of `example.com` and all subdomains but not at `another_page.html` +- `[$path=/\\/(sub1|sub2)\\/page\\.html/]##.textad` hides a `div` with the class `textad` at both `/sub1/page.html` and `/sub2/page.html` of any domain (please note the [escaped special characters](#non-basic-rules-modifiers-syntax)) :::info Compatibility @@ -3804,7 +3804,7 @@ The [special characters](#basic-rules-special-characters) and [regular expressio **Examples** -- `[$url=||example.com/content/*]##div.textad` hides a `div` with a class `textad` at addresses like `https://example.com/content/article.html` and even `https://subdomain.example.com/content/article.html`. +- `[$url=||example.com/content/*]##div.textad` hides a `div` with the class `textad` at addresses like `https://example.com/content/article.html` and even `https://subdomain.example.com/content/article.html`. - `[$url=||example.org^]###adblock` hides an element with attribute `id` equal to `adblock` at `example.org` and its subdomains. - `[$url=/\[a-z\]+\\.example\\.com^/]##.textad` hides `div` elements of the class `textad` for all domains matching the regular expression `[a-z]+\.example\.com^`. @@ -3871,7 +3871,7 @@ Filter URL: `https://example.org/path/filter.txt` #### Conditions {#conditions-directive} Filters maintainers can use conditions to supply different rules depending on the ad blocker type. -A conditional directive beginning with a `!#if` directive must explicitly be terminated with an `!#endif` directive. +A conditional directive beginning with an `!#if` directive must explicitly be terminated with an `!#endif` directive. Conditions support all basic logical operators. There are two possible scenarios: @@ -3968,7 +3968,7 @@ The following products will support it in the mentioned versions or later: - AdGuard for Windows, Mac, and Android, running CoreLibs v1.13; - AdGuard Browser Extension v4.2.208; -- AdGuard for Safari v1.11.16. +- AdGuard v1.11.16 for Safari. ::: @@ -4025,7 +4025,7 @@ example.org#@#.adBanner ``` ```adblock -! to allowlist basic rule from AdGuard Tracking Protection filter filter: +! to allowlist basic rule from AdGuard Tracking Protection filter: !#safari_cb_affinity(privacy) @@||example.org^ !#safari_cb_affinity @@ -4121,7 +4121,7 @@ This rule will be available only in AdGuard for Windows, Mac, Android: ||example.org^ ``` -This rule will be available for every platform except AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS: +Except for AdGuard for Safari, AdGuard Content Blocker, and AdGuard for iOS, this rule is available on all platforms: ```adblock !+ NOT_PLATFORM(ext_safari, ext_android_cb, ios) @@ -4141,7 +4141,7 @@ Depending on which AdGuard product you are using, Filtering log can be located i - In **AdGuard for Windows**, you can find it in the *Ad Blocker* tab or via the tray menu - In **AdGuard for Mac**, it is located in *Settings → Advanced → Filtering log* - In **AdGuard for Android**, you can find it under *Statistics → Recent activity*. *Recent activity* can also be accessed from the *Assistant* -- In **AdGuard Browser Extension**, it is accessible from the *Miscellaneous* settings tab or by right-clicking the extension icon. Only Chromium- and Firefox-based browsers show applied **element hiding rules** (including CSS, ExtCSS) and **JS rules and scriptlets** in their Filtering logs +- In **AdGuard Browser Extension**, it is accessible from the *Miscellaneous* settings tab or by right-clicking the extension icon. Only Chromium- and Firefox-based web browsers show applied **element hiding rules** (including CSS, ExtCSS) and **JS rules and scriptlets** in their Filtering logs :::note @@ -4167,7 +4167,7 @@ Open the browser console while on a web page to see the timing statistics for se **Printed only for remove pseudos:** -- `removed` — flag to signal if elements we removed +- `removed` — flag to signal if elements were removed **Printed if elements are not removed:** diff --git a/docs/guides/take-screenshot.md b/docs/guides/take-screenshot.md index 94bfcdf8c87..c5e34710daf 100644 --- a/docs/guides/take-screenshot.md +++ b/docs/guides/take-screenshot.md @@ -11,7 +11,7 @@ Sometimes a screenshot (or screenshots) are requested by the support team for a Taking a screenshot on an Android device can be done in various ways — depending on the device model and its manufacturer. -Generally, you should use the following button combination for Android: +Generally, you must use the following button combination for Android: - **Hold down at once the *Volume Down* and the *Power* buttons for 1–2 seconds** @@ -56,7 +56,7 @@ To take a screenshot of an active window, use the following combination: - **Hold down *Alt* and press *PrtScn* (or *Fn + Alt + PrtScn* on some laptops)** -To take a screenshot of a specific area, you should use the following combination: +To take a screenshot of a specific area, you must use the following combination: - **Hold down *Win* (the Windows button) and *Shift* and press *S*** @@ -80,7 +80,7 @@ To take a screenshot of an active window, use the following combination: - **Press and hold together *⌘ Cmd + Shift + 4 + Space bar*. The pointer will change to a camera icon. Click the window to capture it. Press the Esc button to cancel taking a screenshot** -To take a screenshot of a specific area, you should use the following combination: +To take a screenshot of a specific area, you must use the following combination: - **Press and hold together *⌘ Cmd + Shift + 4***. Drag the crosshair to select the needed area. Release your mouse or trackpad to take a screenshot, press the Esc button to cancel it. From 5c6d9f92ede5209ce5661e29305094ef736c0c63 Mon Sep 17 00:00:00 2001 From: vyanovsky Date: Mon, 29 Jan 2024 19:04:22 +0300 Subject: [PATCH 04/48] [AGM-1813] Create 'Solving Problems' section on AdGuard for Safari Adding 'Solving Problems' section on AdGuard for Safari that includes 5 articles --- .../solving-problems/_category_.json | 0 .../solving-problems/ads-not-blocked.md | 29 +++++++++++++++ .../solving-problems/filters-after-disable.md | 22 ++++++++++++ .../solving-problems/logs.md | 24 +++++++++++++ .../solving-problems/private-sonoma.md | 19 ++++++++++ .../solving-problems/rule-limit.md | 36 +++++++++++++++++++ 6 files changed, 130 insertions(+) create mode 100644 docs/adguard-for-safari/solving-problems/_category_.json create mode 100644 docs/adguard-for-safari/solving-problems/ads-not-blocked.md create mode 100644 docs/adguard-for-safari/solving-problems/filters-after-disable.md create mode 100644 docs/adguard-for-safari/solving-problems/logs.md create mode 100644 docs/adguard-for-safari/solving-problems/private-sonoma.md create mode 100644 docs/adguard-for-safari/solving-problems/rule-limit.md diff --git a/docs/adguard-for-safari/solving-problems/_category_.json b/docs/adguard-for-safari/solving-problems/_category_.json new file mode 100644 index 00000000000..e69de29bb2d diff --git a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md new file mode 100644 index 00000000000..0ef7aca5347 --- /dev/null +++ b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md @@ -0,0 +1,29 @@ +--- +title: Filtering doesn't work and ads are not blocked +sidebar_position: 2 +--- + +:::info + +This article is about AdGuard for Safari, which safeguards only your Safari browser. To protect your entire device, [download the AdGuard app](https://agrd.io/download-kb-adblock) + +::: + +Sometimes, filtering may not work and ads will still show despite AdGuard for Safari and proper filters being enabled. This usually happens when something goes wrong with filter updates. + +### How to fix + + 1. Open Safari. + 2. Click *Safari* in the left upper corner menu. + 3. Click *Settings…* → *Extensions* tab + 4. Uncheck checkboxes for all 6 AdGuard content blockers, this is how it should look like: + ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) + 5. Check checkboxes for all 6 AdGuard content blockers again. + 6. Open AdGuard for Safari settings by clicking its icon beside the Safari's search bar. + 7. Go to *Filters* tab. + 8. Click *Check for updates*. + 9. Do not close AdGuard for Safari window until filter update is finished. + +If that didn't help and ads are still not blocked, please contact our support at support@adguard.com. + +If you have issues only on a particular page or website, you can report it right from the browser: click AdGuard for Safari icon beside the Safari's search bar and then click *Report an issue*. diff --git a/docs/adguard-for-safari/solving-problems/filters-after-disable.md b/docs/adguard-for-safari/solving-problems/filters-after-disable.md new file mode 100644 index 00000000000..5ecc11d112b --- /dev/null +++ b/docs/adguard-for-safari/solving-problems/filters-after-disable.md @@ -0,0 +1,22 @@ +--- +title: Filtering doesn't stop with AdGuard disabled +sidebar_position: 3 +--- + +:::info + +This article is about AdGuard for Safari, which safeguards only your Safari browser. To protect your entire device, [download the AdGuard app](https://agrd.io/download-kb-adblock) + +::: + +## Filtering doesn't stop even after AdGuard for Safari is disabled + +This is usually caused by the issue when content blockers update takes too long. + +### How to fix + + 1. Open Safari. + 2. Click *Safari* in the left upper corner menu. + 3. Click *Settings…* → ‘Extensions’ tab + 4. Uncheck checkboxes for all 6 AdGuard content blockers, this is how it should look like: + ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) diff --git a/docs/adguard-for-safari/solving-problems/logs.md b/docs/adguard-for-safari/solving-problems/logs.md new file mode 100644 index 00000000000..d8bfaef782f --- /dev/null +++ b/docs/adguard-for-safari/solving-problems/logs.md @@ -0,0 +1,24 @@ +--- +title: How to collect logs +sidebar_position: 4 +--- + +:::info + +This article is about AdGuard for Safari, which safeguards only your Safari browser. To protect your entire device, [download the AdGuard app](https://agrd.io/download-kb-adblock) + +::: + +## How to collect logs in AdGuard for Safari + +To analyze and diagnose different problems that may potentially arise, the AdGuard support service might need AdGuard log files. These files contain records about errors and other events that occurr with the software. Below is the brief instruction describing the way to get the log files and send them to the support service if necessary. + + 1. Open AdGuard for Safari settings by clicking its icon beside the Safari's search bar. + 2. Scroll down and click *Export logs*. + 3. Choose where do you want to sae the .zip file and click *Save*. + +Now, you can share that file with our support team (support@adguard.com) or you can report a bug on GitHub: + + 1. Create an issue on GitHub + 2. Send the log file to devteam@adguard.com. Include the time of the bug and attach a link to your issue or its number (it appears as #number next to the title). + Alternatively, you can upload the log file to Google Drive and send it to devteam@adguard.com. Add the file link to your GitHub issue. diff --git a/docs/adguard-for-safari/solving-problems/private-sonoma.md b/docs/adguard-for-safari/solving-problems/private-sonoma.md new file mode 100644 index 00000000000..61ab877077b --- /dev/null +++ b/docs/adguard-for-safari/solving-problems/private-sonoma.md @@ -0,0 +1,19 @@ +--- +title: Doesn't work in private tabs on macOS Sonoma +sidebar_position: 5 +--- + +:::info + +This article is about AdGuard for Safari, which safeguards only your Safari browser. To protect your entire device, [download the AdGuard app](https://agrd.io/download-kb-adblock) + +::: + +## AdGuard for Safari doesn't work in private tabs on macOS Sonoma + +### How to fix + + 1. Open Safari. + 2. Click *Safari* in the left upper corner menu. + 3. Click *Settings…* → ‘Extensions’ tab + 4. Uncheck "Allow in private browsing" checkboxes for all 6 AdGuard content blockers. diff --git a/docs/adguard-for-safari/solving-problems/rule-limit.md b/docs/adguard-for-safari/solving-problems/rule-limit.md new file mode 100644 index 00000000000..b2f1e09ce16 --- /dev/null +++ b/docs/adguard-for-safari/solving-problems/rule-limit.md @@ -0,0 +1,36 @@ +--- +title: Rule limit issues +sidebar_position: 1 +--- + +:::info + +This article is about AdGuard for Safari, which safeguards only your Safari browser. To protect your entire device, [download the AdGuard app](https://agrd.io/download-kb-adblock) + +::: + +## Safari content blocker rule limit + +Safari Content Blocker functionality is an indispensable tool for ad-blocking in Safari: it gives a way to apply filtering rules to pages accessed in Safari. Currently, as stated in the Safari Content Blocking API documentation, up to 150k rules is allowed in one content blocker. + +AdGuard for Safari has 6 content blockers: + +- AdGuard General +- AdGuard Privacy +- AdGuard Social +- AdGuard Security +- AdGuard Other +- AdGuard Custom + +That means user can use up to 900k filtering rules total. + +However, **you can only have up to 150k in one content blocker**. If you exceed that limit, part of the rules will not be applied and that could lead to some things not being blocked. + +## How to check that if you are exceeding rule limit + + 1. Open AdGuard for Safari settings by clicking its icon beside the Safari's search bar. + 2. Scroll down and click *Content blockers*. + 3. Under each content blocker, you can see the number of enabled rules and enabled filters. + ![Content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-cb.png) + + If a content blocker has more than 150,000 rules, go to *Filters* tab, select a filter category and disable filters or user rules you don't need. From 1857e55ef1e14f6d5a9c3afafa5cd9100a370ea8 Mon Sep 17 00:00:00 2001 From: Slava Leleka Date: Mon, 29 Jan 2024 23:38:29 +0200 Subject: [PATCH 05/48] fix typo --- docs/general/ad-filtering/create-own-filters.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/general/ad-filtering/create-own-filters.md b/docs/general/ad-filtering/create-own-filters.md index 13c3782e75a..b46869f7550 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -182,7 +182,7 @@ modifiers = [modifier0, modifier1[, ...[, modifierN]]] :::note -`|`, `||`, `^` can only be used with rules that have a URL pattern. For example, `||||example.com##.advert` is incorrect and will be ignored by the blocker. +`|`, `||`, `^` can only be used with rules that have a URL pattern. For example, `||example.com##.advert` is incorrect and will be ignored by the blocker. ::: From 74621fb814642184cbfb8ec9f2783acfcc8fea10 Mon Sep 17 00:00:00 2001 From: vyanovsky Date: Tue, 30 Jan 2024 13:53:45 +0300 Subject: [PATCH 06/48] Some fixes based on Alex-302 review Some fixes based on Alex-302 review --- .../solving-problems/ads-not-blocked.md | 13 +++++++------ .../solving-problems/filters-after-disable.md | 6 +++++- .../solving-problems/private-sonoma.md | 5 +++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md index 0ef7aca5347..9f71b81d0bc 100644 --- a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md +++ b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md @@ -9,7 +9,7 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow ::: -Sometimes, filtering may not work and ads will still show despite AdGuard for Safari and proper filters being enabled. This usually happens when something goes wrong with filter updates. +Sometimes, filtering may not work and ads will still show despite AdGuard for Safari and proper filters being enabled. This usually happens when something goes wrong with filter updates due to Safari bugs. ### How to fix @@ -18,11 +18,12 @@ Sometimes, filtering may not work and ads will still show despite AdGuard for Sa 3. Click *Settings…* → *Extensions* tab 4. Uncheck checkboxes for all 6 AdGuard content blockers, this is how it should look like: ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) - 5. Check checkboxes for all 6 AdGuard content blockers again. - 6. Open AdGuard for Safari settings by clicking its icon beside the Safari's search bar. - 7. Go to *Filters* tab. - 8. Click *Check for updates*. - 9. Do not close AdGuard for Safari window until filter update is finished. + 5. Restart Safari. + 6. Check checkboxes for all 6 AdGuard content blockers again. + 7. Open AdGuard for Safari settings by clicking its icon beside the Safari's search bar. + 8. Go to *Filters* tab. + 9. Click *Check for updates*. + 10. Do not close AdGuard for Safari window until filter update is finished. If that didn't help and ads are still not blocked, please contact our support at support@adguard.com. diff --git a/docs/adguard-for-safari/solving-problems/filters-after-disable.md b/docs/adguard-for-safari/solving-problems/filters-after-disable.md index 5ecc11d112b..f1db8e5de89 100644 --- a/docs/adguard-for-safari/solving-problems/filters-after-disable.md +++ b/docs/adguard-for-safari/solving-problems/filters-after-disable.md @@ -17,6 +17,10 @@ This is usually caused by the issue when content blockers update takes too long. 1. Open Safari. 2. Click *Safari* in the left upper corner menu. - 3. Click *Settings…* → ‘Extensions’ tab + 3. Click *Settings…* → *Extensions* tab 4. Uncheck checkboxes for all 6 AdGuard content blockers, this is how it should look like: ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) + 5. Restart Safari. + 6. Check checkboxes for all 6 AdGuard content blockers again. + +Now, the everything should work as intended: filtering is on when AdGuard for Safari is enabled and filtering is off when disabled. diff --git a/docs/adguard-for-safari/solving-problems/private-sonoma.md b/docs/adguard-for-safari/solving-problems/private-sonoma.md index 61ab877077b..f57eab92256 100644 --- a/docs/adguard-for-safari/solving-problems/private-sonoma.md +++ b/docs/adguard-for-safari/solving-problems/private-sonoma.md @@ -15,5 +15,6 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow 1. Open Safari. 2. Click *Safari* in the left upper corner menu. - 3. Click *Settings…* → ‘Extensions’ tab - 4. Uncheck "Allow in private browsing" checkboxes for all 6 AdGuard content blockers. + 3. Click *Settings…* → *Extensions* tab. + 4. Check "Allow in private browsing" checkboxes for all AdGuard extensions. + ![Checked private browsing](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-sonoma-private.png) From 36464885192b19f88147cde489adcbfd15420f83 Mon Sep 17 00:00:00 2001 From: vyanovsky <51786050+vyanovsky@users.noreply.github.com> Date: Mon, 5 Feb 2024 19:25:31 +0300 Subject: [PATCH 07/48] Update adguard-for-safari/solving-problems Some fixes from review Co-authored-by: Sofia Orlova <95080242+ss-orlova@users.noreply.github.com> --- docs/adguard-for-safari/solving-problems/ads-not-blocked.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md index 9f71b81d0bc..320fa464888 100644 --- a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md +++ b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md @@ -16,7 +16,7 @@ Sometimes, filtering may not work and ads will still show despite AdGuard for Sa 1. Open Safari. 2. Click *Safari* in the left upper corner menu. 3. Click *Settings…* → *Extensions* tab - 4. Uncheck checkboxes for all 6 AdGuard content blockers, this is how it should look like: + 4. Clear the checkboxes for AdGuard’s 6 content blocking extensions: *Custom*, *General*, *Other*, *Privacy*, *Security*, and *Social*. ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) 5. Restart Safari. 6. Check checkboxes for all 6 AdGuard content blockers again. From 8cddfbeba13b65dca7ceec598045a4df4b4f6737 Mon Sep 17 00:00:00 2001 From: vyanovsky <51786050+vyanovsky@users.noreply.github.com> Date: Mon, 5 Feb 2024 19:46:11 +0300 Subject: [PATCH 08/48] Apply suggestions from code review Co-authored-by: Sofia Orlova <95080242+ss-orlova@users.noreply.github.com> --- .../solving-problems/ads-not-blocked.md | 12 ++++++------ .../solving-problems/filters-after-disable.md | 6 +++--- docs/adguard-for-safari/solving-problems/logs.md | 8 ++++---- .../solving-problems/private-sonoma.md | 4 ++-- .../solving-problems/rule-limit.md | 10 +++++----- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md index 320fa464888..1ef72cb087f 100644 --- a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md +++ b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md @@ -1,5 +1,5 @@ --- -title: Filtering doesn't work and ads are not blocked +title: Filtering doesn’t work and ads aren’t blocked sidebar_position: 2 --- @@ -9,7 +9,7 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow ::: -Sometimes, filtering may not work and ads will still show despite AdGuard for Safari and proper filters being enabled. This usually happens when something goes wrong with filter updates due to Safari bugs. +In some cases, filtering may not work and ads may still be displayed even though AdGuard for Safari and the proper filters are enabled. This usually happens when something goes wrong filter updates due to Safari bugs. ### How to fix @@ -19,12 +19,12 @@ Sometimes, filtering may not work and ads will still show despite AdGuard for Sa 4. Clear the checkboxes for AdGuard’s 6 content blocking extensions: *Custom*, *General*, *Other*, *Privacy*, *Security*, and *Social*. ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) 5. Restart Safari. - 6. Check checkboxes for all 6 AdGuard content blockers again. - 7. Open AdGuard for Safari settings by clicking its icon beside the Safari's search bar. + 6. Return to *Settings...* → *Extensions* and re-enable the content blocking extensions. + 7. Click the AdGuard for Safari icon next to the search bar and open its settings. 8. Go to *Filters* tab. 9. Click *Check for updates*. 10. Do not close AdGuard for Safari window until filter update is finished. -If that didn't help and ads are still not blocked, please contact our support at support@adguard.com. +If this doesn’t help and ads are still not being blocked, please contact our support at support@adguard.com. -If you have issues only on a particular page or website, you can report it right from the browser: click AdGuard for Safari icon beside the Safari's search bar and then click *Report an issue*. +If you only have problems with a specific page or website, you can report it directly from the browser: click the AdGuard for Safari icon next to the Safari search bar, and then click *Report an issue*. diff --git a/docs/adguard-for-safari/solving-problems/filters-after-disable.md b/docs/adguard-for-safari/solving-problems/filters-after-disable.md index f1db8e5de89..e9e742867fb 100644 --- a/docs/adguard-for-safari/solving-problems/filters-after-disable.md +++ b/docs/adguard-for-safari/solving-problems/filters-after-disable.md @@ -1,5 +1,5 @@ --- -title: Filtering doesn't stop with AdGuard disabled +title: Filtering doesn‘t stop when AdGuard for Safari is disabled sidebar_position: 3 --- @@ -18,9 +18,9 @@ This is usually caused by the issue when content blockers update takes too long. 1. Open Safari. 2. Click *Safari* in the left upper corner menu. 3. Click *Settings…* → *Extensions* tab - 4. Uncheck checkboxes for all 6 AdGuard content blockers, this is how it should look like: + 4. Clear the checkboxes for AdGuard’s 6 content blocking extensions: *Custom*, *General*, *Other*, *Privacy*, *Security*, and *Social*. ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) 5. Restart Safari. 6. Check checkboxes for all 6 AdGuard content blockers again. -Now, the everything should work as intended: filtering is on when AdGuard for Safari is enabled and filtering is off when disabled. +Now everything should work as intended: filtering is on when AdGuard for Safari is enabled, and filtering is off when it is disabled. diff --git a/docs/adguard-for-safari/solving-problems/logs.md b/docs/adguard-for-safari/solving-problems/logs.md index d8bfaef782f..359c65324e0 100644 --- a/docs/adguard-for-safari/solving-problems/logs.md +++ b/docs/adguard-for-safari/solving-problems/logs.md @@ -11,14 +11,14 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow ## How to collect logs in AdGuard for Safari -To analyze and diagnose different problems that may potentially arise, the AdGuard support service might need AdGuard log files. These files contain records about errors and other events that occurr with the software. Below is the brief instruction describing the way to get the log files and send them to the support service if necessary. +To analyze and diagnose various problems that may occur with AdGuard for Safari, the AdGuard support service may need its log files. These files contain records of errors and other software events. Below are brief instructions on how to collect logs and send them to support if necessary. 1. Open AdGuard for Safari settings by clicking its icon beside the Safari's search bar. 2. Scroll down and click *Export logs*. - 3. Choose where do you want to sae the .zip file and click *Save*. +3. Choose a location to save the .zip file and click *Save*. -Now, you can share that file with our support team (support@adguard.com) or you can report a bug on GitHub: +Now you can send this file to support@adguard.com or attach it to your bug report on GitHub: - 1. Create an issue on GitHub + 1. Open the [AdGuard for Safari GitHub repo](https://github.com/AdguardTeam/AdGuardForSafari/issues) and click *New issue*. 2. Send the log file to devteam@adguard.com. Include the time of the bug and attach a link to your issue or its number (it appears as #number next to the title). Alternatively, you can upload the log file to Google Drive and send it to devteam@adguard.com. Add the file link to your GitHub issue. diff --git a/docs/adguard-for-safari/solving-problems/private-sonoma.md b/docs/adguard-for-safari/solving-problems/private-sonoma.md index f57eab92256..48d1efcce50 100644 --- a/docs/adguard-for-safari/solving-problems/private-sonoma.md +++ b/docs/adguard-for-safari/solving-problems/private-sonoma.md @@ -1,5 +1,5 @@ --- -title: Doesn't work in private tabs on macOS Sonoma +title: AdGuard for Safari doesn’t work in private tabs on macOS Sonoma sidebar_position: 5 --- @@ -16,5 +16,5 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow 1. Open Safari. 2. Click *Safari* in the left upper corner menu. 3. Click *Settings…* → *Extensions* tab. - 4. Check "Allow in private browsing" checkboxes for all AdGuard extensions. + 4. Check *Allow in Private Browsing* for all AdGuard extensions. ![Checked private browsing](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-sonoma-private.png) diff --git a/docs/adguard-for-safari/solving-problems/rule-limit.md b/docs/adguard-for-safari/solving-problems/rule-limit.md index b2f1e09ce16..02215c7c3b6 100644 --- a/docs/adguard-for-safari/solving-problems/rule-limit.md +++ b/docs/adguard-for-safari/solving-problems/rule-limit.md @@ -11,7 +11,7 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow ## Safari content blocker rule limit -Safari Content Blocker functionality is an indispensable tool for ad-blocking in Safari: it gives a way to apply filtering rules to pages accessed in Safari. Currently, as stated in the Safari Content Blocking API documentation, up to 150k rules is allowed in one content blocker. +AdGuard for Safari uses the Content Blocking API to apply filtering rules to pages in the Safari browser. Currently, a maximum of 150,000 rules are allowed for each content blocking extension. AdGuard for Safari has 6 content blockers: @@ -22,15 +22,15 @@ AdGuard for Safari has 6 content blockers: - AdGuard Other - AdGuard Custom -That means user can use up to 900k filtering rules total. +This makes a total of 900,000 filtering rules. -However, **you can only have up to 150k in one content blocker**. If you exceed that limit, part of the rules will not be applied and that could lead to some things not being blocked. +However, **an extension can contain up to 150,000 rules**. If you exceed this limit, some of the rules will not be applied. This may lead to incorrect blocking. -## How to check that if you are exceeding rule limit +## How to check if you are exceeding the rule limit 1. Open AdGuard for Safari settings by clicking its icon beside the Safari's search bar. 2. Scroll down and click *Content blockers*. - 3. Under each content blocker, you can see the number of enabled rules and enabled filters. + 3. Below each content blocker, you can see the enabled filters and the number of active rules. ![Content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-cb.png) If a content blocker has more than 150,000 rules, go to *Filters* tab, select a filter category and disable filters or user rules you don't need. From da846f00c8bf734d4bdbf0c4d0d2695696b600b9 Mon Sep 17 00:00:00 2001 From: vyanovsky Date: Tue, 6 Feb 2024 11:55:59 +0300 Subject: [PATCH 09/48] update list indent in logs.md update list indent in logs.md --- docs/adguard-for-safari/solving-problems/logs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-safari/solving-problems/logs.md b/docs/adguard-for-safari/solving-problems/logs.md index 359c65324e0..3c28f289b5c 100644 --- a/docs/adguard-for-safari/solving-problems/logs.md +++ b/docs/adguard-for-safari/solving-problems/logs.md @@ -15,7 +15,7 @@ To analyze and diagnose various problems that may occur with AdGuard for Safari, 1. Open AdGuard for Safari settings by clicking its icon beside the Safari's search bar. 2. Scroll down and click *Export logs*. -3. Choose a location to save the .zip file and click *Save*. + 3. Choose a location to save the .zip file and click *Save*. Now you can send this file to support@adguard.com or attach it to your bug report on GitHub: From d9d0813a53377ce96b5ae4c9674632bfd1e40ac9 Mon Sep 17 00:00:00 2001 From: vyanovsky Date: Tue, 6 Feb 2024 12:04:19 +0300 Subject: [PATCH 10/48] Some fixes from review Some fixes from review --- docs/adguard-for-safari/solving-problems/ads-not-blocked.md | 2 +- .../solving-problems/filters-after-disable.md | 4 +--- docs/adguard-for-safari/solving-problems/logs.md | 2 +- docs/adguard-for-safari/solving-problems/private-sonoma.md | 4 ++++ docs/adguard-for-safari/solving-problems/rule-limit.md | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md index 1ef72cb087f..70a06b2fc11 100644 --- a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md +++ b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md @@ -20,7 +20,7 @@ In some cases, filtering may not work and ads may still be displayed even though ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) 5. Restart Safari. 6. Return to *Settings...* → *Extensions* and re-enable the content blocking extensions. - 7. Click the AdGuard for Safari icon next to the search bar and open its settings. + 7. Open AdGuard for Safari app. 8. Go to *Filters* tab. 9. Click *Check for updates*. 10. Do not close AdGuard for Safari window until filter update is finished. diff --git a/docs/adguard-for-safari/solving-problems/filters-after-disable.md b/docs/adguard-for-safari/solving-problems/filters-after-disable.md index e9e742867fb..343275e698c 100644 --- a/docs/adguard-for-safari/solving-problems/filters-after-disable.md +++ b/docs/adguard-for-safari/solving-problems/filters-after-disable.md @@ -9,11 +9,9 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow ::: -## Filtering doesn't stop even after AdGuard for Safari is disabled - This is usually caused by the issue when content blockers update takes too long. -### How to fix +## How to fix 1. Open Safari. 2. Click *Safari* in the left upper corner menu. diff --git a/docs/adguard-for-safari/solving-problems/logs.md b/docs/adguard-for-safari/solving-problems/logs.md index 3c28f289b5c..f1f1e653c3a 100644 --- a/docs/adguard-for-safari/solving-problems/logs.md +++ b/docs/adguard-for-safari/solving-problems/logs.md @@ -13,7 +13,7 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow To analyze and diagnose various problems that may occur with AdGuard for Safari, the AdGuard support service may need its log files. These files contain records of errors and other software events. Below are brief instructions on how to collect logs and send them to support if necessary. - 1. Open AdGuard for Safari settings by clicking its icon beside the Safari's search bar. + 1. Open AdGuard for Safari app. 2. Scroll down and click *Export logs*. 3. Choose a location to save the .zip file and click *Save*. diff --git a/docs/adguard-for-safari/solving-problems/private-sonoma.md b/docs/adguard-for-safari/solving-problems/private-sonoma.md index 48d1efcce50..20c937d6d31 100644 --- a/docs/adguard-for-safari/solving-problems/private-sonoma.md +++ b/docs/adguard-for-safari/solving-problems/private-sonoma.md @@ -18,3 +18,7 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow 3. Click *Settings…* → *Extensions* tab. 4. Check *Allow in Private Browsing* for all AdGuard extensions. ![Checked private browsing](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-sonoma-private.png) + +If this doesn’t help and ads are still not being blocked, please contact our support at support@adguard.com. + +If you only have problems with a specific page or website, you can report it directly from the browser: click the AdGuard for Safari icon next to the Safari search bar, and then click *Report an issue*. diff --git a/docs/adguard-for-safari/solving-problems/rule-limit.md b/docs/adguard-for-safari/solving-problems/rule-limit.md index 02215c7c3b6..bff229096f2 100644 --- a/docs/adguard-for-safari/solving-problems/rule-limit.md +++ b/docs/adguard-for-safari/solving-problems/rule-limit.md @@ -28,7 +28,7 @@ However, **an extension can contain up to 150,000 rules**. If you exceed this li ## How to check if you are exceeding the rule limit - 1. Open AdGuard for Safari settings by clicking its icon beside the Safari's search bar. + 1. Open AdGuard for Safari app. 2. Scroll down and click *Content blockers*. 3. Below each content blocker, you can see the enabled filters and the number of active rules. ![Content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-cb.png) From 56faee3596bc1526cdf039359ff848d5ae83645c Mon Sep 17 00:00:00 2001 From: vyanovsky Date: Tue, 6 Feb 2024 12:15:08 +0300 Subject: [PATCH 11/48] Remove ## title in private-sonoma.md Remove same title in private-sonoma.md --- docs/adguard-for-safari/solving-problems/private-sonoma.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/adguard-for-safari/solving-problems/private-sonoma.md b/docs/adguard-for-safari/solving-problems/private-sonoma.md index 20c937d6d31..f6d1596e8f7 100644 --- a/docs/adguard-for-safari/solving-problems/private-sonoma.md +++ b/docs/adguard-for-safari/solving-problems/private-sonoma.md @@ -9,9 +9,7 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow ::: -## AdGuard for Safari doesn't work in private tabs on macOS Sonoma - -### How to fix +## How to fix 1. Open Safari. 2. Click *Safari* in the left upper corner menu. From 70c8ee64b2294b1c2cd69af94309dabe6605da0a Mon Sep 17 00:00:00 2001 From: vyanovsky <51786050+vyanovsky@users.noreply.github.com> Date: Tue, 6 Feb 2024 12:20:00 +0300 Subject: [PATCH 12/48] Update filters-after-disable.md Co-authored-by: Sofia Orlova <95080242+ss-orlova@users.noreply.github.com> --- .../solving-problems/filters-after-disable.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-safari/solving-problems/filters-after-disable.md b/docs/adguard-for-safari/solving-problems/filters-after-disable.md index 343275e698c..ad03a898cb6 100644 --- a/docs/adguard-for-safari/solving-problems/filters-after-disable.md +++ b/docs/adguard-for-safari/solving-problems/filters-after-disable.md @@ -19,6 +19,6 @@ This is usually caused by the issue when content blockers update takes too long. 4. Clear the checkboxes for AdGuard’s 6 content blocking extensions: *Custom*, *General*, *Other*, *Privacy*, *Security*, and *Social*. ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) 5. Restart Safari. - 6. Check checkboxes for all 6 AdGuard content blockers again. + 6. Return to *Settings...* → *Extensions* and re-enable the content blocking extensions. Now everything should work as intended: filtering is on when AdGuard for Safari is enabled, and filtering is off when it is disabled. From ea5c63271b8ab715c785e4ef5a31b050773aa9ee Mon Sep 17 00:00:00 2001 From: Helen Date: Wed, 7 Feb 2024 13:36:34 +0300 Subject: [PATCH 13/48] fix mistakes --- docs/adguard-content-blocker/overview.md | 2 +- docs/adguard-for-android/installation.md | 4 ++-- docs/adguard-for-android/overview.md | 6 +++--- .../solving-problems/low-level-settings.md | 2 +- .../solving-problems/manual-certificate.md | 2 +- .../adguard-for-mac/solving-problems/big-sur-issues.md | 2 +- .../manual-certificate-installation.md | 10 +++++----- .../solving-problems/protect-mail-activity.md | 4 ++-- .../solving-problems/protection-cannot-be-enabled.md | 2 +- docs/adguard-for-safari/installation.md | 2 +- docs/adguard-for-windows/overview.md | 2 +- .../solving-problems/common-installer-errors.md | 2 +- .../general/ad-filtering/tracking-filter-statistics.md | 2 +- docs/general/license/legacy.md | 8 ++++---- docs/guides/collect-har-file.md | 10 +++++----- docs/guides/take-screenshot.md | 4 ++-- .../miscellaneous/contribute/translate/plural-forms.md | 8 ++++---- 17 files changed, 36 insertions(+), 36 deletions(-) diff --git a/docs/adguard-content-blocker/overview.md b/docs/adguard-content-blocker/overview.md index 7e0fb36db75..1cd6c587f5c 100644 --- a/docs/adguard-content-blocker/overview.md +++ b/docs/adguard-content-blocker/overview.md @@ -5,7 +5,7 @@ sidebar_position: 1 :::info -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) +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) ::: diff --git a/docs/adguard-for-android/installation.md b/docs/adguard-for-android/installation.md index c3511d6d6fb..ea462b2b1dc 100644 --- a/docs/adguard-for-android/installation.md +++ b/docs/adguard-for-android/installation.md @@ -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. diff --git a/docs/adguard-for-android/overview.md b/docs/adguard-for-android/overview.md index 403cdbacc79..ff12f7e9428 100644 --- a/docs/adguard-for-android/overview.md +++ b/docs/adguard-for-android/overview.md @@ -224,7 +224,7 @@ From the context menu, you can also access the app's stats. ![App management: Chrome. Context menu *mobile_border](https://cdn.adtidy.org/blog/new/4z85achome_management_context_menu.png) -### Compatible and incompatible apps +### Problem-free and incompatible apps By default, only compatible apps are routed through AdGuard and filtered. These are the apps that still work properly when filtering is enabled. @@ -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 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. +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 @@ -446,7 +446,7 @@ You can get access to these features by [purchasing a license](https://adguard.c ### Rooted vs non-rooted devices -Due to additional security measures of Android OS, some AdGuard features are only available on rooted devices. Here's the list of them: +Due to additional 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 restrictions on system-wide traffic filtering diff --git a/docs/adguard-for-android/solving-problems/low-level-settings.md b/docs/adguard-for-android/solving-problems/low-level-settings.md index 1beaf2dd0bd..0cfb69f124b 100644 --- a/docs/adguard-for-android/solving-problems/low-level-settings.md +++ b/docs/adguard-for-android/solving-problems/low-level-settings.md @@ -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 diff --git a/docs/adguard-for-android/solving-problems/manual-certificate.md b/docs/adguard-for-android/solving-problems/manual-certificate.md index 71e933d95e4..f383e6dd6dc 100644 --- a/docs/adguard-for-android/solving-problems/manual-certificate.md +++ b/docs/adguard-for-android/solving-problems/manual-certificate.md @@ -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) diff --git a/docs/adguard-for-mac/solving-problems/big-sur-issues.md b/docs/adguard-for-mac/solving-problems/big-sur-issues.md index 033ef225fc5..d85a1f4f1cf 100644 --- a/docs/adguard-for-mac/solving-problems/big-sur-issues.md +++ b/docs/adguard-for-mac/solving-problems/big-sur-issues.md @@ -41,7 +41,7 @@ For a deeper understanding of this problem, read [this article](../protect-mail- **Recommended solution** -Using a more traditional VPN service, such as AdGuard VPN, instead of the newer Apple privacy features is currently recommended. +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 diff --git a/docs/adguard-for-mac/solving-problems/manual-certificate-installation.md b/docs/adguard-for-mac/solving-problems/manual-certificate-installation.md index 3eb6f01d2a4..41bbac92c49 100644 --- a/docs/adguard-for-mac/solving-problems/manual-certificate-installation.md +++ b/docs/adguard-for-mac/solving-problems/manual-certificate-installation.md @@ -13,16 +13,16 @@ AdGuard for Mac needs to install the root certificate into certificate storage t To manually install the certificate into Firefox-like browser: - 1. Open "Preferences" + 1. Open *Preferences* - 2. Go to "Privacy & Security" — "Certificates" + 2. Go to *Privacy & Security* → *Certificates* - 3. Click "View Certificates" + 3. Click *View Certificates* - 4. Navigate to the "Authorities" tab and click the "Import..." button + 4. Navigate to the *Authorities* tab and click the *Import...* button 5. Select file `/Library/Application Support/AdGuard Software/com.adguard.mac.adguard/AdguardCore/Adguard Personal CA.cer` or just download it from http://local.adguard.org/cert using a Chromium-based browser (e.g Google Chrome or new Edge) and with a HTTPS-filtering running in AdGuard Exact actions required for different Gecko-based browsers may vary, but the general sequence and the path to `AdGuard Personal CA.cer` file will be the same. -PS: For [Setapp application version](https://setapp.com/apps/adguard) the file path is the following: `/Library/Application Support/com.adguard.mac.adguard-setapp/AdguardCore/Adguard Personal CA.cer` +P.S.: For [Setapp application version](https://setapp.com/apps/adguard) the file path is the following: `/Library/Application Support/com.adguard.mac.adguard-setapp/AdguardCore/Adguard Personal CA.cer` diff --git a/docs/adguard-for-mac/solving-problems/protect-mail-activity.md b/docs/adguard-for-mac/solving-problems/protect-mail-activity.md index 21631ad39e7..47ef3dd677f 100644 --- a/docs/adguard-for-mac/solving-problems/protect-mail-activity.md +++ b/docs/adguard-for-mac/solving-problems/protect-mail-activity.md @@ -30,7 +30,7 @@ On Monterey, iCloud Private Relay got introduced. Privacy features of Mail.app a As a consequence, AdGuard can't work together with iCloud Private Relay and Mail app privacy features: -1. iCloud Private Relay is applied to connections at the library level - before they reach the socket level, where AdGuard operates. +1. iCloud Private Relay is applied to connections at the library level — before they reach the socket level, where AdGuard operates. 2. iCloud Private Relay uses QUIC, which AdGuard can't filter because HTTP/3 filtering is not yet available. 3. Consequently, AdGuard blocks QUIC, including iCloud Private Relay traffic – otherwise, ad blocking is impossible. 4. When you use iCloud Private Relay and switch AdGuard into the "split-tunnel" mode, you can't open websites in Safari. @@ -42,4 +42,4 @@ We keep searching for a solution to this issue. One of the options is implementi ## Recommended solution -Using a more traditional VPN service, such as [AdGuard VPN](https://adguard-vpn.com/), instead of the newer Apple privacy features is currently recommended. +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. diff --git a/docs/adguard-for-mac/solving-problems/protection-cannot-be-enabled.md b/docs/adguard-for-mac/solving-problems/protection-cannot-be-enabled.md index 1209f00ef6e..d0740474839 100644 --- a/docs/adguard-for-mac/solving-problems/protection-cannot-be-enabled.md +++ b/docs/adguard-for-mac/solving-problems/protection-cannot-be-enabled.md @@ -11,7 +11,7 @@ This article covers AdGuard for Mac, a multifunctional ad blocker that protects If AdGuard Protection cannot be enabled for some reason, perform the following steps: -1. Click the AdGuard icon at the Menu Bar → go to Advanced → Reset settings... → Quit AdGuard... +1. Click the AdGuard icon at the menu bar and go to *Advanced* → *Reset settings...* → *Quit AdGuard...* 2. In the Spotlight Search, type Terminal, enter `sudo rm -R /Library/Application\ Support/com.adguard.adguard` and execute. diff --git a/docs/adguard-for-safari/installation.md b/docs/adguard-for-safari/installation.md index 1dfb65ea115..05a57bf3e18 100644 --- a/docs/adguard-for-safari/installation.md +++ b/docs/adguard-for-safari/installation.md @@ -19,7 +19,7 @@ AdGuard for Safari is a free app presented on the App Store. To install it on yo 1. Press *Get* → *Install* → *Open*. -1. To set up AdGuard for Safari, enable the AdGuard extensions in the Safari settings. When a notification appears, click *Fix it*. In an opened window, check the boxes next to AdGuard extensions. +1. To set up AdGuard for Safari, enable the AdGuard extensions in the Safari settings. ![Notification: Some extensions are disabled](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adguard-for-safari-notification.png) diff --git a/docs/adguard-for-windows/overview.md b/docs/adguard-for-windows/overview.md index e0a77b448cd..16734b23899 100644 --- a/docs/adguard-for-windows/overview.md +++ b/docs/adguard-for-windows/overview.md @@ -179,7 +179,7 @@ This tab contains information about your license. Here you can: ![About *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/about.png) -In addition to information about the current version of the program, this tab provides some useful links to Licese Agreement, Privacy Policy, Acknowledgements, Discussions, and Version history pages. +In addition to information about the current version of the program, this tab provides some useful links to Licese agreement, Privacy policy, Acknowledgements, Discussions, and Version history pages. ### Check for updates diff --git a/docs/adguard-for-windows/solving-problems/common-installer-errors.md b/docs/adguard-for-windows/solving-problems/common-installer-errors.md index deef08b9e4e..758335735d4 100644 --- a/docs/adguard-for-windows/solving-problems/common-installer-errors.md +++ b/docs/adguard-for-windows/solving-problems/common-installer-errors.md @@ -81,7 +81,7 @@ The error sounds scarier than it actually is. In reality, this is a rather gener 4) Click *OK* to go back to *Properties* dialog. Then click *Advanced*. 5) Click *Change Permissions*. 6) On *Permissions* tab, double-click *Administrators*. - 7) Select *This folder, subfolders and files* for *Applies to* field and check all the available *Basic permissions*. After that hit *OK*. + 7) Select *This folder, subfolders and files* for *Applies to* field and check all the available *Basic permissions*. After that, hit *OK*. 8) Do the same operation above (from item 7) for *SYSTEM*. 9) Click *OK* all the way out. Try installing AdGuard again. diff --git a/docs/general/ad-filtering/tracking-filter-statistics.md b/docs/general/ad-filtering/tracking-filter-statistics.md index 74b38cb605f..84bb74a5770 100644 --- a/docs/general/ad-filtering/tracking-filter-statistics.md +++ b/docs/general/ad-filtering/tracking-filter-statistics.md @@ -37,7 +37,7 @@ The list is created based on the website's visit statistics since the last time The collected statistics will be sent periodically to our server for analysis and filter optimization. -It's important to note that all the statistics we get are averaged and anonymized. We don't use these statistics for any purpose other than optimizing the filters, and we do not sell this data to third parties. You can read about it in our [Privacy Policy](https://adguard.com/privacy.html). +It's important to note that all the statistics we get are averaged and anonymized. We don't use these statistics for any purpose other than optimizing the filters, and we do not sell this data to third parties. You can read about it in our [Privacy policy](https://adguard.com/privacy.html). ### What does tracking filter rules statistics fraught with? diff --git a/docs/general/license/legacy.md b/docs/general/license/legacy.md index af685e9fd56..49a79adfbce 100644 --- a/docs/general/license/legacy.md +++ b/docs/general/license/legacy.md @@ -9,11 +9,11 @@ We have written this article to avoid confusion and explain in detail how you ca Initially licenses of the following types were available to activate AdGuard products: -**Standard** — for desktop applications AdGuard for Windows/AdGuard for Mac +**Standard** was for desktop applications, AdGuard for Windows and AdGuard for Mac -**Mobile** — for mobile apps AdGuard for Android/AdGuard for iOS +**Mobile** was for mobile apps, AdGuard for Android and AdGuard for iOS -**Premium** — a license that combines desktop + mobile application +**Premium** was a license that combined desktop and mobile applications Standard and Mobile licenses could be purchased for 1 to 9 devices. @@ -27,7 +27,7 @@ For all types (Standard, Mobile, Premium) there were options for a Yearly and Li In October 2019 AdGuard switched to the new licensing system: from then on, licenses can still be purchased for 1 year or Lifetime, but their types have become **Personal** (for up to 3 devices) or **Family** (for up to 9 devices). -One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal License can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet, etc.** +One more change: **license keys of the new type can now be used on any device, in any combination. For example, a Personal license can be used on Android, Mac and iOS, just like on two Windows computers and an Apple tablet.** ## What happened to the outdated licenses? diff --git a/docs/guides/collect-har-file.md b/docs/guides/collect-har-file.md index f02ce81426f..6ecb7eb5ecd 100644 --- a/docs/guides/collect-har-file.md +++ b/docs/guides/collect-har-file.md @@ -32,7 +32,7 @@ To create a HAR file in Chrome, follow these steps: 1. Save session as a .har file by right-clicking the grid and selecting **Save as HAR with content**. -1. Send to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well. +1. Send it to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well. ## Edge {#edge} @@ -59,7 +59,7 @@ To create a HAR file in Chrome, follow these steps: 1. Save session as a .har file by right-clicking the grid and selecting **Save as HAR with content**. -1. Send to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well. +1. Send it to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well. ## Firefox {#firefox} @@ -88,7 +88,7 @@ To create a HAR file in Firefox, follow these steps: 1. Save session as a .har file by right-clicking the grid and selecting **Save all as HAR**. -1. Send to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well. +1. Send it to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well. ## Internet Explorer 11 {#ie11} @@ -115,7 +115,7 @@ To create a HAR file in Internet Explorer 11, follow these steps: 1. Save session as a .har file by clicking the **Save to disk** button (Export as HAR) on Network tab. -1. Send to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well. +1. Send it to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, as well. ## Safari {#safari} @@ -147,7 +147,7 @@ To create a HAR file in Safari, follow these steps: 1. Save session as a .har file by clicking the **Export** icon next to the **Delete Trash** icon. -1. Send to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, too. +1. Send it to AdGuard support (support@adguard.com) with detailed explanation of issue. Supporting screenshots can be helpful, too. ## Android {#android} diff --git a/docs/guides/take-screenshot.md b/docs/guides/take-screenshot.md index c5e34710daf..42064b00b15 100644 --- a/docs/guides/take-screenshot.md +++ b/docs/guides/take-screenshot.md @@ -11,13 +11,13 @@ Sometimes a screenshot (or screenshots) are requested by the support team for a Taking a screenshot on an Android device can be done in various ways — depending on the device model and its manufacturer. -Generally, you must use the following button combination for Android: +Generally, the following button combination is used for Android: - **Hold down at once the *Volume Down* and the *Power* buttons for 1–2 seconds** Your Android device will capture the entire screen and save it as a photo. So, you can find the screenshot in a *Screenshots* folder in your Gallery. -But, as it has been already said, there can be differences depending on a particular device. Let’s look at other possible combinations: +But there can be differences depending on a particular device. Let’s look at other possible combinations: - **Hold down at once *Home* and *Power* for 1–2 seconds;** - **Hold down at once the *Back* and the *Home* buttons** diff --git a/docs/miscellaneous/contribute/translate/plural-forms.md b/docs/miscellaneous/contribute/translate/plural-forms.md index 91c5a63e706..c7db0204dd6 100644 --- a/docs/miscellaneous/contribute/translate/plural-forms.md +++ b/docs/miscellaneous/contribute/translate/plural-forms.md @@ -24,13 +24,13 @@ Let’s draw a small parallel between English and Polish for better understandin The English version: The Polish equivalents: - 1. form - It takes one hour. 1. form - Zajmuje to godzinę. - 2. form - It takes two hours. 2. form - Zajmuje to dwie godziny. - 3. form - It takes five hours. 3. form - Zajmuje to pięć godzin. + 1. form — It takes one hour. 1. form — Zajmuje to godzinę. + 2. form — It takes two hours. 2. form — Zajmuje to dwie godziny. + 3. form — It takes five hours. 3. form — Zajmuje to pięć godzin. Now it is clear that the Polish *'godzinę'* (hour) has three different forms, whereas the English word changes its form with given numbers only twice. -Except for Polish, there are a lot of other languages that have three plural forms and more, such as Russian, Serbian, Slovak, Czech etc. But not all of them obey the same rule. That's why it's so important to know how many plurals your language has, as well as their correct usage. +Except for Polish, there are a lot of other languages that have three plural forms and more, such as Russian, Serbian, Slovak, Czech etc. But not all of them obey the same rule. That's why it's so important to know how many plurals your language has, and how to use them correctly. ## Where can you learn about the number of plural forms? {#where-to-learn} From 27aeebd9a1751f3dd86b203fa0b73b2999440ac8 Mon Sep 17 00:00:00 2001 From: Helen Date: Wed, 7 Feb 2024 13:46:09 +0300 Subject: [PATCH 14/48] two more fixes --- docs/adguard-for-android/overview.md | 2 +- docs/adguard-for-windows/overview.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/adguard-for-android/overview.md b/docs/adguard-for-android/overview.md index ff12f7e9428..670720fa442 100644 --- a/docs/adguard-for-android/overview.md +++ b/docs/adguard-for-android/overview.md @@ -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 solution. +> 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. diff --git a/docs/adguard-for-windows/overview.md b/docs/adguard-for-windows/overview.md index 16734b23899..a6285fcd75f 100644 --- a/docs/adguard-for-windows/overview.md +++ b/docs/adguard-for-windows/overview.md @@ -151,7 +151,7 @@ How does AdGuard VPN work? Without going into technical details, we can say that - hides your real whereabouts and helps you stay anonymous - changes your IP address to protect your data from tracking -- encrypts your traffic to make it unintelligible to outsiders +- encrypts your traffic to make it unreadable to third parties - lets you configure where to use VPN and where not to (exclusions feature) To get more information about AdGuard VPN dive into the [AdGuard VPN Knowledge Base](https://adguard-vpn.com/kb/). From 28d0094f4c909e00ca0e9b3acac4991cd8123a97 Mon Sep 17 00:00:00 2001 From: Helen Date: Wed, 7 Feb 2024 17:24:10 +0300 Subject: [PATCH 15/48] no problem --- docs/adguard-for-android/overview.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/adguard-for-android/overview.md b/docs/adguard-for-android/overview.md index 670720fa442..f8422e264b5 100644 --- a/docs/adguard-for-android/overview.md +++ b/docs/adguard-for-android/overview.md @@ -224,15 +224,15 @@ From the context menu, you can also access the app's stats. ![App management: Chrome. Context menu *mobile_border](https://cdn.adtidy.org/blog/new/4z85achome_management_context_menu.png) -### Problem-free and incompatible apps +### Problem-free and problematic apps -By default, only compatible apps are routed through AdGuard and filtered. These are the apps that still work properly when filtering is enabled. +By default, only problem-free apps are routed through AdGuard and filtered. These are the apps that still work properly when filtering is enabled. -Incompatible apps, such as Download Manager, radio, system apps with UID 1000 and 1001 (for example, Google Play services) may work incorrectly when routed through AdGuard. That's why you may see the following warning when trying to route or filter all apps: +Problematic apps, such as Download Manager, radio, system apps with UID 1000 and 1001 (for example, Google Play services) may work incorrectly when routed through AdGuard. That's why you may see the following warning when trying to route or filter all apps: ![Route all apps dialog *mobile_border](https://cdn.adtidy.org/blog/new/6du8jiroute_all.png) -To ensure proper operation of all apps installed on your device, we strongly recommend that you route only compatible apps through AdGuard. You can see the full list of apps not recommended for filtering in *Settings* → *General* → *Advanced* → *Low-level settings* → *Protection* → *Excluded apps*. +To ensure proper operation of all apps installed on your device, we strongly recommend that you route only problem-free apps through AdGuard. You can see the full list of apps not recommended for filtering in *Settings* → *General* → *Advanced* → *Low-level settings* → *Protection* → *Excluded apps*. ## Statistics From 1a64ae2acb71c86aa153747184fb04c4518723bd Mon Sep 17 00:00:00 2001 From: vyanovsky <51786050+vyanovsky@users.noreply.github.com> Date: Mon, 12 Feb 2024 11:43:32 +0300 Subject: [PATCH 16/48] Update ads-not-blocked.md Co-authored-by: Sofia Orlova <95080242+ss-orlova@users.noreply.github.com> --- docs/adguard-for-safari/solving-problems/ads-not-blocked.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md index 70a06b2fc11..707960f6ac2 100644 --- a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md +++ b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md @@ -15,7 +15,7 @@ In some cases, filtering may not work and ads may still be displayed even though 1. Open Safari. 2. Click *Safari* in the left upper corner menu. - 3. Click *Settings…* → *Extensions* tab + 3. Click *Settings…* → *Extensions*. 4. Clear the checkboxes for AdGuard’s 6 content blocking extensions: *Custom*, *General*, *Other*, *Privacy*, *Security*, and *Social*. ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) 5. Restart Safari. From 3aef7780d50fa29d7bed6bbdf2472fe59b3dc608 Mon Sep 17 00:00:00 2001 From: vyanovsky <51786050+vyanovsky@users.noreply.github.com> Date: Mon, 12 Feb 2024 11:44:27 +0300 Subject: [PATCH 17/48] Update ads-not-blocked.md Co-authored-by: Sofia Orlova <95080242+ss-orlova@users.noreply.github.com> --- docs/adguard-for-safari/solving-problems/ads-not-blocked.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md index 707960f6ac2..1ebee42c14d 100644 --- a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md +++ b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md @@ -21,7 +21,7 @@ In some cases, filtering may not work and ads may still be displayed even though 5. Restart Safari. 6. Return to *Settings...* → *Extensions* and re-enable the content blocking extensions. 7. Open AdGuard for Safari app. - 8. Go to *Filters* tab. + 8. Go to *Filters*. 9. Click *Check for updates*. 10. Do not close AdGuard for Safari window until filter update is finished. From 598860d7125266d0249c550d1e8e93f74dc95533 Mon Sep 17 00:00:00 2001 From: vyanovsky <51786050+vyanovsky@users.noreply.github.com> Date: Mon, 12 Feb 2024 11:45:33 +0300 Subject: [PATCH 18/48] Update filters-after-disable.md Co-authored-by: Sofia Orlova <95080242+ss-orlova@users.noreply.github.com> --- .../solving-problems/filters-after-disable.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-safari/solving-problems/filters-after-disable.md b/docs/adguard-for-safari/solving-problems/filters-after-disable.md index ad03a898cb6..7ffdc3f8b26 100644 --- a/docs/adguard-for-safari/solving-problems/filters-after-disable.md +++ b/docs/adguard-for-safari/solving-problems/filters-after-disable.md @@ -15,7 +15,7 @@ This is usually caused by the issue when content blockers update takes too long. 1. Open Safari. 2. Click *Safari* in the left upper corner menu. - 3. Click *Settings…* → *Extensions* tab + 3. Click *Settings…* → *Extensions*. 4. Clear the checkboxes for AdGuard’s 6 content blocking extensions: *Custom*, *General*, *Other*, *Privacy*, *Security*, and *Social*. ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) 5. Restart Safari. From 5ffc2acc6b5e41ba56955cccdd77a81d5f09df3c Mon Sep 17 00:00:00 2001 From: vyanovsky <51786050+vyanovsky@users.noreply.github.com> Date: Mon, 12 Feb 2024 11:50:30 +0300 Subject: [PATCH 19/48] Update private-sonoma.md Co-authored-by: Sofia Orlova <95080242+ss-orlova@users.noreply.github.com> --- docs/adguard-for-safari/solving-problems/private-sonoma.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-safari/solving-problems/private-sonoma.md b/docs/adguard-for-safari/solving-problems/private-sonoma.md index f6d1596e8f7..0beeaa77145 100644 --- a/docs/adguard-for-safari/solving-problems/private-sonoma.md +++ b/docs/adguard-for-safari/solving-problems/private-sonoma.md @@ -13,7 +13,7 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow 1. Open Safari. 2. Click *Safari* in the left upper corner menu. - 3. Click *Settings…* → *Extensions* tab. + 3. Click *Settings…* → *Extensions*. 4. Check *Allow in Private Browsing* for all AdGuard extensions. ![Checked private browsing](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-sonoma-private.png) From b7030ef03e1b6d0dca6c138c9a01cad4ee15f1f7 Mon Sep 17 00:00:00 2001 From: vyanovsky <51786050+vyanovsky@users.noreply.github.com> Date: Mon, 12 Feb 2024 11:52:32 +0300 Subject: [PATCH 20/48] Update rule-limit.md Co-authored-by: Sofia Orlova <95080242+ss-orlova@users.noreply.github.com> --- docs/adguard-for-safari/solving-problems/rule-limit.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-safari/solving-problems/rule-limit.md b/docs/adguard-for-safari/solving-problems/rule-limit.md index bff229096f2..bb6f89cd543 100644 --- a/docs/adguard-for-safari/solving-problems/rule-limit.md +++ b/docs/adguard-for-safari/solving-problems/rule-limit.md @@ -33,4 +33,4 @@ However, **an extension can contain up to 150,000 rules**. If you exceed this li 3. Below each content blocker, you can see the enabled filters and the number of active rules. ![Content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-cb.png) - If a content blocker has more than 150,000 rules, go to *Filters* tab, select a filter category and disable filters or user rules you don't need. +If more than 150,000 rules are enabled in a content blocker, you may need to disable some filters or user rules from it. Go to *Filters*, select the problematic category, and disable the filters or user rules you don’t need. From 318e89fc8858cc07e69560819b74f0670ab714c1 Mon Sep 17 00:00:00 2001 From: vyanovsky Date: Mon, 12 Feb 2024 11:54:41 +0300 Subject: [PATCH 21/48] Fixes based on review Some fixes based on review by the colleagues --- docs/adguard-for-safari/solving-problems/ads-not-blocked.md | 2 +- docs/adguard-for-safari/solving-problems/logs.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md index 1ebee42c14d..3b770087f79 100644 --- a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md +++ b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md @@ -23,7 +23,7 @@ In some cases, filtering may not work and ads may still be displayed even though 7. Open AdGuard for Safari app. 8. Go to *Filters*. 9. Click *Check for updates*. - 10. Do not close AdGuard for Safari window until filter update is finished. + 10. Do not close the AdGuard for Safari window until the filters are updated. If this doesn’t help and ads are still not being blocked, please contact our support at support@adguard.com. diff --git a/docs/adguard-for-safari/solving-problems/logs.md b/docs/adguard-for-safari/solving-problems/logs.md index f1f1e653c3a..f6e4b7c0896 100644 --- a/docs/adguard-for-safari/solving-problems/logs.md +++ b/docs/adguard-for-safari/solving-problems/logs.md @@ -1,5 +1,5 @@ --- -title: How to collect logs +title: How to collect logs in AdGuard for Safari sidebar_position: 4 --- @@ -9,10 +9,10 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow ::: -## How to collect logs in AdGuard for Safari - To analyze and diagnose various problems that may occur with AdGuard for Safari, the AdGuard support service may need its log files. These files contain records of errors and other software events. Below are brief instructions on how to collect logs and send them to support if necessary. +### How to collect logs + 1. Open AdGuard for Safari app. 2. Scroll down and click *Export logs*. 3. Choose a location to save the .zip file and click *Save*. From fe116ca40d89cdb109fe3afa542a488f1ea0ed52 Mon Sep 17 00:00:00 2001 From: vyanovsky Date: Mon, 12 Feb 2024 12:02:24 +0300 Subject: [PATCH 22/48] apsotrophe fix in filters-after-disbale.md --- .../solving-problems/filters-after-disable.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-safari/solving-problems/filters-after-disable.md b/docs/adguard-for-safari/solving-problems/filters-after-disable.md index 7ffdc3f8b26..e9acdff2891 100644 --- a/docs/adguard-for-safari/solving-problems/filters-after-disable.md +++ b/docs/adguard-for-safari/solving-problems/filters-after-disable.md @@ -1,5 +1,5 @@ --- -title: Filtering doesn‘t stop when AdGuard for Safari is disabled +title: Filtering doesn't stop when AdGuard for Safari is disabled sidebar_position: 3 --- From aeae80fddbbdeb0b043446fcd52f666938e80cb0 Mon Sep 17 00:00:00 2001 From: vyanovsky Date: Mon, 12 Feb 2024 12:05:57 +0300 Subject: [PATCH 23/48] Apostrophe fix yet another one --- .../solving-problems/filters-after-disable.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-safari/solving-problems/filters-after-disable.md b/docs/adguard-for-safari/solving-problems/filters-after-disable.md index e9acdff2891..9c739647a88 100644 --- a/docs/adguard-for-safari/solving-problems/filters-after-disable.md +++ b/docs/adguard-for-safari/solving-problems/filters-after-disable.md @@ -1,5 +1,5 @@ --- -title: Filtering doesn't stop when AdGuard for Safari is disabled +title: Filtering doesn’t stop when AdGuard for Safari is disabled sidebar_position: 3 --- From 0e1b80cbaa3e9d7508aa264d266e779f2a7edd13 Mon Sep 17 00:00:00 2001 From: vyanovsky Date: Mon, 12 Feb 2024 12:20:51 +0300 Subject: [PATCH 24/48] 'Content-blocking' fix --- docs/adguard-for-safari/solving-problems/ads-not-blocked.md | 4 ++-- .../solving-problems/filters-after-disable.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md index 3b770087f79..a37691fd65c 100644 --- a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md +++ b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md @@ -16,10 +16,10 @@ In some cases, filtering may not work and ads may still be displayed even though 1. Open Safari. 2. Click *Safari* in the left upper corner menu. 3. Click *Settings…* → *Extensions*. - 4. Clear the checkboxes for AdGuard’s 6 content blocking extensions: *Custom*, *General*, *Other*, *Privacy*, *Security*, and *Social*. + 4. Clear the checkboxes for AdGuard’s 6 content-blocking extensions: *Custom*, *General*, *Other*, *Privacy*, *Security*, and *Social*. ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) 5. Restart Safari. - 6. Return to *Settings...* → *Extensions* and re-enable the content blocking extensions. + 6. Return to *Settings...* → *Extensions* and re-enable the content-blocking extensions. 7. Open AdGuard for Safari app. 8. Go to *Filters*. 9. Click *Check for updates*. diff --git a/docs/adguard-for-safari/solving-problems/filters-after-disable.md b/docs/adguard-for-safari/solving-problems/filters-after-disable.md index 9c739647a88..eb161034f99 100644 --- a/docs/adguard-for-safari/solving-problems/filters-after-disable.md +++ b/docs/adguard-for-safari/solving-problems/filters-after-disable.md @@ -16,9 +16,9 @@ This is usually caused by the issue when content blockers update takes too long. 1. Open Safari. 2. Click *Safari* in the left upper corner menu. 3. Click *Settings…* → *Extensions*. - 4. Clear the checkboxes for AdGuard’s 6 content blocking extensions: *Custom*, *General*, *Other*, *Privacy*, *Security*, and *Social*. + 4. Clear the checkboxes for AdGuard’s 6 content-blocking extensions: *Custom*, *General*, *Other*, *Privacy*, *Security*, and *Social*. ![Unchecked content blockers](https://cdn.adtidy.org/content/Kb/ad_blocker/safari/adg-safari-unchecked-cbs.png) 5. Restart Safari. - 6. Return to *Settings...* → *Extensions* and re-enable the content blocking extensions. + 6. Return to *Settings...* → *Extensions* and re-enable the content-blocking extensions. Now everything should work as intended: filtering is on when AdGuard for Safari is enabled, and filtering is off when it is disabled. From 5e9ce6cbfe24a4da1ab44852eb251f13fbe1acaf Mon Sep 17 00:00:00 2001 From: vyanovsky Date: Mon, 12 Feb 2024 12:42:25 +0300 Subject: [PATCH 25/48] Add intro to filters-after-disable.md --- .../solving-problems/filters-after-disable.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-safari/solving-problems/filters-after-disable.md b/docs/adguard-for-safari/solving-problems/filters-after-disable.md index eb161034f99..3ae0df9f998 100644 --- a/docs/adguard-for-safari/solving-problems/filters-after-disable.md +++ b/docs/adguard-for-safari/solving-problems/filters-after-disable.md @@ -9,7 +9,7 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow ::: -This is usually caused by the issue when content blockers update takes too long. +When filtering doesn’t stop with AdGuard for Safari disabled, this is usually caused by the issue of content blockers update taking too long. ## How to fix From 2e8a0a4cd1235dfa69edef54200acb698242bee9 Mon Sep 17 00:00:00 2001 From: vyanovsky Date: Mon, 12 Feb 2024 12:44:35 +0300 Subject: [PATCH 26/48] Yet another hyphen fix --- docs/adguard-for-safari/solving-problems/rule-limit.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-safari/solving-problems/rule-limit.md b/docs/adguard-for-safari/solving-problems/rule-limit.md index bb6f89cd543..ef472fd0e26 100644 --- a/docs/adguard-for-safari/solving-problems/rule-limit.md +++ b/docs/adguard-for-safari/solving-problems/rule-limit.md @@ -11,7 +11,7 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow ## Safari content blocker rule limit -AdGuard for Safari uses the Content Blocking API to apply filtering rules to pages in the Safari browser. Currently, a maximum of 150,000 rules are allowed for each content blocking extension. +AdGuard for Safari uses the Content Blocking API to apply filtering rules to pages in the Safari browser. Currently, a maximum of 150,000 rules are allowed for each content-blocking extension. AdGuard for Safari has 6 content blockers: From 21ac0825866945154cc99db3ef814be906192893 Mon Sep 17 00:00:00 2001 From: vyanovsky Date: Mon, 12 Feb 2024 13:34:00 +0300 Subject: [PATCH 27/48] Fix intro in filters-after-update.md --- .../solving-problems/filters-after-disable.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-safari/solving-problems/filters-after-disable.md b/docs/adguard-for-safari/solving-problems/filters-after-disable.md index 3ae0df9f998..5cf1993caf2 100644 --- a/docs/adguard-for-safari/solving-problems/filters-after-disable.md +++ b/docs/adguard-for-safari/solving-problems/filters-after-disable.md @@ -9,7 +9,7 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow ::: -When filtering doesn’t stop with AdGuard for Safari disabled, this is usually caused by the issue of content blockers update taking too long. +If filtering doesn’t stop when AdGuard for Safari is disabled, it may be because content blockers take too long to update. ## How to fix From ac2a64347cbdfd55c44855d978a8926494679900 Mon Sep 17 00:00:00 2001 From: vyanovsky Date: Wed, 14 Feb 2024 15:20:48 +0300 Subject: [PATCH 28/48] Update ad-not-blocked.md fix typo --- docs/adguard-for-safari/solving-problems/ads-not-blocked.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md index a37691fd65c..e427f9147c7 100644 --- a/docs/adguard-for-safari/solving-problems/ads-not-blocked.md +++ b/docs/adguard-for-safari/solving-problems/ads-not-blocked.md @@ -9,7 +9,7 @@ This article is about AdGuard for Safari, which safeguards only your Safari brow ::: -In some cases, filtering may not work and ads may still be displayed even though AdGuard for Safari and the proper filters are enabled. This usually happens when something goes wrong filter updates due to Safari bugs. +In some cases, filtering may not work and ads may still be displayed even though AdGuard for Safari and the proper filters are enabled. This usually happens when something goes wrong with filter updates due to Safari bugs. ### How to fix From c08024942208604f5bb42da4a383e6cebe29cb68 Mon Sep 17 00:00:00 2001 From: Slava Leleka Date: Wed, 14 Feb 2024 16:41:02 +0200 Subject: [PATCH 29/48] fix list --- .../solving-problems/connection-not-trusted.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/adguard-for-windows/solving-problems/connection-not-trusted.md b/docs/adguard-for-windows/solving-problems/connection-not-trusted.md index 7b216708d36..4293b1e0728 100644 --- a/docs/adguard-for-windows/solving-problems/connection-not-trusted.md +++ b/docs/adguard-for-windows/solving-problems/connection-not-trusted.md @@ -23,19 +23,19 @@ Old FireFox versions, as well as browsers based on them, do not trust certificat If that doesn't help, follow the instructions for manually adding the AdGuard certificate to the FireFox storage. ->This instruction is for Firefox browser. Names of buttons and menu items may differ in other Firefox-based browsers. +> This instruction is for Firefox browser. Names of buttons and menu items may differ in other Firefox-based browsers. 1. Run AdGuard. 1. Go to [http://local.adguard.org/cert](http://local.adguard.org/cert) and click the *Download* button. The browser should start downloading **cert.cer** file. -:::note + :::note -You can also open the download page by clicking the link via the AdGuard app at *Settings → Network → HTTPS filtering*. + You can also open the download page by clicking the link via the AdGuard app at *Settings → Network → HTTPS filtering*. -::: + ::: -![Certificate settings](https://cdn.adtidy.org/content/kb/ad_blocker/windows/solving-problems/link.jpeg) + ![Certificate settings](https://cdn.adtidy.org/content/kb/ad_blocker/windows/solving-problems/link.jpeg) 1. Open your browser and then open *Settings*. @@ -43,19 +43,19 @@ You can also open the download page by clicking the link via the AdGuard app at 1. Scroll down to *Certificates* and click the *View Certificates* button. -![View certificates window](https://cdn.adtidy.org/content/kb/ad_blocker/windows/solving-problems/import1.jpeg) + ![View certificates window](https://cdn.adtidy.org/content/kb/ad_blocker/windows/solving-problems/import1.jpeg) 1. Select *Authorities* tab. 1. Click *Import...*. -![Certificate settings — import](https://cdn.adtidy.org/content/kb/ad_blocker/windows/solving-problems/import2.jpeg) + ![Certificate settings — import](https://cdn.adtidy.org/content/kb/ad_blocker/windows/solving-problems/import2.jpeg) 1. Browse the downloaded **cert.cer** file and click *Open*. 1. Check the *Trust this CA to identify websites* box and then lick *OK*. -![Certificate settings — checkbox](https://cdn.adtidy.org/content/kb/ad_blocker/windows/solving-problems/cert_checkbox.jpg) + ![Certificate settings — checkbox](https://cdn.adtidy.org/content/kb/ad_blocker/windows/solving-problems/cert_checkbox.jpg) You've successfully installed AdGuard certificate. Restart the browser and the error should go away. From 78f8324078d43a14b036e7a0495d1d96aa7e6079 Mon Sep 17 00:00:00 2001 From: Slava Leleka Date: Wed, 14 Feb 2024 16:59:23 +0200 Subject: [PATCH 30/48] fix typo --- .../solving-problems/connection-not-trusted.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-windows/solving-problems/connection-not-trusted.md b/docs/adguard-for-windows/solving-problems/connection-not-trusted.md index 4293b1e0728..3a95839581d 100644 --- a/docs/adguard-for-windows/solving-problems/connection-not-trusted.md +++ b/docs/adguard-for-windows/solving-problems/connection-not-trusted.md @@ -53,7 +53,7 @@ If that doesn't help, follow the instructions for manually adding the AdGuard ce 1. Browse the downloaded **cert.cer** file and click *Open*. -1. Check the *Trust this CA to identify websites* box and then lick *OK*. +1. Check the *Trust this CA to identify websites* box and then click *OK*. ![Certificate settings — checkbox](https://cdn.adtidy.org/content/kb/ad_blocker/windows/solving-problems/cert_checkbox.jpg) From c496ba243f64808b284f1b78da6017d10937e008 Mon Sep 17 00:00:00 2001 From: vyanovsky Date: Thu, 15 Feb 2024 12:56:53 +0300 Subject: [PATCH 31/48] Add contents to _category_.json Added contents to _category_.json --- docs/adguard-for-safari/solving-problems/_category_.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/adguard-for-safari/solving-problems/_category_.json b/docs/adguard-for-safari/solving-problems/_category_.json index e69de29bb2d..f4d013eef35 100644 --- a/docs/adguard-for-safari/solving-problems/_category_.json +++ b/docs/adguard-for-safari/solving-problems/_category_.json @@ -0,0 +1,6 @@ +{ + "position": 4, + "label": "Solving problems", + "collapsible": true, + "collapsed": true +} \ No newline at end of file From 8a03703b123f1de1959a3bfffae4178879698052 Mon Sep 17 00:00:00 2001 From: SeverAnna Date: Fri, 16 Feb 2024 15:21:54 +0300 Subject: [PATCH 32/48] fix mistakes and formatting Fixed image links and added a preposition --- docs/adguard-for-safari/installation.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/adguard-for-safari/installation.md b/docs/adguard-for-safari/installation.md index ee86df1da37..febc7985f45 100644 --- a/docs/adguard-for-safari/installation.md +++ b/docs/adguard-for-safari/installation.md @@ -41,14 +41,13 @@ AdGuard for Safari is a free app presented on the App Store. To install it on yo On macOS, click *Preference* → *Websites* → *Content Blockers*. If you want to enable AdGuard on every website, turn *When visiting other websites* to *On*. - ![Mac Safari Content Blocker Setting](https://i0.imgs.ovh/2023/10/26/Fmc9U.png) - + +![Mac Safari Content Blocker Setting](https://i0.imgs.ovh/2023/10/26/Fmc9U.png) -On iOS, go *Settings* → *Safari* → *Content Blockers*, and set the option to *Yes*. - - ![iOS Safari Content Blocker Setting](https://i0.imgs.ovh/2023/10/26/FmgM0.jpeg) +On iOS, go to *Settings* → *Safari* → *Content Blockers*, and set the option to *Yes*. +![iOS Safari Content Blocker Setting](https://i0.imgs.ovh/2023/10/26/FmgM0.jpeg) After you complete steps 1-4, AdGuard for Safari will start functioning. You can now configure its settings. From c4f0d483543353977b982de23b8b993759dc9c94 Mon Sep 17 00:00:00 2001 From: SeverAnna Date: Fri, 16 Feb 2024 15:26:23 +0300 Subject: [PATCH 33/48] fix trailing spaces --- docs/adguard-for-safari/installation.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/adguard-for-safari/installation.md b/docs/adguard-for-safari/installation.md index febc7985f45..dabea66bd15 100644 --- a/docs/adguard-for-safari/installation.md +++ b/docs/adguard-for-safari/installation.md @@ -41,7 +41,6 @@ AdGuard for Safari is a free app presented on the App Store. To install it on yo On macOS, click *Preference* → *Websites* → *Content Blockers*. If you want to enable AdGuard on every website, turn *When visiting other websites* to *On*. - ![Mac Safari Content Blocker Setting](https://i0.imgs.ovh/2023/10/26/Fmc9U.png) From 6f3444748ec4b47e50282cee818e74644f1049f7 Mon Sep 17 00:00:00 2001 From: SeverAnna <141145497+SeverAnna@users.noreply.github.com> Date: Fri, 16 Feb 2024 17:01:00 +0300 Subject: [PATCH 34/48] Update docs/adguard-for-safari/installation.md Co-authored-by: Slava <45171506+slavaleleka@users.noreply.github.com> --- docs/adguard-for-safari/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-safari/installation.md b/docs/adguard-for-safari/installation.md index dabea66bd15..0025f8f4ec1 100644 --- a/docs/adguard-for-safari/installation.md +++ b/docs/adguard-for-safari/installation.md @@ -47,7 +47,7 @@ On macOS, click *Preference* → *Websites* → *Content Blockers*. If you want On iOS, go to *Settings* → *Safari* → *Content Blockers*, and set the option to *Yes*. ![iOS Safari Content Blocker Setting](https://i0.imgs.ovh/2023/10/26/FmgM0.jpeg) - + After you complete steps 1-4, AdGuard for Safari will start functioning. You can now configure its settings. From 97228a6ae63887793121c1578dfa334ea19cd498 Mon Sep 17 00:00:00 2001 From: SeverAnna <141145497+SeverAnna@users.noreply.github.com> Date: Fri, 16 Feb 2024 17:01:23 +0300 Subject: [PATCH 35/48] Update docs/adguard-for-safari/installation.md Co-authored-by: Slava <45171506+slavaleleka@users.noreply.github.com> --- docs/adguard-for-safari/installation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-safari/installation.md b/docs/adguard-for-safari/installation.md index 0025f8f4ec1..6726307cc70 100644 --- a/docs/adguard-for-safari/installation.md +++ b/docs/adguard-for-safari/installation.md @@ -42,7 +42,7 @@ AdGuard for Safari is a free app presented on the App Store. To install it on yo On macOS, click *Preference* → *Websites* → *Content Blockers*. If you want to enable AdGuard on every website, turn *When visiting other websites* to *On*. ![Mac Safari Content Blocker Setting](https://i0.imgs.ovh/2023/10/26/Fmc9U.png) - + On iOS, go to *Settings* → *Safari* → *Content Blockers*, and set the option to *Yes*. From 88e04c5bc8447950408c34283bac1894cbf1fbcd Mon Sep 17 00:00:00 2001 From: SeverAnna Date: Fri, 16 Feb 2024 17:29:52 +0300 Subject: [PATCH 36/48] Imrove the wording in Guides articles Changed some wording and made corrections suggested by contributors --- docs/guides/report-website.md | 4 ++-- docs/guides/take-screenshot.md | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/guides/report-website.md b/docs/guides/report-website.md index 2904d221e3d..990ca03aefb 100644 --- a/docs/guides/report-website.md +++ b/docs/guides/report-website.md @@ -12,7 +12,7 @@ When using ad blockers, you may face incorrect work of certain websites or broke - The authors of one of the filters made a mistake when creating the rule; - Advertising reinsertion. Find more about this method in our [blog](https://adguard.com/en/blog/ad-reinsertion.html). -You can help us by filling in an application form with examples of ads you faced with. To do it, please, use instructions for your OS. +You can help us by filling in a form with examples of ads you have encountered. To do it, please, use instructions for your OS. ## Report a website {#report} @@ -149,5 +149,5 @@ where **example.com** is an example site name that needs to be replaced by your ### **Third-party blockers** Some browsers and antivirus programs (such as Yandex Browser, Kaspersky, etc.) have built-in ad blockers. They may affect and cause problems in the operation of sites. -If you use such programs, make sure that the problem is on the side of **AdGuard**: disable **AdGuard** filtering and try to repeat the problem. If it remains, it means that the problem is caused by another application or browser. +If you are using such programs, first make sure that the problem is caused by **AdGuard**: disable **AdGuard** filtering and try to reproduce the problem. If it remains, it means that the problem is caused by another application or browser. If the problem is caused by **AdGuard**, follow the steps described in the previous paragraphs. diff --git a/docs/guides/take-screenshot.md b/docs/guides/take-screenshot.md index 42064b00b15..1eb891170c0 100644 --- a/docs/guides/take-screenshot.md +++ b/docs/guides/take-screenshot.md @@ -30,7 +30,7 @@ Besides, you can always use any special applications for taking screenshots on y ### iOS {#ios} -Any iOS device (barring ancient ones) lets you take a screenshot using standard tools. +Any iOS device (except very old ones) lets you take a screenshot using standard tools. To take a screenshot on an iOS device, use the following combination: @@ -44,13 +44,13 @@ Your iOS device will capture the entire screen and save it as a photo. You can f ### Windows {#windows} -- **To take a screenshot on Windows, press the *PrtScn* button** +- **To take a screenshot on Windows, press the *PrtScn* key** On some notebooks you have to hold *Fn* and then press *PrtScn*. -*Please note: PrtScn (Print Screen) button can be differently abbreviated on various keyboards — PrntScrn, PrtScn, PrtScr or PrtSc.* +*Please note: The PrtScn (Print Screen) key may be abbreviated differently on different keyboards — PrntScrn, PrtScn, PrtScr or PrtSc.* -Windows captures the entire screen and copies it to the (invisible) clipboard. +Windows captures the entire screen and copies it to the clipboard. To take a screenshot of an active window, use the following combination: @@ -58,11 +58,11 @@ To take a screenshot of an active window, use the following combination: To take a screenshot of a specific area, you must use the following combination: -- **Hold down *Win* (the Windows button) and *Shift* and press *S*** +- **Hold down *Win* (the Windows key) and *Shift* and press *S*** -After you take a screenshot, it will be saved in the clipboard. In most cases you will be able to paste it into a document that you are currently editing by using *Ctrl + V* button combination. Alternatively, if you need to save the screenshot into a file, you should open the standard **Paint** program (or any other app that can work with images). Paste your screenshot there using the same button combination or by clicking the Paste button (usually in the top left corner of the screen) and then save it. +After you take a screenshot, it will be saved in the clipboard. In most cases, you will be able to paste it into a document that you are currently editing by using the *Ctrl + V* shortcut. Alternatively, if you need to save the screenshot into a file, you should open the standard **Paint** program (or any other app that can work with images). Paste your screenshot there using the same key combination or by clicking the Paste button (usually in the top left corner of the screen) and then save it. -Windows 8 and 10 let you take a screenshot very quickly with a *Win + PrtScn* combination. As soon as you press these buttons, the screenshot will be automatically saved as a file to your *Pictures* → *Screenshots Folder*. +Windows 8 and 10 let you take a screenshot very quickly with a *Win + PrtScn* combination. As soon as you press these keys, the screenshot will be automatically saved as a file to your *Pictures* → *Screenshots Folder*. There is also a dedicated program for taking screenshots called *Snipping Tool* that you can find via Start menu among standard programs of your computer. Snipping Tool lets you capture of any area of your desktop or the entire screen. After taking a screenshot using this program you can edit the picture and save it to any folder on your computer. @@ -70,19 +70,19 @@ Besides, you can also try using different apps for taking screenshots on your co ### macOS {#mac} -To take a screenshot on Mac, use the following button combination: +To take a screenshot on Mac, use the following shortcut: - **Press and hold together *⌘ Cmd + Shift + 3*** Your Mac will capture the entire screen and save it as a file on the desktop. -To take a screenshot of an active window, use the following combination: +To take a screenshot of an active window, use the following key combination: -- **Press and hold together *⌘ Cmd + Shift + 4 + Space bar*. The pointer will change to a camera icon. Click the window to capture it. Press the Esc button to cancel taking a screenshot** +- **Press and hold together *⌘ Cmd + Shift + 4 + Space bar*. The pointer will change to a camera icon. Click the window to capture it. Press Esc to cancel taking a screenshot** To take a screenshot of a specific area, you must use the following combination: -- **Press and hold together *⌘ Cmd + Shift + 4***. Drag the crosshair to select the needed area. Release your mouse or trackpad to take a screenshot, press the Esc button to cancel it. +- **Press and hold together *⌘ Cmd + Shift + 4***. Drag the crosshair to select the needed area. Release your mouse or trackpad to take a screenshot, press Esc to cancel it. To take a screenshot of the *Touch Bar* (MacBook Pro) use the following combination: From 8b976d350fab91a24c81eac68865a6e95835537d Mon Sep 17 00:00:00 2001 From: Anastasiia Fedotova Date: Mon, 19 Feb 2024 14:05:20 +0300 Subject: [PATCH 37/48] update info in admins-documentation.md and adguard-logs.md --- docs/adguard-for-windows/admins-documentation.md | 4 +++- docs/adguard-for-windows/solving-problems/adguard-logs.md | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/adguard-for-windows/admins-documentation.md b/docs/adguard-for-windows/admins-documentation.md index 05c42befabc..396b0e963d1 100644 --- a/docs/adguard-for-windows/admins-documentation.md +++ b/docs/adguard-for-windows/admins-documentation.md @@ -39,7 +39,9 @@ If you want to install AdGuard on a Windows 7 computer, make sure that it has .N :::info -Automatic updates are disabled when you install AdGuard for Windows from MSI. If you want to allow updates for a user (which is not recommended because centralized updates will become impossible), set the value of the `AllowCheckUpdates` parameter for the `HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Adguard` key to `YES` (case insensitive). In this case automatic updates will be allowed, any other value or no value for this parameter disables automatic updates. +Starting with AdGuard v7.17 for Windows, automatic updates are enabled by default when you install the application from MSI. We recommend that you disable updates for a user so that AdGuard for Windows is updated centrally. To do this, add the ForbidCheckUpdates=Yes key, which is located at the following path: HKEY_LOCAL_MACHINE\SOFTWARE\Adguard. + +In older versions of AdGuard for Windows an automatic updates are disabled by default. To allow updates for a user, set the value of the `AllowCheckUpdates` parameter for the `HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Adguard` key to `YES` (case insensitive). :::note diff --git a/docs/adguard-for-windows/solving-problems/adguard-logs.md b/docs/adguard-for-windows/solving-problems/adguard-logs.md index b49ee6706f7..f820ad9c316 100644 --- a/docs/adguard-for-windows/solving-problems/adguard-logs.md +++ b/docs/adguard-for-windows/solving-problems/adguard-logs.md @@ -43,7 +43,9 @@ Sometimes support team members may ask you to send *trace* logs. Then you will n 1. Open the console (type `cmd` in the start panel). -1. Run the app with the command `C:\"Program Files (x86)"\Adguard\Adguard.exe /trace` if you are using 64-bit Windows, and `C:\"Program Files"\Adguard\Adguard.exe /trace` in case if you use 32-bit one. +1. Run the app with the command `C:\"Program Files"\Adguard\Adguard.exe /trace` regardless of Windows bitness if you have AdGuard v7.16 for Windows or later installed. + +In case you have an older AdGuard for Windows version, run the app with the command `C:\"Program Files (x86)"\Adguard\Adguard.exe /trace` if you are using 64-bit Windows, and `C:\"Program Files"\Adguard\Adguard.exe /trace` in case if you use 32-bit one. 1. Reproduce the issue. From 5c6fe8e952a49177231bccbcd11e4f9f35e8abf8 Mon Sep 17 00:00:00 2001 From: Anastasiia Fedotova Date: Mon, 19 Feb 2024 14:08:20 +0300 Subject: [PATCH 38/48] lint fix --- docs/adguard-for-windows/admins-documentation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-windows/admins-documentation.md b/docs/adguard-for-windows/admins-documentation.md index 396b0e963d1..a7abfde39c5 100644 --- a/docs/adguard-for-windows/admins-documentation.md +++ b/docs/adguard-for-windows/admins-documentation.md @@ -41,7 +41,7 @@ If you want to install AdGuard on a Windows 7 computer, make sure that it has .N Starting with AdGuard v7.17 for Windows, automatic updates are enabled by default when you install the application from MSI. We recommend that you disable updates for a user so that AdGuard for Windows is updated centrally. To do this, add the ForbidCheckUpdates=Yes key, which is located at the following path: HKEY_LOCAL_MACHINE\SOFTWARE\Adguard. -In older versions of AdGuard for Windows an automatic updates are disabled by default. To allow updates for a user, set the value of the `AllowCheckUpdates` parameter for the `HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Adguard` key to `YES` (case insensitive). +In older versions of AdGuard for Windows an automatic updates are disabled by default. To allow updates for a user, set the value of the `AllowCheckUpdates` parameter for the `HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Adguard` key to `YES` (case insensitive). :::note From bb7f45735727f699b047fe3c786c0922a3edf752 Mon Sep 17 00:00:00 2001 From: Anastasiia Fedotova Date: Mon, 19 Feb 2024 17:53:46 +0300 Subject: [PATCH 39/48] fixes --- docs/adguard-for-windows/admins-documentation.md | 2 +- docs/adguard-for-windows/solving-problems/adguard-logs.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/adguard-for-windows/admins-documentation.md b/docs/adguard-for-windows/admins-documentation.md index a7abfde39c5..cfa1faabc4e 100644 --- a/docs/adguard-for-windows/admins-documentation.md +++ b/docs/adguard-for-windows/admins-documentation.md @@ -39,7 +39,7 @@ If you want to install AdGuard on a Windows 7 computer, make sure that it has .N :::info -Starting with AdGuard v7.17 for Windows, automatic updates are enabled by default when you install the application from MSI. We recommend that you disable updates for a user so that AdGuard for Windows is updated centrally. To do this, add the ForbidCheckUpdates=Yes key, which is located at the following path: HKEY_LOCAL_MACHINE\SOFTWARE\Adguard. +Starting with AdGuard v7.17 for Windows, an automatic updates are enabled by default when you install the application from MSI. We recommend that you disable updates for a user so that AdGuard for Windows is updated centrally. To do this, add the ForbidCheckUpdates=Yes key, which is located at the following path: HKEY_LOCAL_MACHINE\SOFTWARE\Adguard. In older versions of AdGuard for Windows an automatic updates are disabled by default. To allow updates for a user, set the value of the `AllowCheckUpdates` parameter for the `HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Adguard` key to `YES` (case insensitive). diff --git a/docs/adguard-for-windows/solving-problems/adguard-logs.md b/docs/adguard-for-windows/solving-problems/adguard-logs.md index f820ad9c316..6d7e684ac6b 100644 --- a/docs/adguard-for-windows/solving-problems/adguard-logs.md +++ b/docs/adguard-for-windows/solving-problems/adguard-logs.md @@ -43,9 +43,9 @@ Sometimes support team members may ask you to send *trace* logs. Then you will n 1. Open the console (type `cmd` in the start panel). -1. Run the app with the command `C:\"Program Files"\Adguard\Adguard.exe /trace` regardless of Windows bitness if you have AdGuard v7.16 for Windows or later installed. +1. Run the application with the command `C:\"Program Files"\Adguard\Adguard.exe /trace` regardless of Windows bitness if you have installed AdGuard v7.16 for Windows or later. -In case you have an older AdGuard for Windows version, run the app with the command `C:\"Program Files (x86)"\Adguard\Adguard.exe /trace` if you are using 64-bit Windows, and `C:\"Program Files"\Adguard\Adguard.exe /trace` in case if you use 32-bit one. +In case you have an older AdGuard for Windows version, run the application with the command `C:\"Program Files (x86)"\Adguard\Adguard.exe /trace` if you are using 64-bit Windows, and `C:\"Program Files"\Adguard\Adguard.exe /trace` in case if you use 32-bit one. 1. Reproduce the issue. From 801ba19ebc6709e16c202e6a139df2d2f4a29b8a Mon Sep 17 00:00:00 2001 From: Anastasiia Fedotova Date: Mon, 19 Feb 2024 17:56:07 +0300 Subject: [PATCH 40/48] one more fix --- docs/adguard-for-windows/solving-problems/adguard-logs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/adguard-for-windows/solving-problems/adguard-logs.md b/docs/adguard-for-windows/solving-problems/adguard-logs.md index 6d7e684ac6b..6fdc23903fc 100644 --- a/docs/adguard-for-windows/solving-problems/adguard-logs.md +++ b/docs/adguard-for-windows/solving-problems/adguard-logs.md @@ -45,7 +45,7 @@ Sometimes support team members may ask you to send *trace* logs. Then you will n 1. Run the application with the command `C:\"Program Files"\Adguard\Adguard.exe /trace` regardless of Windows bitness if you have installed AdGuard v7.16 for Windows or later. -In case you have an older AdGuard for Windows version, run the application with the command `C:\"Program Files (x86)"\Adguard\Adguard.exe /trace` if you are using 64-bit Windows, and `C:\"Program Files"\Adguard\Adguard.exe /trace` in case if you use 32-bit one. +If you have an older version of AdGuard for Windows, run the application with the command C:\"Program Files (x86)"\Adguard\Adguard.exe /trace if you are using 64-bit Windows, and C:\"Program Files"\Adguard\Adguard.exe /trace if you are using 32-bit. 1. Reproduce the issue. From 517b28920c862c292a4416b8d8cf9f856a7b53c0 Mon Sep 17 00:00:00 2001 From: Anastasiia Fedotova Date: Mon, 19 Feb 2024 18:00:40 +0300 Subject: [PATCH 41/48] deleted an article --- docs/adguard-for-windows/admins-documentation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/adguard-for-windows/admins-documentation.md b/docs/adguard-for-windows/admins-documentation.md index cfa1faabc4e..50b4563dfec 100644 --- a/docs/adguard-for-windows/admins-documentation.md +++ b/docs/adguard-for-windows/admins-documentation.md @@ -39,9 +39,9 @@ If you want to install AdGuard on a Windows 7 computer, make sure that it has .N :::info -Starting with AdGuard v7.17 for Windows, an automatic updates are enabled by default when you install the application from MSI. We recommend that you disable updates for a user so that AdGuard for Windows is updated centrally. To do this, add the ForbidCheckUpdates=Yes key, which is located at the following path: HKEY_LOCAL_MACHINE\SOFTWARE\Adguard. +Starting with AdGuard v7.17 for Windows, automatic updates are enabled by default when you install the application from MSI. We recommend that you disable updates for a user so that AdGuard for Windows is updated centrally. To do this, add the ForbidCheckUpdates=Yes key, which is located at the following path: HKEY_LOCAL_MACHINE\SOFTWARE\Adguard. -In older versions of AdGuard for Windows an automatic updates are disabled by default. To allow updates for a user, set the value of the `AllowCheckUpdates` parameter for the `HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Adguard` key to `YES` (case insensitive). +In older versions of AdGuard for Windows automatic updates are disabled by default. To allow updates for a user, set the value of the `AllowCheckUpdates` parameter for the `HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Adguard` key to `YES` (case insensitive). :::note From 353f6a38b1a72a167c7b41a2d4a88d88fdbcabe8 Mon Sep 17 00:00:00 2001 From: Vasily Bagirov Date: Tue, 20 Feb 2024 20:03:22 +0300 Subject: [PATCH 42/48] Update filter policy --- docs/general/ad-filtering/filter-policy.md | 300 ++++++++++++++++----- 1 file changed, 234 insertions(+), 66 deletions(-) diff --git a/docs/general/ad-filtering/filter-policy.md b/docs/general/ad-filtering/filter-policy.md index 778ddeedfc4..9c5ebcdcd6b 100644 --- a/docs/general/ad-filtering/filter-policy.md +++ b/docs/general/ad-filtering/filter-policy.md @@ -3,123 +3,291 @@ title: AdGuard filter policy sidebar_position: 6 --- -When discussing AdGuard ad filters, one topic often comes up — whether AdGuard should block this or that ad. By setting the rules, we stick to specific criteria that are very similar to [EasyList Policy](https://easylist.to/pages/policy.html), which we find correct and appropriate. However, we have made some changes to it. +At AdGuard, we’ve long followed certain principles in making our filters, which, along with filter descriptions, are outlined below as part of our filtering policy. -![To filter or not to filter](https://cdn.adtidy.org/public/Adguard/Common/page_filtering.png) +## Common criteria -## Terminology +These criteria are equally applied to the rules of all filters. -Throughout this text, we use the terms **first party** and **third party**. +- Rules for a specific site will only be added if there is sufficient traffic. Traffic is determined by public statistics (if available) or indirect indicators, such as the number of subscribers on social networks. A site’s traffic is considered sufficient if it reaches 100,000 visits per month. We will consider adding a rule for a site that is not as popular, but the final decision rests with filter developers. Sites with low traffic should still be checked for third-party analytics and advertising networks +- The decision about content farms (websites that produce large amounts of content primarily aimed at achieving high visibility in search results and generating advertising revenue) is made by filter developers depending on the quality of the content -A "first party" is a website that a user visits intentionally and knowingly, plus a set of resources on the web operated by the same organization. In practice, we consider resources to belong to the same party if they are part of the same registrable domain: a public suffix plus one additional label. Example: `site.example`, `www.site.example`, and `s.u.b.site.example` belong to the same party because `site.example` is their common registrable domain. +Quality requirements for filtering rules: -A "third party" is any party that does not fall within the definition of the first party above. Interactions with other parties are considered third-party, even if the user is transiently informed in context (for example, in the form of a redirect). Merely hovering over, muting, pausing, or closing a given piece of content does not constitute an intention to interact. +- Rules should not negatively impact the websites in terms of performance +- Unblocking rules must be as specific as possible to avoid unblocking anything unnecessary +- JavaScript rules should be used as sparingly as possible and only if blocking ads is impossible without them -## Common criteria +## Ad Blocking Filters -These equally apply to rules in all filters. +### Terminology -- Rules that often cause problems with the work of some websites will be deleted. -- Website-specific rules will be added only if a website has sufficient traffic. Traffic is determined by open statistics (if available) or by other means, such as followers on social media. A website's traffic is considered sufficient when it has 100 thousand visits per month. We will consider adding a rule for a website that's not that popular, but the final decision is up to the filter list maintainer. +**Ad blocker** is a software or hardware tool designed to filter, hide, or block advertisements and other elements on web pages. Ad blockers are created to improve user experience, reduce page load times, decrease internet traffic consumption, block ads, enhance privacy while browsing websites and using applications, and block annoying elements. -## Ad filters -This part describes the AdGuard Base filter, the Mobile Ads filter, and the following language-specific filters: Chinese, Dutch, French, German, Japanese, Russian, Spanish/Portuguese, and Turkish. +A **filter** (or a **filter list**) is a set of filtering rules designed to filter content and block various types of advertisements and other types of content using ad blockers. These filters usually operate at the level of the web browser, programs, or DNS server. -**What shall these filters block?** -- These filters will block ads wherever possible. -- Ads should be blocked regardless of their reasons and goals. -- We will block ads caused by malicious apps or extensions that inject ads. Please note that we do it only on the condition that you specify how to install such an app or extension. +**Anti-adblock** is a technology used by websites or applications intended to detect ad blocking and react to it in different ways: tracking, reinjecting ads, encouraging to disable ad blocker (so called “adblock walls”). Anti-adblocks may be of different types: -**Limitations and Exceptions** +- Anti-adblock that blocks website content without offering an alternative: to continue using the site, the user must disable the ad blocker on the site +- “Anti-adblock wall” with alternative options offered, such as purchasing a subscription to continue using the ad blocker +- Informational messages that do not obligate action: users are asked to disable the ad blocker, but these messages can be closed, allowing users to continue using the site without restrictions +- Implementing alternative advertising in response to ad blocker usage: sites introduce alternative advertising when ad blockers are detected +- Paywall: a method of content monetization where content is partially or fully hidden from users, with a message prompting them to purchase a subscription for access -If a rule is subject to the list of limitations described below, then it won’t be added to the main filters. +### Filters -- Websites’ own ads should not be removed on purpose. On the other hand, they should not be unblocked if it may cause third-party ads to reappear. -- Website-specific rules will be added only if a website has sufficient traffic. Traffic is determined by open statistics (if available) or by other means, such as followers on social media. A website's traffic is considered sufficient when it has 100 thousand visits per month. We will consider adding a rule for a website that's not that popular, but the final decision is up to the filter list maintainer. -- Anti-adblock scripts will be blocked only if they limit or affect the functionality of a website. -- Anti-adblock scripts will not be blocked in cases when it is prohibited by law. -- Rules that often cause problems with the work of some websites will be deleted. +AdGuard ad-blocking filters include: -## Tracking Protection filter +- AdGuard Base filter +- AdGuard Mobile Ads filter +- Regional filters divided by language principle — Chinese, Dutch, French, German, Japanese, Russian, Spanish/Portuguese, Turkish, and Ukrainian -**What will be blocked with this filter?** +### What these filters do -- This filter will block all trackers that collect user personal data. +- **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. +- **Regional filters** follow the same policy as the **Base filter**, but limited to websites in certain languages. -We define **tracking** as collecting data regarding an individual’s identity or activity across one or more websites. Even if such data is considered to be personally unidentifiable, it’s still tracking. +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: -**Tracker** is an online script that has tracking as its only purpose, or as one of its purposes. +- Banners — advertisements displayed as images in various parts of web pages +- Teasers — text or graphical ads, often animated, designed to intrigue visitors (sensational headlines, attention-grabbing images) and prompt them to click on the banner (clickbait) +- Text ads — advertising in the form of text, including links +- Modal adverts — advertising that suddenly appears over the current content in the form of modal windows +- Popunders — advertising that opens in a separate window under the current one, when clicked anywhere on the page +- Redirect advertising — mechanisms which automatically redirect users to another site after clicking +- 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 +- 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*) +- 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 -**Limitations and Exceptions** +### Limitations and exceptions + +- The site’s own advertising should not be deliberately blocked. However, it should not be unblocked if the blocking is caused by general filtering rules +- Content access measures like paywalls are not blocked +- Anti-adblock walls will be blocked in the following cases: + - They aggressively insist on disabling or removing the ad blocker or effectively prevent using the website + - They feature incorrect and misleading descriptions of possible consequences of ad blockers’ use + - They put visitors at risk of malvertising — when unblocked advertisements come from dubious sources +- We do not block ad blocker detection messages that satisfy at least one of the following criteria: + - They allow the usage of the website and do not overlay the significant amount of content + - They provide an alternative to disabling an ad blocker given that this alternative does not put the users’ privacy or security at risk + - They allow the user to proceed to the website’s content or offer a feasible value exchange that does not put the user’s privacy or security at risk + - Some legacy rules may continue to block messages that satisfy one or more of these criteria. If identified, such rules will be handled according to this policy +- Mining pools are not blocked if they are public and not used solely for malicious purposes + +## Tracking Protection Filters + +### Terminology + +**Tracking** — the process of monitoring and collecting data about users and their interactions with websites and applications for marketing purposes, as well as to obtain telemetry about the functioning of websites or applications for the purpose of analyzing their operation. This process includes tracking visited pages, time spent, interaction with website elements (e.g., clicks, form submissions), and other metrics. It allows website and application owners to better understand user behavior, optimize functionality, and adapt marketing strategies. Tracking is also used to monitor performance, usage patterns, and identify issues, providing developers with the necessary data to improve the stability and quality of the website or application. Even if the data obtained cannot identify a person’s identity, such actions are still considered tracking + +**Tracker** — software used on a website or in an application and designed to collect information about their operation and visitors’ actions. It tracks user interaction with the website or application, recording data about page views, time spent, clicks, form submissions, and other events. Its purpose is to provide website and application owners with a tool for analyzing user behavior, improving the user experience, and optimizing content and advertising + +**URL tracking parameter** — a part of the address that is added to links by analytics systems or present in some links on web pages. When a request is made, this URL tracking parameter can be processed by the backend of an analytics system or website, which will extract information from it. For example, URL tracking parameters can transmit information about clicks or advertising campaigns. URL tracking parameters can also be used by fraud protection or bot detection systems + +**Cookies** — files that websites send to and store on devices. These files contain various information — both necessary for the functioning of the site on the device and used for analytics purposes — unique identifiers used to track visitor activity on the website, advertising parameters, and more + +### Filters + +AdGuard tracking protection filters include: + +- AdGuard Tracking Protection filter +- AdGuard URL Tracking filter + +### What these filters do + +**Tracking Protection filter** is designed to block trackers that collect users’ personal data and to improve users’ privacy. + +What is blocks: + +- Analytics systems’ scripts +- Websites’ and applications’ own tracking scripts +- Masked CNAME trackers +- Tracking cookies +- Tracking pixels +- Tracking APIs of browsers +- Privacy Sandbox functionality in Google Chrome and its forks used for tracking (Google Topics API, the Protected Audience API) + +The **URL Tracking filter** is designed to remove tracking parameters from web addresses + +### Limitations and exceptions + +Tracking protection filters should not block a tracker if blocking would disrupt the correct functioning of the website: + +- Anti-bots and fraud protection if it interferes with using the site. For example, with PerimeterX or hCaptcha blocking causes problems when the site attempts to verify its visitor witch a captcha +- Error tracking systems like Sentry or Bugsnag are not blocked + +## Annoyance filters + +Annoyance filters are designed to improve the usability of websites by blocking elements on pages that are not advertisements but distract from and interfere with site interaction or content consumption — such as various modal windows and interactive forms, cookie consent notifications and requests, mobile app banners, and various widgets. + +### Terminology + +**Cookie notice** — a form that describes the types and use of cookies on a website. A cookie notice appears when a user visits the website, informing the user that the website uses cookies or other tracking technologies to collect and use personal information, and explaining why and with whom the information collected is shared. + +**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. + +**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. + +### Filters + +For better customization, annoyance filters are divided by their purpose: + +- AdGuard Cookie Notices filter +- AdGuard Popups filter +- AdGuard Mobile App Banners filter +- AdGuard Widgets filter +- AdGuard Other Annoyances filter +- AdGuard Annoyances filter — a combined filter that includes all 5 specialized annoyance filters -If a rule is subject to the list of limitations described below, then it won’t be added to this filter. +### What will be blocked with these filters? -- Rules that cause problems with website functionality will be removed. -- Website-specific rules will be added only if a website has sufficient traffic. Traffic is determined by open statistics (if available) or by other means, such as followers on social media. A website's traffic is considered sufficient when it has 100 thousand visits per month. We will consider adding a rule for a website that's not that popular, but the final decision is up to the filter list maintainer. +#### AdGuard Cookie Notices filter -## AdGuard URL Tracking filter +This filter is designed to block both cookie notices and requests from cookie management platforms (CMPs). Various methods may be applied to cookie notices and CMPs. In most cases, simply hiding or blocking the corresponding scripts is sufficient. However, when the site’s functionality and display of third-party content require cookie consent, the following methods are applied: -**What will be blocked with this filter?** +- Scriptlets are used to bypass the consent request (practically not applicable on sites with restrictions on loading third-party content until a decision is made) +- Setting a cookie or key in the site’s local storage in such a way that the script considers the user to have made a choice +- Simulating user action using a rule that clicks a specified button and interrupts its execution 10 seconds after loading. Two options are possible: + - Reject (except for functional cookies — depending on the CMP system) — the preferred option, as there is less chance of loading additional analytics tools + - Accept — this option is used as the last resort if other methods fail. In this case, the site is additionally checked for the use of analytics tools, which are then blocked by the **AdGuard Tracking Protection filter** -- This filter will strip all tracking parameters from URLs. +**Limitations and Exceptions** + +In some cases, the decision to add rules is made independently by filter developers; mostly, when the choice made when simulating actions would affect the site’s functionality (for example, history may not work, or user settings may not be saved on such a site). + +#### AdGuard Popups filter + +This is a filter that blocks various popups on web pages that are not necessary for normal site usage, including but not limited to: -We define **tracking** as collecting data regarding an individual’s identity or activity across one or more websites. Even if such data is considered to be personally unidentifiable, it’s still tracking. +- Requests for permission to receive push notifications +- Popups and forms for subscribing to news, promotions, and various events, including third-party channels for receiving them (such as Google News, Telegram) +- Popups that encourage users to disable ad blocker and violate user’s privacy (at the discretion of the filter developers) +- Other types of popups that may annoy users (at the discretion of filter developers) **Limitations and Exceptions** -If a rule is subject to the list of limitations described below, then it won’t be added to this filter. +- Push notifications are only blocked on sites where they are not used for practical purposes. For example, in email web clients or tools used for work purposes, such notifications will not be blocked +- Some popups that do not fall into the categories described above but still interfere with the user’s experience may be also blocked. For example, registration prompts on a site or popups that introduce the site’s features. The decision is made by filter developers +- Content access measures that ask the user to pay to access the content must not be circumvented + +#### AdGuard Mobile App Banners filter + +This is a filter that blocks banners and popups that encourage visitors to install mobile applications. + +**Limitations and Exceptions** -- Rules that would reduce user security levels will be removed. -- Rules that cause problems with website functionality will be removed. -- Website-specific rules will be added only if a website has sufficient traffic. Traffic is determined by open statistics (if available) or by other means, such as followers on social media. A website's traffic is considered sufficient when it has 100 thousand visits per month. We will consider adding a rule for a website that's not that popular, but the final decision is up to the filter list maintainer. +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. -## Social Media filter +#### AdGuard Widgets filter -**What will be blocked with this 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 filter will block social media widgets (on third-party websites) such as "Like" and "Share" buttons, recommendation widgets, and more. +- 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 +- Marketing widgets: + - Chats for communication with assistants or bots + - Widgets with product recommendations that are shown to the user + - Call-back forms +- Other widgets that do not have a separate category but may visually clutter the page. For example, weather widgets, currency exchange rates, job listings, and donations **Limitations and Exceptions** -If a rule is subject to the list of limitations described below, then it won’t be added to this filter. +This filter doesn’t block: -- Rules that block widgets that are a part of a website’s functionality, such as "Comments," "Embedded Post," "Surveys," or widgets that require authorization via social networks. -- Rules that block links to a website’s communities in social networks. -- Rules that cause problems with website functionality will be removed. -- Website-specific rules will be added only if a website has sufficient traffic. Traffic is determined by open statistics (if available) or by other means, such as followers on social media. A website's traffic is considered sufficient when it has 100 thousand visits per month. We will consider adding a rule for a website that's not that popular, but the final decision is up to the filter list maintainer. +- Widgets closely related to the content of the page, such as comments sections, live chat streams, with an exception of unmoderated chats on sites with unofficial streams, which are often filled with spam and similar content +- Widgets for self-promotion and site-specific promotional activities +- Donation widgets, except the cases where they occupy a significant portion of the page and stand out prominently against the content. The decision to block is made by filter developers -## Annoyances filter +#### AdGuard Other Annoyances filter -**What will be blocked with this filter?** +This filter is designed to block annoying elements that are not included in other filters, as well as to apply various tweaks. It’s purpose is to: -- This filter will block obstructions on the page. These elements are not ads, but they obstruct the view and make it difficult to see the actual content of the website. Such elements include cookie notices, third-party widgets, in-page pop-ups, email subscription forms, banners with special offers, and aggressively placed social media widgets. +- Block self-promotion of websites (any type of advertising promoting goods or services owned by the site owner, without receiving commercial compensation from a third party), if it is considered an annoying element +- Block annoying elements that are not included in other categories +- Unblock actions on the page, such as opening the context menu, selecting and copying text, if they are blocked +- Speed up countdown timers when loading files from websites, if the check is not controlled by the server or is not hindered +- Apply various rules that may be useful for filter developers. For example, blocking web debugger detection **Limitations and Exceptions** -If a rule is subject to the list of limitations described below, then it won’t be added to this filter. +This filter may contain rules that are not suitable for all users. In such cases, it is recommended to disable this filter. The decisions to add rules to this filter are made by filter developers on a rule-by-rule basis. + +## Social Media filters + +### Filters + +AdGuard ad-blocking filters include: + +- AdGuard Social Media filter + +### What these filters do + +This filter will block social media widgets on third-party websites, such as “Like” and “Share” buttons, group widgets, recommendations, and similar widgets. + +### Limitations and exceptions + +Widgets that are part of the website’s functionality or content, such as comments, embedded posts, polls, as well as social media login widgets, are not blocked. Links to the website’s social media pages are also not blocked. -- Rules that block elements that are essential for the website functioning (e.g. authorization forms) will not be blocked even if they satisfy other requirements. -- Rules that cause problems with website functionality will be removed. -- Website-specific rules will be added only if a website has sufficient traffic. Traffic is determined by open statistics (if available) or by other means, such as followers on social media. A website's traffic is considered sufficient when it has 100 thousand visits per month. We will consider adding a rule for a website that's not that popular, but the final decision is up to the filter list maintainer. +## Other filters -## Filter unblocking search ads and self-promotion +This group contains filters that are not essential for blocking advertisements. -Unlike other filters, this one **unblocks** certain ads. Read more about it in the [article on search ads and self-promotion](../search-ads). +### Terminology -**What will be unblocked with this filter?** +**Contextual advertising** is a type of internet advertising where the advertisement is displayed based on the content, selected audience, location, time, or other context of internet pages. -- Search ads (ads that you see among the results when using an online search engine). -- Website self-promotion (when an ad on a website is promoting this very website or other websites/social media/etc closely related to it). +**Search advertising** is a subclass of contextual advertising where ads are displayed based on the visitor's search query. + +**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/). + +### Filters + +- Filter unblocking search ads and self-promotion +- AdGuard DNS filter +- AdGuard Experimental filter + +### What these filters do: + +#### Filter unblocking search ads and self-promotion + +This filter unblocks: + +- Contextual advertising in search results when using search engines (such as Google, Bing, Yandex, DuckDuckGo) +- Self-promotion of websites **Limitations and Exceptions** -- Rules that cause problems with website functionality will be removed. -- Website-specific rules will be added only if a website has sufficient traffic. Traffic is determined by open statistics (if available) or by other means, such as followers on social media. A website's traffic is considered sufficient when it has 100 thousand visits per month. We will consider adding a rule for a website that's not that popular, but the final decision is up to the filter list maintainer. +- Search advertising is unblocked only if it corresponds to the user’s search query, as it is contextual. Otherwise, the advertising remains blocked +- Self-promotion is unblocked only if it complies with the filter policy. A request for unblocking may be rejected by filter developers +- Any other advertising will not be unblocked -## Quality requirements for filtering rules +#### AdGuard DNS filter + +This filter is used in AdGuard DNS. It is not a replacement for ad-blocking filters. + +**Limitations and Exceptions** + +Same as for ad-blocking filters. + +#### AdGuard Experimental filter + +This filter is intended for testing and debugging rules that potentially may break websites’ functionality. Rules are added by filter developers when there’s a need to test a particular solution. As the filter is designed for debugging purposes, its limitations are minimal. + +**Limitations and Exceptions** -- The rules should be as efficient as possible in terms of performance. -- Exception rules should be as specific as possible in order to avoid unnecessary unblocking. -- CSS and JS injection rules should be used as rarely as possible and only when it is impossible to block ads without them. +- Rules should not explicitly break websites’ functionality +- Rules should not unblock advertisements or otherwise violate the Policy From 67169e4e681e22cad3741bc0400124a838b104da Mon Sep 17 00:00:00 2001 From: Vasily Bagirov Date: Tue, 20 Feb 2024 21:09:47 +0300 Subject: [PATCH 43/48] Fix filters' description --- docs/general/ad-filtering/filter-policy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/general/ad-filtering/filter-policy.md b/docs/general/ad-filtering/filter-policy.md index 9c5ebcdcd6b..d9776408509 100644 --- a/docs/general/ad-filtering/filter-policy.md +++ b/docs/general/ad-filtering/filter-policy.md @@ -228,7 +228,7 @@ This filter may contain rules that are not suitable for all users. In such cases ### Filters -AdGuard ad-blocking filters include: +AdGuard Seocial Media filters include: - AdGuard Social Media filter From 24d856aff902d7da942256632fac2ec26157438e Mon Sep 17 00:00:00 2001 From: Vasily Bagirov Date: Wed, 21 Feb 2024 12:46:10 +0300 Subject: [PATCH 44/48] Remove punctuation from headings --- docs/general/ad-filtering/filter-policy.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/general/ad-filtering/filter-policy.md b/docs/general/ad-filtering/filter-policy.md index d9776408509..e9111ff3d25 100644 --- a/docs/general/ad-filtering/filter-policy.md +++ b/docs/general/ad-filtering/filter-policy.md @@ -151,7 +151,7 @@ For better customization, annoyance filters are divided by their purpose: - AdGuard Other Annoyances filter - AdGuard Annoyances filter — a combined filter that includes all 5 specialized annoyance filters -### What will be blocked with these filters? +### What will be blocked with these filters #### AdGuard Cookie Notices filter @@ -260,7 +260,7 @@ For more details on these types of advertising, refer to the [article on Search - AdGuard DNS filter - AdGuard Experimental filter -### What these filters do: +### What these filters do #### Filter unblocking search ads and self-promotion From 7d722bb4b36c9366fdea9722e95667efd8d5a583 Mon Sep 17 00:00:00 2001 From: Vasily Bagirov Date: Wed, 21 Feb 2024 12:49:10 +0300 Subject: [PATCH 45/48] Remove extra empty lines and trailing spaces --- docs/general/ad-filtering/filter-policy.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/general/ad-filtering/filter-policy.md b/docs/general/ad-filtering/filter-policy.md index e9111ff3d25..7b2dd63ad2a 100644 --- a/docs/general/ad-filtering/filter-policy.md +++ b/docs/general/ad-filtering/filter-policy.md @@ -24,7 +24,6 @@ Quality requirements for filtering rules: **Ad blocker** is a software or hardware tool designed to filter, hide, or block advertisements and other elements on web pages. Ad blockers are created to improve user experience, reduce page load times, decrease internet traffic consumption, block ads, enhance privacy while browsing websites and using applications, and block annoying elements. - A **filter** (or a **filter list**) is a set of filtering rules designed to filter content and block various types of advertisements and other types of content using ad blockers. These filters usually operate at the level of the web browser, programs, or DNS server. @@ -73,7 +72,7 @@ The goal of ad-blocking filters is to block all types of advertising on websites - The site’s own advertising should not be deliberately blocked. However, it should not be unblocked if the blocking is caused by general filtering rules - Content access measures like paywalls are not blocked -- Anti-adblock walls will be blocked in the following cases: +- Anti-adblock walls will be blocked in the following cases: - They aggressively insist on disabling or removing the ad blocker or effectively prevent using the website - They feature incorrect and misleading descriptions of possible consequences of ad blockers’ use - They put visitors at risk of malvertising — when unblocked advertisements come from dubious sources @@ -153,7 +152,7 @@ For better customization, annoyance filters are divided by their purpose: ### What will be blocked with these filters -#### AdGuard Cookie Notices filter +#### AdGuard Cookie Notices filter This filter is designed to block both cookie notices and requests from cookie management platforms (CMPs). Various methods may be applied to cookie notices and CMPs. In most cases, simply hiding or blocking the corresponding scripts is sufficient. However, when the site’s functionality and display of third-party content require cookie consent, the following methods are applied: From ad8b72252e656532930e702e97e41c7f79bc011e Mon Sep 17 00:00:00 2001 From: Vasily Bagirov Date: Wed, 21 Feb 2024 13:36:30 +0300 Subject: [PATCH 46/48] Remove extra empty line --- docs/general/ad-filtering/filter-policy.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/general/ad-filtering/filter-policy.md b/docs/general/ad-filtering/filter-policy.md index 7b2dd63ad2a..29576e4c329 100644 --- a/docs/general/ad-filtering/filter-policy.md +++ b/docs/general/ad-filtering/filter-policy.md @@ -26,7 +26,6 @@ Quality requirements for filtering rules: A **filter** (or a **filter list**) is a set of filtering rules designed to filter content and block various types of advertisements and other types of content using ad blockers. These filters usually operate at the level of the web browser, programs, or DNS server. - **Anti-adblock** is a technology used by websites or applications intended to detect ad blocking and react to it in different ways: tracking, reinjecting ads, encouraging to disable ad blocker (so called “adblock walls”). Anti-adblocks may be of different types: - Anti-adblock that blocks website content without offering an alternative: to continue using the site, the user must disable the ad blocker on the site From 46dbbcee47a56b8ea3b27f1debc934088d6ab32f Mon Sep 17 00:00:00 2001 From: Vasily Bagirov Date: Wed, 21 Feb 2024 18:52:48 +0300 Subject: [PATCH 47/48] Change wording for filters' purposes --- docs/general/ad-filtering/filter-policy.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/general/ad-filtering/filter-policy.md b/docs/general/ad-filtering/filter-policy.md index 29576e4c329..2cac7fe2de0 100644 --- a/docs/general/ad-filtering/filter-policy.md +++ b/docs/general/ad-filtering/filter-policy.md @@ -42,7 +42,7 @@ AdGuard ad-blocking filters include: - AdGuard Mobile Ads filter - Regional filters divided by language principle — Chinese, Dutch, French, German, Japanese, Russian, Spanish/Portuguese, Turkish, and Ukrainian -### What these filters do +### 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. @@ -101,7 +101,7 @@ AdGuard tracking protection filters include: - AdGuard Tracking Protection filter - AdGuard URL Tracking filter -### What these filters do +### The purpose of these filters **Tracking Protection filter** is designed to block trackers that collect users’ personal data and to improve users’ privacy. @@ -149,7 +149,7 @@ For better customization, annoyance filters are divided by their purpose: - AdGuard Other Annoyances filter - AdGuard Annoyances filter — a combined filter that includes all 5 specialized annoyance filters -### What will be blocked with these filters +### The purpose of these filters #### AdGuard Cookie Notices filter @@ -230,7 +230,7 @@ AdGuard Seocial Media filters include: - AdGuard Social Media filter -### What these filters do +### The purpose of these filters This filter will block social media widgets on third-party websites, such as “Like” and “Share” buttons, group widgets, recommendations, and similar widgets. @@ -258,7 +258,7 @@ For more details on these types of advertising, refer to the [article on Search - AdGuard DNS filter - AdGuard Experimental filter -### What these filters do +### The purpose of these filters #### Filter unblocking search ads and self-promotion From 43b9485c0f0b472f7932395bf8c5986330e4e600 Mon Sep 17 00:00:00 2001 From: Eugene Miroshkin Date: Mon, 26 Feb 2024 11:18:04 +0300 Subject: [PATCH 48/48] ADG-8288 fix videos style for markdown --- src/css/custom.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/css/custom.css b/src/css/custom.css index 98e59edf377..c14eb3a1983 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -168,6 +168,18 @@ html[lang='ko'] .navbar__search { background-image: url("data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjE2IiB2aWV3Qm94PSIwIDAgMTcgMTYiIHdpZHRoPSIxNyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48ZyBzdHJva2U9IiM2N2IyNzkiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgc3Ryb2tlLXdpZHRoPSIwLjUiPjxwYXRoIGQ9Im0xMi41IDcuODg4Njd2LTMuODg4ODloLTMuODA5NTIiLz48cGF0aCBkPSJtMTIuNDQ3MyA0LjAyNjE3LTQuNTI2MDUgNC42MjAzMSIvPjxwYXRoIGQ9Im02LjM0NDQ4IDQuNjY2OTljLTEuMDE4NjggMC0xLjg0NDQ4LjgyNTgtMS44NDQ0OCAxLjg0NDQ4djMuNDg4ODNjMCAxLjEwNDYuODk1NDMgMiAyIDJoMy41MzA4Yy45OTU1IDAgMS44MDI1LS44MDcgMS44MDI1LTEuODAyNSIvPjwvZz48L3N2Zz4="); } +.youtube-video { + width: 100%; + max-width: 560px; + height: 200px; +} + +@media (min-width: 593px) { + .youtube-video { + height: 315px; + } +} + @media (prefers-color-scheme: light) { /* ... */ }