diff options
author | Mario Vavti <mario@mariovavti.com> | 2017-02-02 09:38:07 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2017-02-02 09:38:07 +0100 |
commit | c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45 (patch) | |
tree | a13c2d56c1b14ba99a853fb7494a9214d075554d /doc/context | |
parent | 2e0180ba55e5cbefcfc4066a82dbcaa5b59cacc2 (diff) | |
parent | 23303391e070120851d505a2ec8f3b9b696329e2 (diff) | |
download | volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.tar.gz volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.tar.bz2 volse-hubzilla-c3bada3c329cac9b712e0d4d0c5fb0bb73f24d45.zip |
resolve merge conflict
Diffstat (limited to 'doc/context')
-rw-r--r-- | doc/context/en/settings/tokens/help.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/context/en/settings/tokens/help.html b/doc/context/en/settings/tokens/help.html index d37a0fd2b..6d7e6b98d 100644 --- a/doc/context/en/settings/tokens/help.html +++ b/doc/context/en/settings/tokens/help.html @@ -1,5 +1,5 @@ <dl class="dl-horizontal"> - <dt>Guest Access Tokens</dt> + <dt><a href="/help/member/member_guide#Guest_Access_Tokens">Guest Access Tokens</a></dt> <dd> In order to facilitate sharing of private resources with non-members or members of federation nodes with limited identification discovery, Hubzilla should provide members with a mechanism to create and manage temporary ("throwaway") logins, aka "Zot Access Tokens". These tokens/credentials may be used to authenticate to a hubzilla site for the sole purpose of accessing privileged or access controlled resources (files, photos, posts, webpages, chatrooms, etc.). </dd> |