aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2018-10-06 14:54:21 +0200
committerMario <mario@mariovavti.com>2018-10-06 14:54:21 +0200
commit778086ce199c38be793ed59e03eb0446af9263ec (patch)
treef5ac67cd82a3d2664b0208906214f5493e61fb22
parent3e231e7c13744ec4d2803941395fb00d8aa2d67f (diff)
parentc087aaf5be13a55a75c1308aef1077d1a1b59d5d (diff)
downloadvolse-hubzilla-778086ce199c38be793ed59e03eb0446af9263ec.tar.gz
volse-hubzilla-778086ce199c38be793ed59e03eb0446af9263ec.tar.bz2
volse-hubzilla-778086ce199c38be793ed59e03eb0446af9263ec.zip
Merge branch 'patch-6' into 'dev'
Add new table names in docs See merge request hubzilla/core!1315
-rw-r--r--doc/database.bb4
-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.bb4
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]