From 05ae18d74e236081f3437c10f7bade504d376047 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 6 Oct 2018 12:54:21 +0000 Subject: [PATCH] Merge branch 'patch-6' into 'dev' Add new table names in docs See merge request hubzilla/core!1315 (cherry picked from commit 778086ce199c38be793ed59e03eb0446af9263ec) 4f70fd3e Add new table names in docs 2e4772ac Update db_groups.bb 4cb46c12 Update intro_for_developers.bb c087aaf5 Update database.bb --- doc/database.bb | 4 ++-- doc/database/{db_groups.bb => db_pgrp.bb} | 0 doc/database/{db_group_member.bb => db_pgrp_member.bb} | 0 doc/intro_for_developers.bb | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename doc/database/{db_groups.bb => db_pgrp.bb} (100%) rename doc/database/{db_group_member.bb => db_pgrp_member.bb} (100%) 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 similarity index 100% rename from doc/database/db_groups.bb rename to doc/database/db_pgrp.bb diff --git a/doc/database/db_group_member.bb b/doc/database/db_pgrp_member.bb similarity index 100% rename from doc/database/db_group_member.bb rename to 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]