Commit 509fe115 authored by Sytse Sijbrandij's avatar Sytse Sijbrandij

Merge branch 'master' into 'master'

Doc: Added FreeOTP to 2FA

I have just added a note about a free alternative to Google Authenticator to the documentation of your two factor authentication.

See merge request !777
parents e73d7b67 975d1106
...@@ -21,7 +21,8 @@ is to know your username and password *and* have access to your phone. ...@@ -21,7 +21,8 @@ is to know your username and password *and* have access to your phone.
**On your phone:** **On your phone:**
1. Install a compatible application. We recommend [Google Authenticator]. 1. Install a compatible application. We recommend [Google Authenticator]
\(proprietary\) or [FreeOTP] \(open source\).
1. In the application, add a new entry in one of two ways: 1. In the application, add a new entry in one of two ways:
* Scan the code with your phone's camera to add the entry automatically. * Scan the code with your phone's camera to add the entry automatically.
* Enter the details provided to add the entry manually. * Enter the details provided to add the entry manually.
...@@ -63,3 +64,4 @@ your phone's application or a recovery code to log in. ...@@ -63,3 +64,4 @@ your phone's application or a recovery code to log in.
1. Click **Disable Two-factor Authentication**. 1. Click **Disable Two-factor Authentication**.
[Google Authenticator]: https://support.google.com/accounts/answer/1066447?hl=en [Google Authenticator]: https://support.google.com/accounts/answer/1066447?hl=en
[FreeOTP]: https://fedorahosted.org/freeotp/
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment