diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-03-28 14:07:42 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-03-28 14:07:42 +0200 |
| commit | 7d1d961267c129e2110ce9cc14c5a9d0a7d255cb (patch) | |
| tree | d260d7b4ffc8466d7d410ec61bd896bdadd8456e /docs/en/user/configuration.rst | |
| parent | e1cc8fd79921fdff9999087ba896c88b14ffc0cd (diff) | |
| parent | 6ae579e43f6a4ffe607a6361191366410d19f806 (diff) | |
| download | wallabag-7d1d961267c129e2110ce9cc14c5a9d0a7d255cb.tar.gz wallabag-7d1d961267c129e2110ce9cc14c5a9d0a7d255cb.tar.zst wallabag-7d1d961267c129e2110ce9cc14c5a9d0a7d255cb.zip | |
Merge remote-tracking branch 'origin/master' into 2.3
Diffstat (limited to 'docs/en/user/configuration.rst')
| -rw-r--r-- | docs/en/user/configuration.rst | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/en/user/configuration.rst b/docs/en/user/configuration.rst index caca834f..bba12cb9 100644 --- a/docs/en/user/configuration.rst +++ b/docs/en/user/configuration.rst | |||
| @@ -68,7 +68,9 @@ Two factor authentication (2FA) | |||
| 68 | Two-factor authentication (also known as 2FA) is a technology patented in 1984 | 68 | Two-factor authentication (also known as 2FA) is a technology patented in 1984 |
| 69 | that provides identification of users by means of the combination of two different components. | 69 | that provides identification of users by means of the combination of two different components. |
| 70 | 70 | ||
| 71 | https://en.wikipedia.org/wiki/Two-factor_authentication | 71 | https://en.wikipedia.org/wiki/Two-factor_authentication |
| 72 | |||
| 73 | **Warning**: enabling 2FA from the configuration interface is only possible if it has been authorized before in `app/config/parameters.yml` by setting the *twofactor_auth* property to `true` (do not forget to run `php bin/console cache:clear -e=prod` after modification). | ||
| 72 | 74 | ||
| 73 | If you enable 2FA, each time you want to login to wallabag, you'll receive | 75 | If you enable 2FA, each time you want to login to wallabag, you'll receive |
| 74 | a code by email. You have to put this code on the following form. | 76 | a code by email. You have to put this code on the following form. |