aboutsummaryrefslogtreecommitdiffstats
path: root/doc/permissions.bb
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-12-27 15:28:52 -0800
committerzotlabs <mike@macgirvin.com>2016-12-27 15:28:52 -0800
commitdb9ea66069f2a2df6044e8267a68eae377c45911 (patch)
treeaa93597df2ee43ceeaa980db864b58143f2e06df /doc/permissions.bb
parentef02464e3c3188563349bfda42585ce40cdb45ad (diff)
parentc2830c4a98cf3c9983b3c4b61024d52a6d7187df (diff)
downloadvolse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.tar.gz
volse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.tar.bz2
volse-hubzilla-db9ea66069f2a2df6044e8267a68eae377c45911.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
Diffstat (limited to 'doc/permissions.bb')
-rw-r--r--doc/permissions.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/permissions.bb b/doc/permissions.bb
index 0721c763d..64690d608 100644
--- a/doc/permissions.bb
+++ b/doc/permissions.bb
@@ -32,6 +32,8 @@ We highly recommend that you use the "typical social network" settings when you
[*= Anybody authenticated ] This is similar to "anybody in this network" except that it can include anybody who can authenticate by any means - and therefore [i]may[/i] include visitors from other networks.
+ [*=Guest Access Token] This allows you to share a file, folder, photo, album, or channel with a specific person or group of people. They don't need to be Hubzilla members. You can set an expiration for the Access Token.
+
[*= Anybody on the internet ] Completely public. This permission will be approved for anybody at all.
[/dl]
[*= The individual permissions are:]