Skip to content

Commit

Permalink
Merge branch 'master' into safari-ext
Browse files Browse the repository at this point in the history
  • Loading branch information
sonya-orlova authored Aug 10, 2023
2 parents 63b0187 + db5b622 commit 02fa735
Show file tree
Hide file tree
Showing 80 changed files with 2,164 additions and 1,761 deletions.
20 changes: 20 additions & 0 deletions .github/workflows/markdown-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Lint Markdown

on:
push

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: 18.x

- name: yarn install
run: yarn install

- name: yarn lint:md
run: yarn lint:md
16 changes: 16 additions & 0 deletions .markdownlint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"ul-indent": { "indent": 4 },
"ul-style": { "style": "dash" },
"emphasis-style": { "style": "asterisk" },
"no-duplicate-header": { "siblings_only": true },
"no-inline-html": {
"allowed_elements": [
"br",
"details",
"summary"
]},
"line-length": false,
"no-bare-urls": false,
"no-emphasis-as-heading": false,
"link-fragments": false
}
2 changes: 2 additions & 0 deletions .markdownlintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules/
i18n/
19 changes: 9 additions & 10 deletions docs/adguard-browser-extension/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ This article is about AdGuard Browser Extension, which safeguards only your brow

:::

## How to install AdGuard Browser Extension for Google Chrome or Chromium browsers
## How to install AdGuard Browser Extension for Google Chrome or Chromium browsers

Open the extension's page in [Chrome Web Store](https://agrd.io/extension_chrome) and click _Add to Chrome_.
Open the extension's page in [Chrome Web Store](https://agrd.io/extension_chrome) and click *Add to Chrome*.

![AdGuard Browser Extension in Chrome Web Store *border](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/ad_blocker_browser_extension_chrome.png)

In the opened dialog box, click _Add extension_.
In the opened dialog box, click *Add extension*.

![Dialog box in Chrome Web Store *border](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/ad_blocker_browser_extension_chrome1.png)

