diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-27 17:24:05 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-27 17:24:05 +0100 |
| commit | c766cf9565129b762998e709f5ee7c3eb14cffca (patch) | |
| tree | c462e39540d6f63e30d10aca1c64ffefcfa4d4ef /doc/features.bb | |
| parent | e4674142c6a205651d4bb207aa038e6d089da73f (diff) | |
| parent | 722d7ff38d5bbf49a7c990d9219998c2c8a5b58f (diff) | |
| download | volse-hubzilla-c766cf9565129b762998e709f5ee7c3eb14cffca.tar.gz volse-hubzilla-c766cf9565129b762998e709f5ee7c3eb14cffca.tar.bz2 volse-hubzilla-c766cf9565129b762998e709f5ee7c3eb14cffca.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc/features.bb')
| -rw-r--r-- | doc/features.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/features.bb b/doc/features.bb index 2d9849d4e..3daf403c3 100644 --- a/doc/features.bb +++ b/doc/features.bb @@ -106,9 +106,9 @@ There is also experimental support for OpenID authentication which may be used i Channels may have permissions to become "derivative channels" where two or more existing channels combine to create a new topical channel.
-[b]Collections[/b]
+[b]Privacy Groups[/b]
-"Collections" is our implementation of privacy groups, which is similar to Google "Circles" and Diaspora "Aspects". This allows you to filter your incoming stream by collections or groups, and automatically set the outbound Access Control List to only those in the Collection when you post. You may over-ride this at any time (prior to sending the post).
+Our implementation of privacy groups is similar to Google "Circles" and Diaspora "Aspects". This allows you to filter your incoming stream by selected groups, and automatically set the outbound Access Control List to only those in that privacy group when you post. You may over-ride this at any time (prior to sending the post).
[b]Directory Services[/b]
|