diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-14 18:02:29 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-14 18:02:29 -0700 |
| commit | a6cb90c81c29663e96d4fd96acd43fde1c28ac15 (patch) | |
| tree | 24d116fb5fe6b1e2687f833cee9685d6480a95eb /doc/permissions.bb | |
| parent | b467dc4f0055452b65fac842d1294ec9cc978445 (diff) | |
| parent | 51b89f0ed8833004cf695de90791d8d0eec550b5 (diff) | |
| download | volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.gz volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.tar.bz2 volse-hubzilla-a6cb90c81c29663e96d4fd96acd43fde1c28ac15.zip | |
Merge branch 'master' into tres
Conflicts:
include/Import/refimport.php
include/activities.php
include/attach.php
include/event.php
include/externals.php
include/identity.php
include/items.php
include/notifier.php
include/photos.php
include/taxonomy.php
include/zot.php
mod/channel.php
mod/connedit.php
mod/events.php
mod/item.php
mod/like.php
mod/manage.php
mod/mood.php
mod/ping.php
mod/poke.php
mod/subthread.php
mod/tagger.php
mod/thing.php
Diffstat (limited to 'doc/permissions.bb')
| -rw-r--r-- | doc/permissions.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/permissions.bb b/doc/permissions.bb index b4facde39..bcf3c43e0 100644 --- a/doc/permissions.bb +++ b/doc/permissions.bb @@ -1,6 +1,6 @@ [b]Permissions[/b]
-Permissions in the Red Matrix are more complete than you may be used to. This allows us to define more fine graded relationships than the black and white "this person is my friend, so they can do everything" or "this person is not my friend, so they can't do anything" permissions you may find elsewhere.
+Permissions in the $Projectname are more complete than you may be used to. This allows us to define more fine graded relationships than the black and white "this person is my friend, so they can do everything" or "this person is not my friend, so they can't do anything" permissions you may find elsewhere.
[b]Default Permissions[/b]
@@ -24,7 +24,7 @@ The scopes of permissions are: [li]Anybody On This Hub. Anybody using the same hub as you will have permission approved. Anybody who registered at a different hub will have this permission denied.[/li]
-[li]Anybody in this network. Anybody in the Red Matrix will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied.[/li]
+[li]Anybody in this network. Anybody in the $Projectname will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied.[/li]
[li]Anybody authenticated. This is similar to "anybody in this network" except that it can include anybody who can authenticate by any means - and therefore may include visitors from other networks.[/li]
|