Expand All @@ -25,31 +25,31 @@ Open the page [addons.opera.com](https://agrd.io/extension_opera).

![AdGuard Browser Extension in Opera addons *border](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/ad_blocker_browser_extension_opera.png)

Click _Add to Opera_.
Click *Add to Opera*.

## How to install AdGuard Browser Extension for Firefox

Open the page [addons.mozilla.org](https://agrd.io/extension_firefox).

![AdGuard Browser Extension in Firefox add-ons *border](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/ad_blocker_browser_extension_firefox.png)

Click _Add to Firefox_.
Click *Add to Firefox*.

## How to install AdGuard Browser Extension for Yandex Browser

Click the browser settings button in the upper right corner of the browser, then choose _Add-ons_ in the drop-down menu.
Click the browser settings button in the upper right corner of the browser, then choose *Add-ons* in the drop-down menu.

Scroll down to find AdGuard, then click _Install_.
Scroll down to find AdGuard, then click *Install*.

![AdGuard Browser Extension in Yandex Add-ons *border](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/ad_blocker_browser_extension_yandex.png)

## How to install AdGuard Browser Extension for Microsoft Edge

Find AdGuard Browser Extension in the [Edge Add-ons store](https://agrd.io/extension_edge) and click _Get_.
Find AdGuard Browser Extension in the [Edge Add-ons store](https://agrd.io/extension_edge) and click *Get*.

![AdGuard Browser Extension in Edge Add-ons *border](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/ad_blocker_browser_extension_edge.png)

In the opened dialog window, press _Add extension_.
In the opened dialog window, press *Add extension*.

![Edge dialog window *border](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/ad_blocker_browser_extension_edge1.png)

Expand All @@ -69,7 +69,6 @@ In the opened dialog window, click *Add extension* to install AdGuard Browser Ex

![Add to Edge button](https://cdn.adtidy.org/content/Kb/ad_blocker/browser_extension/add_to_edge.jpg)


## How to install AdGuard Browser Extension for Safari

AdGuard for Safari is not a browser extension in a common sense. You can read more about it in a [dedicated article](/adguard-for-safari/overview). Or you can [download the installation file](https://agrd.io/safari_release) directly from this page.
4 changes: 2 additions & 2 deletions docs/adguard-content-blocker/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This article is about AdGuard Content Blocker, which only safeguards your Samsun

The application is available in five stores: [Google Play](https://play.google.com/store/apps/details?id=com.adguard.android.contentblocker), [Samsung Galaxy store](https://galaxystore.samsung.com/detail/com.adguard.android.contentblocker), [Huawei AppGallery](https://appgallery.huawei.com/#/app/C100440597), [Aptoide](https://adguard-content-blocker.en.aptoide.com/), and [F-Droid](https://f-droid.org/en/packages/com.adguard.android.contentblocker/).

To install AdGuard Content Blocker from Google Play, search _AdGuard Content Blocker_ and tap _Install_.
To install AdGuard Content Blocker from Google Play, search *AdGuard Content Blocker* and tap *Install*.

![Content Blocker on Google Play *mobile_border](https://cdn.adtidy.org/content/Kb/ad_blocker/content_blocker/content_blocker_play_market.jpg)

Expand All @@ -21,7 +21,7 @@ AdGuard Content Blocker works in two browsers: [Yandex Browser](https://browser.

:::

After the installation is completed, tap _Open_ to run the app.
After the installation is completed, tap *Open* to run the app.

![Content Blocker installed *mobile_border](https://cdn.adtidy.org/content/Kb/ad_blocker/content_blocker/content_blocker_play_market_installed.jpg)

Expand Down
42 changes: 21 additions & 21 deletions docs/adguard-for-android/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,47 +25,47 @@ That’s why you can only install AdGuard for Android manually. To use the app o

1. **Download the app on your device**. Here are a few ways you can do this:

* head over to [our website](https://adguard.com/adguard-android/overview.html) and tap the *Download* button
* start the browser and type in the following URL: [https://adguard.com/apk](https://adguard.com/apk)
* or scan this QR code
- head over to [our website](https://adguard.com/adguard-android/overview.html) and tap the *Download* button
- start the browser and type in the following URL: [https://adguard.com/apk](https://adguard.com/apk)
- or scan this QR code

![QR code *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_qr.png)

2. **Allow installing apps from unknown sources**. Once the file download is complete, tap *Open* in the notification.
1. **Allow installing apps from unknown sources**. Once the file download is complete, tap *Open* in the notification.

![Installing apps from unknown sources *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_1.png)
![Installing apps from unknown sources *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_1.png)

A popup will appear. Tap *Settings*, navigate to *Install unknown apps*, and grant permission for the browser you've used to download the file.
A popup will appear. Tap *Settings*, navigate to *Install unknown apps*, and grant permission for the browser you've used to download the file.

![Installing apps from unknown sources *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_3.png)
![Installing apps from unknown sources *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_3.png)

This guide is for Android 8+. If you have an older OS version, before downloading the apk file, go to *Settings* and select *Additional settings* in *System & Device*. Enable *Unknown sources* and tap *OK* in the system warning window.
This guide is for Android 8+. If you have an older OS version, before downloading the apk file, go to *Settings* and select *Additional settings* in *System & Device*. Enable *Unknown sources* and tap *OK* in the system warning window.

3. **Install the app**. Once the browser has obtained the necessary permissions, the system will ask you if you want to install the AdGuard app. Tap *Install*.
1. **Install the app**. Once the browser has obtained the necessary permissions, the system will ask you if you want to install the AdGuard app. Tap *Install*.

![Installing apps from unknown sources *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/inst_4.png)
![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)

4. **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.
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.

![Create a local VPN *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_2.png)
![Create a local VPN *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_2.png)

5. **Enable HTTPS filtering**. It is not a mandatory option, however, we advice to turn it on for the best ad-blocking quality.
1. **Enable HTTPS filtering**. It is not a mandatory option, however, we advice to turn it on for the best ad-blocking quality.

If your device is running Android 7–9, you'll be prompted to install a root certificate and configure HTTPS filtering after the local VPN setup.
If your device is running Android 7–9, you'll be prompted to install a root certificate and configure HTTPS filtering after the local VPN setup.

![Enable HTTPS filtering on Android 7-9 *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/cert_1.jpg)
![Enable HTTPS filtering on Android 7-9 *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/cert_1.jpg)

After you tap *Install now*, a prompt will appear asking you to authenticate the certificate installation with a password or fingerprint.
After you tap *Install now*, a prompt will appear asking you to authenticate the certificate installation with a password or fingerprint.

![Enable HTTPS filtering on Android 7-9. Step 2 *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/cert_2.jpg)
![Enable HTTPS filtering on Android 7-9. Step 2 *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/cert_2.jpg)

If you have Android 10+ on your device, then after creating a local VPN, you will see the main app screen with a snack bar at the bottom: tap *Enable* and follow the instructions on the next screen.
If you have Android 10+ on your device, then after creating a local VPN, you will see the main app screen with a snack bar at the bottom: tap *Enable* and follow the instructions on the next screen.

![Enable HTTPS filtering *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_5.png)
![Enable HTTPS filtering *mobile_border](https://cdn.adtidy.org/content/kb/ad_blocker/android/installation/fl_5.png)

## Uninstalling/Reinstalling AdGuard

Expand Down
Loading

0 comments on commit 02fa735

Please sign in to comment.