summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMateusz Konieczny <matkoniecz@gmail.com>2019-03-28 02:37:06 +0000
committerEvan Read <eread@gitlab.com>2019-03-28 02:37:06 +0000
commitce26d7f5ecdd98856543971a3e3f1666a0fdeb4f (patch)
treef9b0dbcffa0a4769885f5d11dac601a8752d9ece
parent0795a27fd1d539519c6c6e2cb2cd175dff34d580 (diff)
downloadgitlab-ce-ce26d7f5ecdd98856543971a3e3f1666a0fdeb4f.tar.gz
Update U2F recommendations, fix #57656
-rw-r--r--doc/user/profile/account/two_factor_authentication.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md
index b74bd81d467..8b3ae19b544 100644
--- a/doc/user/profile/account/two_factor_authentication.md
+++ b/doc/user/profile/account/two_factor_authentication.md
@@ -18,9 +18,10 @@ the second factor of authentication. Once enabled, in addition to supplying your
password to login, you'll be prompted to activate your U2F device (usually by pressing
a button on it), and it will perform secure authentication on your behalf.
-The U2F workflow is only [supported by](https://caniuse.com/#search=U2F) Google Chrome, Opera and Firefox at this point, so we _strongly_ recommend
-that you set up both methods of two-factor authentication, so you can still access your account
-from other browsers.
+The U2F workflow is [supported by](https://caniuse.com/#search=U2F) Google Chrome, Opera, and Firefox.
+
+We recommend that you set up 2FA with both a [one-time password authenticator](#enable-2fa-via-one-time-password-authenticator) and a [U2F device](#enable-2fa-via-u2f-device), so you can still access your account
+if you lose your U2F device.
## Enabling 2FA