diff options
| author | zotlabs <mike@macgirvin.com> | 2018-10-08 20:58:16 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-10-08 20:58:16 -0700 |
| commit | 2cb52f88755aac62f208463e4754153bbf249c67 (patch) | |
| tree | 01746da751c10a67f6064d2d1fd79af33dc73685 /doc | |
| parent | 2c797807cd63850055fc65e445a605aee106530a (diff) | |
| parent | 37b94bf5fa71835fe50af6f862e124e24b5db4b4 (diff) | |
| download | volse-hubzilla-2cb52f88755aac62f208463e4754153bbf249c67.tar.gz volse-hubzilla-2cb52f88755aac62f208463e4754153bbf249c67.tar.bz2 volse-hubzilla-2cb52f88755aac62f208463e4754153bbf249c67.zip | |
Merge branch 'dev'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/database.bb | 4 | ||||
| -rw-r--r-- | doc/database/db_pgrp.bb (renamed from doc/database/db_groups.bb) | 0 | ||||
| -rw-r--r-- | doc/database/db_pgrp_member.bb (renamed from doc/database/db_group_member.bb) | 0 | ||||
| -rw-r--r-- | doc/intro_for_developers.bb | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/database.bb b/doc/database.bb index 160ec505e..a72081e4a 100644 --- a/doc/database.bb +++ b/doc/database.bb @@ -16,8 +16,8 @@ [tr][td][zrl=[baseurl]/help/database/db_config]config[/zrl][/td][td]main configuration storage[/td][/tr] [tr][td][zrl=[baseurl]/help/database/db_conv]conv[/zrl][/td][td]Diaspora private messages meta conversation structure[/td][/tr] [tr][td][zrl=[baseurl]/help/database/db_event]event[/zrl][/td][td]Events[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_group_member]group_member[/zrl][/td][td]privacy groups (collections), group info[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_groups]groups[/zrl][/td][td]privacy groups (collections), member info[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_pgrp_member]pgrp_member[/zrl][/td][td]privacy groups (collections), group info[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_pgrp]pgrp[/zrl][/td][td]privacy groups (collections), member info[/td][/tr] [tr][td][zrl=[baseurl]/help/database/db_hook]hook[/zrl][/td][td]plugin hook registry[/td][/tr] [tr][td][zrl=[baseurl]/help/database/db_hubloc]hubloc[/zrl][/td][td]xchan location storage, ties a hub location to an xchan[/td][/tr] [tr][td][zrl=[baseurl]/help/database/db_iconfig]iconfig[/zrl][/td][td]extensible arbitrary storage for items[/td][/tr] diff --git a/doc/database/db_groups.bb b/doc/database/db_pgrp.bb index 73265b90e..73265b90e 100644 --- a/doc/database/db_groups.bb +++ b/doc/database/db_pgrp.bb diff --git a/doc/database/db_group_member.bb b/doc/database/db_pgrp_member.bb index b9ab8171d..b9ab8171d 100644 --- a/doc/database/db_group_member.bb +++ b/doc/database/db_pgrp_member.bb diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb index 6ef7a4d9e..172008b7f 100644 --- a/doc/intro_for_developers.bb +++ b/doc/intro_for_developers.bb @@ -55,8 +55,8 @@ [li]ffinder - friend suggestion stuff[/li] [li]fserver - obsolete[/li] [li]fsuggest - friend suggestion stuff[/li] - [li]groups - privacy groups[/li] - [li]group_member - privacy groups[/li] + [li]pgrp - privacy groups[/li] + [li]pgrp_member - privacy groups[/li] [li]hook - plugin hook registry[/li] [li]hubloc - Red location storage, ties a location to an xchan[/li] [li]item - posts[/li] |