diff --git a/docs/adguard-browser-extension/comparison-standalone.md b/docs/adguard-browser-extension/comparison-standalone.md index 06e156c9feb..413736f5f17 100644 --- a/docs/adguard-browser-extension/comparison-standalone.md +++ b/docs/adguard-browser-extension/comparison-standalone.md @@ -19,8 +19,8 @@ Whereas AdGuard Browser Extension is free and easy to install, and has filters t ![Extension vs. App *border](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/ad_blocker_browser_extension_comparison.png) -`1` – within browser restrictions and only in the browser where it is installed; +`1` — within browser restrictions and only in the browser where it is installed; -`2` – the extension is unable to detect requests from other extensions. If a malicious or tracking extension sends a request to its server to show you ads or track your activity, AdGuard Browser Extension will not be able to block that request; +`2` — the extension is unable to detect requests from other extensions. If a malicious or tracking extension sends a request to its server to show you ads or track your activity, AdGuard Browser Extension will not be able to block that request; -`3` – not all types of ads and threats can be blocked by browser extensions due to certain browser limitations. Some elements may get to the page and slow down the loading process. Besides, unlike browser-based ad blockers, the AdGuard app blocks ads before they are loaded to the browser. This saves traffic and speeds up page loading. +`3` — not all types of ads and threats can be blocked by browser extensions due to certain browser limitations. Some elements may get to the page and slow down the loading process. Besides, unlike browser-based ad blockers, the AdGuard app blocks ads before they are loaded to the browser. This saves traffic and speeds up page loading. diff --git a/docs/adguard-browser-extension/features/filters.md b/docs/adguard-browser-extension/features/filters.md index 7d35fa4939c..07c5c70af89 100644 --- a/docs/adguard-browser-extension/features/filters.md +++ b/docs/adguard-browser-extension/features/filters.md @@ -19,7 +19,7 @@ All filters are grouped according to their role. For example, there are categori ## Custom filters -While the features of other filter groups are more or less predictable, there is a group called *Custom* that may raise additional questions. +While the features of other filter groups are more or less self-explanatory, there is a group called *Custom* that may raise additional questions. ![Custom filters *border](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/ad_blocker_browser_extension_custom_filters.png) diff --git a/docs/adguard-browser-extension/features/main-menu.md b/docs/adguard-browser-extension/features/main-menu.md index eac7d44df8f..413ce9529dd 100644 --- a/docs/adguard-browser-extension/features/main-menu.md +++ b/docs/adguard-browser-extension/features/main-menu.md @@ -15,6 +15,6 @@ The extension's main page can be accessed by clicking the extension's icon on th On the main page, you can hide any element on any page manually (a corresponding rule will be added to the *User rules*), open the *Filtering log* to view the complete information about your browser's traffic and block requests on the go, or look at a website’s security report. Besides, you can submit a complaint about any website (for example, if there are missed ads on the page, our filter engineers will review the report and fix the problem) and see the statistics on applied blocking rules. -All web requests made by the browser are displayed in the *Filtering log*, along with detailed information about each request. The *Filtering log* makes it easy, for example, to monitor requests blocked by AdGuard Browser Extension. Besides, it allows you to block any request or add a previously blocked request to Allowlist in two clicks. The *Filtering log* also offers you a wide variety of options for sorting web requests, which can be helpful when creating your own filtering rules. You can open the *Filtering log* by selecting the corresponding item in the main menu, or from the settings page (in the "Additional settings" tab). +All web requests made by the browser are displayed in the *Filtering log*, along with detailed information about each request. The *Filtering log* makes it easy, for example, to monitor requests blocked by AdGuard Browser Extension. Besides, it allows you to block any request or add a previously blocked request to Allowlist in two clicks. The *Filtering log* also offers you a wide variety of options for sorting web requests, which can be helpful when creating your own filtering rules. You can open the *Filtering log* by selecting the corresponding item in the main menu, or from the settings page (in the *Additional settings* tab). By clicking the icons in the top right corner of the extension's main menu, you can open the extension settings or pause the protection. diff --git a/docs/adguard-browser-extension/features/other-features.md b/docs/adguard-browser-extension/features/other-features.md index cd9ca4f63f8..c5b26d4f5f4 100644 --- a/docs/adguard-browser-extension/features/other-features.md +++ b/docs/adguard-browser-extension/features/other-features.md @@ -13,13 +13,13 @@ Apart from the large key modules of AdGuard Browser Extension, there are several ## General {#general} -In the *General* tab, you can allow search ads and the [self-promotion of websites](/general/ad-filtering/search-ads), enable the automatic activation of language-specific filters, indicate the filters update interval, etc. +In the *General* tab, you can allow search ads and the [self-promotion of websites](/general/ad-filtering/search-ads), enable the automatic activation of language-specific filters, indicate the filters' update interval, etc. ![General *border](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/ad_blocker_browser_extension_general.png) Besides, here you can enable [*Phishing and malware protection*](/general/browsing-security). -You can save your settings configuration by clicking the *Export settings* button. The settings will be saved as a .json file. To upload the previously saved settings configuration, use the *Import settings* function. You can even use it to quickly switch between different settings profiles or even to transfer settings configurations between different browsers. +You can save your settings configuration by clicking the *Export settings* button. The settings will be saved as a .json file. To import the previously saved settings configuration, use the *Import settings* function. You can even use it to quickly switch between different settings profiles or even to transfer settings configurations between different browsers. ## Additional settings {#misc} @@ -33,6 +33,6 @@ Besides, you can opt to help us with the development of filters by sending the s ## About {#about} -In the *About* section, you can find infos about the current version, links to the EULA and Privacy policy, and to the repository of the Browser extension on GitHub. +In the *About* section, you can find info about the current version, links to the EULA and Privacy policy, and to the repository of the Browser extension on GitHub. ![About *border](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/ad_blocker_browser_extension_about.png) diff --git a/docs/adguard-for-android/features/app-management.md b/docs/adguard-for-android/features/app-management.md index e8112e683a2..545629f216e 100644 --- a/docs/adguard-for-android/features/app-management.md +++ b/docs/adguard-for-android/features/app-management.md @@ -28,7 +28,7 @@ From the context menu, you can also access the app's stats. ### “Problem-free” and “problematic” apps -Most apps work properly when filtering is enabled. For such apps, their traffic is routed through AdGuard and filtered by default. +Most apps work correctly when filtered. For such apps, their traffic is routed through AdGuard and filtered by default. Some apps, such as Download Manager, radio, system apps with UID 1000 and 1001 (for example, Google Play services), are “problematic” and may work incorrectly when routed through AdGuard. That's why you may see the following warning when trying to route or filter all apps: diff --git a/docs/adguard-for-android/features/protection/dns-protection.md b/docs/adguard-for-android/features/protection/dns-protection.md index e5b4c2ba99d..830c27a6d52 100644 --- a/docs/adguard-for-android/features/protection/dns-protection.md +++ b/docs/adguard-for-android/features/protection/dns-protection.md @@ -13,7 +13,7 @@ The DNS protection module can be accessed by tapping the *Protection* tab (secon :::tip -DNS protection works differently from regular ad and tracker blocking. You cam [learn more about it and how it works from a dedicated article](https://adguard-dns.io/kb/general/dns-filtering/#how-does-dns-filtering-work) +DNS protection works differently from regular ad and tracker blocking. You can [learn more about it and how it works from a dedicated article](https://adguard-dns.io/kb/general/dns-filtering/#how-does-dns-filtering-work) ::: diff --git a/docs/adguard-for-android/features/protection/firewall/firewall.md b/docs/adguard-for-android/features/protection/firewall/firewall.md index c3605ab9867..30a09ca6f7d 100644 --- a/docs/adguard-for-android/features/protection/firewall/firewall.md +++ b/docs/adguard-for-android/features/protection/firewall/firewall.md @@ -45,7 +45,7 @@ To delete a rule or app from *Custom rules*, swipe it to the left. ### Notifications -If enabled, this feature notifies you when an app tries to break one of the Firewall rules set for that app (for example, to access mobile data when it shouldn’t). You can turn notifications on and off for all apps or for each app separately. +If enabled, this feature notifies you when an app is attempting to violate an applicable firewall rule, e.g. attempts to access mobile data from which it is blocked. You can turn notifications on and off for all apps or for each app separately. Tap the notification to access the app’s Firewall settings, or temporary disable all Firewall rules for that app by tapping the corresponding button in the notification. You can also mute all Firewall notifications for the app by tapping the *Mute* button in the notification for that app. diff --git a/docs/adguard-for-android/features/protection/tracking-protection.md b/docs/adguard-for-android/features/protection/tracking-protection.md index ca619c310e3..d780aef7549 100644 --- a/docs/adguard-for-android/features/protection/tracking-protection.md +++ b/docs/adguard-for-android/features/protection/tracking-protection.md @@ -77,4 +77,4 @@ Here are the active features of the pre-configured levels: k. *Remove X-Client-Data header*. This feature prevents Google Chrome from sending its version and modifications information to Google domains (including DoubleClick and Google Analytics) -You can tweak individual settings in *Tracking protection* and come up with a custom configuration. Every setting has a description that will help you understand its role. [Learn more about what various *Tracking protection* settings do](/general/stealth-mode) and approach them with caution, as some may interfere with the functionality of websites and browser extensions. +You can tweak individual settings in *Tracking protection* and come up with a custom configuration. Every setting has a description that will help you understand its role. [Read more about what the various *Tracking protection* settings do](/general/stealth-mode) and utilize them cautiously, as some may interfere with the functionality of websites and browser extensions. diff --git a/docs/adguard-for-android/features/rooted.md b/docs/adguard-for-android/features/rooted.md index e19db3de82e..8e5d5274c8b 100644 --- a/docs/adguard-for-android/features/rooted.md +++ b/docs/adguard-for-android/features/rooted.md @@ -11,6 +11,6 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro Due to security measures of the Android OS, some AdGuard features are only available on rooted devices. Here's the list of them: -- **HTTPS filtering in most apps** requires [installing a CA certificate into the system store](/adguard-for-android/features/settings#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 +- In most cases, **HTTPS filtering in apps** requires [installing a CA certificate into the system store](/adguard-for-android/features/settings#security-certificates), as most apps don't trust certificates in the user store - The [**Automatic proxy** routing mode](/adguard-for-android/features/settings#routing-mode) requires root access due to Android's restrictions on system-wide traffic filtering - The [**Manual proxy** routing mode](/adguard-for-android/features/settings#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 diff --git a/docs/adguard-for-android/features/settings.md b/docs/adguard-for-android/features/settings.md index cf7b3c26299..2279f1f89e4 100644 --- a/docs/adguard-for-android/features/settings.md +++ b/docs/adguard-for-android/features/settings.md @@ -133,7 +133,7 @@ In this section, you can find information about your license and manage it: - Buy an AdGuard license to activate [the full version's features](/adguard-for-android/features/free-vs-full) - Log in to your AdGuard account or enter the license key to activate your license - Sign up to activate your 7-day trial period if you haven't used it yet -- Refresh the license status from the three-dots menu (:) +- Refresh the license status from the three-dots menu (⋮) - Open the AdGuard account to manage your license there - Reset your license — for example, if you've reached device limit for this license and want to apply another one diff --git a/docs/adguard-for-android/solving-problems/adguard-for-android-tv.md b/docs/adguard-for-android/solving-problems/adguard-for-android-tv.md index 0c36f76f2c1..da8f91428c6 100644 --- a/docs/adguard-for-android/solving-problems/adguard-for-android-tv.md +++ b/docs/adguard-for-android/solving-problems/adguard-for-android-tv.md @@ -9,7 +9,7 @@ This article is about AdGuard for Android TV, an ad blocker that protects your T ::: -In most cases, stock browsers cannot install a file on your TV, but you can download a browser from the Google Play Store that has this functionality. In our guide, we will consider an example of installation using the TV Bro browser, but there are other options and you can choose the one that better suits your needs. As an alternative, you can use the [Downloader](https://play.google.com/store/apps/details?id=com.esaba.downloader) app. +In most cases, stock browsers cannot install a file on your TV, but you can download a browser from the Google Play Store that has this functionality. In our guide, we will go through an example of installation using the TV Bro browser, but there are other options and you can choose the one that better suits your needs. As an alternative, you can use the [Downloader](https://play.google.com/store/apps/details?id=com.esaba.downloader) app. ## Installing AdGuard for Android TV via browser diff --git a/docs/adguard-for-android/solving-problems/background-work.md b/docs/adguard-for-android/solving-problems/background-work.md index f6fb0834595..6d9974ec596 100644 --- a/docs/adguard-for-android/solving-problems/background-work.md +++ b/docs/adguard-for-android/solving-problems/background-work.md @@ -51,7 +51,7 @@ Done! You have successfully set up AdGuard to work in the background. To let your AdGuard app run successfully in the background, do the following: -In **Settings** → **Apps** → **Manage apps** → scroll down to locate **AdGuard**, set **Autostart** to “On”. +In **Settings** → **Apps** → **Manage apps**, scroll down to locate **AdGuard** and set **Autostart** to “On”. ![Xiaomi Settings *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/background-work/xiaomi4en.jpeg) diff --git a/docs/adguard-for-android/solving-problems/battery.md b/docs/adguard-for-android/solving-problems/battery.md index 0ffc5a34d37..7367e63cef9 100644 --- a/docs/adguard-for-android/solving-problems/battery.md +++ b/docs/adguard-for-android/solving-problems/battery.md @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -On Android devices running OS 6 and earlier, built-in statistics often attributed high data and/or battery usage to AdGuard. This was because AdGuard counted all the traffic it filtered from various apps. As a result, AdGuard's share of total data and battery usage was overstated, while other apps were understated. +Due to built-in statistics processes, high data and/or battery consumption was often attributed to AdGuard by Android 6 and earlier. This was because AdGuard counted all the traffic it filtered from various apps. As a result, AdGuard's share of total data and battery usage was overstated, while other apps were understated. With Android 7, however, this scenario has improved. Now the data reflected in Android's built-in data usage statistics is very close to reality, although there are minor discrepancies in the battery usage data. diff --git a/docs/adguard-for-android/solving-problems/compatibility-issues.md b/docs/adguard-for-android/solving-problems/compatibility-issues.md index a0de5c6236a..31faca135f4 100644 --- a/docs/adguard-for-android/solving-problems/compatibility-issues.md +++ b/docs/adguard-for-android/solving-problems/compatibility-issues.md @@ -36,7 +36,7 @@ Some device manufacturers keep Private DNS settings hidden and set 'Automatic' m ### UC Browsers: UC Browser, UC Browser for x86, UC Mini, UC Browser HD -To be able to filter HTTPS traffic, AdGuard requires the user to add a certificate to the device's trusted user certificates. Unfortunately, UC-family browsers don't trust user certificates, so AdGuard cannot perform HTTPS filtering there. +To be able to filter HTTPS traffic, AdGuard requires the user to add a certificate to the device's trusted user certificates. Unfortunately, UC browsers don't trust user certificates, so AdGuard cannot perform HTTPS filtering there. - To solve this problem, move the [certificate to the system certificate store](../solving-problems/https-certificate-for-rooted.md/) 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 b034a2e0b8c..0e874d34bcf 100644 --- a/docs/adguard-for-android/solving-problems/low-level-settings.md +++ b/docs/adguard-for-android/solving-problems/low-level-settings.md @@ -148,7 +148,7 @@ Here you can specify port ranges that should be filtered. If this setting is enabled, AdGuard will record blocked HTML elements in *Recent activity*. -#### Scriplet debugging +#### Scriptlet debugging If this setting is enabled, debugging in scriptlets will be activated, and the browser log will record when scriptlet rules are applied. diff --git a/docs/adguard-for-android/solving-problems/manual-certificate.md b/docs/adguard-for-android/solving-problems/manual-certificate.md index f0abeb8bcbb..1d89a5d8f2e 100644 --- a/docs/adguard-for-android/solving-problems/manual-certificate.md +++ b/docs/adguard-for-android/solving-problems/manual-certificate.md @@ -13,14 +13,14 @@ To be able to [filter HTTPS traffic](/general/https-filtering/what-is-https-filt ![Certificate *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/solving_problems/manual-certificate/g.gif) -Follow these steps to install AdGuard certificate: +Follow these steps to install the AdGuard certificate: 1. When you see the *HTTPS filtering is off* notification, tap *Enable*. 1. Then you'll be presented with three screens that explain: - Why filter HTTPS traffic - The safety of this filtering process - - The necessity of AdGuard certificate + - The necessity of the AdGuard certificate Consecutively tap *Next* → *Next* → *Save certificate*. diff --git a/docs/adguard-for-android/solving-problems/outbound-proxy.md b/docs/adguard-for-android/solving-problems/outbound-proxy.md index 88582229d0f..a5d8fa7a3d9 100644 --- a/docs/adguard-for-android/solving-problems/outbound-proxy.md +++ b/docs/adguard-for-android/solving-problems/outbound-proxy.md @@ -9,7 +9,7 @@ This article is about AdGuard for Android, a multifunctional ad blocker that pro ::: -Below you can find a list of the most famous applications that you can configure to work as proxies in AdGuard. +Below is a list of the most well-known applications that can be configured to work as proxies in AdGuard. :::note @@ -41,11 +41,11 @@ In this article we give examples of how to set up some of the most popular proxi Proxy host | *127.0.0.1* Proxy port | *9050* - Or you can tap **Proxy server** → **Add proxy server**, enter these values manually, and set Orbot as a default proxy. + Or you can tap **Proxy server** → **Add proxy server**, enter these values manually, and set Orbot as the default proxy. 1. Enable the main Proxy switch and AdGuard protection to route your device's traffic through the proxy. - Now AdGuard will forward all traffic through Orbot. If you disable Orbot, Internet connection will be unavailable until you disable outbound proxy settings in AdGuard. + Now AdGuard will route all traffic through Orbot. If you disable Orbot, Internet connection will be unavailable until you disable the outbound proxy settings in AdGuard. ### How to use AdGuard with PIA (Private Internet Access) @@ -157,4 +157,4 @@ You should remove Shadowsocks app from filtering before setting up the process ( ## Limitations -There is a factor that can prevent certain traffic from being routed through the outgoing proxy even after you configure AdGuard proxy settings. It can happen if you don't set up the app itself to send the traffic through AdGuard. To do it, you need to proceed to **App management**, choose the app, and turn on **Route traffic through AdGuard**. +However, at least one factor may prevent certain traffic from being routed through the outbound proxy, even after configuring the AdGuard proxy settings. That would be if the app itself isn't configured to send its traffic through AdGuard. To do it, you need to proceed to **App management**, choose the app, and turn on **Route traffic through AdGuard**. diff --git a/docs/adguard-for-android/solving-problems/tasker.md b/docs/adguard-for-android/solving-problems/tasker.md index 1af95ed681d..001e509b43d 100644 --- a/docs/adguard-for-android/solving-problems/tasker.md +++ b/docs/adguard-for-android/solving-problems/tasker.md @@ -126,7 +126,7 @@ Or you can configure remove parameters manually: ::: -**Don't forget to include the password as an extra and mention package name and class. You need to do so for every intent.** +**Don't forget to include the password, package name, and class. You need to do so for every intent.** Extra: `password:*******` @@ -136,7 +136,7 @@ Class: `com.adguard.android.receiver.AutomationReceiver` :::note -Before v4.0 the class was called `com.adguard.android.receivers.AutomationReceiver` but then we changed its name to `com.adguard.android.receiver.AutomationReceiver`. If you used this feature, please pay attention and use the new name. +Before v4.0 the class was called `com.adguard.android.receivers.AutomationReceiver` but then we changed its name to `com.adguard.android.receiver.AutomationReceiver`. If this function is used, remember to update to the new name. ::: diff --git a/docs/adguard-for-ios/solving-problems/block-youtube-ads.md b/docs/adguard-for-ios/solving-problems/block-youtube-ads.md index b81977d18e0..5908de67b42 100644 --- a/docs/adguard-for-ios/solving-problems/block-youtube-ads.md +++ b/docs/adguard-for-ios/solving-problems/block-youtube-ads.md @@ -17,7 +17,7 @@ This article covers AdGuard for iOS, a multifunctional ad blocker that protects 1. Choose a video and tap *Share*. 1. Tap *More*, then select *Block YouTube Ads (by AdGuard)*. -AdGuard will open its ad-free video player. +The video now opens in AdGuard's ad-free player. ## How to block ads on YouTube in Safari @@ -31,4 +31,4 @@ Make sure you've given AdGuard access to all websites. You can check it in Safar 1. Choose a video and tap *Share*. 1. Tap *Block YouTube Ads (by AdGuard)*. -AdGuard will open its ad-free video player. +The video now opens in AdGuard's ad-free player. diff --git a/docs/adguard-for-ios/solving-problems/facetime-compatibility-issues.md b/docs/adguard-for-ios/solving-problems/facetime-compatibility-issues.md index 701acc8189a..b5363e14c44 100644 --- a/docs/adguard-for-ios/solving-problems/facetime-compatibility-issues.md +++ b/docs/adguard-for-ios/solving-problems/facetime-compatibility-issues.md @@ -1,5 +1,5 @@ --- -title: How to avoid compatibility problem with FaceTime +title: How to avoid compatibility issues with FaceTime sidebar_position: 3 --- 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 ce034feea6c..126da843a7e 100644 --- a/docs/adguard-for-mac/solving-problems/big-sur-issues.md +++ b/docs/adguard-for-mac/solving-problems/big-sur-issues.md @@ -63,7 +63,7 @@ If you use Flutter alongside AdGuard in "Network Extension" mode (or any other " #### VPN apps with legacy API -Despite AdGuard is displayed as a VPN in system settings, it shouldn't cause any conflicts when working alongside other VPN-based apps. However, if you're using a VPN-based app that was downloaded from outside App Store, there's a chance it uses the old VPN API and you have to exclude it from filtering: +Despite AdGuard is displayed as a VPN in system settings, it shouldn't cause any conflicts when working alongside other VPN-based apps. However, if a VPN-based app downloaded outside the App Store is used, there is a risk that it uses the old VPN API and needs to be excluded from filtering: 1. Open AdGuard's menu. 1. Select *Preferences...*. @@ -79,9 +79,9 @@ These problems have been fixed by Apple by now but can be encountered in the old ### Compatibility with Little Snitch 5 -At this moment, Network Extension mode in AdGuard isn't compatible with [Little Snitch 5](https://obdev.at/products/littlesnitch/index.html). When both are running, there's a chance to encounter issues with various apps' behavior, even if they aren't filtered by AdGuard. This problem is directly caused by a bug in Big Sur, and we've already informed Apple about it. This leaves us to believe that this issue will get resolved in one of the next updates. +At this moment, Network Extension mode in AdGuard isn't compatible with [Little Snitch 5](https://obdev.at/products/littlesnitch/index.html). When both are running, there's a risk to encounter issues with various apps' behavior, even if they aren't filtered by AdGuard. This problem is directly caused by a bug in Big Sur, and we've already informed Apple about it. This leaves us to believe that this issue will get resolved in one of the next updates. -It needs to be said that this problem can't be solved by disabling connections monitoring in Little Snitch, because this action doesn't unload Little Snitch's extension from the system. We recommend to switch to [**Automatic Proxy**](#automatic-proxy) filtering mode when running AdGuard alongside with Little Snitch on Big Sur, at least until Apple fixes the bug. +However, disabling connection monitoring in Little Snitch doesn't solve the issue, as this doesn't unload the Little Snitch extension from the system memory. We recommend to switch to [**Automatic Proxy**](#automatic-proxy) filtering mode when running AdGuard alongside with Little Snitch on Big Sur, at least until Apple fixes the bug. ### Compatibility with local proxies @@ -121,7 +121,7 @@ First of all, you need a working server side for your proxy. Most likely, to set :::tip -You can find more information about how to get started on [Shadowsocks website](https://shadowsocks.org/guide/what-is-shadowsocks.html). +More information on how to get started can be found on the [Shadowsocks website](https://shadowsocks.org/guide/what-is-shadowsocks.html). ::: 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 1b8de0cfff8..acf23ace531 100644 --- a/docs/adguard-for-mac/solving-problems/protect-mail-activity.md +++ b/docs/adguard-for-mac/solving-problems/protect-mail-activity.md @@ -32,7 +32,7 @@ As a consequence, AdGuard can't work together with iCloud Private Relay and Mail 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. +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-safari/features/rules.md b/docs/adguard-for-safari/features/rules.md index 276126312a2..a6d541c8861 100644 --- a/docs/adguard-for-safari/features/rules.md +++ b/docs/adguard-for-safari/features/rules.md @@ -3,4 +3,4 @@ title: User rules sidebar_position: 4 --- -User rules can be used to customize ad blocking. They can be added manually, imported, or created automatically when you block an element on the page. To add your own filering rules, use a [special syntax](/general/ad-filtering/create-own-filters). +User rules can be used to customize ad blocking. They can be added manually, imported, or created automatically when you block an element on the page. To add your own filtering rules, use a [special syntax](/general/ad-filtering/create-own-filters). diff --git a/docs/adguard-for-windows/admins-documentation.md b/docs/adguard-for-windows/admins-documentation.md index 6ccd8d62cd9..8b003d96e4a 100644 --- a/docs/adguard-for-windows/admins-documentation.md +++ b/docs/adguard-for-windows/admins-documentation.md @@ -53,4 +53,4 @@ Please note that such installation of the application and manual updates are not ## 5. Test your installation {#installation-test} -On a target machine, launch AdGuard. Open the license screen to check that it uses the one you've set. You might need to click "Refresh status" to make AdGuard validate the license key. +On a target machine, launch AdGuard. Open the license screen to check that it is using the specified license. You might need to click "Refresh status" to make AdGuard validate the license key. diff --git a/docs/adguard-for-windows/browser-assistant.md b/docs/adguard-for-windows/browser-assistant.md index c82c9664001..55859a7a167 100644 --- a/docs/adguard-for-windows/browser-assistant.md +++ b/docs/adguard-for-windows/browser-assistant.md @@ -21,7 +21,7 @@ Background information: In previous versions of the AdGuard Browser Extension (before v3.5), if you had it installed along with the AdGuard for Windows app, the extension took over the functions of Assistant, stopped filtering itself and relied on the app to do this. -The extension and the app worked in conjunction but sometimes the integration would fail. Some websites would stop being protected by the desktop program and be backed up only by the less powerful extension. +The extension and the app worked in conjunction but sometimes the integration would fail. The protection normally provided by the desktop program would stop on certain sites, where only the less powerful extension would then provide protection. When using the Browser Assistant, all these problems don’t matter as there can be no conflicts in essence. The role of the Browser Assistant is well-defined and it can’t hinder the functioning of the main app, so there is no need to worry. @@ -43,4 +43,4 @@ Basically, there are two cases when you might want to pick it instead of the new If you want to install the Browser Assistant for your default browser, you can do it directly from the app settings, but you also have an opportunity to install it for other browsers. -AdGuard Browser Assistant is available for all popular browsers: Chrome, Firefox, Edge, Opera, and Yandex. To install the one you need (or many, it is not prohibited but even encouraged), go to [our website](https://adguard.com/adguard-assistant/overview.html), click the browser icon and tap the *Install* button. That’s it! +AdGuard Browser Assistant is available for all popular browsers: Chrome, Firefox, Edge, Opera, and Yandex. To install the one you need (or many, it is not prohibited but even encouraged), go to [our website](https://adguard.com/adguard-assistant/overview.html), click the browser icon and then the *Install* button. That’s it! diff --git a/docs/adguard-for-windows/features/extensions.md b/docs/adguard-for-windows/features/extensions.md index f273ad129c4..5285015b62b 100644 --- a/docs/adguard-for-windows/features/extensions.md +++ b/docs/adguard-for-windows/features/extensions.md @@ -41,7 +41,7 @@ Web of Trust lets you see the reputation of each website based on its users’ o ### Network -The penultimate module is dedicated to network filtering, and here you will find additional network-related options. Two of them are enabled by default: *Enable traffic filtering* and *Filter HTTPS protocol*. These are important extra precautions to better filter your web space. Most websites are now using HTTPS, and the same applies to advertising. From many sites, like youtube.com, facebook.com and twitter.com, it is impossible to remove ads without HTTPS filtering. So keep the *Filter HTTPS protocol* feature enabled unless you have a strong reason not to. +The penultimate module is dedicated to network filtering, and here you will find additional network-related options. Two of them are enabled by default: *Enable traffic filtering* and *Filter HTTPS*. These are important extra precautions to better filter your web space. Most websites are now using HTTPS, and the same applies to advertising. From many sites, like youtube.com, facebook.com and twitter.com, it is impossible to remove ads without HTTPS filtering. So keep the *Filter HTTPS* feature enabled unless you have a strong reason not to. ![Network Settings *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/overview/network-settings.png) diff --git a/docs/adguard-for-windows/installation.md b/docs/adguard-for-windows/installation.md index b87021fd4d2..cd6513c2796 100644 --- a/docs/adguard-for-windows/installation.md +++ b/docs/adguard-for-windows/installation.md @@ -23,7 +23,7 @@ This article covers AdGuard for Windows, a multifunctional ad blocker that prote To use AdGuard on a PC or tablet under Microsoft Windows, you should download the installation package and launch the installation program. Perform the following actions: -1. Go to the [AdGuard website](http://adguard.com) in the address bar and click *Download* [on the opened page](https://adguard.com/download.html?auto=1). +1. Go to the [AdGuard website](http://adguard.com) in the address bar and click *Download* [on the homepage](https://adguard.com/download.html?auto=1). ![Download AdGuard](https://cdn.adtidy.org/content/kb/ad_blocker/windows/installation/download-from-website.png) @@ -91,7 +91,7 @@ Follow the next steps only if performing the first two steps wasn’t enough for ::: -- Select *AdGuard Ad Blocker* and *Extended* uninstall type, then click *Uninstall*. Clcik *Yes, continue* in the window prompt. +- Select *AdGuard Ad Blocker* and *Extended* uninstall type, then click *Uninstall*. Click *Yes, continue* in the window prompt. ![Extended uninstall *border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/installation/ab_extended.jpg) diff --git a/docs/adguard-for-windows/solving-problems/adguard-logs.md b/docs/adguard-for-windows/solving-problems/adguard-logs.md index 95058d17d53..2acaf828b66 100644 --- a/docs/adguard-for-windows/solving-problems/adguard-logs.md +++ b/docs/adguard-for-windows/solving-problems/adguard-logs.md @@ -15,7 +15,7 @@ Data and/or files provided in logs are processed in accordance with [the AdGuard ::: -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 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 occur 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. :::note @@ -25,7 +25,7 @@ AdGuard is committed to protecting your privacy. We strictly follow our [Privacy ### Debug logs {#debug-logs} -1. Open the AdGuard settings. Go to the *General Settings* section, scroll down to the end of the screen and switch the *Logging Level* to *Debug*. +1. Open the AdGuard settings. Go to the *General Settings* section, scroll down to the bottom of the screen, and switch the *Logging Level* to *Debug*. ![Debug logging level *border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/solving-problems/adg-logs-1.png) @@ -39,7 +39,7 @@ AdGuard is committed to protecting your privacy. We strictly follow our [Privacy Save the archive to any folder. -1. **Important**: after exporting the logs, set the logging level back to *Standard*. *Debug* logging level will slow down the application. +1. **Important**: after exporting the logs, set the logging level back to *Default*. *Debug* logging level will slow down the application. 1. Send the archive to the AdGuard support service at **support@adguard.com**, describe the problem and don't forget to mention the time when you reproduced the issue. diff --git a/docs/adguard-for-windows/solving-problems/dns-leaks.md b/docs/adguard-for-windows/solving-problems/dns-leaks.md index bbcb64c9c70..19fed36752f 100644 --- a/docs/adguard-for-windows/solving-problems/dns-leaks.md +++ b/docs/adguard-for-windows/solving-problems/dns-leaks.md @@ -11,7 +11,7 @@ This article covers AdGuard for Windows, a multifunctional ad blocker that prote AdGuard for Windows allows users to specify a DNS server address to resolve queries instead of system DNS server, which is provided by your ISP if not overridden in the system settings. Using a non-default DNS server can safeguard your DNS traffic from the ISP’s interception. Moreover, by choosing an encrypted and/or filtering DNS server, you get another layer of protection against bad actors and annoying ads. -Many AdGuard for Windows users appreciate the DNS protection feature. But some of them encounter the following issue: a check on a website like https://ipleak.net/ shows that requests are handled by default DNS server instead of the selected one. In this article we will tell you why this happens and how to avoid it. +Many AdGuard for Windows users appreciate the DNS protection feature. But some of them encounter the following issue: a check on a website like https://ipleak.net/ shows that requests are handled by the default DNS server instead of the selected one. In this article we will tell you why this happens and how to avoid it. ## Bootstrap DNS address @@ -22,7 +22,7 @@ In the case of IP addresses there are no difficulties: AdGuard forwards the DNS - go to the *Advanced settings* - scroll down to the *List of custom bootstrap addresses* section -- enter the custom bootstrap address in IP address format (you may use [the list of known DNS providers](https://adguard-dns.io/kb/general/dns-providers/)) +- enter the custom bootstrap address in the IP address format (you may use [the list of known DNS providers](https://adguard-dns.io/kb/general/dns-providers/)) - click *Save* ## Fallback DNS server @@ -34,7 +34,7 @@ It could happen that AdGuard cannot reach the specified server because of a weak - go to the *Advanced settings* - scroll down to the *Fallback servers* section - check the *Use custom servers* option -- then find the *List of custom fallback servers* section and enter custom fallback servers one per line +- then find the *List of custom fallback servers* section and enter the custom fallback servers one per line or diff --git a/docs/adguard-for-windows/solving-problems/installation-logs.md b/docs/adguard-for-windows/solving-problems/installation-logs.md index 6c45a70da18..207f6204675 100644 --- a/docs/adguard-for-windows/solving-problems/installation-logs.md +++ b/docs/adguard-for-windows/solving-problems/installation-logs.md @@ -17,7 +17,7 @@ Data and/or files provided in system logs are processed in accordance with [the If any problems occur during the installation of AdGuard, the support team might ask you to collect and send them AdGuard installation logs. In this case you need to: -1. Select *Run* command in Start menu or press *Win + R* on the keyboard. +1. Select the *Run* command in Start menu or press *Win + R* on the keyboard. 1. Type in *%tmp%* and click *OK*. diff --git a/docs/adguard-for-windows/solving-problems/system-logs.md b/docs/adguard-for-windows/solving-problems/system-logs.md index 89743cc50a7..27c8a562ab8 100644 --- a/docs/adguard-for-windows/solving-problems/system-logs.md +++ b/docs/adguard-for-windows/solving-problems/system-logs.md @@ -15,7 +15,7 @@ Data and/or files provided in system logs are processed in accordance with [the ::: -To analyze and diagnose different problems that may potentially arise, the AdGuard support service might need Windows system log files. Windows event logs contain records about all errors that occurr with the installed software, including AdGuard. Below is the brief instruction describing the way to get the log files and to send them to our support service if necessary. +To analyze and diagnose different problems that may potentially arise, the AdGuard support service might need Windows system log files. Windows event logs contain records about all errors that occur with the installed software, including AdGuard. Below is the brief instruction describing the way to get the log files and to send them to our support service if necessary. 1. Press *Win + R* diff --git a/docs/adguard-for-windows/solving-problems/wfp-driver.md b/docs/adguard-for-windows/solving-problems/wfp-driver.md index 397d6a4cff1..5fbe4081260 100644 --- a/docs/adguard-for-windows/solving-problems/wfp-driver.md +++ b/docs/adguard-for-windows/solving-problems/wfp-driver.md @@ -9,12 +9,12 @@ This article covers AdGuard for Windows, a multifunctional ad blocker that prote ::: -To filter network traffic, AdGuard uses a network driver. There are two options: TDI driver and WFP driver. While WFP driver is generally preferrable and is enabled by default for all newer Windows OS versions (Windows 8 and newer), it can potentially cause compatibility problems, especially with some antiviruses. These problems and subsequent errors can be very different in each case. +To filter network traffic, AdGuard uses a network driver. There are two options: TDI driver and WFP driver. While a WFP driver is generally preferrable and is enabled by default for all newer Windows OS versions (Windows 8 and newer), it can potentially cause compatibility problems, especially with some antiviruses. These problems and subsequent errors can be very different in each case. If you encounter a problem that you suspect might be caused by this, you can always switch to the older but more stable TDI network driver. To do so: 1. Go to *Settings → Network*. -2. Disable WFP driver as it’s done in this picture: +2. Disable the WFP driver as it’s done in this picture: ![WFP driver *border](https://cdn.adtidy.org/content/kb/ad_blocker/windows/solving-problems/wfp-driver.png) diff --git a/docs/general/ad-filtering/adguard-filters.md b/docs/general/ad-filtering/adguard-filters.md index aa3e499d36d..fd6b52a1297 100644 --- a/docs/general/ad-filtering/adguard-filters.md +++ b/docs/general/ad-filtering/adguard-filters.md @@ -41,7 +41,7 @@ This article is about the filters we create to use in AdGuard and other ad-block ## AdGuard Filters Policy -Our filter policy defines what AdGuard filters should block and what they should not, as well as the rules for adding and removing rules from filters. Read the full text of [AdGuard filter policy](../filter-policy) for detailed information. +Our filter policy defines what AdGuard filters should and shouldn't block, as well as the rules for adding and removing rules from filters. Read the full text of [AdGuard filter policy](../filter-policy) for detailed information. ## Contributing to AdGuard filters diff --git a/docs/general/ad-filtering/create-own-filters.md b/docs/general/ad-filtering/create-own-filters.md index b806bc33faf..8ced108c2ef 100644 --- a/docs/general/ad-filtering/create-own-filters.md +++ b/docs/general/ad-filtering/create-own-filters.md @@ -561,7 +561,7 @@ This modifier limits the rule scope to requests that use the specified set of HT :::caution Restrictions Rules with mixed negated and not negated values are considered invalid. -So, for example, the rule `||evil.com^$method=get|~head` will be rejected. +So, for example, the rule `||evil.com^$method=get|~head` will be ignored. ::: @@ -976,9 +976,9 @@ $extension="userscript name\, with \"quote\"" - `@@||example.com^$extension="AdGuard Assistant"` disables the `AdGuard Assistant` userscript on `example.com` website. - `@@||example.com^$extension=MyUserscript` disables the `MyUserscript` userscript on `example.com` website. -- `@@||example.com^$extension='AdGuard Assistant'|'Popup Blocker'` disables both `AdGuard Assistant` and `Popup Blocker` userscripts on `example.com` website. +- `@@||example.com^$extension='AdGuard Assistant'|'AdGuard Popup Blocker'` disables both `AdGuard Assistant` and `AdGuard Popup Blocker` userscripts on `example.com` website. - `@@||example.com^$extension=~"AdGuard Assistant"` disables all user scripts on `example.com` website, except `AdGuard Assistant`. -- `@@||example.com^$extension=~"AdGuard Assistant"|~"Popup Blocker"` disables all user scripts on `example.com` website, except `AdGuard Assistant` and `Popup Blocker`. +- `@@||example.com^$extension=~"AdGuard Assistant"|~"AdGuard Popup Blocker"` disables all user scripts on `example.com` website, except `AdGuard Assistant` and `AdGuard Popup Blocker`. - `@@||example.com^$extension` no userscript will work on webpages on `example.com`. - `@@||example.com^$extension="AdGuard \"Assistant\""` disables the `AdGuard "Assistant"` userscript on `example.com` website. @@ -991,7 +991,7 @@ $extension="userscript name\, with \"quote\"" #### **`$jsinject`** {#jsinject-modifier} -Forbids adding of javascript code to the page. You can read about scriptlets and javascript rules further. +Forbids adding of JavaScript code to the page. You can read about scriptlets and javascript rules further. **Examples** @@ -1259,7 +1259,7 @@ where: - **`name`** — optional, string or regular expression to match cookie name. - **`seconds`** — number of seconds for current time to offset the expiration date of cookie. -- **`strategy`** — string for [Same-Site](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite) strategy to make cookie use. +- **`strategy`** — string for [Same-Site](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite) strategy to be applied to the cookie. For example, @@ -1274,7 +1274,7 @@ every time AdGuard encounters a cookie called `NAME` in a request to `example.or **Escaping special characters** -If regular expression `name` is used for matching, two characters must be escaped: comma `,` and dollar sign `$`. Use backslash `\` escape each of them. For example, escaped comma looks like this: `\,`. +If regular expression `name` is used for matching, two characters must be escaped: comma `,` and dollar sign `$`. Use backslash `\` to escape each of them. For example, escaped comma looks like this: `\,`. **Examples** @@ -1336,7 +1336,7 @@ In case if multiple `$csp` rules match a single request, we will apply each of t :::caution Restrictions - There are a few characters forbidden in the `$csp` value: `,`, `$`. -- `$csp` rules support limited list of modifiers: `$domain`, `$important`, `$subdocument`. +- `$csp` rules support three types of modifiers: `$domain`, `$important`, `$subdocument`. - Rules with `report-*` directives are considered invalid. ::: @@ -1405,7 +1405,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. 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 +1. Tags will not be matched if they apply to the entire playlist, and `$hls` rules 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:** @@ -2017,7 +2017,7 @@ For the requests matching a `$permissions` rule, AdGuard strengthens response's `$permissions` value syntax is identical to that of the `Permissions-Policy` header [syntax](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Permissions-Policy) with the following exceptions: 1. A comma that separates multiple features **MUST** be escaped — see examples below. -2. A pipe character (`|`) can be used to separate features instead of a comma. +2. A pipe character (`|`) can be used instead of a comma to separate features. The list of available directives is available [here](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Permissions-Policy#directives). @@ -2401,7 +2401,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 10 MB. -- `$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 natches 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. @@ -2572,7 +2572,7 @@ Rules with the `$urltransform` modifier are supported by AdGuard for Windows, Ad #### **`noop`** {#noop-modifier} -`noop` modifier does nothing and can be used solely to increase rules' readability. It consists of a sequence of underscore characters (`_`) of any length and can appear in a rule as many times as needed. +`noop` modifier does nothing and can be used solely to increase rules' readability. It consists of a sequence of underscore characters (`_`) of arbitrary length and can appear in a rule as often as needed. **Examples** @@ -2637,14 +2637,13 @@ Each rule has its own priority, which is necessary when several rules match the :::note Collisions -When two rules with the same priority match the same request, it depends on the -filtering engine implementation which one will be selected. +When two rules with the same priority match the same request, the filter engine implementation determines which one is chosen. ::: :::info -The concept of rule priorities becomes increasingly important in light of Manifest V3 as the existing rules need to be converted to declarativeNetRequest rules. +The concept of rule priorities becomes increasingly important in light of Manifest V3, as the existing rules need to be converted to declarativeNetRequest rules. ::: @@ -2742,7 +2741,7 @@ Similarly, specific exceptions add `$document,subdocument`. If there is a `$method` modifier in the rule with allowed methods it adds `(50 + 50 / N)`, where `N` is the number of methods allowed, for example: `||example.com^$method=GET|POST|PUT` will add `50 + 50 / 3 = 50 + 16.6 = 67` to the total weight of the rule. -If there is a `$header` modifier in the rule it adds `50`. +If there is a `$header` modifier in the rule, it adds `50`. #### `$domain` or `$app` with allowed domains or applications {#priority-category-3} @@ -3265,7 +3264,7 @@ The `:matches-css()` pseudo-class allows to match the element by its current sty - `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/`. +- `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/`. **Special characters escaping and unescaping** @@ -3436,7 +3435,7 @@ div:matches-property(memoizedProps.key="null") div:matches-property(memoizedProps._owner.src=/ad/) ``` -:::tip For filters maintainers +:::tip For filter maintainers To check properties of a specific element, do the following: @@ -3945,7 +3944,7 @@ We recommend to use this kind of exceptions only if it is not possible to change ## JavaScript rules {#javascript-rules} -AdGuard supports a special type of rules that allows you to inject any javascript code to websites pages. +AdGuard supports a special type of rules that allows you to inject any JavaScript code to websites pages. We **strongly recommend** using [scriptlets](#scriptlets) instead of JavaScript rules whenever possible. JS rules are supposed to help with debugging, but as a long-time solution a scriptlet rule should be used. @@ -3956,7 +3955,7 @@ rule = [domains] "#%#" script ``` - **`domains`** — domain restriction for the rule. Same principles as in [element hiding rules](#cosmetic-elemhide-rules). -- **`script`** — arbitrary javascript code **in one string**. +- **`script`** — arbitrary JavaScript code **in one string**. **Examples** @@ -4282,13 +4281,13 @@ and AdGuard Browser Extension with [TSUrlFilter] v3.0.0 or later. ::: -## Information for filters maintainers +## Information for filter maintainers If you maintain a third-party filter that is known to AdGuard, you might be interested in the information presented in this section. Please note that hints will be applied to registered filters only. The filter is considered to be registered and known by AdGuard, if it is present in the [known filters index](https://filters.adtidy.org/extension/chromium/filters.json). If you want your filter to be registered, please file an issue to [AdguardFilters repo](https://github.com/AdguardTeam/AdguardFilters). ### Preprocessor directives -We provide preprocessor directives that can be used by filters maintainers to improve compatibility with different ad blockers and provide: +We provide preprocessor directives that can be used by filter maintainers to improve compatibility with different ad blockers and provide: - [including a file](#include-directive) - [applying rules conditionally by ad blocker type](#conditions-directive) @@ -4304,7 +4303,7 @@ Preprocessor directives can be used in the user rules or in the custom filters. #### Including a file {#include-directive} -The `!#include` directive allows to include contents of a specified file into the filter. It supports only files from the same origin to make sure that the filter maintainer is in control of the specified file. The included file can also contain pre- directives (even other `!#include` directives). Ad blockers should consider the case of recursive `!#include` and implement a protection mechanism. +The `!#include` directive allows to include contents of a specified file into the filter. It supports only files from the same origin to make sure that the filter maintainer is in control of the specified file. The included file can also contain pre-directives (even other `!#include` directives). Ad blockers should consider the case of recursive `!#include` and implement a protection mechanism. **Syntax** @@ -4314,7 +4313,7 @@ The `!#include` directive allows to include contents of a specified file into th where `file_path` is a same origin absolute or relative file path to be included. -The files must originate from the same domain but may be located in a different folder. +The files must originate from the same domain, but may be located in a different folder. If included file is not found or unavailable, the whole filter update should fail. @@ -4338,7 +4337,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. +Filter maintainers can use conditions to supply different rules depending on the ad blocker type. A conditional directive beginning with an `!#if` directive must explicitly be terminated with an `!#endif` directive. Conditions support all basic logical operators. diff --git a/docs/general/browsing-security.md b/docs/general/browsing-security.md index 37eb5cfec4b..4ced044f4c4 100644 --- a/docs/general/browsing-security.md +++ b/docs/general/browsing-security.md @@ -5,7 +5,7 @@ sidebar_position: 3 Falling prey to phishing and malware remains a common issue. To enhance digital security, we’ve incorporated special filters in AdGuard products to shield you from malicious and phishing websites. To date, we’ve categorized over 15 million sites and built a database of 1.5 million websites known for phishing and malware. Using this database, AdGuard checks the websites you visit to protect you from online threats. -::: note +:::note We strictly do not collect or use any information about the websites you visit. diff --git a/docs/general/license/what-is.md b/docs/general/license/what-is.md index e74909f64f6..ce4579cee8c 100644 --- a/docs/general/license/what-is.md +++ b/docs/general/license/what-is.md @@ -1,5 +1,5 @@ --- -title: What is AdGuard license? +title: What is an AdGuard license? sidebar_position: 1 --- @@ -12,7 +12,7 @@ On the [purchase page](https://adguard.com/license.html), you can see the follow - **1-year subscriptions** — these licenses are renewed automatically every year or can be extended manually - Personal — up to 3 devices - Family — up to 9 devices -- **Lifetime** — these licenses are not time-limited +- **Lifetime** — these licenses are perpetual - Personal — up to 3 devices - Family — up to 9 devices diff --git a/docs/guides/report-bugs.md b/docs/guides/report-bugs.md index 9dc0e35955e..0338945dbfc 100644 --- a/docs/guides/report-bugs.md +++ b/docs/guides/report-bugs.md @@ -17,7 +17,7 @@ Check if the bug hasn’t been reported before. We advise paying attention to bo ### How to describe a problem -Try to provide as many details as possible — that'll make it easier for us to reproduce the bug and figure out how to fix it. Here’s what we’re expecting to see in a bug report: +Try to provide as many details as possible — that'll make it easier for us to reproduce the bug and figure out how to fix it. Here’s what we expect a bug report to include: - Your app version - Your OS version diff --git a/docs/guides/take-screenshot.md b/docs/guides/take-screenshot.md index af363ab69e3..676d894af89 100644 --- a/docs/guides/take-screenshot.md +++ b/docs/guides/take-screenshot.md @@ -52,15 +52,15 @@ On some notebooks you have to hold *Fn* and then press *PrtScn*. Windows captures the entire screen and copies it to the clipboard. -To take a screenshot of an active window, use the following shortcut: +To take a screenshot of an active window, use the following shortcut keys: - **Hold down *Alt* and press *PrtScn* (or *Fn + Alt + PrtScn* on some laptops)** -To take a screenshot of a specific area, use the following shortcut: +To take a screenshot of a specific area, use the following shortcut keys: - **Press *Win + Shift + 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 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 shortcut 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 shortcut keys 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 the *Win + PrtScn* shortcut. As soon as you press these keys, the screenshot will be automatically saved as a file to your *Pictures* → *Screenshots Folder*. @@ -70,26 +70,26 @@ 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 shortcut: +To take a screenshot on Mac, use the following shortcut keys: - **Press and hold *⌘ 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 shortcut: +To take a screenshot of an active window, use the following shortcut keys: - **Press and hold *⌘ 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, use the following shortcut: +To take a screenshot of a specific area, use the following shortcut keys: - **Press *⌘ Cmd + Shift + 5***. 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 shortcut: +To take a screenshot of the *Touch Bar* (MacBook Pro), use the following shortcut keys: - **Press *⌘ Cmd + Shift + 6*** Your Mac captures the entire *Touch Bar* and saves it as a file on the desktop. -To copy a screenshot to the clipboard instead of saving it, hold down *Ctrl* together with any of the shortcuts above. Then you can paste the screenshot (from the clipboard) into a document or an image you are currently editing by using *Cmd + V* shortcut. +To copy a screenshot to the clipboard instead of saving it, hold down *Ctrl* together with any of the shortcut keys above. Then you can paste the screenshot (from the clipboard) into a document or an image you are currently editing by using *Cmd + V* shortcut keys. You can also take screenshots by using **Preview** and choosing **Take screenshot** (of the selected area, window, or the entire screen). With **Preview** you can save your screenshots in JPG, TIFF, PDF, and other file formats. diff --git a/docs/miscellaneous/contribute/translate/plural-forms.md b/docs/miscellaneous/contribute/translate/plural-forms.md index 634d4085d37..f75b8b8c1d6 100644 --- a/docs/miscellaneous/contribute/translate/plural-forms.md +++ b/docs/miscellaneous/contribute/translate/plural-forms.md @@ -38,7 +38,7 @@ When you are faced with a translation that requires the use of plurals, you may Here are some sources of information you can use. -[Localization Guide](http://docs.translatehouse.org/projects/localization-guide/en/latest/l10n/pluralforms.html) contains a wide list of languages. The number of plural forms for different languages is shown this way: `nplurals=2`, `nplurals=4` and so on. The numeral after the Equals sign `=` means the number of plural forms of the respective language. +[Localization Guide](http://docs.translatehouse.org/projects/localization-guide/en/latest/l10n/pluralforms.html) contains a wide list of languages. The number of plural forms for different languages is shown this way: `nplurals=2`, `nplurals=4` and so on. The numeral after the Equals sign `=` indicates the number of plural forms of the respective language. Also, you can get information about plural forms in the [Unicode Common Locale Data Repository](http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html#rules) (CLDR). The CLDR Plural Rules indicate an additional word form for decimal numbers (1.5; 2.3; 100.1…), but we don’t use them in AdGuard translations.