Merge branch 'develop' into blocks-status-fix

[friendica.git] / doc / Two-Factor-Authentication.md

diff --git a/doc/Two-Factor-Authentication.md b/doc/Two-Factor-Authentication.md
index eca6f598c9f847f782894989125e4e693081cedf..2ec33ed29c35cdd9082daf4aadade7990a6242b1 100644 (file)
--- a/doc/Two-Factor-Authentication.md
+++ b/doc/Two-Factor-Authentication.md
@@ -71,4 +71,11 @@ Just copy and paste it in your third-party app in the Friendica account password
 We recommend generating a single app-specific password for each separate third-party app you are using, using a meaningul description of the target app (like "Frienqa on my Fairphone 2").
 
 You can also revoke any and all app-specific password you generated this way.
-This may log you out of the third-party application(s) you used the revoked app-specific password to log in with.
\ No newline at end of file
+This may log you out of the third-party application(s) you used the revoked app-specific password to log in with.
+
+## Trusted browsers
+
+As a convenience, during two-factor authentication it is possible to identify a browser as trusted.
+This will skip all further two-factor authentication prompt on this browser.
+
+You can remove any or all of these trusted browsers in the two-factor authentication settings.