Skip to content

Commit

Permalink
Merge branch 'master' into adguard-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
sonya-orlova authored Dec 9, 2024
2 parents 5140c98 + 19ce349 commit 9d2ff19
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 22 deletions.
2 changes: 2 additions & 0 deletions crowdin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ files:
- source: /i18n/en/**/*
translation: /i18n/%two_letters_code%/**/%original_file_name%
languages_mapping: *languages_mapping
update_option: 'update_as_unapproved'
- source: /docs/**/*
translation: /i18n/%two_letters_code%/docusaurus-plugin-content-docs/current/**/%original_file_name%
languages_mapping: *languages_mapping
update_option: 'update_as_unapproved'
ignore:
- "/**/_category_.json"
36 changes: 25 additions & 11 deletions docs/general/account/2fa.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,40 @@ We recommend setting up two-factor authentication for your AdGuard account. It w

## How to set it up

1. Log into your [AdGuard account](https://auth.adguard.com/login.html) and go to the Settings tab:
1. Log into your [AdGuard account](https://auth.adguard.com/login.html) and go to the *Settings* tab:

![AdGuard Account settings *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/account_settings.png)
![AdGuard Account settings *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_1.png)

1. Scroll down to *Password and 2FA* section and click **Enable**:
1. Scroll down to *Two-factor authentication* and enable it:

![The Change button *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_new.png)
![Two-factor authentication toggle *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_2.png)

1. Follow the on-screen instructions to install an authenticator app and scan the QR code:
1. A code will be sent to the email address associated with your AdGuard account. To enable 2FA, enter the code and click *Enable*.

![The verification code](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_enable.png)
![The verification code *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_3.png?)

***Important***
After you enable two-factor authentication, you have two options to choose from:

- Save the second-factor backup code somewhere, it will be necessary to recover your account in case your mobile phone gets lost or stolen;
- *One-time email code*: when you log in, we will ask you to enter the code we sent to your email

- *Code from authenticator app*: when you log in, we will ask for a code from your authenticator app

![2FA options *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_4.png)

:::note

If you use the authenticator app, make sure to save the **setup key** somewhere. It will be necessary to recover your account in case your mobile phone gets lost or stolen.

![The setup key in the authenticator app *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/setup_key.png)

:::

If everything is done right, you will see this when you log into your account the next time:

![The result *mobile](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_success.png)
![The result *border](https://cdn.adtidy.org/content/kb/ad_blocker/general/2fa_5.png)

:::note

Use your mobile authenticator app to read the code and enter it. You should be logged in now!
If you get an authentication error, check the clock on your phone. Adjust it if needed, as an unsynchronized clock may be the cause of the error.

***NOTE***: If you get an authentication error, check the clock on your phone. Adjust it if needed, as an unsynchronized clock may be the cause of the error.
:::
20 changes: 10 additions & 10 deletions docs/general/account/features.md
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
---
title: What can be done in the AdGuard Account
title: What can be done in the AdGuard account
sidebar_position: 2
---

In your account, you can manage your licenses, devices bound to them, personal data, email and password, view purchases and contact support.

## Manage account settings

In the *Settings* section of your AdGuard account, you can update or reset your password, change your email address, enable [two-factor authentication](../2fa), view the data stored about you by AdGuard and choose the language of your personal account and notifications.
In the *Settings* section of your AdGuard account, you can update or reset your password, change your email address, enable one-time code login or [two-factor authentication](../2fa), view the data stored about you by AdGuard, and select the language of your account and notifications.

In this section, you can also manage your email preferences:

- receive transactional emails,
- receive AdGuard’s monthly newsletters,
- receive emails about AdGuard special offers and promotions,
- send read receipts to AdGuard when you open emails.
- Receive AdGuard newsletter
- Receive transactional emails
- Send read receipts to AdGuard
- Opt-out preferences

## Manage licenses

Expand All @@ -28,12 +28,12 @@ In the *Licenses* section, you can manage your licenses and the devices bound to
- canceled.
You can also update your payment details.

The devices bound to your AdGuard Ad Blocker licenses can be unbound or renamed. You can unbind unused devices by clicking the cross icon next to them.
The devices bound to your AdGuard Ad Blocker licenses can be unbound or renamed. To unbind unused devices, click the number of bound devices next to *Devices*, then select the right arrow → *Remove*.

## View purchases

The Purchase history section displays all the licenses that you have ever purchased using the email account you registered your AdGuard account with. You will also find there information about the date of purchase, order ID, payment method, and cost of the purchase.
The *Purchases* section displays all the licenses that you have ever purchased using the email account you registered your AdGuard account with. You will also find there information about the date of purchase, order ID, payment method, and cost of the purchase.

## Contact support
## Activity

The Support tab contains useful links to help you solve problems or find answers to your questions about AdGuard products. They are divided into six sections: FAQ, Send a bug repot/feature request, Report incorrect blocking, Contact support, Knowledge Base, and Discuss.
The *Activity* tab allows you to monitor login activity for your AdGuard account. It displays the email address used, location, and login date. You can also filter records by product: *All products*, *AdGuard Ad Blocker*, *AdGuard VPN*, *AdGuard DNS*.
8 changes: 7 additions & 1 deletion docs/general/account/register.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ sidebar_position: 1

## How to create an account

To create an account, go to [AdGuard's official website](https://adguard.com/welcome.html) and press the *My Account* button on the top right corner of the screen. Enter your email address and create a password — your account will be registered.
To create an account, go to [AdGuard's official website](https://adguard.com/welcome.html) and click the *Log in* button on the top right corner of the screen. Enter your email address and create a password — your account will be registered.

:::tip

Expand All @@ -21,6 +21,12 @@ An account can also be created directly in an AdGuard app. Press the *Log in* or

After the account is created, activate it by following the link in the activation email.

:::tip

After you've registered your account, you can use the *One-time code* option to log in to the application. Enter your email address and choose to enter either your password or the the code sent to your email address.

:::

## How to create an account via a social network

To create an account via a social network, simply follow the [link](https://auth.adguard.com/login.html) and log in to your account. Once you’ve signed up, check your inbox — there’ll be a confirmation email. Set a password and that’s it! Now you can use all the [features of the AdGuard account](https://adguard.com/kb/general/account/features/).

0 comments on commit 9d2ff19

Please sign in to comment.