From bf8cb39102ea306bf2fb21f1196ea04f57329243 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 13 Jun 2021 11:15:04 +0000
Subject: [PATCH 01/14] Diaspora relay functionality is removed

---
 src/Module/Admin/Site.php                |  13 +-
 src/Module/WellKnown/XSocialRelay.php    |  10 +-
 src/Protocol/ActivityPub/Transmitter.php |   8 +-
 src/Protocol/Relay.php                   | 118 +++---
 src/Worker/Notifier.php                  |  17 +-
 static/settings.config.php               |  10 +-
 view/lang/C/messages.po                  | 472 +++++++++++------------
 view/templates/admin/site.tpl            |  15 +-
 view/theme/frio/templates/admin/site.tpl |  15 +-
 9 files changed, 333 insertions(+), 345 deletions(-)

diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index c12dd7b753..a04b4194df 100644
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -32,6 +32,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\User;
 use Friendica\Module\BaseAdmin;
 use Friendica\Module\Register;
+use Friendica\Protocol\Relay;
 use Friendica\Util\BasePath;
 use Friendica\Util\EMailer\MailBuilder;
 use Friendica\Util\Strings;
@@ -208,8 +209,6 @@ class Site extends BaseAdmin
 		$worker_fastlane  = !empty($_POST['worker_fastlane']);
 
 		$relay_directly    = !empty($_POST['relay_directly']);
-		$relay_server      = (!empty($_POST['relay_server'])      ? Strings::escapeTags(trim($_POST['relay_server']))       : '');
-		$relay_subscribe   = !empty($_POST['relay_subscribe']);
 		$relay_scope       = (!empty($_POST['relay_scope'])       ? Strings::escapeTags(trim($_POST['relay_scope']))        : '');
 		$relay_server_tags = (!empty($_POST['relay_server_tags']) ? Strings::escapeTags(trim($_POST['relay_server_tags']))  : '');
 		$relay_deny_tags   = (!empty($_POST['relay_deny_tags'])   ? Strings::escapeTags(trim($_POST['relay_deny_tags']))    : '');
@@ -418,8 +417,6 @@ class Site extends BaseAdmin
 		DI::config()->set('system', 'worker_fastlane'  , $worker_fastlane);
 
 		DI::config()->set('system', 'relay_directly'   , $relay_directly);
-		DI::config()->set('system', 'relay_server'     , $relay_server);
-		DI::config()->set('system', 'relay_subscribe'  , $relay_subscribe);
 		DI::config()->set('system', 'relay_scope'      , $relay_scope);
 		DI::config()->set('system', 'relay_server_tags', $relay_server_tags);
 		DI::config()->set('system', 'relay_deny_tags'  , $relay_deny_tags);
@@ -589,6 +586,10 @@ class Site extends BaseAdmin
 			'$performance'       => DI::l10n()->t('Performance'),
 			'$worker_title'      => DI::l10n()->t('Worker'),
 			'$relay_title'       => DI::l10n()->t('Message Relay'),
+			'$relay_description' => DI::l10n()->t('Use the command "console relay" in the command line to add or remove relays.'),
+			'$no_relay_list'     => DI::l10n()->t('The system is not subscribed to any relays at the moment.'),
+			'$relay_list_title'  => DI::l10n()->t('The system is currently subscribed to the following relays:'),
+			'$relay_list'        => Relay::getList(['url']),
 			'$relocate'          => DI::l10n()->t('Relocate Instance'),
 			'$relocate_warning'  => DI::l10n()->t('<strong>Warning!</strong> Advanced function. Could make this server unreachable.'),
 			'$baseurl'           => DI::baseUrl()->get(true),
@@ -688,10 +689,8 @@ class Site extends BaseAdmin
 			'$worker_queues'          => ['worker_queues', DI::l10n()->t('Maximum number of parallel workers'), DI::config()->get('system', 'worker_queues'), DI::l10n()->t('On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d.', 5, 20, 10)],
 			'$worker_fastlane'        => ['worker_fastlane', DI::l10n()->t('Enable fastlane'), DI::config()->get('system', 'worker_fastlane'), DI::l10n()->t('When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.')],
 
-			'$relay_subscribe'        => ['relay_subscribe', DI::l10n()->t('Use relay servers'), DI::config()->get('system', 'relay_subscribe'), DI::l10n()->t('Enables the receiving of public posts from relay servers. They will be included in the search, subscribed tags and on the global community page.')],
-			'$relay_server'           => ['relay_server', DI::l10n()->t('"Social Relay" server'), DI::config()->get('system', 'relay_server'), DI::l10n()->t('Address of the "Social Relay" server where public posts should be send to. For example %s. ActivityRelay servers are administrated via the "console relay" command line command.', 'https://social-relay.isurf.ca')],
 			'$relay_directly'         => ['relay_directly', DI::l10n()->t('Direct relay transfer'), DI::config()->get('system', 'relay_directly'), DI::l10n()->t('Enables the direct transfer to other servers without using the relay servers')],
-			'$relay_scope'            => ['relay_scope', DI::l10n()->t('Relay scope'), DI::config()->get('system', 'relay_scope'), DI::l10n()->t('Can be "all" or "tags". "all" means that every public post should be received. "tags" means that only posts with selected tags should be received.'), ['' => DI::l10n()->t('Disabled'), 'all' => DI::l10n()->t('all'), 'tags' => DI::l10n()->t('tags')]],
+			'$relay_scope'            => ['relay_scope', DI::l10n()->t('Relay scope'), DI::config()->get('system', 'relay_scope'), DI::l10n()->t('Can be "all" or "tags". "all" means that every public post should be received. "tags" means that only posts with selected tags should be received.'), [SR_SCOPE_NONE => DI::l10n()->t('Disabled'), SR_SCOPE_ALL => DI::l10n()->t('all'), SR_SCOPE_TAGS => DI::l10n()->t('tags')]],
 			'$relay_server_tags'      => ['relay_server_tags', DI::l10n()->t('Server tags'), DI::config()->get('system', 'relay_server_tags'), DI::l10n()->t('Comma separated list of tags for the "tags" subscription.')],
 			'$relay_deny_tags'        => ['relay_deny_tags', DI::l10n()->t('Deny Server tags'), DI::config()->get('system', 'relay_deny_tags'), DI::l10n()->t('Comma separated list of tags that are rejected.')],
 			'$relay_user_tags'        => ['relay_user_tags', DI::l10n()->t('Allow user tags'), DI::config()->get('system', 'relay_user_tags'), DI::l10n()->t('If enabled, the tags from the saved searches will used for the "tags" subscription in addition to the "relay_server_tags".')],
diff --git a/src/Module/WellKnown/XSocialRelay.php b/src/Module/WellKnown/XSocialRelay.php
index 6a72a810cd..6dcd65c505 100644
--- a/src/Module/WellKnown/XSocialRelay.php
+++ b/src/Module/WellKnown/XSocialRelay.php
@@ -35,13 +35,7 @@ class XSocialRelay extends BaseModule
 	{
 		$config = DI::config();
 
-		$subscribe = $config->get('system', 'relay_subscribe', false);
-
-		if ($subscribe) {
-			$scope = $config->get('system', 'relay_scope', SR_SCOPE_ALL);
-		} else {
-			$scope = SR_SCOPE_NONE;
-		}
+		$scope = $config->get('system', 'relay_scope');
 
 		$systemTags = [];
 		$userTags = [];
@@ -63,7 +57,7 @@ class XSocialRelay extends BaseModule
 		$tagList = array_unique(array_merge($systemTags, $userTags));
 
 		$relay = [
-			'subscribe' => $subscribe,
+			'subscribe' => ($scope != SR_SCOPE_NONE),
 			'scope'     => $scope,
 			'tags'      => $tagList,
 			'protocols' => [
diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index f6fd1ad132..3e6b130a33 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -68,13 +68,9 @@ class Transmitter
 	 */
 	public static function addRelayServerInboxes(array $inboxes = [])
 	{
-		$contacts = DBA::select('apcontact', ['inbox'],
-			["`type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` = ?)",
-				'Application', 0, Contact::FRIEND]);
-		while ($contact = DBA::fetch($contacts)) {
+		foreach (Relay::getList(['inbox']) as $contact) {
 			$inboxes[$contact['inbox']] = $contact['inbox'];
 		}
-		DBA::close($contacts);
 
 		return $inboxes;
 	}
@@ -92,7 +88,7 @@ class Transmitter
 			return $inboxes;
 		}
 
-		$relays = Relay::getList($item_id, [], [Protocol::ACTIVITYPUB]);
+		$relays = Relay::getDirectRelayList($item_id);
 		if (empty($relays)) {
 			return $inboxes;
 		}
diff --git a/src/Protocol/Relay.php b/src/Protocol/Relay.php
index d40ba5c338..f89dc39999 100644
--- a/src/Protocol/Relay.php
+++ b/src/Protocol/Relay.php
@@ -29,7 +29,6 @@ use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
 use Friendica\Model\GServer;
-use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Search;
 use Friendica\Model\Tag;
@@ -54,12 +53,7 @@ class Relay
 	{
 		$config = DI::config();
 
-		$subscribe = $config->get('system', 'relay_subscribe', false);
-		if ($subscribe) {
-			$scope = $config->get('system', 'relay_scope', SR_SCOPE_ALL);
-		} else {
-			$scope = SR_SCOPE_NONE;
-		}
+		$scope = $config->get('system', 'relay_scope');
 
 		if ($scope == SR_SCOPE_NONE) {
 			Logger::info('Server does not accept relay posts - rejected', ['network' => $network, 'url' => $url]);
@@ -168,7 +162,7 @@ class Relay
 			return;
 		}
 
-		if (DBA::isResult($old)) {	
+		if (DBA::isResult($old)) {
 			$fields['updated'] = DateTimeFormat::utcNow();
 
 			Logger::info('Update relay contact', ['server' => $gserver['url'], 'id' => $old['id'], 'fields' => $fields]);
@@ -224,76 +218,65 @@ class Relay
 	}
 
 	/**
-	 * Return a list of relay servers
-	 *
-	 * The list contains not only the official relays but also servers that we serve directly
+	 * Return a list of servers that we serve via the direct relay
 	 *
 	 * @param integer $item_id  id of the item that is sent
 	 * @param array   $contacts Previously fetched contacts
-	 * @param array   $networks Networks of the relay servers 
+	 * @param array   $networks Networks of the relay servers
 	 *
 	 * @return array of relay servers
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	public static function getList(int $item_id, array $contacts, array $networks)
+	public static function getDirectRelayList(int $item_id)
 	{
 		$serverlist = [];
 
-		// Fetching relay servers
-		$serverdata = DI::config()->get("system", "relay_server");
-
-		if (!empty($serverdata)) {
-			$servers = explode(",", $serverdata);
-			foreach ($servers as $server) {
-				$gserver = DBA::selectFirst('gserver', ['id', 'url', 'network'], ['nurl' => Strings::normaliseLink($server)]);
-				if (DBA::isResult($gserver)) {
-					$serverlist[$gserver['id']] = $gserver;
-				}
-			}
+		if (!DI::config()->get("system", "relay_directly", false)) {
+			return [];
 		}
 
-		if (DI::config()->get("system", "relay_directly", false)) {
-			// We distribute our stuff based on the parent to ensure that the thread will be complete
-			$parent = Post::selectFirst(['uri-id'], ['id' => $item_id]);
-			if (!DBA::isResult($parent)) {
-				return;
-			}
+		// We distribute our stuff based on the parent to ensure that the thread will be complete
+		$parent = Post::selectFirst(['uri-id'], ['id' => $item_id]);
+		if (!DBA::isResult($parent)) {
+			return [];
+		}
 
-			// Servers that want to get all content
-			$servers = DBA::select('gserver', ['id', 'url', 'network'], ['relay-subscribe' => true, 'relay-scope' => 'all']);
+		// Servers that want to get all content
+		$servers = DBA::select('gserver', ['id', 'url', 'network'], ['relay-subscribe' => true, 'relay-scope' => 'all']);
+		while ($server = DBA::fetch($servers)) {
+			$serverlist[$server['id']] = $server;
+		}
+		DBA::close($servers);
+
+		// All tags of the current post
+		$tags = DBA::select('tag-view', ['name'], ['uri-id' => $parent['uri-id'], 'type' => Tag::HASHTAG]);
+		$taglist = [];
+		while ($tag = DBA::fetch($tags)) {
+			$taglist[] = $tag['name'];
+		}
+		DBA::close($tags);
+
+		// All servers who wants content with this tag
+		$tagserverlist = [];
+		if (!empty($taglist)) {
+			$tagserver = DBA::select('gserver-tag', ['gserver-id'], ['tag' => $taglist]);
+			while ($server = DBA::fetch($tagserver)) {
+				$tagserverlist[] = $server['gserver-id'];
+			}
+			DBA::close($tagserver);
+		}
+
+		// All adresses with the given id
+		if (!empty($tagserverlist)) {
+			$servers = DBA::select('gserver', ['id', 'url', 'network'], ['relay-subscribe' => true, 'relay-scope' => 'tags', 'id' => $tagserverlist]);
 			while ($server = DBA::fetch($servers)) {
 				$serverlist[$server['id']] = $server;
 			}
 			DBA::close($servers);
-
-			// All tags of the current post
-			$tags = DBA::select('tag-view', ['name'], ['uri-id' => $parent['uri-id'], 'type' => Tag::HASHTAG]);
-			$taglist = [];
-			while ($tag = DBA::fetch($tags)) {
-				$taglist[] = $tag['name'];
-			}
-			DBA::close($tags);
-
-			// All servers who wants content with this tag
-			$tagserverlist = [];
-			if (!empty($taglist)) {
-				$tagserver = DBA::select('gserver-tag', ['gserver-id'], ['tag' => $taglist]);
-				while ($server = DBA::fetch($tagserver)) {
-					$tagserverlist[] = $server['gserver-id'];
-				}
-				DBA::close($tagserver);
-			}
-
-			// All adresses with the given id
-			if (!empty($tagserverlist)) {
-				$servers = DBA::select('gserver', ['id', 'url', 'network'], ['relay-subscribe' => true, 'relay-scope' => 'tags', 'id' => $tagserverlist]);
-				while ($server = DBA::fetch($servers)) {
-					$serverlist[$server['id']] = $server;
-				}
-				DBA::close($servers);
-			}
 		}
 
+		$contacts = [];
+
 		// Now we are collecting all relay contacts
 		foreach ($serverlist as $gserver) {
 			// We don't send messages to ourselves
@@ -304,15 +287,24 @@ class Relay
 			if (empty($contact)) {
 				continue;
 			}
-
-			if (in_array($contact['network'], $networks) && !in_array($contact['batch'], array_column($contacts, 'batch'))) {
-				$contacts[] = $contact;
-			}
 		}
 
 		return $contacts;
 	}
 
+	/**
+	 * Return a list of relay servers
+	 *
+	 * @param array $fields Field list
+	 * @return array 
+	 * @throws Exception 
+	 */
+	public static function getList($fields = []):array
+	{
+		return DBA::selectToArray('apcontact', $fields,
+			["`type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` = ?)", 'Application', 0, Contact::FRIEND]);
+	}
+
 	/**
 	 * Return a contact for a given server address or creates a dummy entry
 	 *
diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 550b3a4739..e31141ea46 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -39,7 +39,6 @@ use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
-use Friendica\Protocol\Relay;
 use Friendica\Protocol\Salmon;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
@@ -442,12 +441,12 @@ class Notifier
 		$batch_delivery = false;
 
 		if ($public_message && !in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION]) && !$followup) {
-			$relay_list = [];
+			$participants = [];
 
 			if ($diaspora_delivery && !$unlisted) {
 				$batch_delivery = true;
 
-				$relay_list_stmt = DBA::p(
+				$participants_stmt = DBA::p(
 					"SELECT
 						`batch`, `network`, `protocol`,
 						ANY_VALUE(`id`) AS `id`,
@@ -466,17 +465,11 @@ class Notifier
 					$owner['uid'],
 					Contact::SHARING
 				);
-				$relay_list = DBA::toArray($relay_list_stmt);
+				$participants = DBA::toArray($participants_stmt);
 
 				// Fetch the participation list
 				// The function will ensure that there are no duplicates
-				$relay_list = Diaspora::participantsForThread($target_item, $relay_list);
-
-				// Add the relay to the list, avoid duplicates.
-				// Don't send community posts to the relay. Forum posts via the Diaspora protocol are looking ugly.
-				if (!$followup && !Item::isForumPost($target_item, $owner) && !self::isForumPost($target_item)) {
-					$relay_list = Relay::getList($target_id, $relay_list, [Protocol::DFRN, Protocol::DIASPORA]);
-				}
+				$participants = Diaspora::participantsForThread($target_item, $participants);
 			}
 
 			$condition = ['network' => Protocol::DFRN, 'uid' => $owner['uid'], 'blocked' => false,
@@ -484,7 +477,7 @@ class Notifier
 
 			$contacts = DBA::toArray(DBA::select('contact', ['id', 'url', 'addr', 'name', 'network', 'protocol'], $condition));
 
-			$conversants = array_merge($contacts, $relay_list);
+			$conversants = array_merge($contacts, $participants);
 
 			$delivery_queue_count += self::delivery($cmd, $post_uriid, $sender_uid, $target_item, $thr_parent, $owner, $batch_delivery, true, $conversants, $ap_contacts, []);
 
diff --git a/static/settings.config.php b/static/settings.config.php
index c1c7e7bc88..e8c6d09f81 100644
--- a/static/settings.config.php
+++ b/static/settings.config.php
@@ -164,9 +164,13 @@ return [
 		// Comma separated list of tags that are rejected.
 		'relay_deny_tags' => '',
 
-		// relay_server (String)
-		// Address of the relay server where public posts should be send to.
-		'relay_server' => 'https://social-relay.isurf.ca',
+		// relay_directly (Boolean)
+		// Directly transmit content to relay subscribers without using a relay server
+		'relay_directly' => false,
+
+		// relay_scope (SR_SCOPE_NONE, SR_SCOPE_TAGS or SR_SCOPE_ALL)
+		// Defines the scope of accepted posts from the relay servers
+		'relay_scope' => SR_SCOPE_NONE,
 
 		// relay_server_tags (String)
 		// Comma separated list of tags for the "tags" subscription.
diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index 5e9941df4b..5869205499 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2021.06-rc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-10 06:29+0000\n"
+"POT-Creation-Date: 2021-06-13 11:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,26 +18,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 
-#: include/api.php:1143
+#: include/api.php:1135
 #, php-format
 msgid "Daily posting limit of %d post reached. The post was rejected."
 msgid_plural "Daily posting limit of %d posts reached. The post was rejected."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/api.php:1157
+#: include/api.php:1149
 #, php-format
 msgid "Weekly posting limit of %d post reached. The post was rejected."
 msgid_plural "Weekly posting limit of %d posts reached. The post was rejected."
 msgstr[0] ""
 msgstr[1] ""
 
-#: include/api.php:1171
+#: include/api.php:1163
 #, php-format
 msgid "Monthly posting limit of %d post reached. The post was rejected."
 msgstr ""
 
-#: include/api.php:4534 mod/photos.php:107 mod/photos.php:211
+#: include/api.php:4526 mod/photos.php:107 mod/photos.php:211
 #: mod/photos.php:639 mod/photos.php:1043 mod/photos.php:1060
 #: mod/photos.php:1609 src/Model/User.php:1100 src/Model/User.php:1108
 #: src/Model/User.php:1116 src/Module/Settings/Profile/Photo/Crop.php:97
@@ -1366,7 +1366,7 @@ msgstr ""
 msgid "Basic"
 msgstr ""
 
-#: mod/events.php:577 src/Module/Admin/Site.php:587 src/Module/Contact.php:961
+#: mod/events.php:577 src/Module/Admin/Site.php:584 src/Module/Contact.php:961
 #: src/Module/Profile/Profile.php:245
 msgid "Advanced"
 msgstr ""
@@ -2183,7 +2183,7 @@ msgstr ""
 
 #: mod/settings.php:564 mod/settings.php:662 mod/settings.php:797
 #: src/Module/Admin/Addons/Index.php:69 src/Module/Admin/Features.php:87
-#: src/Module/Admin/Logs/Settings.php:82 src/Module/Admin/Site.php:582
+#: src/Module/Admin/Logs/Settings.php:82 src/Module/Admin/Site.php:579
 #: src/Module/Admin/Themes/Index.php:113 src/Module/Admin/Tos.php:66
 #: src/Module/Settings/Delegation.php:170 src/Module/Settings/Display.php:189
 msgid "Save Settings"
@@ -5234,10 +5234,10 @@ msgstr ""
 
 #: src/Module/Admin/Addons/Details.php:111 src/Module/Admin/Addons/Index.php:67
 #: src/Module/Admin/Blocklist/Contact.php:78
-#: src/Module/Admin/Blocklist/Server.php:88 src/Module/Admin/Federation.php:141
+#: src/Module/Admin/Blocklist/Server.php:88 src/Module/Admin/Federation.php:159
 #: src/Module/Admin/Item/Delete.php:65 src/Module/Admin/Logs/Settings.php:80
 #: src/Module/Admin/Logs/View.php:64 src/Module/Admin/Queue.php:72
-#: src/Module/Admin/Site.php:579 src/Module/Admin/Summary.php:232
+#: src/Module/Admin/Site.php:576 src/Module/Admin/Summary.php:232
 #: src/Module/Admin/Themes/Details.php:90 src/Module/Admin/Themes/Index.php:111
 #: src/Module/Admin/Tos.php:58 src/Module/Admin/Users/Active.php:136
 #: src/Module/Admin/Users/Blocked.php:137 src/Module/Admin/Users/Create.php:61
@@ -5567,26 +5567,26 @@ msgstr ""
 msgid "Manage Additional Features"
 msgstr ""
 
-#: src/Module/Admin/Federation.php:54
+#: src/Module/Admin/Federation.php:56
 msgid "Other"
 msgstr ""
 
-#: src/Module/Admin/Federation.php:108 src/Module/Admin/Federation.php:268
+#: src/Module/Admin/Federation.php:118 src/Module/Admin/Federation.php:348
 msgid "unknown"
 msgstr ""
 
-#: src/Module/Admin/Federation.php:136
+#: src/Module/Admin/Federation.php:154
 msgid ""
 "This page offers you some numbers to the known part of the federated social "
 "network your Friendica node is part of. These numbers are not complete but "
 "only reflect the part of the network your node is aware of."
 msgstr ""
 
-#: src/Module/Admin/Federation.php:142 src/Module/BaseAdmin.php:87
+#: src/Module/Admin/Federation.php:160 src/Module/BaseAdmin.php:87
 msgid "Federation Statistics"
 msgstr ""
 
-#: src/Module/Admin/Federation.php:146
+#: src/Module/Admin/Federation.php:164
 #, php-format
 msgid ""
 "Currently this node is aware of %d nodes with %d registered users from the "
@@ -5783,275 +5783,289 @@ msgstr ""
 msgid "Priority"
 msgstr ""
 
-#: src/Module/Admin/Site.php:69
+#: src/Module/Admin/Site.php:70
 msgid "Can not parse base url. Must have at least <scheme>://<domain>"
 msgstr ""
 
-#: src/Module/Admin/Site.php:123
+#: src/Module/Admin/Site.php:124
 msgid "Relocation started. Could take a while to complete."
 msgstr ""
 
-#: src/Module/Admin/Site.php:249
+#: src/Module/Admin/Site.php:248
 msgid "Invalid storage backend setting value."
 msgstr ""
 
-#: src/Module/Admin/Site.php:449 src/Module/Settings/Display.php:134
+#: src/Module/Admin/Site.php:446 src/Module/Settings/Display.php:134
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: src/Module/Admin/Site.php:466 src/Module/Settings/Display.php:144
+#: src/Module/Admin/Site.php:463 src/Module/Settings/Display.php:144
 #, php-format
 msgid "%s - (Experimental)"
 msgstr ""
 
-#: src/Module/Admin/Site.php:478
+#: src/Module/Admin/Site.php:475
 msgid "No community page for local users"
 msgstr ""
 
-#: src/Module/Admin/Site.php:479
+#: src/Module/Admin/Site.php:476
 msgid "No community page"
 msgstr ""
 
-#: src/Module/Admin/Site.php:480
+#: src/Module/Admin/Site.php:477
 msgid "Public postings from users of this site"
 msgstr ""
 
-#: src/Module/Admin/Site.php:481
+#: src/Module/Admin/Site.php:478
 msgid "Public postings from the federated network"
 msgstr ""
 
-#: src/Module/Admin/Site.php:482
+#: src/Module/Admin/Site.php:479
 msgid "Public postings from local users and the federated network"
 msgstr ""
 
-#: src/Module/Admin/Site.php:488
+#: src/Module/Admin/Site.php:485
 msgid "Multi user instance"
 msgstr ""
 
-#: src/Module/Admin/Site.php:516
+#: src/Module/Admin/Site.php:513
 msgid "Closed"
 msgstr ""
 
-#: src/Module/Admin/Site.php:517
+#: src/Module/Admin/Site.php:514
 msgid "Requires approval"
 msgstr ""
 
-#: src/Module/Admin/Site.php:518
+#: src/Module/Admin/Site.php:515
 msgid "Open"
 msgstr ""
 
-#: src/Module/Admin/Site.php:522 src/Module/Install.php:215
+#: src/Module/Admin/Site.php:519 src/Module/Install.php:215
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: src/Module/Admin/Site.php:523 src/Module/Install.php:216
+#: src/Module/Admin/Site.php:520 src/Module/Install.php:216
 msgid "Force all links to use SSL"
 msgstr ""
 
-#: src/Module/Admin/Site.php:524 src/Module/Install.php:217
+#: src/Module/Admin/Site.php:521 src/Module/Install.php:217
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: src/Module/Admin/Site.php:528
+#: src/Module/Admin/Site.php:525
 msgid "Don't check"
 msgstr ""
 
-#: src/Module/Admin/Site.php:529
+#: src/Module/Admin/Site.php:526
 msgid "check the stable version"
 msgstr ""
 
-#: src/Module/Admin/Site.php:530
+#: src/Module/Admin/Site.php:527
 msgid "check the development version"
 msgstr ""
 
-#: src/Module/Admin/Site.php:534
+#: src/Module/Admin/Site.php:531
 msgid "none"
 msgstr ""
 
-#: src/Module/Admin/Site.php:535
+#: src/Module/Admin/Site.php:532
 msgid "Local contacts"
 msgstr ""
 
-#: src/Module/Admin/Site.php:536
+#: src/Module/Admin/Site.php:533
 msgid "Interactors"
 msgstr ""
 
-#: src/Module/Admin/Site.php:549
+#: src/Module/Admin/Site.php:546
 msgid "Database (legacy)"
 msgstr ""
 
-#: src/Module/Admin/Site.php:580 src/Module/BaseAdmin.php:90
+#: src/Module/Admin/Site.php:577 src/Module/BaseAdmin.php:90
 msgid "Site"
 msgstr ""
 
-#: src/Module/Admin/Site.php:581
+#: src/Module/Admin/Site.php:578
 msgid "General Information"
 msgstr ""
 
-#: src/Module/Admin/Site.php:583
+#: src/Module/Admin/Site.php:580
 msgid "Republish users to directory"
 msgstr ""
 
-#: src/Module/Admin/Site.php:584 src/Module/Register.php:139
+#: src/Module/Admin/Site.php:581 src/Module/Register.php:139
 msgid "Registration"
 msgstr ""
 
-#: src/Module/Admin/Site.php:585
+#: src/Module/Admin/Site.php:582
 msgid "File upload"
 msgstr ""
 
-#: src/Module/Admin/Site.php:586
+#: src/Module/Admin/Site.php:583
 msgid "Policies"
 msgstr ""
 
-#: src/Module/Admin/Site.php:588
+#: src/Module/Admin/Site.php:585
 msgid "Auto Discovered Contact Directory"
 msgstr ""
 
-#: src/Module/Admin/Site.php:589
+#: src/Module/Admin/Site.php:586
 msgid "Performance"
 msgstr ""
 
-#: src/Module/Admin/Site.php:590
+#: src/Module/Admin/Site.php:587
 msgid "Worker"
 msgstr ""
 
-#: src/Module/Admin/Site.php:591
+#: src/Module/Admin/Site.php:588
 msgid "Message Relay"
 msgstr ""
 
-#: src/Module/Admin/Site.php:592
-msgid "Relocate Instance"
+#: src/Module/Admin/Site.php:589
+msgid ""
+"Use the command \"console relay\" in the command line to add or remove "
+"relays."
+msgstr ""
+
+#: src/Module/Admin/Site.php:590
+msgid "The system is not subscribed to any relays at the moment."
+msgstr ""
+
+#: src/Module/Admin/Site.php:591
+msgid "The system is currently subscribed to the following relays:"
 msgstr ""
 
 #: src/Module/Admin/Site.php:593
+msgid "Relocate Instance"
+msgstr ""
+
+#: src/Module/Admin/Site.php:594
 msgid ""
 "<strong>Warning!</strong> Advanced function. Could make this server "
 "unreachable."
 msgstr ""
 
-#: src/Module/Admin/Site.php:597
+#: src/Module/Admin/Site.php:598
 msgid "Site name"
 msgstr ""
 
-#: src/Module/Admin/Site.php:598
+#: src/Module/Admin/Site.php:599
 msgid "Sender Email"
 msgstr ""
 
-#: src/Module/Admin/Site.php:598
+#: src/Module/Admin/Site.php:599
 msgid ""
 "The email address your server shall use to send notification emails from."
 msgstr ""
 
-#: src/Module/Admin/Site.php:599
+#: src/Module/Admin/Site.php:600
 msgid "Name of the system actor"
 msgstr ""
 
-#: src/Module/Admin/Site.php:599
+#: src/Module/Admin/Site.php:600
 msgid ""
 "Name of the internal system account that is used to perform ActivityPub "
 "requests. This must be an unused username. If set, this can't be changed "
 "again."
 msgstr ""
 
-#: src/Module/Admin/Site.php:600
+#: src/Module/Admin/Site.php:601
 msgid "Banner/Logo"
 msgstr ""
 
-#: src/Module/Admin/Site.php:601
+#: src/Module/Admin/Site.php:602
 msgid "Email Banner/Logo"
 msgstr ""
 
-#: src/Module/Admin/Site.php:602
+#: src/Module/Admin/Site.php:603
 msgid "Shortcut icon"
 msgstr ""
 
-#: src/Module/Admin/Site.php:602
+#: src/Module/Admin/Site.php:603
 msgid "Link to an icon that will be used for browsers."
 msgstr ""
 
-#: src/Module/Admin/Site.php:603
+#: src/Module/Admin/Site.php:604
 msgid "Touch icon"
 msgstr ""
 
-#: src/Module/Admin/Site.php:603
+#: src/Module/Admin/Site.php:604
 msgid "Link to an icon that will be used for tablets and mobiles."
 msgstr ""
 
-#: src/Module/Admin/Site.php:604
+#: src/Module/Admin/Site.php:605
 msgid "Additional Info"
 msgstr ""
 
-#: src/Module/Admin/Site.php:604
+#: src/Module/Admin/Site.php:605
 #, php-format
 msgid ""
 "For public servers: you can add additional information here that will be "
 "listed at %s/servers."
 msgstr ""
 
-#: src/Module/Admin/Site.php:605
+#: src/Module/Admin/Site.php:606
 msgid "System language"
 msgstr ""
 
-#: src/Module/Admin/Site.php:606
+#: src/Module/Admin/Site.php:607
 msgid "System theme"
 msgstr ""
 
-#: src/Module/Admin/Site.php:606
+#: src/Module/Admin/Site.php:607
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href=\"/"
 "admin/themes\" id=\"cnftheme\">Change default theme settings</a>"
 msgstr ""
 
-#: src/Module/Admin/Site.php:607
+#: src/Module/Admin/Site.php:608
 msgid "Mobile system theme"
 msgstr ""
 
-#: src/Module/Admin/Site.php:607
+#: src/Module/Admin/Site.php:608
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: src/Module/Admin/Site.php:608 src/Module/Install.php:225
+#: src/Module/Admin/Site.php:609 src/Module/Install.php:225
 msgid "SSL link policy"
 msgstr ""
 
-#: src/Module/Admin/Site.php:608 src/Module/Install.php:227
+#: src/Module/Admin/Site.php:609 src/Module/Install.php:227
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: src/Module/Admin/Site.php:609
+#: src/Module/Admin/Site.php:610
 msgid "Force SSL"
 msgstr ""
 
-#: src/Module/Admin/Site.php:609
+#: src/Module/Admin/Site.php:610
 msgid ""
 "Force all Non-SSL requests to SSL - Attention: on some systems it could lead "
 "to endless loops."
 msgstr ""
 
-#: src/Module/Admin/Site.php:610
+#: src/Module/Admin/Site.php:611
 msgid "Hide help entry from navigation menu"
 msgstr ""
 
-#: src/Module/Admin/Site.php:610
+#: src/Module/Admin/Site.php:611
 msgid ""
 "Hides the menu entry for the Help pages from the navigation menu. You can "
 "still access it calling /help directly."
 msgstr ""
 
-#: src/Module/Admin/Site.php:611
+#: src/Module/Admin/Site.php:612
 msgid "Single user instance"
 msgstr ""
 
-#: src/Module/Admin/Site.php:611
+#: src/Module/Admin/Site.php:612
 msgid "Make this instance multi-user or single-user for the named user"
 msgstr ""
 
-#: src/Module/Admin/Site.php:613
+#: src/Module/Admin/Site.php:614
 msgid "File storage backend"
 msgstr ""
 
-#: src/Module/Admin/Site.php:613
+#: src/Module/Admin/Site.php:614
 msgid ""
 "The backend used to store uploaded data. If you change the storage backend, "
 "you can manually move the existing files. If you do not do so, the files "
@@ -6060,202 +6074,202 @@ msgid ""
 "for more information about the choices and the moving procedure."
 msgstr ""
 
-#: src/Module/Admin/Site.php:615
+#: src/Module/Admin/Site.php:616
 msgid "Maximum image size"
 msgstr ""
 
-#: src/Module/Admin/Site.php:615
+#: src/Module/Admin/Site.php:616
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: src/Module/Admin/Site.php:616
+#: src/Module/Admin/Site.php:617
 msgid "Maximum image length"
 msgstr ""
 
-#: src/Module/Admin/Site.php:616
+#: src/Module/Admin/Site.php:617
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is "
 "-1, which means no limits."
 msgstr ""
 
-#: src/Module/Admin/Site.php:617
+#: src/Module/Admin/Site.php:618
 msgid "JPEG image quality"
 msgstr ""
 
-#: src/Module/Admin/Site.php:617
+#: src/Module/Admin/Site.php:618
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr ""
 
-#: src/Module/Admin/Site.php:619
+#: src/Module/Admin/Site.php:620
 msgid "Register policy"
 msgstr ""
 
-#: src/Module/Admin/Site.php:620
+#: src/Module/Admin/Site.php:621
 msgid "Maximum Daily Registrations"
 msgstr ""
 
-#: src/Module/Admin/Site.php:620
+#: src/Module/Admin/Site.php:621
 msgid ""
 "If registration is permitted above, this sets the maximum number of new user "
 "registrations to accept per day.  If register is set to closed, this setting "
 "has no effect."
 msgstr ""
 
-#: src/Module/Admin/Site.php:621
+#: src/Module/Admin/Site.php:622
 msgid "Register text"
 msgstr ""
 
-#: src/Module/Admin/Site.php:621
+#: src/Module/Admin/Site.php:622
 msgid ""
 "Will be displayed prominently on the registration page. You can use BBCode "
 "here."
 msgstr ""
 
-#: src/Module/Admin/Site.php:622
+#: src/Module/Admin/Site.php:623
 msgid "Forbidden Nicknames"
 msgstr ""
 
-#: src/Module/Admin/Site.php:622
+#: src/Module/Admin/Site.php:623
 msgid ""
 "Comma separated list of nicknames that are forbidden from registration. "
 "Preset is a list of role names according RFC 2142."
 msgstr ""
 
-#: src/Module/Admin/Site.php:623
+#: src/Module/Admin/Site.php:624
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: src/Module/Admin/Site.php:623
+#: src/Module/Admin/Site.php:624
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: src/Module/Admin/Site.php:624
+#: src/Module/Admin/Site.php:625
 msgid "Allowed friend domains"
 msgstr ""
 
-#: src/Module/Admin/Site.php:624
+#: src/Module/Admin/Site.php:625
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: src/Module/Admin/Site.php:625
+#: src/Module/Admin/Site.php:626
 msgid "Allowed email domains"
 msgstr ""
 
-#: src/Module/Admin/Site.php:625
+#: src/Module/Admin/Site.php:626
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: src/Module/Admin/Site.php:626
+#: src/Module/Admin/Site.php:627
 msgid "No OEmbed rich content"
 msgstr ""
 
-#: src/Module/Admin/Site.php:626
+#: src/Module/Admin/Site.php:627
 msgid ""
 "Don't show the rich content (e.g. embedded PDF), except from the domains "
 "listed below."
 msgstr ""
 
-#: src/Module/Admin/Site.php:627
+#: src/Module/Admin/Site.php:628
 msgid "Trusted third-party domains"
 msgstr ""
 
-#: src/Module/Admin/Site.php:627
+#: src/Module/Admin/Site.php:628
 msgid ""
 "Comma separated list of domains from which content is allowed to be embedded "
 "in posts like with OEmbed. All sub-domains of the listed domains are allowed "
 "as well."
 msgstr ""
 
-#: src/Module/Admin/Site.php:628
+#: src/Module/Admin/Site.php:629
 msgid "Block public"
 msgstr ""
 
-#: src/Module/Admin/Site.php:628
+#: src/Module/Admin/Site.php:629
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: src/Module/Admin/Site.php:629
+#: src/Module/Admin/Site.php:630
 msgid "Force publish"
 msgstr ""
 
-#: src/Module/Admin/Site.php:629
+#: src/Module/Admin/Site.php:630
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: src/Module/Admin/Site.php:629
+#: src/Module/Admin/Site.php:630
 msgid "Enabling this may violate privacy laws like the GDPR"
 msgstr ""
 
-#: src/Module/Admin/Site.php:630
+#: src/Module/Admin/Site.php:631
 msgid "Global directory URL"
 msgstr ""
 
-#: src/Module/Admin/Site.php:630
+#: src/Module/Admin/Site.php:631
 msgid ""
 "URL to the global directory. If this is not set, the global directory is "
 "completely unavailable to the application."
 msgstr ""
 
-#: src/Module/Admin/Site.php:631
+#: src/Module/Admin/Site.php:632
 msgid "Private posts by default for new users"
 msgstr ""
 
-#: src/Module/Admin/Site.php:631
+#: src/Module/Admin/Site.php:632
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr ""
 
-#: src/Module/Admin/Site.php:632
+#: src/Module/Admin/Site.php:633
 msgid "Don't include post content in email notifications"
 msgstr ""
 
-#: src/Module/Admin/Site.php:632
+#: src/Module/Admin/Site.php:633
 msgid ""
 "Don't include the content of a post/comment/private message/etc. in the "
 "email notifications that are sent out from this site, as a privacy measure."
 msgstr ""
 
-#: src/Module/Admin/Site.php:633
+#: src/Module/Admin/Site.php:634
 msgid "Disallow public access to addons listed in the apps menu."
 msgstr ""
 
-#: src/Module/Admin/Site.php:633
+#: src/Module/Admin/Site.php:634
 msgid ""
 "Checking this box will restrict addons listed in the apps menu to members "
 "only."
 msgstr ""
 
-#: src/Module/Admin/Site.php:634
+#: src/Module/Admin/Site.php:635
 msgid "Don't embed private images in posts"
 msgstr ""
 
-#: src/Module/Admin/Site.php:634
+#: src/Module/Admin/Site.php:635
 msgid ""
 "Don't replace locally-hosted private photos in posts with an embedded copy "
 "of the image. This means that contacts who receive posts containing private "
 "photos will have to authenticate and load each image, which may take a while."
 msgstr ""
 
-#: src/Module/Admin/Site.php:635
+#: src/Module/Admin/Site.php:636
 msgid "Explicit Content"
 msgstr ""
 
-#: src/Module/Admin/Site.php:635
+#: src/Module/Admin/Site.php:636
 msgid ""
 "Set this to announce that your node is used mostly for explicit content that "
 "might not be suited for minors. This information will be published in the "
@@ -6264,234 +6278,234 @@ msgid ""
 "will be shown at the user registration page."
 msgstr ""
 
-#: src/Module/Admin/Site.php:636
+#: src/Module/Admin/Site.php:637
 msgid "Allow Users to set remote_self"
 msgstr ""
 
-#: src/Module/Admin/Site.php:636
+#: src/Module/Admin/Site.php:637
 msgid ""
 "With checking this, every user is allowed to mark every contact as a "
 "remote_self in the repair contact dialog. Setting this flag on a contact "
 "causes mirroring every posting of that contact in the users stream."
 msgstr ""
 
-#: src/Module/Admin/Site.php:637
+#: src/Module/Admin/Site.php:638
 msgid "Block multiple registrations"
 msgstr ""
 
-#: src/Module/Admin/Site.php:637
+#: src/Module/Admin/Site.php:638
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: src/Module/Admin/Site.php:638
+#: src/Module/Admin/Site.php:639
 msgid "Disable OpenID"
 msgstr ""
 
-#: src/Module/Admin/Site.php:638
+#: src/Module/Admin/Site.php:639
 msgid "Disable OpenID support for registration and logins."
 msgstr ""
 
-#: src/Module/Admin/Site.php:639
+#: src/Module/Admin/Site.php:640
 msgid "No Fullname check"
 msgstr ""
 
-#: src/Module/Admin/Site.php:639
+#: src/Module/Admin/Site.php:640
 msgid ""
 "Allow users to register without a space between the first name and the last "
 "name in their full name."
 msgstr ""
 
-#: src/Module/Admin/Site.php:640
+#: src/Module/Admin/Site.php:641
 msgid "Community pages for visitors"
 msgstr ""
 
-#: src/Module/Admin/Site.php:640
+#: src/Module/Admin/Site.php:641
 msgid ""
 "Which community pages should be available for visitors. Local users always "
 "see both pages."
 msgstr ""
 
-#: src/Module/Admin/Site.php:641
+#: src/Module/Admin/Site.php:642
 msgid "Posts per user on community page"
 msgstr ""
 
-#: src/Module/Admin/Site.php:641
+#: src/Module/Admin/Site.php:642
 msgid ""
 "The maximum number of posts per user on the community page. (Not valid for "
 "\"Global Community\")"
 msgstr ""
 
-#: src/Module/Admin/Site.php:642
+#: src/Module/Admin/Site.php:643
 msgid "Disable OStatus support"
 msgstr ""
 
-#: src/Module/Admin/Site.php:642
+#: src/Module/Admin/Site.php:643
 msgid ""
 "Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr ""
 
-#: src/Module/Admin/Site.php:643
+#: src/Module/Admin/Site.php:644
 msgid "OStatus support can only be enabled if threading is enabled."
 msgstr ""
 
-#: src/Module/Admin/Site.php:645
+#: src/Module/Admin/Site.php:646
 msgid ""
 "Diaspora support can't be enabled because Friendica was installed into a sub "
 "directory."
 msgstr ""
 
-#: src/Module/Admin/Site.php:646
+#: src/Module/Admin/Site.php:647
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: src/Module/Admin/Site.php:646
+#: src/Module/Admin/Site.php:647
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: src/Module/Admin/Site.php:647
+#: src/Module/Admin/Site.php:648
 msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: src/Module/Admin/Site.php:647
+#: src/Module/Admin/Site.php:648
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: src/Module/Admin/Site.php:648
+#: src/Module/Admin/Site.php:649
 msgid "Verify SSL"
 msgstr ""
 
-#: src/Module/Admin/Site.php:648
+#: src/Module/Admin/Site.php:649
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you "
 "cannot connect (at all) to self-signed SSL sites."
 msgstr ""
 
-#: src/Module/Admin/Site.php:649
+#: src/Module/Admin/Site.php:650
 msgid "Proxy user"
 msgstr ""
 
-#: src/Module/Admin/Site.php:650
+#: src/Module/Admin/Site.php:651
 msgid "Proxy URL"
 msgstr ""
 
-#: src/Module/Admin/Site.php:651
+#: src/Module/Admin/Site.php:652
 msgid "Network timeout"
 msgstr ""
 
-#: src/Module/Admin/Site.php:651
+#: src/Module/Admin/Site.php:652
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: src/Module/Admin/Site.php:652
+#: src/Module/Admin/Site.php:653
 msgid "Maximum Load Average"
 msgstr ""
 
-#: src/Module/Admin/Site.php:652
+#: src/Module/Admin/Site.php:653
 #, php-format
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default %d."
 msgstr ""
 
-#: src/Module/Admin/Site.php:653
+#: src/Module/Admin/Site.php:654
 msgid "Maximum Load Average (Frontend)"
 msgstr ""
 
-#: src/Module/Admin/Site.php:653
+#: src/Module/Admin/Site.php:654
 msgid "Maximum system load before the frontend quits service - default 50."
 msgstr ""
 
-#: src/Module/Admin/Site.php:654
+#: src/Module/Admin/Site.php:655
 msgid "Minimal Memory"
 msgstr ""
 
-#: src/Module/Admin/Site.php:654
+#: src/Module/Admin/Site.php:655
 msgid ""
 "Minimal free memory in MB for the worker. Needs access to /proc/meminfo - "
 "default 0 (deactivated)."
 msgstr ""
 
-#: src/Module/Admin/Site.php:655
+#: src/Module/Admin/Site.php:656
 msgid "Periodically optimize tables"
 msgstr ""
 
-#: src/Module/Admin/Site.php:655
+#: src/Module/Admin/Site.php:656
 msgid "Periodically optimize tables like the cache and the workerqueue"
 msgstr ""
 
-#: src/Module/Admin/Site.php:657
+#: src/Module/Admin/Site.php:658
 msgid "Discover followers/followings from contacts"
 msgstr ""
 
-#: src/Module/Admin/Site.php:657
+#: src/Module/Admin/Site.php:658
 msgid ""
 "If enabled, contacts are checked for their followers and following contacts."
 msgstr ""
 
-#: src/Module/Admin/Site.php:658
+#: src/Module/Admin/Site.php:659
 msgid "None - deactivated"
 msgstr ""
 
-#: src/Module/Admin/Site.php:659
+#: src/Module/Admin/Site.php:660
 msgid ""
 "Local contacts - contacts of our local contacts are discovered for their "
 "followers/followings."
 msgstr ""
 
-#: src/Module/Admin/Site.php:660
+#: src/Module/Admin/Site.php:661
 msgid ""
 "Interactors - contacts of our local contacts and contacts who interacted on "
 "locally visible postings are discovered for their followers/followings."
 msgstr ""
 
-#: src/Module/Admin/Site.php:662
+#: src/Module/Admin/Site.php:663
 msgid "Synchronize the contacts with the directory server"
 msgstr ""
 
-#: src/Module/Admin/Site.php:662
+#: src/Module/Admin/Site.php:663
 msgid ""
 "if enabled, the system will check periodically for new contacts on the "
 "defined directory server."
 msgstr ""
 
-#: src/Module/Admin/Site.php:664
+#: src/Module/Admin/Site.php:665
 msgid "Days between requery"
 msgstr ""
 
-#: src/Module/Admin/Site.php:664
+#: src/Module/Admin/Site.php:665
 msgid "Number of days after which a server is requeried for his contacts."
 msgstr ""
 
-#: src/Module/Admin/Site.php:665
+#: src/Module/Admin/Site.php:666
 msgid "Discover contacts from other servers"
 msgstr ""
 
-#: src/Module/Admin/Site.php:665
+#: src/Module/Admin/Site.php:666
 msgid ""
 "Periodically query other servers for contacts. The system queries Friendica, "
 "Mastodon and Hubzilla servers."
 msgstr ""
 
-#: src/Module/Admin/Site.php:666
+#: src/Module/Admin/Site.php:667
 msgid "Search the local directory"
 msgstr ""
 
-#: src/Module/Admin/Site.php:666
+#: src/Module/Admin/Site.php:667
 msgid ""
 "Search the local directory instead of the global directory. When searching "
 "locally, every search will be executed on the global directory in the "
 "background. This improves the search results when the search is repeated."
 msgstr ""
 
-#: src/Module/Admin/Site.php:668
+#: src/Module/Admin/Site.php:669
 msgid "Publish server information"
 msgstr ""
 
-#: src/Module/Admin/Site.php:668
+#: src/Module/Admin/Site.php:669
 msgid ""
 "If enabled, general server and usage data will be published. The data "
 "contains the name and version of the server, number of users with public "
@@ -6499,50 +6513,50 @@ msgid ""
 "href=\"http://the-federation.info/\">the-federation.info</a> for details."
 msgstr ""
 
-#: src/Module/Admin/Site.php:670
+#: src/Module/Admin/Site.php:671
 msgid "Check upstream version"
 msgstr ""
 
-#: src/Module/Admin/Site.php:670
+#: src/Module/Admin/Site.php:671
 msgid ""
 "Enables checking for new Friendica versions at github. If there is a new "
 "version, you will be informed in the admin panel overview."
 msgstr ""
 
-#: src/Module/Admin/Site.php:671
+#: src/Module/Admin/Site.php:672
 msgid "Suppress Tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:671
+#: src/Module/Admin/Site.php:672
 msgid "Suppress showing a list of hashtags at the end of the posting."
 msgstr ""
 
-#: src/Module/Admin/Site.php:672
+#: src/Module/Admin/Site.php:673
 msgid "Clean database"
 msgstr ""
 
-#: src/Module/Admin/Site.php:672
+#: src/Module/Admin/Site.php:673
 msgid ""
 "Remove old remote items, orphaned database records and old content from some "
 "other helper tables."
 msgstr ""
 
-#: src/Module/Admin/Site.php:673
+#: src/Module/Admin/Site.php:674
 msgid "Lifespan of remote items"
 msgstr ""
 
-#: src/Module/Admin/Site.php:673
+#: src/Module/Admin/Site.php:674
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "remote items will be deleted. Own items, and marked or filed items are "
 "always kept. 0 disables this behaviour."
 msgstr ""
 
-#: src/Module/Admin/Site.php:674
+#: src/Module/Admin/Site.php:675
 msgid "Lifespan of unclaimed items"
 msgstr ""
 
-#: src/Module/Admin/Site.php:674
+#: src/Module/Admin/Site.php:675
 msgid ""
 "When the database cleanup is enabled, this defines the days after which "
 "unclaimed remote items (mostly content from the relay) will be deleted. "
@@ -6550,206 +6564,184 @@ msgid ""
 "items if set to 0."
 msgstr ""
 
-#: src/Module/Admin/Site.php:675
+#: src/Module/Admin/Site.php:676
 msgid "Lifespan of raw conversation data"
 msgstr ""
 
-#: src/Module/Admin/Site.php:675
+#: src/Module/Admin/Site.php:676
 msgid ""
 "The conversation data is used for ActivityPub and OStatus, as well as for "
 "debug purposes. It should be safe to remove it after 14 days, default is 90 "
 "days."
 msgstr ""
 
-#: src/Module/Admin/Site.php:676
+#: src/Module/Admin/Site.php:677
 msgid "Path to item cache"
 msgstr ""
 
-#: src/Module/Admin/Site.php:676
+#: src/Module/Admin/Site.php:677
 msgid "The item caches buffers generated bbcode and external images."
 msgstr ""
 
-#: src/Module/Admin/Site.php:677
+#: src/Module/Admin/Site.php:678
 msgid "Cache duration in seconds"
 msgstr ""
 
-#: src/Module/Admin/Site.php:677
+#: src/Module/Admin/Site.php:678
 msgid ""
 "How long should the cache files be hold? Default value is 86400 seconds (One "
 "day). To disable the item cache, set the value to -1."
 msgstr ""
 
-#: src/Module/Admin/Site.php:678
+#: src/Module/Admin/Site.php:679
 msgid "Maximum numbers of comments per post"
 msgstr ""
 
-#: src/Module/Admin/Site.php:678
+#: src/Module/Admin/Site.php:679
 msgid "How much comments should be shown for each post? Default value is 100."
 msgstr ""
 
-#: src/Module/Admin/Site.php:679
+#: src/Module/Admin/Site.php:680
 msgid "Maximum numbers of comments per post on the display page"
 msgstr ""
 
-#: src/Module/Admin/Site.php:679
+#: src/Module/Admin/Site.php:680
 msgid ""
 "How many comments should be shown on the single view for each post? Default "
 "value is 1000."
 msgstr ""
 
-#: src/Module/Admin/Site.php:680
+#: src/Module/Admin/Site.php:681
 msgid "Temp path"
 msgstr ""
 
-#: src/Module/Admin/Site.php:680
+#: src/Module/Admin/Site.php:681
 msgid ""
 "If you have a restricted system where the webserver can't access the system "
 "temp path, enter another path here."
 msgstr ""
 
-#: src/Module/Admin/Site.php:681
+#: src/Module/Admin/Site.php:682
 msgid "Disable picture proxy"
 msgstr ""
 
-#: src/Module/Admin/Site.php:681
+#: src/Module/Admin/Site.php:682
 msgid ""
 "The picture proxy increases performance and privacy. It shouldn't be used on "
 "systems with very low bandwidth."
 msgstr ""
 
-#: src/Module/Admin/Site.php:682
+#: src/Module/Admin/Site.php:683
 msgid "Only search in tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:682
+#: src/Module/Admin/Site.php:683
 msgid "On large systems the text search can slow down the system extremely."
 msgstr ""
 
-#: src/Module/Admin/Site.php:684
+#: src/Module/Admin/Site.php:685
 msgid "New base url"
 msgstr ""
 
-#: src/Module/Admin/Site.php:684
+#: src/Module/Admin/Site.php:685
 msgid ""
 "Change base url for this server. Sends relocate message to all Friendica and "
 "Diaspora* contacts of all users."
 msgstr ""
 
-#: src/Module/Admin/Site.php:686
+#: src/Module/Admin/Site.php:687
 msgid "RINO Encryption"
 msgstr ""
 
-#: src/Module/Admin/Site.php:686
+#: src/Module/Admin/Site.php:687
 msgid "Encryption layer between nodes."
 msgstr ""
 
-#: src/Module/Admin/Site.php:686 src/Module/Admin/Site.php:694
+#: src/Module/Admin/Site.php:687 src/Module/Admin/Site.php:693
 #: src/Module/Contact.php:562 src/Module/Settings/TwoFactor/Index.php:118
 msgid "Disabled"
 msgstr ""
 
-#: src/Module/Admin/Site.php:686
+#: src/Module/Admin/Site.php:687
 msgid "Enabled"
 msgstr ""
 
-#: src/Module/Admin/Site.php:688
+#: src/Module/Admin/Site.php:689
 msgid "Maximum number of parallel workers"
 msgstr ""
 
-#: src/Module/Admin/Site.php:688
+#: src/Module/Admin/Site.php:689
 #, php-format
 msgid ""
 "On shared hosters set this to %d. On larger systems, values of %d are great. "
 "Default value is %d."
 msgstr ""
 
-#: src/Module/Admin/Site.php:689
+#: src/Module/Admin/Site.php:690
 msgid "Enable fastlane"
 msgstr ""
 
-#: src/Module/Admin/Site.php:689
+#: src/Module/Admin/Site.php:690
 msgid ""
 "When enabed, the fastlane mechanism starts an additional worker if processes "
 "with higher priority are blocked by processes of lower priority."
 msgstr ""
 
-#: src/Module/Admin/Site.php:691
-msgid "Use relay servers"
-msgstr ""
-
-#: src/Module/Admin/Site.php:691
-msgid ""
-"Enables the receiving of public posts from relay servers. They will be "
-"included in the search, subscribed tags and on the global community page."
-msgstr ""
-
 #: src/Module/Admin/Site.php:692
-msgid "\"Social Relay\" server"
-msgstr ""
-
-#: src/Module/Admin/Site.php:692
-#, php-format
-msgid ""
-"Address of the \"Social Relay\" server where public posts should be send to. "
-"For example %s. ActivityRelay servers are administrated via the \"console "
-"relay\" command line command."
-msgstr ""
-
-#: src/Module/Admin/Site.php:693
 msgid "Direct relay transfer"
 msgstr ""
 
-#: src/Module/Admin/Site.php:693
+#: src/Module/Admin/Site.php:692
 msgid ""
 "Enables the direct transfer to other servers without using the relay servers"
 msgstr ""
 
-#: src/Module/Admin/Site.php:694
+#: src/Module/Admin/Site.php:693
 msgid "Relay scope"
 msgstr ""
 
-#: src/Module/Admin/Site.php:694
+#: src/Module/Admin/Site.php:693
 msgid ""
 "Can be \"all\" or \"tags\". \"all\" means that every public post should be "
 "received. \"tags\" means that only posts with selected tags should be "
 "received."
 msgstr ""
 
-#: src/Module/Admin/Site.php:694
+#: src/Module/Admin/Site.php:693
 msgid "all"
 msgstr ""
 
-#: src/Module/Admin/Site.php:694
+#: src/Module/Admin/Site.php:693
 msgid "tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:695
+#: src/Module/Admin/Site.php:694
 msgid "Server tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:695
+#: src/Module/Admin/Site.php:694
 msgid "Comma separated list of tags for the \"tags\" subscription."
 msgstr ""
 
-#: src/Module/Admin/Site.php:696
+#: src/Module/Admin/Site.php:695
 msgid "Deny Server tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:696
+#: src/Module/Admin/Site.php:695
 msgid "Comma separated list of tags that are rejected."
 msgstr ""
 
-#: src/Module/Admin/Site.php:697
+#: src/Module/Admin/Site.php:696
 msgid "Allow user tags"
 msgstr ""
 
-#: src/Module/Admin/Site.php:697
+#: src/Module/Admin/Site.php:696
 msgid ""
 "If enabled, the tags from the saved searches will used for the \"tags\" "
 "subscription in addition to the \"relay_server_tags\"."
 msgstr ""
 
-#: src/Module/Admin/Site.php:700
+#: src/Module/Admin/Site.php:699
 msgid "Start Relocation"
 msgstr ""
 
@@ -8881,15 +8873,15 @@ msgstr ""
 msgid "Show all"
 msgstr ""
 
-#: src/Module/OAuth/Authorize.php:53
+#: src/Module/OAuth/Authorize.php:54
 msgid "Unsupported or missing response type"
 msgstr ""
 
-#: src/Module/OAuth/Authorize.php:58 src/Module/OAuth/Token.php:58
+#: src/Module/OAuth/Authorize.php:59 src/Module/OAuth/Token.php:58
 msgid "Incomplete request data"
 msgstr ""
 
-#: src/Module/OAuth/Authorize.php:108
+#: src/Module/OAuth/Authorize.php:106
 #, php-format
 msgid ""
 "Please copy the following authentication code into your application and "
diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl
index c44553d6df..75d9437d78 100644
--- a/view/templates/admin/site.tpl
+++ b/view/templates/admin/site.tpl
@@ -127,13 +127,22 @@
 		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
 		<h2>{{$relay_title}}</h2>
-		{{include file="field_checkbox.tpl" field=$relay_subscribe}}
-		{{include file="field_input.tpl" field=$relay_server}}
-		{{include file="field_checkbox.tpl" field=$relay_directly}}
+		{{if $relay_list}}
+			<p>{{$relay_list_title}}</p>
+			<ul id="relay-list">
+				{{foreach $relay_list as $relay}}
+				<li>{{$relay.url}}</li>
+				{{/foreach}}
+			</ul>
+		{{else}}
+			<p>{{$no_relay_list}}</p>
+		{{/if}}
+		<p>{{$relay_description}}</p>
 		{{include file="field_select.tpl" field=$relay_scope}}
 		{{include file="field_input.tpl" field=$relay_server_tags}}
 		{{include file="field_input.tpl" field=$relay_deny_tags}}
 		{{include file="field_checkbox.tpl" field=$relay_user_tags}}
+		{{include file="field_checkbox.tpl" field=$relay_directly}}
 
 		<div class="submit"><input type="submit" name="page_site" value="{{$submit}}"/></div>
 
diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl
index 57f43cefbb..69076833dd 100644
--- a/view/theme/frio/templates/admin/site.tpl
+++ b/view/theme/frio/templates/admin/site.tpl
@@ -297,13 +297,22 @@
 				</div>
 				<div id="admin-settings-relay-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="admin-settings-relay">
 					<div class="panel-body">
-						{{include file="field_checkbox.tpl" field=$relay_subscribe}}
-						{{include file="field_input.tpl" field=$relay_server}}
-						{{include file="field_checkbox.tpl" field=$relay_directly}}
+						{{if $relay_list}}
+							<p>{{$relay_list_title}}</p>
+							<ul id="relay-list">
+								{{foreach $relay_list as $relay}}
+								<li>{{$relay.url}}</li>
+								{{/foreach}}
+							</ul>
+						{{else}}
+							<p>{{$no_relay_list}}</p>
+						{{/if}}
+						<p>{{$relay_description}}</p>
 						{{include file="field_select.tpl" field=$relay_scope}}
 						{{include file="field_input.tpl" field=$relay_server_tags}}
 						{{include file="field_input.tpl" field=$relay_deny_tags}}
 						{{include file="field_checkbox.tpl" field=$relay_user_tags}}
+						{{include file="field_checkbox.tpl" field=$relay_directly}}
 					</div>
 					<div class="panel-footer">
 						<input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>

From 84ab5d61594ed92e0e28415d6c33df267a3636c5 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 13 Jun 2021 20:33:50 +0000
Subject: [PATCH 02/14] Updates database structure documentation

---
 doc/database.md                              | 120 +++++++++------
 doc/database/db_2fa_app_specific_password.md |  14 ++
 doc/database/db_2fa_recovery_codes.md        |  12 ++
 doc/database/db_2fa_trusted_browser.md       |  13 ++
 doc/database/db_addon.md                     |  22 ++-
 doc/database/db_apcontact.md                 |  32 ++++
 doc/database/db_application-token.md         |  18 +++
 doc/database/db_application.md               |  19 +++
 doc/database/db_attach.md                    |  37 ++---
 doc/database/db_auth_codes.md                |  19 ++-
 doc/database/db_cache.md                     |  13 +-
 doc/database/db_challenge.md                 |  19 +--
 doc/database/db_clients.md                   |  19 +--
 doc/database/db_config.md                    |  15 +-
 doc/database/db_contact-relation.md          |  13 ++
 doc/database/db_contact.md                   | 152 ++++++++++---------
 doc/database/db_conv.md                      |  23 +--
 doc/database/db_conversation.md              |  22 +--
 doc/database/db_delayed-post.md              |  12 ++
 doc/database/db_diaspora-interaction.md      |  10 ++
 doc/database/db_event.md                     |  44 +++---
 doc/database/db_fcontact.md                  |  41 ++---
 doc/database/db_fsuggest.md                  |  25 +--
 doc/database/db_group.md                     |  15 +-
 doc/database/db_group_member.md              |  14 +-
 doc/database/db_gserver-tag.md               |  10 ++
 doc/database/db_gserver.md                   |  47 +++---
 doc/database/db_hook.md                      |  17 ++-
 doc/database/db_host.md                      |  10 ++
 doc/database/db_inbox-status.md              |  15 ++
 doc/database/db_intro.md                     |  27 ++--
 doc/database/db_item-uri.md                  |  11 ++
 doc/database/db_item.md                      |  72 ---------
 doc/database/db_locks.md                     |  14 +-
 doc/database/db_mail.md                      |  46 +++---
 doc/database/db_mailacct.md                  |  33 ++--
 doc/database/db_manage.md                    |  13 +-
 doc/database/db_notification.md              |  17 +++
 doc/database/db_notify-threads.md            |  18 ++-
 doc/database/db_notify.md                    |  42 ++---
 doc/database/db_oembed.md                    |  15 +-
 doc/database/db_openwebauth-token.md         |  14 ++
 doc/database/db_parsed_url.md                |  19 ++-
 doc/database/db_pconfig.md                   |  19 +--
 doc/database/db_permissionset.md             |  14 ++
 doc/database/db_photo.md                     |  54 ++++---
 doc/database/db_poll.md                      |  19 ---
 doc/database/db_poll_result.md               |  10 --
 doc/database/db_post-category.md             |  12 ++
 doc/database/db_post-content.md              |  25 +++
 doc/database/db_post-delivery-data.md        |  19 +++
 doc/database/db_post-media.md                |  27 ++++
 doc/database/db_post-tag.md                  |  12 ++
 doc/database/db_post-thread-user.md          |  31 ++++
 doc/database/db_post-thread.md               |  17 +++
 doc/database/db_post-user-notification.md    |  11 ++
 doc/database/db_post-user.md                 |  38 +++++
 doc/database/db_post.md                      |  26 ++++
 doc/database/db_process.md                   |  11 ++
 doc/database/db_profile.md                   |  90 +++++------
 doc/database/db_profile_check.md             |  19 +--
 doc/database/db_profile_field.md             |  16 ++
 doc/database/db_push_subscriber.md           |  20 ++-
 doc/database/db_queue.md                     |  14 --
 doc/database/db_register.md                  |  20 +--
 doc/database/db_search.md                    |  13 +-
 doc/database/db_session.md                   |  15 +-
 doc/database/db_sign.md                      |  12 --
 doc/database/db_storage.md                   |  10 ++
 doc/database/db_tag.md                       |  11 ++
 doc/database/db_term.md                      |  19 ---
 doc/database/db_thread.md                    |  33 ----
 doc/database/db_tokens.md                    |  19 +--
 doc/database/db_user-contact.md              |  13 ++
 doc/database/db_user.md                      | 122 ++++++---------
 doc/database/db_userd.md                     |   9 +-
 doc/database/db_verb.md                      |  10 ++
 doc/database/db_worker-ipc.md                |  10 ++
 doc/database/db_workerqueue.md               |  24 +--
 src/Console/DatabaseStructure.php            |   1 +
 src/Database/DBStructure.php                 |  36 +++++
 view/templates/structure.tpl                 |  11 ++
 view/templates/tables.tpl                    |  10 ++
 83 files changed, 1289 insertions(+), 796 deletions(-)
 create mode 100644 doc/database/db_2fa_app_specific_password.md
 create mode 100644 doc/database/db_2fa_recovery_codes.md
 create mode 100644 doc/database/db_2fa_trusted_browser.md
 create mode 100644 doc/database/db_apcontact.md
 create mode 100644 doc/database/db_application-token.md
 create mode 100644 doc/database/db_application.md
 create mode 100644 doc/database/db_contact-relation.md
 create mode 100644 doc/database/db_delayed-post.md
 create mode 100644 doc/database/db_diaspora-interaction.md
 create mode 100644 doc/database/db_gserver-tag.md
 create mode 100644 doc/database/db_host.md
 create mode 100644 doc/database/db_inbox-status.md
 create mode 100644 doc/database/db_item-uri.md
 delete mode 100644 doc/database/db_item.md
 create mode 100644 doc/database/db_notification.md
 create mode 100644 doc/database/db_openwebauth-token.md
 create mode 100644 doc/database/db_permissionset.md
 delete mode 100644 doc/database/db_poll.md
 delete mode 100644 doc/database/db_poll_result.md
 create mode 100644 doc/database/db_post-category.md
 create mode 100644 doc/database/db_post-content.md
 create mode 100644 doc/database/db_post-delivery-data.md
 create mode 100644 doc/database/db_post-media.md
 create mode 100644 doc/database/db_post-tag.md
 create mode 100644 doc/database/db_post-thread-user.md
 create mode 100644 doc/database/db_post-thread.md
 create mode 100644 doc/database/db_post-user-notification.md
 create mode 100644 doc/database/db_post-user.md
 create mode 100644 doc/database/db_post.md
 create mode 100644 doc/database/db_process.md
 create mode 100644 doc/database/db_profile_field.md
 delete mode 100644 doc/database/db_queue.md
 delete mode 100644 doc/database/db_sign.md
 create mode 100644 doc/database/db_storage.md
 create mode 100644 doc/database/db_tag.md
 delete mode 100644 doc/database/db_term.md
 delete mode 100644 doc/database/db_thread.md
 create mode 100644 doc/database/db_user-contact.md
 create mode 100644 doc/database/db_verb.md
 create mode 100644 doc/database/db_worker-ipc.md
 create mode 100644 view/templates/structure.tpl
 create mode 100644 view/templates/tables.tpl

diff --git a/doc/database.md b/doc/database.md
index 447607f8da..4e22add378 100644
--- a/doc/database.md
+++ b/doc/database.md
@@ -3,50 +3,76 @@ Database Tables
 
 * [Home](help)
 
-| Table                                                | Description                                      |
-|------------------------------------------------------|--------------------------------------------------|
-| [addon](help/database/db_addon)                      | registered addons                               |
-| [attach](help/database/db_attach)                    | file attachments                                 |
-| [auth_codes](help/database/db_auth_codes)            | OAuth usage                                      |
-| [cache](help/database/db_cache)                      | OEmbed cache                                     |
-| [challenge](help/database/db_challenge)              |                                                  |
-| [clients](help/database/db_clients)                  | OAuth usage                                      |
-| [config](help/database/db_config)                    | main configuration storage                       |
-| [contact](help/database/db_contact)                  | contact table                                    |
-| [conv](help/database/db_conv)                        | private messages                                 |
-| [conversation](help/database/db_conversation)        | Raw data and structure information for messages  |
-| [event](help/database/db_event)                      | Events                                           |
-| [fcontact](help/database/db_fcontact)                | friend suggestion stuff                          |
-| [fsuggest](help/database/db_fsuggest)                | friend suggestion stuff                          |
-| [group](help/database/db_group)                      | privacy groups, group info                       |
-| [group_member](help/database/db_group_member)        | privacy groups, member info                      |
-| [gserver](help/database/db_gserver)                  |                                                  |
-| [hook](help/database/db_hook)                        | addon hook registry                             |
-| [intro](help/database/db_intro)                      |                                                  |
-| [item](help/database/db_item)                        | all posts                                        |
-| [locks](help/database/db_locks)                      |                                                  |
-| [mail](help/database/db_mail)                        | private messages                                 |
-| [mailacct](help/database/db_mailacct)                |                                                  |
-| [manage](help/database/db_manage)                    | table of accounts that can "su" each other       |
-| [notify](help/database/db_notify)                    | notifications                                    |
-| [notify-threads](help/database/db_notify-threads)    |                                                  |
-| [oembed](help/database/db_oembed)                    | cache for OEmbed queries                         |
-| [parsed_url](help/database/db_parsed_url)            | cache for "parse_url" queries                    |
-| [pconfig](help/database/db_pconfig)                  | personal (per user) configuration storage        |
-| [photo](help/database/db_photo)                      | photo storage                                    |
-| [poll](help/database/db_poll)                        | data for polls                                   |
-| [poll_result](help/database/db_poll_result)          | data for poll elements                           |
-| [profile](help/database/db_profile)                  | user profiles data                               |
-| [profile_check](help/database/db_profile_check)      | DFRN remote auth use                             |
-| [push_subscriber](help/database/db_push_subscriber)  |                                                  |
-| [queue](help/database/db_queue)                      |                                                  |
-| [register](help/database/db_register)                | registrations requiring admin approval           |
-| [search](help/database/db_search)                    |                                                  |
-| [session](help/database/db_session)                  | web session storage                              |
-| [sign](help/database/db_sign)                        | Diaspora signatures                              |
-| [term](help/database/db_term)                        | item taxonomy (categories, tags, etc.) table     |
-| [thread](help/database/db_thread)                    |                                                  |
-| [tokens](help/database/db_tokens)                    | OAuth usage                                      |
-| [user](help/database/db_user)                        | local user table                                 |
-| [userd](help/database/db_userd)                      |                                                  |
-| [workerqueue](help/database/db_workerqueue)          |                                                  |
+| Table | Description |
+|-------|-------------|
+| [gserver](help/database/db_gserver) | Global servers |
+| [user](help/database/db_user) | The local users |
+| [contact](help/database/db_contact) | contact table |
+| [item-uri](help/database/db_item-uri) | URI and GUID for items |
+| [tag](help/database/db_tag) | tags and mentions |
+| [clients](help/database/db_clients) | OAuth usage |
+| [permissionset](help/database/db_permissionset) |  |
+| [verb](help/database/db_verb) | Activity Verbs |
+| [2fa_app_specific_password](help/database/db_2fa_app_specific_password) | Two-factor app-specific _password |
+| [2fa_recovery_codes](help/database/db_2fa_recovery_codes) | Two-factor authentication recovery codes |
+| [2fa_trusted_browser](help/database/db_2fa_trusted_browser) | Two-factor authentication trusted browsers |
+| [addon](help/database/db_addon) | registered addons |
+| [apcontact](help/database/db_apcontact) | ActivityPub compatible contacts - used in the ActivityPub implementation |
+| [application](help/database/db_application) | OAuth application |
+| [application-token](help/database/db_application-token) | OAuth user token |
+| [attach](help/database/db_attach) | file attachments |
+| [auth_codes](help/database/db_auth_codes) | OAuth usage |
+| [cache](help/database/db_cache) | Stores temporary data |
+| [challenge](help/database/db_challenge) |  |
+| [config](help/database/db_config) | main configuration storage |
+| [contact-relation](help/database/db_contact-relation) | Contact relations |
+| [conv](help/database/db_conv) | private messages |
+| [conversation](help/database/db_conversation) | Raw data and structure information for messages |
+| [delayed-post](help/database/db_delayed-post) | Posts that are about to be distributed at a later time |
+| [diaspora-interaction](help/database/db_diaspora-interaction) | Signed Diaspora Interaction |
+| [event](help/database/db_event) | Events |
+| [fcontact](help/database/db_fcontact) | Diaspora compatible contacts - used in the Diaspora implementation |
+| [fsuggest](help/database/db_fsuggest) | friend suggestion stuff |
+| [group](help/database/db_group) | privacy groups, group info |
+| [group_member](help/database/db_group_member) | privacy groups, member info |
+| [gserver-tag](help/database/db_gserver-tag) | Tags that the server has subscribed |
+| [hook](help/database/db_hook) | addon hook registry |
+| [host](help/database/db_host) | Hostname |
+| [inbox-status](help/database/db_inbox-status) | Status of ActivityPub inboxes |
+| [intro](help/database/db_intro) |  |
+| [locks](help/database/db_locks) |  |
+| [mail](help/database/db_mail) | private messages |
+| [mailacct](help/database/db_mailacct) | Mail account data for fetching mails |
+| [manage](help/database/db_manage) | table of accounts that can manage each other |
+| [notification](help/database/db_notification) | notifications |
+| [notify](help/database/db_notify) | notifications |
+| [notify-threads](help/database/db_notify-threads) |  |
+| [oembed](help/database/db_oembed) | cache for OEmbed queries |
+| [openwebauth-token](help/database/db_openwebauth-token) | Store OpenWebAuth token to verify contacts |
+| [parsed_url](help/database/db_parsed_url) | cache for &#039;parse_url&#039; queries |
+| [pconfig](help/database/db_pconfig) | personal (per user) configuration storage |
+| [photo](help/database/db_photo) | photo storage |
+| [post](help/database/db_post) | Structure for all posts |
+| [post-category](help/database/db_post-category) | post relation to categories |
+| [post-content](help/database/db_post-content) | Content for all posts |
+| [post-delivery-data](help/database/db_post-delivery-data) | Delivery data for items |
+| [post-media](help/database/db_post-media) | Attached media |
+| [post-tag](help/database/db_post-tag) | post relation to tags |
+| [post-thread](help/database/db_post-thread) | Thread related data |
+| [post-user](help/database/db_post-user) | User specific post data |
+| [post-thread-user](help/database/db_post-thread-user) | Thread related data per user |
+| [post-user-notification](help/database/db_post-user-notification) | User post notifications |
+| [process](help/database/db_process) | Currently running system processes |
+| [profile](help/database/db_profile) | user profiles data |
+| [profile_check](help/database/db_profile_check) | DFRN remote auth use |
+| [profile_field](help/database/db_profile_field) | Custom profile fields |
+| [push_subscriber](help/database/db_push_subscriber) | Used for OStatus: Contains feed subscribers |
+| [register](help/database/db_register) | registrations requiring admin approval |
+| [search](help/database/db_search) |  |
+| [session](help/database/db_session) | web session storage |
+| [storage](help/database/db_storage) | Data stored by Database storage backend |
+| [tokens](help/database/db_tokens) | OAuth usage |
+| [userd](help/database/db_userd) | Deleted usernames |
+| [user-contact](help/database/db_user-contact) | User specific public contact data |
+| [worker-ipc](help/database/db_worker-ipc) | Inter process communication between the frontend and the worker |
+| [workerqueue](help/database/db_workerqueue) | Background tasks queue entries |
diff --git a/doc/database/db_2fa_app_specific_password.md b/doc/database/db_2fa_app_specific_password.md
new file mode 100644
index 0000000000..9e3680b768
--- /dev/null
+++ b/doc/database/db_2fa_app_specific_password.md
@@ -0,0 +1,14 @@
+Table 2fa_app_specific_password
+===========
+Two-factor app-specific _password
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | Password ID for revocation | mediumint unsigned | YES | PRI |  | auto_increment |    
+| uid | User ID | mediumint unsigned | YES |  |  |  |    
+| description | Description of the usage of the password | varchar(255) | NO |  |  |  |    
+| hashed_password | Hashed password | varchar(255) | YES |  |  |  |    
+| generated | Datetime the password was generated | datetime | YES |  |  |  |    
+| last_used | Datetime the password was last used | datetime | NO |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_2fa_recovery_codes.md b/doc/database/db_2fa_recovery_codes.md
new file mode 100644
index 0000000000..7b3b9d649c
--- /dev/null
+++ b/doc/database/db_2fa_recovery_codes.md
@@ -0,0 +1,12 @@
+Table 2fa_recovery_codes
+===========
+Two-factor authentication recovery codes
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| uid | User ID | mediumint unsigned | YES | PRI |  |  |    
+| code | Recovery code string | varchar(50) | YES | PRI |  |  |    
+| generated | Datetime the code was generated | datetime | YES |  |  |  |    
+| used | Datetime the code was used | datetime | NO |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_2fa_trusted_browser.md b/doc/database/db_2fa_trusted_browser.md
new file mode 100644
index 0000000000..29be4646a7
--- /dev/null
+++ b/doc/database/db_2fa_trusted_browser.md
@@ -0,0 +1,13 @@
+Table 2fa_trusted_browser
+===========
+Two-factor authentication trusted browsers
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| cookie_hash | Trusted cookie hash | varchar(80) | YES | PRI |  |  |    
+| uid | User ID | mediumint unsigned | YES |  |  |  |    
+| user_agent | User agent string | text | NO |  |  |  |    
+| created | Datetime the trusted browser was recorded | datetime | YES |  |  |  |    
+| last_used | Datetime the trusted browser was last used | datetime | NO |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_addon.md b/doc/database/db_addon.md
index cd8a3d44a6..db3a5d44bb 100644
--- a/doc/database/db_addon.md
+++ b/doc/database/db_addon.md
@@ -1,17 +1,15 @@
 Table addon
 ===========
+registered addons
 
-| Field         | Description                                   | Type       | Null | Key | Default | Extra           |
-| ------------- | --------------------------------------------- | ---------- | ---- | --- | ------- | --------------- |
-| id            |                                               | int(11)    | NO   | PRI | NULL    | auto_increment  |
-| name          | addon base (file)name                        | char(255)  | NO   |     |         |                 |
-| version       | currently unused                              | char(255)  | NO   |     |         |                 |
-| installed     | currently always 1                            | tinyint(1) | NO   |     | 0       |                 |
-| hidden        | currently unused                              | tinyint(1) | NO   |     | 0       |                 |
-| timestamp     | file timestamp to check for reloads           | bigint(20) | NO   |     | 0       |                 |
-| plugin_admin  | 1 = has admin config, 0 = has no admin config | tinyint(1) | NO   |     | 0       |                 |
-
-Notes:
-These are addons which have been enabled by the site administrator on the addon page
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id |  | int unsigned | YES | PRI |  | auto_increment |    
+| name | addon base (file)name | varchar(50) | YES |  |  |  |    
+| version | currently unused | varchar(50) | YES |  |  |  |    
+| installed | currently always 1 | boolean | YES |  | 0 |  |    
+| hidden | currently unused | boolean | YES |  | 0 |  |    
+| timestamp | file timestamp to check for reloads | int unsigned | YES |  | 0 |  |    
+| plugin_admin | 1 = has admin config, 0 = has no admin config | boolean | YES |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_apcontact.md b/doc/database/db_apcontact.md
new file mode 100644
index 0000000000..bea394bc22
--- /dev/null
+++ b/doc/database/db_apcontact.md
@@ -0,0 +1,32 @@
+Table apcontact
+===========
+ActivityPub compatible contacts - used in the ActivityPub implementation
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| url | URL of the contact | varbinary(255) | YES | PRI |  |  |    
+| uuid |  | varchar(255) | NO |  |  |  |    
+| type |  | varchar(20) | YES |  |  |  |    
+| following |  | varchar(255) | NO |  |  |  |    
+| followers |  | varchar(255) | NO |  |  |  |    
+| inbox |  | varchar(255) | YES |  |  |  |    
+| outbox |  | varchar(255) | NO |  |  |  |    
+| sharedinbox |  | varchar(255) | NO |  |  |  |    
+| manually-approve |  | boolean | NO |  |  |  |    
+| nick |  | varchar(255) | YES |  |  |  |    
+| name |  | varchar(255) | NO |  |  |  |    
+| about |  | text | NO |  |  |  |    
+| photo |  | varchar(255) | NO |  |  |  |    
+| addr |  | varchar(255) | NO |  |  |  |    
+| alias |  | varchar(255) | NO |  |  |  |    
+| pubkey |  | text | NO |  |  |  |    
+| subscribe |  | varchar(255) | NO |  |  |  |    
+| baseurl | baseurl of the ap contact | varchar(255) | NO |  |  |  |    
+| gsid | Global Server ID | int unsigned | NO |  |  |  |    
+| generator | Name of the contact&#039;s system | varchar(255) | NO |  |  |  |    
+| following_count | Number of following contacts | int unsigned | NO |  | 0 |  |    
+| followers_count | Number of followers | int unsigned | NO |  | 0 |  |    
+| statuses_count | Number of posts | int unsigned | NO |  | 0 |  |    
+| updated |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_application-token.md b/doc/database/db_application-token.md
new file mode 100644
index 0000000000..8b3d601ff7
--- /dev/null
+++ b/doc/database/db_application-token.md
@@ -0,0 +1,18 @@
+Table application-token
+===========
+OAuth user token
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| application-id |  | int unsigned | YES | PRI |  |  |    
+| uid | Owner User id | mediumint unsigned | YES | PRI |  |  |    
+| code |  | varchar(64) | YES |  |  |  |    
+| access_token |  | varchar(64) | YES |  |  |  |    
+| created_at | creation time | datetime | YES |  |  |  |    
+| scopes |  | varchar(255) | NO |  |  |  |    
+| read | Read scope | boolean | NO |  |  |  |    
+| write | Write scope | boolean | NO |  |  |  |    
+| follow | Follow scope | boolean | NO |  |  |  |    
+| push | Push scope | boolean | NO |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_application.md b/doc/database/db_application.md
new file mode 100644
index 0000000000..26b9232660
--- /dev/null
+++ b/doc/database/db_application.md
@@ -0,0 +1,19 @@
+Table application
+===========
+OAuth application
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | generated index | int unsigned | YES | PRI |  | auto_increment |    
+| client_id |  | varchar(64) | YES |  |  |  |    
+| client_secret |  | varchar(64) | YES |  |  |  |    
+| name |  | varchar(255) | YES |  |  |  |    
+| redirect_uri |  | varchar(255) | YES |  |  |  |    
+| website |  | varchar(255) | NO |  |  |  |    
+| scopes |  | varchar(255) | NO |  |  |  |    
+| read | Read scope | boolean | NO |  |  |  |    
+| write | Write scope | boolean | NO |  |  |  |    
+| follow | Follow scope | boolean | NO |  |  |  |    
+| push | Push scope | boolean | NO |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_attach.md b/doc/database/db_attach.md
index 7dde8f860d..e35003c368 100644
--- a/doc/database/db_attach.md
+++ b/doc/database/db_attach.md
@@ -1,22 +1,23 @@
 Table attach
-============
+===========
+file attachments
 
-| Field      | Description                                           | Type         | Null | Key | Default             | Extra           |
-| ---------- | ------------------------------------------------------| ------------ | ---- | --- | ------------------- | --------------- |
-| id         | generated index                                       | int(11)      | NO   | PRI | NULL                | auto_increment  |
-| uid        | user_id of owner                                      | int(11)      | NO   |     | 0                   |                 |
-| hash       | hash                                                  | varchar(64)  | NO   |     |                     |                 |
-| filename   | filename of original                                  | varchar(255) | NO   |     |                     |                 |
-| filetype   | mimetype                                              | varchar(64)  | NO   |     |                     |                 |
-| filesize   | size in bytes                                         | int(11)      | NO   |     | 0                   |                 |
-| data       | file data                                             | longblob     | NO   |     | NULL                |                 |
-| created    | creation time                                         | datetime     | NO   |     | 0001-01-01 00:00:00 |                 |
-| edited     | last edit time                                        | datetime     | NO   |     | 0001-01-01 00:00:00 |                 |
-| allow_cid  | Access Control - list of allowed contact.id '<19><78> | mediumtext   | NO   |     | NULL                |                 |
-| allow_gid  | Access Control - list of allowed groups               | mediumtext   | NO   |     | NULL                |                 |
-| deny_cid   | Access Control - list of denied contact.id            | mediumtext   | NO   |     | NULL                |                 |
-| deny_gid   | Access Control - list of denied groups                | mediumtext   | NO   |     | NULL                |                 |
-
-Notes: Permissions are surrounded by angle chars. e.g. <4>
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | generated index | int unsigned | YES | PRI |  | auto_increment |    
+| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
+| hash | hash | varchar(64) | YES |  |  |  |    
+| filename | filename of original | varchar(255) | YES |  |  |  |    
+| filetype | mimetype | varchar(64) | YES |  |  |  |    
+| filesize | size in bytes | int unsigned | YES |  | 0 |  |    
+| data | file data | longblob | YES |  |  |  |    
+| created | creation time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| edited | last edit time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt; | mediumtext | NO |  |  |  |    
+| allow_gid | Access Control - list of allowed groups | mediumtext | NO |  |  |  |    
+| deny_cid | Access Control - list of denied contact.id | mediumtext | NO |  |  |  |    
+| deny_gid | Access Control - list of denied groups | mediumtext | NO |  |  |  |    
+| backend-class | Storage backend class | tinytext | NO |  |  |  |    
+| backend-ref | Storage backend data reference | text | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_auth_codes.md b/doc/database/db_auth_codes.md
index 1fec38500d..6a33a30a14 100644
--- a/doc/database/db_auth_codes.md
+++ b/doc/database/db_auth_codes.md
@@ -1,14 +1,13 @@
 Table auth_codes
-================
+===========
+OAuth usage
 
-OAuth2 authorisation register - currently implemented but unused
-
-| Field         | Description | Type         | Null | Key | Default | Extra |
-| ------------- | ----------- | ------------ | ---- | --- | ------- | ----- |
-| id            |             | varchar(40)  | NO   | PRI | NULL    |       |
-| client_id     |             | varchar(20)  | NO   |     |         |       |
-| redirect_uri  |             | varchar(200) | NO   |     |         |       |
-| expires       |             | int(11)      | NO   |     | 0       |       |
-| scope         |             | varchar(250) | NO   |     |         |       |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id |  | varchar(40) | YES | PRI |  |  |    
+| client_id |  | varchar(20) | YES |  |  |  |    
+| redirect_uri |  | varchar(200) | YES |  |  |  |    
+| expires |  | int | YES |  | 0 |  |    
+| scope |  | varchar(250) | YES |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_cache.md b/doc/database/db_cache.md
index f5691d08a6..328f485e05 100644
--- a/doc/database/db_cache.md
+++ b/doc/database/db_cache.md
@@ -1,13 +1,12 @@
 Table cache
 ===========
-
 Stores temporary data
 
-| Field        | Description                        | Type         | Null | Key | Default             | Extra |
-| ------------ | ---------------------------------- | ------------ | ---- | --- | ------------------- | ----- |
-| k            | cache key                          | varchar(255) | NO   | PRI | NULL                |       |
-| v            | cached serialized value            | text         | NO   |     | NULL                |       |
-| expires      | datetime of cache expiration       | datetime     | NO   | MUL | 0001-01-01 00:00:00 |       |
-| updated      | datetime of cache insertion        | datetime     | NO   | MUL | 0001-01-01 00:00:00 |       |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| k | cache key | varbinary(255) | YES | PRI |  |  |    
+| v | cached serialized value | mediumtext | NO |  |  |  |    
+| expires | datetime of cache expiration | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| updated | datetime of cache insertion | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_challenge.md b/doc/database/db_challenge.md
index aa7b263fdf..59534ba137 100644
--- a/doc/database/db_challenge.md
+++ b/doc/database/db_challenge.md
@@ -1,13 +1,14 @@
 Table challenge
-===============
+===========
 
-| Field       | Description      | Type             | Null | Key | Default | Extra          |
-|-------------|------------------|------------------|------|-----|---------|----------------|
-| id          | sequential ID    | int(10) unsigned | NO   | PRI | NULL    | auto_increment |
-| challenge   |                  | varchar(255)     | NO   |     |         |                |
-| dfrn-id     |                  | varchar(255)     | NO   |     |         |                |
-| expire      |                  | int(11)          | NO   |     | 0       |                |
-| type        |                  | varchar(255)     | NO   |     |         |                |
-| last_update |                  | varchar(255)     | NO   |     |         |                |
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| challenge |  | varchar(255) | YES |  |  |  |    
+| dfrn-id |  | varchar(255) | YES |  |  |  |    
+| expire |  | int unsigned | YES |  | 0 |  |    
+| type |  | varchar(255) | YES |  |  |  |    
+| last_update |  | varchar(255) | YES |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_clients.md b/doc/database/db_clients.md
index 228b45cc21..89025d428b 100644
--- a/doc/database/db_clients.md
+++ b/doc/database/db_clients.md
@@ -1,13 +1,14 @@
 Table clients
-=============
+===========
+OAuth usage
 
-| Field         | Description | Type         | Null | Key | Default | Extra |
-| ------------- | ----------- | ------------ | ---- | --- | ------- | ----- |
-| client_id     |             | varchar(20)  | NO   | PRI | NULL    |       |
-| pw            |             | varchar(20)  | NO   |     |         |       |
-| redirect_uri  |             | varchar(200) | NO   |     |         |       |
-| name          |             | text         | YES  |     | NULL    |       |
-| icon          |             | text         | YES  |     | NULL    |       |
-| uid           |             | int(11)      | NO   |     | 0       |       |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| client_id |  | varchar(20) | YES | PRI |  |  |    
+| pw |  | varchar(20) | YES |  |  |  |    
+| redirect_uri |  | varchar(200) | YES |  |  |  |    
+| name |  | text | NO |  |  |  |    
+| icon |  | text | NO |  |  |  |    
+| uid | User id | mediumint unsigned | YES |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_config.md b/doc/database/db_config.md
index 6bcb4bcf89..994b1a8713 100644
--- a/doc/database/db_config.md
+++ b/doc/database/db_config.md
@@ -1,11 +1,12 @@
 Table config
-============
+===========
+main configuration storage
 
-| Field | Description | Type             | Null | Key | Default | Extra           |
-| ----- | ----------- | ---------------- | ---- | --- | ------- | --------------- |
-| id    |             | int(10) unsigned | NO   | PRI | NULL    | auto_increment  |
-| cat   |             | char(255)        | NO   | MUL |         |                 |
-| k     |             | char(255)        | NO   |     |         |                 |
-| v     |             | text             | NO   |     | NULL    |                 |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id |  | int unsigned | YES | PRI |  | auto_increment |    
+| cat |  | varbinary(50) | YES |  |  |  |    
+| k |  | varbinary(50) | YES |  |  |  |    
+| v |  | mediumtext | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_contact-relation.md b/doc/database/db_contact-relation.md
new file mode 100644
index 0000000000..5077cd753f
--- /dev/null
+++ b/doc/database/db_contact-relation.md
@@ -0,0 +1,13 @@
+Table contact-relation
+===========
+Contact relations
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| cid | contact the related contact had interacted with | int unsigned | YES | PRI | 0 |  |    
+| relation-cid | related contact who had interacted with the contact | int unsigned | YES | PRI | 0 |  |    
+| last-interaction | Date of the last interaction | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| follow-updated | Date of the last update of the contact relationship | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| follows |  | boolean | YES |  | 0 |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_contact.md b/doc/database/db_contact.md
index 2963a1a2a4..108157fc09 100644
--- a/doc/database/db_contact.md
+++ b/doc/database/db_contact.md
@@ -1,72 +1,88 @@
 Table contact
-=============
+===========
+contact table
 
-| Field                     | Description                                               | Type         | Null | Key | Default             | Extra          |
-|---------------------------|-----------------------------------------------------------|--------------|------|-----|---------------------|----------------|
-| id                        | sequential ID                                             | int(11)      | NO   | PRI | NULL                | auto_increment |
-| uid                       | user.id of the owner of this data                         | int(11)      | NO   | MUL | 0                   |                |
-| created                   |                                                           | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
-| self                      | 1 if the contact is the user him/her self                 | tinyint(1)   | NO   |     | 0                   |                |
-| remote_self               |                                                           | tinyint(1)   | NO   |     | 0                   |                |
-| rel                       | The kind of the relation between the user and the contact | tinyint(1)   | NO   |     | 0                   |                |
-| duplex                    |                                                           | tinyint(1)   | NO   |     | 0                   |                |
-| network                   | Network protocol of the contact                           | varchar(255) | NO   |     |                     |                |
-| name                      | Name that this contact is known by                        | varchar(255) | NO   |     |                     |                |
-| nick                      | Nick- and user name of the contact                        | varchar(255) | NO   |     |                     |                |
-| location                  |                                                           | varchar(255) | NO   |     |                     |                |
-| about                     |                                                           | text         | NO   |     | NULL                |                |
-| keywords                  | public keywords (interests) of the contact                | text         | NO   |     | NULL                |                |
-| gender                    |                                                           | varchar(32)  | NO   |     |                     |                |
-| attag                     |                                                           | varchar(255) | NO   |     |                     |                |
-| photo                     | Link to the profile photo of the contact                  | text         | NO   |     | NULL                |                |
-| thumb                     | Link to the profile photo (thumb size)                    | text         | NO   |     | NULL                |                |
-| micro                     | Link to the profile photo (micro size)                    | text         | NO   |     | NULL                |                |
-| site-pubkey               |                                                           | text         | NO   |     | NULL                |                |
-| issued-id                 |                                                           | varchar(255) | NO   |     |                     |                |
-| dfrn-id                   |                                                           | varchar(255) | NO   |     |                     |                |
-| url                       |                                                           | varchar(255) | NO   |     |                     |                |
-| nurl                      |                                                           | varchar(255) | NO   |     |                     |                |
-| addr                      |                                                           | varchar(255) | NO   |     |                     |                |
-| alias                     |                                                           | varchar(255) | NO   |     |                     |                |
-| pubkey                    | RSA public key 4096 bit                                   | text         | NO   |     | NULL                |                |
-| prvkey                    | RSA private key 4096 bit                                  | text         | NO   |     | NULL                |                |
-| batch                     |                                                           | varchar(255) | NO   |     |                     |                |
-| request                   |                                                           | text         | NO   |     | NULL                |                |
-| notify                    |                                                           | text         | NO   |     | NULL                |                |
-| poll                      |                                                           | text         | NO   |     | NULL                |                |
-| confirm                   |                                                           | text         | NO   |     | NULL                |                |
-| poco                      |                                                           | text         | NO   |     | NULL                |                |
-| aes_allow                 |                                                           | tinyint(1)   | NO   |     | 0                   |                |
-| ret-aes                   |                                                           | tinyint(1)   | NO   |     | 0                   |                |
-| usehub                    |                                                           | tinyint(1)   | NO   |     | 0                   |                |
-| subhub                    |                                                           | tinyint(1)   | NO   |     | 0                   |                |
-| hub-verify                |                                                           | varchar(255) | NO   |     |                     |                |
-| last-update               | Date of the last try to update the contact info           | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
-| success_update            | Date of the last successful contact update                | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
-| failure_update            | Date of the last failed update                            | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
-| name-date                 |                                                           | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
-| uri-date                  |                                                           | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
-| avatar-date               |                                                           | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
-| term-date                 |                                                           | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
-| last-item                 | date of the last post                                     | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
-| priority                  |                                                           | tinyint(3)   | NO   |     | 0                   |                |
-| blocked                   |                                                           | tinyint(1)   | NO   |     | 1                   |                |
-| readonly                  | posts of the contact are readonly                         | tinyint(1)   | NO   |     | 0                   |                |
-| writable                  |                                                           | tinyint(1)   | NO   |     | 0                   |                |
-| forum                     | contact is a forum                                        | tinyint(1)   | NO   |     | 0                   |                |
-| prv                       | contact is a private group                                | tinyint(1)   | NO   |     | 0                   |                |
-| hidden                    |                                                           | tinyint(1)   | NO   |     | 0                   |                |
-| archive                   |                                                           | tinyint(1)   | NO   |     | 0                   |                |
-| pending                   |                                                           | tinyint(1)   | NO   |     | 1                   |                |
-| rating                    |                                                           | tinyint(1)   | NO   |     | 0                   |                |
-| reason                    |                                                           | text         | NO   |     | NULL                |                |
-| closeness                 |                                                           | tinyint(2)   | NO   |     | 99                  |                |
-| info                      |                                                           | mediumtext   | NO   |     | NULL                |                |
-| profile-id                |                                                           | int(11)      | NO   |     | 0                   |                |
-| bdyear                    |                                                           | varchar(4)   | NO   |     |                     |                |
-| bd                        |                                                           | date         | NO   |     | 0001-01-01          |                |
-| notify_new_posts          |                                                           | tinyint(1)   | NO   |     | 0                   |                |
-| fetch_further_information |                                                           | tinyint(1)   | NO   |     | 0                   |                |
-| ffi_keyword_denylist     |                                                            | mediumtext   | NO   |     | NULL                |                |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
+| created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| updated | Date of last contact update | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| self | 1 if the contact is the user him/her self | boolean | YES |  | 0 |  |    
+| remote_self |  | boolean | YES |  | 0 |  |    
+| rel | The kind of the relation between the user and the contact | tinyint unsigned | YES |  | 0 |  |    
+| duplex |  | boolean | YES |  | 0 |  |    
+| network | Network of the contact | char(4) | YES |  |  |  |    
+| protocol | Protocol of the contact | char(4) | YES |  |  |  |    
+| name | Name that this contact is known by | varchar(255) | YES |  |  |  |    
+| nick | Nick- and user name of the contact | varchar(255) | YES |  |  |  |    
+| location |  | varchar(255) | NO |  |  |  |    
+| about |  | text | NO |  |  |  |    
+| keywords | public keywords (interests) of the contact | text | NO |  |  |  |    
+| gender | Deprecated | varchar(32) | YES |  |  |  |    
+| xmpp |  | varchar(255) | YES |  |  |  |    
+| attag |  | varchar(255) | YES |  |  |  |    
+| avatar |  | varchar(255) | YES |  |  |  |    
+| photo | Link to the profile photo of the contact | varchar(255) | NO |  |  |  |    
+| thumb | Link to the profile photo (thumb size) | varchar(255) | NO |  |  |  |    
+| micro | Link to the profile photo (micro size) | varchar(255) | NO |  |  |  |    
+| site-pubkey |  | text | NO |  |  |  |    
+| issued-id |  | varchar(255) | YES |  |  |  |    
+| dfrn-id |  | varchar(255) | YES |  |  |  |    
+| url |  | varchar(255) | YES |  |  |  |    
+| nurl |  | varchar(255) | YES |  |  |  |    
+| addr |  | varchar(255) | YES |  |  |  |    
+| alias |  | varchar(255) | YES |  |  |  |    
+| pubkey | RSA public key 4096 bit | text | NO |  |  |  |    
+| prvkey | RSA private key 4096 bit | text | NO |  |  |  |    
+| batch |  | varchar(255) | YES |  |  |  |    
+| request |  | varchar(255) | NO |  |  |  |    
+| notify |  | varchar(255) | NO |  |  |  |    
+| poll |  | varchar(255) | NO |  |  |  |    
+| confirm |  | varchar(255) | NO |  |  |  |    
+| subscribe |  | varchar(255) | NO |  |  |  |    
+| poco |  | varchar(255) | NO |  |  |  |    
+| aes_allow |  | boolean | YES |  | 0 |  |    
+| ret-aes |  | boolean | YES |  | 0 |  |    
+| usehub |  | boolean | YES |  | 0 |  |    
+| subhub |  | boolean | YES |  | 0 |  |    
+| hub-verify |  | varchar(255) | YES |  |  |  |    
+| last-update | Date of the last try to update the contact info | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| success_update | Date of the last successful contact update | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| failure_update | Date of the last failed update | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| failed | Connection failed | boolean | NO |  |  |  |    
+| name-date |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| uri-date |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| avatar-date |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| term-date |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| last-item | date of the last post | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| last-discovery | date of the last follower discovery | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| priority |  | tinyint unsigned | YES |  | 0 |  |    
+| blocked | Node-wide block status | boolean | YES |  | 1 |  |    
+| block_reason | Node-wide block reason | text | NO |  |  |  |    
+| readonly | posts of the contact are readonly | boolean | YES |  | 0 |  |    
+| writable |  | boolean | YES |  | 0 |  |    
+| forum | contact is a forum | boolean | YES |  | 0 |  |    
+| prv | contact is a private group | boolean | YES |  | 0 |  |    
+| contact-type |  | tinyint | YES |  | 0 |  |    
+| manually-approve |  | boolean | NO |  |  |  |    
+| hidden |  | boolean | YES |  | 0 |  |    
+| archive |  | boolean | YES |  | 0 |  |    
+| pending |  | boolean | YES |  | 1 |  |    
+| deleted | Contact has been deleted | boolean | YES |  | 0 |  |    
+| rating |  | tinyint | YES |  | 0 |  |    
+| unsearchable | Contact prefers to not be searchable | boolean | YES |  | 0 |  |    
+| sensitive | Contact posts sensitive content | boolean | YES |  | 0 |  |    
+| baseurl | baseurl of the contact | varchar(255) | NO |  |  |  |    
+| gsid | Global Server ID | int unsigned | NO |  |  |  |    
+| reason |  | text | NO |  |  |  |    
+| closeness |  | tinyint unsigned | YES |  | 99 |  |    
+| info |  | mediumtext | NO |  |  |  |    
+| profile-id | Deprecated | int unsigned | NO |  |  |  |    
+| bdyear |  | varchar(4) | YES |  |  |  |    
+| bd |  | date | YES |  | 0001-01-01 |  |    
+| notify_new_posts |  | boolean | YES |  | 0 |  |    
+| fetch_further_information |  | tinyint unsigned | YES |  | 0 |  |    
+| ffi_keyword_denylist |  | text | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_conv.md b/doc/database/db_conv.md
index f70191b88e..bcea6012d6 100644
--- a/doc/database/db_conv.md
+++ b/doc/database/db_conv.md
@@ -1,15 +1,16 @@
 Table conv
-==========
+===========
+private messages
 
-| Field   | Description                               | Type             | Null | Key | Default             | Extra           |
-| ------- | ----------------------------------------- | ---------------- | ---- | --- | ------------------- | --------------- |
-| id      | sequential ID                             | int(10) unsigned | NO   | PRI | NULL                | auto_increment  |
-| guid    | A unique identifier for this conversation | varchar(64)      | NO   |     |                     |                 |
-| recips  | sender_handle;recipient_handle            | mediumtext       | NO   |     | NULL                |                 |
-| uid     | user_id of the owner of this data         | int(11)          | NO   | MUL | 0                   |                 |
-| creator | handle of creator                         | varchar(255)     | NO   |     |                     |                 |
-| created | creation timestamp                        | datetime         | NO   |     | 0001-01-01 00:00:00 |                 |
-| updated | edited timestamp                          | datetime         | NO   |     | 0001-01-01 00:00:00 |                 |
-| subject | subject of initial message                | mediumtext       | NO   |     | NULL                |                 |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| guid | A unique identifier for this conversation | varchar(255) | YES |  |  |  |    
+| recips | sender_handle;recipient_handle | text | NO |  |  |  |    
+| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
+| creator | handle of creator | varchar(255) | YES |  |  |  |    
+| created | creation timestamp | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| updated | edited timestamp | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| subject | subject of initial message | text | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_conversation.md b/doc/database/db_conversation.md
index 32d030cb15..e9ce966905 100644
--- a/doc/database/db_conversation.md
+++ b/doc/database/db_conversation.md
@@ -1,14 +1,16 @@
 Table conversation
-==================
+===========
+Raw data and structure information for messages
 
-| Field             | Description                        | Type                | Null | Key | Default             | Extra          |
-|-------------------| ---------------------------------- |---------------------|------|-----|---------------------|----------------|
-| item-uri          | URI of the item                    | varbinary(255)      | NO   | PRI | NULL                |                |
-| reply-to-uri      | URI to which this item is a reply  | varbinary(255)      | NO   |     |                     |                |
-| conversation-uri  | GNU Social conversation URI        | varbinary(255)      | NO   |     |                     |                |
-| conversation-href | GNU Social conversation link       | varbinary(255)      | NO   |     |                     |                |
-| protocol          | The protocol of the item           | tinyint(1) unsigned | NO   |     | 0                   |                |
-| source            | Original source                    | mediumtext          | NO   |     |                     |                |
-| received          | Receiving date                     | datetime            | NO   |     | 0001-01-01          |                |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| item-uri | Original URI of the item - unrelated to the table with the same name | varbinary(255) | YES | PRI |  |  |    
+| reply-to-uri | URI to which this item is a reply | varbinary(255) | YES |  |  |  |    
+| conversation-uri | GNU Social conversation URI | varbinary(255) | YES |  |  |  |    
+| conversation-href | GNU Social conversation link | varbinary(255) | YES |  |  |  |    
+| protocol | The protocol of the item | tinyint unsigned | YES |  | 255 |  |    
+| direction | How the message arrived here: 1=push, 2=pull | tinyint unsigned | YES |  | 0 |  |    
+| source | Original source | mediumtext | NO |  |  |  |    
+| received | Receiving date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_delayed-post.md b/doc/database/db_delayed-post.md
new file mode 100644
index 0000000000..3f83f49c24
--- /dev/null
+++ b/doc/database/db_delayed-post.md
@@ -0,0 +1,12 @@
+Table delayed-post
+===========
+Posts that are about to be distributed at a later time
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id |  | int unsigned | YES | PRI |  | auto_increment |    
+| uri | URI of the post that will be distributed later | varchar(255) | NO |  |  |  |    
+| uid | Owner User id | mediumint unsigned | NO |  |  |  |    
+| delayed | delay time | datetime | NO |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_diaspora-interaction.md b/doc/database/db_diaspora-interaction.md
new file mode 100644
index 0000000000..f2906e9d27
--- /dev/null
+++ b/doc/database/db_diaspora-interaction.md
@@ -0,0 +1,10 @@
+Table diaspora-interaction
+===========
+Signed Diaspora Interaction
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
+| interaction | The Diaspora interaction | mediumtext | NO |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_event.md b/doc/database/db_event.md
index 2c0650a8d8..9c46939f3c 100644
--- a/doc/database/db_event.md
+++ b/doc/database/db_event.md
@@ -1,26 +1,28 @@
 Table event
 ===========
+Events
 
-| Field      | Description                                            | Type                | Null | Key | Default             | Extra           |
-| ---------- | ----------------------------------------------- -------| ------------------- | ---- | --- | ------------------- | --------------- |
-| id         | sequential ID                                          | int(11)             | NO   | PRI | NULL                | auto_increment  |
-| uid        | user_id of the owner of this data                      | int(11)             | NO   | MUL | 0                   |                 |
-| cid        | contact_id (ID of the contact in contact table)        | int(11)             | NO   |     | 0                   |                 |
-| uri        |                                                        | varchar(255)        | NO   |     |                     |                 |
-| created    |  creation time                                         | datetime            | NO   |     | 0001-01-01 00:00:00 |                 |
-| edited     | last edit time                                         | datetime            | NO   |     | 0001-01-01 00:00:00 |                 |
-| start      | event start time                                       | datetime            | NO   |     | 0001-01-01 00:00:00 |                 |
-| finish     | event end time                                         | datetime            | NO   |     | 0001-01-01 00:00:00 |                 |
-| summary    |  short description or title of the event               | text                | NO   |     | NULL                |                 |
-| desc       | event description                                      | text                | NO   |     | NULL                |                 |
-| location   | event location                                         | text                | NO   |     | NULL                |                 |
-| type       | event or birthday                                      | varchar(255)        | NO   |     |                     |                 |
-| nofinish   | if event does have no end this is 1                    | tinyint(1)          | NO   |     | 0                   |                 |
-| adjust     | adjust to timezone of the recipient (0 or 1)           | tinyint(1)          | NO   |     | 1                   |                 |
-| ignore     | 0 or 1                                                 | tinyint(1) unsigned | NO   |     | 0                   |                 |
-| allow_cid  | Access Control - list of allowed contact.id '<19><78>' | mediumtext          | NO   |     | NULL                |                 |
-| allow_gid  | Access Control - list of allowed groups                | mediumtext          | NO   |     | NULL                |                 |
-| deny_cid   | Access Control - list of denied contact.id             | mediumtext          | NO   |     | NULL                |                 |
-| deny_gid   | Access Control - list of denied groups                 | mediumtext          | NO   |     | NULL                |                 |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| guid |  | varchar(255) | YES |  |  |  |    
+| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
+| cid | contact_id (ID of the contact in contact table) | int unsigned | YES |  | 0 |  |    
+| uri |  | varchar(255) | YES |  |  |  |    
+| created | creation time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| edited | last edit time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| start | event start time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| finish | event end time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| summary | short description or title of the event | text | NO |  |  |  |    
+| desc | event description | text | NO |  |  |  |    
+| location | event location | text | NO |  |  |  |    
+| type | event or birthday | varchar(20) | YES |  |  |  |    
+| nofinish | if event does have no end this is 1 | boolean | YES |  | 0 |  |    
+| adjust | adjust to timezone of the recipient (0 or 1) | boolean | YES |  | 1 |  |    
+| ignore | 0 or 1 | boolean | YES |  | 0 |  |    
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | NO |  |  |  |    
+| allow_gid | Access Control - list of allowed groups | mediumtext | NO |  |  |  |    
+| deny_cid | Access Control - list of denied contact.id | mediumtext | NO |  |  |  |    
+| deny_gid | Access Control - list of denied groups | mediumtext | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_fcontact.md b/doc/database/db_fcontact.md
index d9a786acc9..ed468633d0 100644
--- a/doc/database/db_fcontact.md
+++ b/doc/database/db_fcontact.md
@@ -1,24 +1,25 @@
 Table fcontact
-==============
+===========
+Diaspora compatible contacts - used in the Diaspora implementation
 
-| Field    | Description   | Type             | Null | Key | Default             | Extra           |
-| -------- | ------------- | ---------------- | ---- | --- | ------------------- | --------------- |
-| id       | sequential ID | int(10) unsigned | NO   | PRI | NULL                | auto_increment  |
-| guid     | unique id     | varchar(64)      | NO   |     |                     |                 |
-| url      |               | varchar(255)     | NO   |     |                     |                 |
-| name     |               | varchar(255)     | NO   |     |                     |                 |
-| photo    |               | varchar(255)     | NO   |     |                     |                 |
-| request  |               | varchar(255)     | NO   |     |                     |                 |
-| nick     |               | varchar(255)     | NO   |     |                     |                 |
-| addr     |               | varchar(255)     | NO   | MUL |                     |                 |
-| batch    |               | varchar(255)     | NO   |     |                     |                 |
-| notify   |               | varchar(255)     | NO   |     |                     |                 |
-| poll     |               | varchar(255)     | NO   |     |                     |                 |
-| confirm  |               | varchar(255)     | NO   |     |                     |                 |
-| priority |               | tinyint(1)       | NO   |     | 0                   |                 |
-| network  |               | varchar(32)      | NO   |     |                     |                 |
-| alias    |               | varchar(255)     | NO   |     |                     |                 |
-| pubkey   |               | text             | NO   |     | NULL                |                 |
-| updated  |               | datetime         | NO   |     | 0001-01-01 00:00:00 |                 |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| guid | unique id | varchar(255) | YES |  |  |  |    
+| url |  | varchar(255) | YES |  |  |  |    
+| name |  | varchar(255) | YES |  |  |  |    
+| photo |  | varchar(255) | YES |  |  |  |    
+| request |  | varchar(255) | YES |  |  |  |    
+| nick |  | varchar(255) | YES |  |  |  |    
+| addr |  | varchar(255) | YES |  |  |  |    
+| batch |  | varchar(255) | YES |  |  |  |    
+| notify |  | varchar(255) | YES |  |  |  |    
+| poll |  | varchar(255) | YES |  |  |  |    
+| confirm |  | varchar(255) | YES |  |  |  |    
+| priority |  | tinyint unsigned | YES |  | 0 |  |    
+| network |  | char(4) | YES |  |  |  |    
+| alias |  | varchar(255) | YES |  |  |  |    
+| pubkey |  | text | NO |  |  |  |    
+| updated |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_fsuggest.md b/doc/database/db_fsuggest.md
index e461895c80..66865b5063 100644
--- a/doc/database/db_fsuggest.md
+++ b/doc/database/db_fsuggest.md
@@ -1,16 +1,17 @@
 Table fsuggest
-==============
+===========
+friend suggestion stuff
 
-| Field   | Description | Type         | Null | Key | Default             | Extra           |
-| ------- | ----------- | ------------ | ---- | --- | ------------------- | --------------- |
-| id      |             | int(11)      | NO   | PRI | NULL                | auto_increment  |
-| uid     |             | int(11)      | NO   |     | 0                   |                 |
-| cid     |             | int(11)      | NO   |     | 0                   |                 |
-| name    |             | varchar(255) | NO   |     |                     |                 |
-| url     |             | varchar(255) | NO   |     |                     |                 |
-| request |             | varchar(255) | NO   |     |                     |                 |
-| photo   |             | varchar(255) | NO   |     |                     |                 |
-| note    |             | text         | NO   |     | NULL                |                 |
-| created |             | datetime     | NO   |     | 0001-01-01 00:00:00 |                 |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id |  | int unsigned | YES | PRI |  | auto_increment |    
+| uid | User id | mediumint unsigned | YES |  | 0 |  |    
+| cid |  | int unsigned | YES |  | 0 |  |    
+| name |  | varchar(255) | YES |  |  |  |    
+| url |  | varchar(255) | YES |  |  |  |    
+| request |  | varchar(255) | YES |  |  |  |    
+| photo |  | varchar(255) | YES |  |  |  |    
+| note |  | text | NO |  |  |  |    
+| created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_group.md b/doc/database/db_group.md
index f27b9a75f7..f4f60436cd 100644
--- a/doc/database/db_group.md
+++ b/doc/database/db_group.md
@@ -1,12 +1,13 @@
 Table group
 ===========
+privacy groups, group info
 
-| Field   | Description                                | Type             | Null | Key | Default | Extra           |
-| ------- | ------------------------------------------ | ---------------- | ---- | --- | ------- | --------------- |
-| id      | sequential ID                              | int(10) unsigned | NO   | PRI | NULL    | auto_increment  |
-| uid     | user.id owning this data                   | int(10) unsigned | NO   | MUL | 0       |                 |
-| visible | 1 indicates the member list is not private | tinyint(1)       | NO   |     | 0       |                 |
-| deleted | 1 indicates the group has been deleted     | tinyint(1)       | NO   |     | 0       |                 |
-| name    | human readable name of group               | varchar(255)     | NO   |     |         |                 |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
+| visible | 1 indicates the member list is not private | boolean | YES |  | 0 |  |    
+| deleted | 1 indicates the group has been deleted | boolean | YES |  | 0 |  |    
+| name | human readable name of group | varchar(255) | YES |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_group_member.md b/doc/database/db_group_member.md
index f8a402ef6e..a4ecfdf7db 100644
--- a/doc/database/db_group_member.md
+++ b/doc/database/db_group_member.md
@@ -1,11 +1,11 @@
 Table group_member
-==================
+===========
+privacy groups, member info
 
-| Field      | Description                                                 | Type             | Null | Key | Default | Extra           |
-| ---------- | ----------------------------------------------------------- | ---------------- | ---- | --- | ------- | --------------- |
-| id         | sequential ID                                               | int(10) unsigned | NO   | PRI | NULL    | auto_increment  |
-| uid        | user.id of the owner of this data                           | int(10) unsigned | NO   | MUL | 0       |                 |
-| gid        | groups.id of the associated group                           | int(10) unsigned | NO   |     | 0       |                 |
-| contact-id | contact.id  of the member assigned to the associated group  | int(10) unsigned | NO   |     | 0       |                 |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| gid | groups.id of the associated group | int unsigned | YES |  | 0 |  |    
+| contact-id | contact.id of the member assigned to the associated group | int unsigned | YES |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_gserver-tag.md b/doc/database/db_gserver-tag.md
new file mode 100644
index 0000000000..96a5f02f49
--- /dev/null
+++ b/doc/database/db_gserver-tag.md
@@ -0,0 +1,10 @@
+Table gserver-tag
+===========
+Tags that the server has subscribed
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| gserver-id | The id of the gserver | int unsigned | YES | PRI | 0 |  |    
+| tag | Tag that the server has subscribed | varchar(100) | YES | PRI |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_gserver.md b/doc/database/db_gserver.md
index d9ec69a53c..919363def7 100644
--- a/doc/database/db_gserver.md
+++ b/doc/database/db_gserver.md
@@ -1,24 +1,31 @@
 Table gserver
-=============
-
-| Field            | Description               | Type             | Null | Key | Default             | Extra          |
-|------------------|---------------------------|------------------|------|-----|---------------------|----------------|
-| id               | sequential ID             | int(10) unsigned | NO   | PRI | NULL                | auto_increment |
-| url              |                           | varchar(255)     | NO   |     |                     |                |
-| nurl             |                           | varchar(255)     | NO   | MUL |                     |                |
-| version          |                           | varchar(255)     | NO   |     |                     |                |
-| site_name        |                           | varchar(255)     | NO   |     |                     |                |
-| info             |                           | text             | NO   |     | NULL                |                |
-| register_policy  |                           | tinyint(1)       | NO   |     | 0                   |                |
-| registered-users |Number of registered users | int(10)          | NO   |     | 0                   |                |
-| poco             |                           | varchar(255)     | NO   |     |                     |                |
-| noscrape         |                           | varchar(255)     | NO   |     |                     |                |
-| network          |                           | varchar(32)      | NO   |     |                     |                |
-| platform         |                           | varchar(255)     | NO   |     |                     |                |
-| created          |                           | datetime         | NO   |     | 0001-01-01 00:00:00 |                |
-| last_poco_query  |                           | datetime         | YES  |     | 0001-01-01 00:00:00 |                |
-| last_contact     |                           | datetime         | YES  |     | 0001-01-01 00:00:00 |                |
-| last_failure     |                           | datetime         | YES  |     | 0001-01-01 00:00:00 |                |
+===========
+Global servers
 
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| url |  | varchar(255) | YES |  |  |  |    
+| nurl |  | varchar(255) | YES |  |  |  |    
+| version |  | varchar(255) | YES |  |  |  |    
+| site_name |  | varchar(255) | YES |  |  |  |    
+| info |  | text | NO |  |  |  |    
+| register_policy |  | tinyint | YES |  | 0 |  |    
+| registered-users | Number of registered users | int unsigned | YES |  | 0 |  |    
+| directory-type | Type of directory service (Poco, Mastodon) | tinyint | NO |  | 0 |  |    
+| poco |  | varchar(255) | YES |  |  |  |    
+| noscrape |  | varchar(255) | YES |  |  |  |    
+| network |  | char(4) | YES |  |  |  |    
+| protocol | The protocol of the server | tinyint unsigned | NO |  |  |  |    
+| platform |  | varchar(255) | YES |  |  |  |    
+| relay-subscribe | Has the server subscribed to the relay system | boolean | YES |  | 0 |  |    
+| relay-scope | The scope of messages that the server wants to get | varchar(10) | YES |  |  |  |    
+| detection-method | Method that had been used to detect that server | tinyint unsigned | NO |  |  |  |    
+| created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| last_poco_query |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| last_contact | Last successful connection request | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| last_failure | Last failed connection request | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| failed | Connection failed | boolean | NO |  |  |  |    
+| next_contact | Next connection request | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_hook.md b/doc/database/db_hook.md
index 06eb84a182..71be258f3d 100644
--- a/doc/database/db_hook.md
+++ b/doc/database/db_hook.md
@@ -1,12 +1,13 @@
 Table hook
-==========
+===========
+addon hook registry
 
-| Field    | Description                                                                                                | Type             | Null | Key | Default | Extra           |
-| -------- | ---------------------------------------------------------------------------------------------------------- | ---------------- | ---- | --- | ------- | --------------- |
-| id       | sequential ID                                                                                              | int(11)          | NO   | PRI | NULL    | auto_increment  |
-| hook     | name of hook                                                                                               | varchar(255)     | NO   | MUL |         |                 |
-| file     | relative filename of hook handler                                                                          | varchar(255)     | NO   |     |         |                 |
-| function | function name of hook handler                                                                              | varchar(255)     | NO   |     |         |                 |
-| priority | not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order | int(11) unsigned | NO   |     | 0       |                 |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| hook | name of hook | varbinary(100) | YES |  |  |  |    
+| file | relative filename of hook handler | varbinary(200) | YES |  |  |  |    
+| function | function name of hook handler | varbinary(200) | YES |  |  |  |    
+| priority | not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order | smallint unsigned | YES |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_host.md b/doc/database/db_host.md
new file mode 100644
index 0000000000..0ce2932286
--- /dev/null
+++ b/doc/database/db_host.md
@@ -0,0 +1,10 @@
+Table host
+===========
+Hostname
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | tinyint unsigned | YES | PRI |  | auto_increment |    
+| name | The hostname | varchar(128) | YES |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_inbox-status.md b/doc/database/db_inbox-status.md
new file mode 100644
index 0000000000..93e99dc5d4
--- /dev/null
+++ b/doc/database/db_inbox-status.md
@@ -0,0 +1,15 @@
+Table inbox-status
+===========
+Status of ActivityPub inboxes
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| url | URL of the inbox | varbinary(255) | YES | PRI |  |  |    
+| created | Creation date of this entry | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| success | Date of the last successful delivery | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| failure | Date of the last failed delivery | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| previous | Previous delivery date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| archive | Is the inbox archived? | boolean | YES |  | 0 |  |    
+| shared | Is it a shared inbox? | boolean | YES |  | 0 |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_intro.md b/doc/database/db_intro.md
index a71154a4f9..a05494de5c 100644
--- a/doc/database/db_intro.md
+++ b/doc/database/db_intro.md
@@ -1,18 +1,19 @@
 Table intro
 ===========
 
-| Field      | Description      | Type             | Null | Key | Default             | Extra          |
-|------------|------------------|------------------|------|-----|---------------------|----------------|
-| id         | sequential ID    | int(10) unsigned | NO   | PRI | NULL                | auto_increment |
-| uid        |                  | int(10) unsigned | NO   |     | 0                   |                |
-| fid        |                  | int(11)          | NO   |     | 0                   |                |
-| contact-id |                  | int(11)          | NO   |     | 0                   |                |
-| knowyou    |                  | tinyint(1)       | NO   |     | 0                   |                |
-| duplex     |                  | tinyint(1)       | NO   |     | 0                   |                |
-| note       |                  | text             | NO   |     | NULL                |                |
-| hash       |                  | varchar(255)     | NO   |     |                     |                |
-| datetime   |                  | datetime         | NO   |     | 0001-01-01 00:00:00 |                |
-| blocked    |                  | tinyint(1)       | NO   |     | 1                   |                |
-| ignore     |                  | tinyint(1)       | NO   |     | 0                   |                |
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| uid | User id | mediumint unsigned | YES |  | 0 |  |    
+| fid |  | int unsigned | NO |  |  |  |    
+| contact-id |  | int unsigned | YES |  | 0 |  |    
+| knowyou |  | boolean | YES |  | 0 |  |    
+| duplex |  | boolean | YES |  | 0 |  |    
+| note |  | text | NO |  |  |  |    
+| hash |  | varchar(255) | YES |  |  |  |    
+| datetime |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| blocked |  | boolean | YES |  | 1 |  |    
+| ignore |  | boolean | YES |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_item-uri.md b/doc/database/db_item-uri.md
new file mode 100644
index 0000000000..5f1d447147
--- /dev/null
+++ b/doc/database/db_item-uri.md
@@ -0,0 +1,11 @@
+Table item-uri
+===========
+URI and GUID for items
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id |  | int unsigned | YES | PRI |  | auto_increment |    
+| uri | URI of an item | varbinary(255) | YES |  |  |  |    
+| guid | A unique identifier for an item | varbinary(255) | NO |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_item.md b/doc/database/db_item.md
deleted file mode 100644
index d24d92bad8..0000000000
--- a/doc/database/db_item.md
+++ /dev/null
@@ -1,72 +0,0 @@
-Table item
-==========
-
-| Field         | Description                                                                                                                                                | Type                | Null | Key | Default             | Extra          |
-|---------------|------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------|------|-----|---------------------|----------------|
-| id            | sequential ID                                                                                                                                              | int(10) unsigned    | NO   | PRI | NULL                | auto_increment |
-| guid          | A unique identifier for this item                                                                                                                          | varchar(255)        | NO   | MUL |                     |                |
-| uri           |                                                                                                                                                            | varchar(255)        | NO   | MUL |                     |                |
-| uid           | user.id which owns this copy of the item                                                                                                                   | int(10) unsigned    | NO   | MUL | 0                   |                |
-| contact-id    | contact.id                                                                                                                                                 | int(11)             | NO   | MUL | 0                   |                |
-| gcontact-id   | ID of the global contact                                                                                                                                   | int(11)             | NO   | MUL | 0                   |                |
-| type          |                                                                                                                                                            | varchar(255)        | NO   |     |                     |                |
-| wall          | This item was posted to the wall of uid                                                                                                                    | tinyint(1)          | NO   | MUL | 0                   |                |
-| gravity       |                                                                                                                                                            | tinyint(1)          | NO   |     | 0                   |                |
-| parent        | item.id of the parent to this item if it is a reply of some form; otherwise this must be set to the id of this item                                        | int(10) unsigned    | NO   | MUL | 0                   |                |
-| parent-uri    | uri of the parent to this item                                                                                                                             | varchar(255)        | NO   | MUL |                     |                |
-| extid         |                                                                                                                                                            | varchar(255         | NO   | MUL |                     |                |
-| thr-parent    | If the parent of this item is not the top-level item in the conversation, the uri of the immediate parent; otherwise set to parent-uri                     | varchar(255)        | NO   |     |                     |                |
-| created       | Creation timestamp.                                                                                                                                        | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
-| edited        | Date of  last edit (default is created)                                                                                                                    | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
-| commented     | Date of last comment/reply to this item                                                                                                                    | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
-| received      | datetime                                                                                                                                                   | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
-| changed       | Date that something in the conversation changed, indicating clients should fetch the conversation again                                                    | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
-| owner-name    | Name of the owner of this item                                                                                                                             | varchar(255)        | NO   |     |                     |                |
-| owner-link    | Link to the profile page of the owner of this item                                                                                                         | varchar(255)        | NO   |     |                     |                |
-| owner-avatar  | Link to the avatar picture of the owner of this item                                                                                                       | varchar(255)        | NO   |     |                     |                |
-| owner-id      | Link to the contact table with uid=0 of the owner of this item                                                                                             | int(11)             | NO   | MUL | 0                   |                |
-| author-name   | Name of the author of this item                                                                                                                            | varchar(255)        | NO   |     |                     |                |
-| author-link   | Link to the profile page of the author of this item                                                                                                        | varchar(255)        | NO   |     |                     |                |
-| author-avatar | Link to the avatar picture of the author of this item                                                                                                      | varchar(255)        | NO   |     |                     |                |
-| author-id     | Link to the contact table with uid=0 of the author of this item                                                                                            | int(11)             | NO   | MUL | 0                   |                |
-| title         | item title                                                                                                                                                 | varchar(255)        | NO   |     |                     |                |
-| body          | item body content                                                                                                                                          | mediumtext          | NO   |     | NULL                |                |
-| app           | application which generated this item                                                                                                                      | varchar(255)        | NO   |     |                     |                |
-| verb          | ActivityStreams verb                                                                                                                                       | varchar(255)        | NO   |     |                     |                |
-| object-type   | ActivityStreams object type                                                                                                                                | varchar(255)        | NO   |     |                     |                |
-| object        | JSON encoded object structure unless it is an implied object (normal post)                                                                                 | text                | NO   |     | NULL                |                |
-| target-type   | ActivityStreams target type if applicable (URI)                                                                                                            | varchar(255)        | NO   |     |                     |                |
-| target        | JSON encoded target structure if used                                                                                                                      | text                | NO   |     | NULL                |                |
-| postopts      | External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery | text                | NO   |     | NULL                |                |
-| plink         | permalink or URL toa displayable copy  of the message at its source                                                                                        | varchar(255)        | NO   |     |                     |                |
-| resource-id   | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type                                  | varchar(255)        | NO   | MUL |                     |                |
-| event-id      | Used to link to the event.id                                                                                                                               | int(11)             | NO   |     | 0                   |                |
-| tag           |                                                                                                                                                            | mediumtext          | NO   |     | NULL                |                |
-| attach        | JSON structure representing attachments to this item                                                                                                       | mediumtext          | NO   |     | NULL                |                |
-| inform        |                                                                                                                                                            | mediumtext          | NO   |     | NULL                |                |
-| file          |                                                                                                                                                            | mediumtext          | NO   |     | NULL                |                |
-| location      | text location where this item originated                                                                                                                   | varchar(255)        | NO   |     |                     |                |
-| coord         | longitude/latitude pair representing location where this item originated                                                                                   | varchar(255)        | NO   |     |                     |                |
-| allow_cid     | Access Control - list of allowed contact.id '<19><78>'                                                                                                     | mediumtext          | NO   |     | NULL                |                |
-| allow_gid     | Access Control - list of allowed groups                                                                                                                    | mediumtext          | NO   |     | NULL                |                |
-| deny_cid      | Access Control - list of denied contact.id                                                                                                                 | mediumtext          | NO   |     | NULL                |                |
-| deny_gid      | Access Control - list of denied groups                                                                                                                     | mediumtext          | NO   |     | NULL                |                |
-| private       | distribution is restricted                                                                                                                                 | tinyint(1)          | NO   |     | 0                   |                |
-| pubmail       |                                                                                                                                                            | tinyint(1)          | NO   |     | 0                   |                |
-| moderated     |                                                                                                                                                            | tinyint(1)          | NO   |     | 0                   |                |
-| visible       |                                                                                                                                                            | tinyint(1)          | NO   |     | 0                   |                |
-| spam          |                                                                                                                                                            | tinyint(1)          | NO   |     | 0                   |                |
-| starred       | item has been favourited                                                                                                                                   | tinyint(1)          | NO   |     | 0                   |                |
-| bookmark      | item has been bookmarked                                                                                                                                   | tinyint(1)          | NO   |     | 0                   |                |
-| unseen        | item has not been seen                                                                                                                                     | tinyint(1)          | NO   |     | 1                   |                |
-| deleted       | item has been deleted                                                                                                                                      | tinyint(1)          | NO   | MUL | 0                   |                |
-| origin        | item originated at this site                                                                                                                               | tinyint(1)          | NO   |     | 0                   |                |
-| forum_mode    |                                                                                                                                                            | tinyint(1)          | NO   |     | 0                   |                |
-| last-child    |                                                                                                                                                            | tinyint(1) unsigned | NO   |     | 1                   |                |
-| mention       | The owner of this item was mentioned in it                                                                                                                 | tinyint(1)          | NO   |     | 0                   |                |
-| network       | Network from where the item comes from                                                                                                                     | varchar(32)         | NO   |     |                     |                |
-| rendered-hash |                                                                                                                                                            | varchar(32)         | NO   |     |                     |                |
-| rendered-html | item.body converted to html                                                                                                                                | mediumtext          | NO   |     | NULL                |                |
-| global        |                                                                                                                                                            | tinyint(1)          | NO   |     | 0                   |                |
-
-Return to [database documentation](help/database)
diff --git a/doc/database/db_locks.md b/doc/database/db_locks.md
index 4de6fbf961..3c219c2cc5 100644
--- a/doc/database/db_locks.md
+++ b/doc/database/db_locks.md
@@ -1,11 +1,13 @@
 Table locks
 ===========
 
-| Field   | Description      | Type             | Null | Key | Default             | Extra          |
-|---------|------------------|------------------|------|-----|---------------------|----------------|
-| id      | sequential ID    | int(11)          | NO   | PRI | NULL                | auto_increment |
-| name    |                  | varchar(128)     | NO   |     |                     |                |
-| locked  |                  | tinyint(1)       | NO   |     | 0                   |                |
-| pid     | Process ID       | int(10) unsigned | NO   |     | 0                   |                |
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| name |  | varchar(128) | YES |  |  |  |    
+| locked |  | boolean | YES |  | 0 |  |    
+| pid | Process ID | int unsigned | YES |  | 0 |  |    
+| expires | datetime of cache expiration | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_mail.md b/doc/database/db_mail.md
index 623b8c9c85..43c9baf33c 100644
--- a/doc/database/db_mail.md
+++ b/doc/database/db_mail.md
@@ -1,24 +1,30 @@
 Table mail
-==========
+===========
+private messages
 
-| Field      | Description                                  | Type             | Null | Key | Default             | Extra           |
-| ---------- | -------------------------------------------- | ---------------- | ---- | --- | ------------------- | --------------- |
-| id         | sequential ID                                | int(10) unsigned | NO   | PRI | NULL                | auto_increment  |
-| uid        | user.id of the owner of this data            | int(10) unsigned | NO   | MUL | 0                   |                 |
-| guid       | A unique identifier for this private message | int(10) unsigned | NO   | MUL |                     |                 |
-| from-name  | name of the sender                           | varchar(255)     | NO   |     |                     |                 |
-| from-photo | contact photo link of the sender             | varchar(255)     | NO   |     |                     |                 |
-| from-url   | profile linke of the sender                  | varchar(255)     | NO   |     |                     |                 |
-| contact-id | contact.id                                   | varchar(255)     | NO   |     |                     |                 |
-| convid     | conv.id                                      | int(11) unsigned | NO   | MUL | 0                   |                 |
-| title      |                                              | varchar(255)     | NO   |     |                     |                 |
-| body       |                                              | mediumtext       | NO   |     | NULL                |                 |
-| seen       | if message visited it is 1                   | varchar(255)     | NO   |     | 0                   |                 |
-| reply      |                                              | varchar(255)     | NO   | MUL | 0                   |                 |
-| replied    |                                              | varchar(255)     | NO   |     | 0                   |                 |
-| unknown    | if sender not in the contact table this is 1 | varchar(255)     | NO   |     | 0                   |                 |
-| uri        |                                              | varchar(255)     | NO   | MUL |                     |                 |
-| parent-uri |                                              | varchar(255)     | NO   | MUL |                     |                 |
-| created    | creation time of the private message         | datetime         | NO   |     | 0001-01-01 00:00:00 |                 |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
+| guid | A unique identifier for this private message | varchar(255) | YES |  |  |  |    
+| from-name | name of the sender | varchar(255) | YES |  |  |  |    
+| from-photo | contact photo link of the sender | varchar(255) | YES |  |  |  |    
+| from-url | profile linke of the sender | varchar(255) | YES |  |  |  |    
+| contact-id | contact.id | varchar(255) | NO |  |  |  |    
+| author-id | Link to the contact table with uid=0 of the author of the mail | int unsigned | NO |  |  |  |    
+| convid | conv.id | int unsigned | NO |  |  |  |    
+| title |  | varchar(255) | YES |  |  |  |    
+| body |  | mediumtext | NO |  |  |  |    
+| seen | if message visited it is 1 | boolean | YES |  | 0 |  |    
+| reply |  | boolean | YES |  | 0 |  |    
+| replied |  | boolean | YES |  | 0 |  |    
+| unknown | if sender not in the contact table this is 1 | boolean | YES |  | 0 |  |    
+| uri |  | varchar(255) | YES |  |  |  |    
+| uri-id | Item-uri id of the related mail | int unsigned | NO |  |  |  |    
+| parent-uri |  | varchar(255) | YES |  |  |  |    
+| parent-uri-id | Item-uri id of the parent of the related mail | int unsigned | NO |  |  |  |    
+| thr-parent |  | varchar(255) | NO |  |  |  |    
+| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | NO |  |  |  |    
+| created | creation time of the private message | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_mailacct.md b/doc/database/db_mailacct.md
index 9f6484f818..2c2b4e7af4 100644
--- a/doc/database/db_mailacct.md
+++ b/doc/database/db_mailacct.md
@@ -1,20 +1,21 @@
 Table mailacct
-==============
+===========
+Mail account data for fetching mails
 
-| Field        | Description      | Type         | Null | Key | Default             | Extra          |
-|--------------|------------------|--------------|------|-----|---------------------|----------------|
-| id           | sequential ID    | int(11)      | NO   | PRI | NULL                | auto_increment |
-| uid          |                  | int(11)      | NO   |     | 0                   |                |
-| server       |                  | varchar(255) | NO   |     |                     |                |
-| port         |                  | int(11)      | NO   |     | 0                   |                |
-| ssltype      |                  | varchar(16)  | NO   |     |                     |                |
-| mailbox      |                  | varchar(255) | NO   |     |                     |                |
-| user         |                  | varchar(255) | NO   |     |                     |                |
-| pass         |                  | text         | NO   |     | NULL                |                |
-| reply_to     |                  | varchar(255) | NO   |     |                     |                |
-| action       |                  | int(11)      | NO   |     | 0                   |                |
-| movetofolder |                  | varchar(255) | NO   |     |                     |                |
-| pubmail      |                  | tinyint(1)   | NO   |     | 0                   |                |
-| last_check   |                  | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| uid | User id | mediumint unsigned | YES |  | 0 |  |    
+| server |  | varchar(255) | YES |  |  |  |    
+| port |  | smallint unsigned | YES |  | 0 |  |    
+| ssltype |  | varchar(16) | YES |  |  |  |    
+| mailbox |  | varchar(255) | YES |  |  |  |    
+| user |  | varchar(255) | YES |  |  |  |    
+| pass |  | text | NO |  |  |  |    
+| reply_to |  | varchar(255) | YES |  |  |  |    
+| action |  | tinyint unsigned | YES |  | 0 |  |    
+| movetofolder |  | varchar(255) | YES |  |  |  |    
+| pubmail |  | boolean | YES |  | 0 |  |    
+| last_check |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_manage.md b/doc/database/db_manage.md
index 4cfc1d0a11..94994ec9b0 100644
--- a/doc/database/db_manage.md
+++ b/doc/database/db_manage.md
@@ -1,10 +1,11 @@
 Table manage
-============
+===========
+table of accounts that can manage each other
 
-| Field | Description   | Type    | Null | Key | Default | Extra           |
-| ----- | ------------- | ------- | ---- | --- | ------- | --------------- |
-| id    | sequential ID | int(11) | NO   | PRI | NULL    | auto_increment  |
-| uid   | user.id       | int(11) | NO   | MUL | 0       |                 |
-| mid   |               | int(11) | NO   |     | 0       |                 |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| uid | User id | mediumint unsigned | YES |  | 0 |  |    
+| mid | User id | mediumint unsigned | YES |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notification.md b/doc/database/db_notification.md
new file mode 100644
index 0000000000..f4e524d73c
--- /dev/null
+++ b/doc/database/db_notification.md
@@ -0,0 +1,17 @@
+Table notification
+===========
+notifications
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| uid | Owner User id | mediumint unsigned | NO |  |  |  |    
+| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | NO |  |  |  |    
+| type |  | tinyint unsigned | NO |  |  |  |    
+| actor-id | Link to the contact table with uid=0 of the actor that caused the notification | int unsigned | NO |  |  |  |    
+| target-uri-id | Item-uri id of the related post | int unsigned | NO |  |  |  |    
+| parent-uri-id | Item-uri id of the parent of the related post | int unsigned | NO |  |  |  |    
+| created |  | datetime | NO |  |  |  |    
+| seen |  | boolean | NO |  | 0 |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_notify-threads.md b/doc/database/db_notify-threads.md
index 5c196628d4..a788e82242 100644
--- a/doc/database/db_notify-threads.md
+++ b/doc/database/db_notify-threads.md
@@ -1,12 +1,14 @@
 Table notify-threads
-====================
+===========
 
-| Field              | Description      | Type             | Null | Key | Default | Extra          |
-|--------------------|------------------|------------------|------|-----|---------|----------------|
-| id                 | sequential ID    | int(11)          | NO   | PRI | NULL    | auto_increment |
-| notify-id          |                  | int(11)          | NO   |     | 0       |                |
-| master-parent-item |                  | int(10) unsigned | NO   | MUL | 0       |                |
-| parent-item        |                  | int(10) unsigned | NO   |     | 0       |                |
-| receiver-uid       |                  | int(11)          | NO   | MUL | 0       |                |
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| notify-id |  | int unsigned | YES |  | 0 |  |    
+| master-parent-item | Deprecated | int unsigned | NO |  |  |  |    
+| master-parent-uri-id | Item-uri id of the parent of the related post | int unsigned | NO |  |  |  |    
+| parent-item |  | int unsigned | YES |  | 0 |  |    
+| receiver-uid | User id | mediumint unsigned | YES |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notify.md b/doc/database/db_notify.md
index fbf0db7705..360e93ba24 100644
--- a/doc/database/db_notify.md
+++ b/doc/database/db_notify.md
@@ -1,24 +1,26 @@
 Table notify
-============
+===========
+notifications
 
-| Field      | Description                       | Type         | Null | Key | Default             | Extra           |
-| ---------- | --------------------------------- | ------------ | ---- | --- | ------------------- | --------------- |
-| id         | sequential ID                     | int(11)      | NO   | PRI | NULL                | auto_increment  |
-| hash       |                                   | varchar(64)  | NO   |     |                     |                 |
-| type       |                                   | int(11)      | NO   |     | 0                   |                 |
-| name       |                                   | varchar(255) | NO   |     |                     |                 |
-| url        |                                   | varchar(255) | NO   |     |                     |                 |
-| photo      |                                   | varchar(255) | NO   |     |                     |                 |
-| date       |                                   | datetime     | NO   |     | 0001-01-01 00:00:00 |                 |
-| msg        |                                   | mediumtext   | YES  |     | NULL                |                 |
-| uid        | user.id of the owner of this data | int(11)      | NO   | MUL | 0                   |                 |
-| link       |                                   | varchar(255) | NO   |     |                     |                 |
-| iid        | item.id                           | int(11)      | NO   |     | 0                   |                 |
-| parent     |                                   | int(11)      | NO   |     | 0                   |                 |
-| seen       |                                   | tinyint(1)   | NO   |     | 0                   |                 |
-| verb       |                                   | varchar(255) | NO   |     |                     |                 |
-| otype      |                                   | varchar(16)  | NO   |     |                     |                 |
-| name_cache | Cached bbcode parsing of name     | tinytext     | YES  |     | NULL                |                 |
-| msg_cache  | Cached bbcode parsing of msg      | mediumtext   | YES  |     | NULL                |                 |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| type |  | smallint unsigned | YES |  | 0 |  |    
+| name |  | varchar(255) | YES |  |  |  |    
+| url |  | varchar(255) | YES |  |  |  |    
+| photo |  | varchar(255) | YES |  |  |  |    
+| date |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| msg |  | mediumtext | NO |  |  |  |    
+| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
+| link |  | varchar(255) | YES |  |  |  |    
+| iid |  | int unsigned | NO |  |  |  |    
+| parent |  | int unsigned | NO |  |  |  |    
+| uri-id | Item-uri id of the related post | int unsigned | NO |  |  |  |    
+| parent-uri-id | Item-uri id of the parent of the related post | int unsigned | NO |  |  |  |    
+| seen |  | boolean | YES |  | 0 |  |    
+| verb |  | varchar(100) | YES |  |  |  |    
+| otype |  | varchar(10) | YES |  |  |  |    
+| name_cache | Cached bbcode parsing of name | tinytext | NO |  |  |  |    
+| msg_cache | Cached bbcode parsing of msg | mediumtext | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_oembed.md b/doc/database/db_oembed.md
index 651a52e740..e08af5f010 100644
--- a/doc/database/db_oembed.md
+++ b/doc/database/db_oembed.md
@@ -1,11 +1,12 @@
 Table oembed
-============
+===========
+cache for OEmbed queries
 
-| Field        | Description                        | Type         | Null | Key | Default             | Extra |
-| ------------ | ---------------------------------- | ------------ | ---- | --- | ------------------- | ----- |
-| url          | page url                           | varchar(255) | NO   | PRI | NULL                |       |
-| maxwidth     | Maximum width passed to Oembed     | int(11)      | NO   | PRI | 0                   |       |
-| content      | OEmbed data of the page            | text         | NO   |     | NULL                |       |
-| created      | datetime of creation               | datetime     | NO   | MUL | 0001-01-01 00:00:00 |       |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| url | page url | varbinary(255) | YES | PRI |  |  |    
+| maxwidth | Maximum width passed to Oembed | mediumint unsigned | YES | PRI |  |  |    
+| content | OEmbed data of the page | mediumtext | NO |  |  |  |    
+| created | datetime of creation | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_openwebauth-token.md b/doc/database/db_openwebauth-token.md
new file mode 100644
index 0000000000..98fa7b6a41
--- /dev/null
+++ b/doc/database/db_openwebauth-token.md
@@ -0,0 +1,14 @@
+Table openwebauth-token
+===========
+Store OpenWebAuth token to verify contacts
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| uid | User id - currently unused | mediumint unsigned | YES |  | 0 |  |    
+| type | Verify type | varchar(32) | YES |  |  |  |    
+| token | A generated token | varchar(255) | YES |  |  |  |    
+| meta |  | varchar(255) | YES |  |  |  |    
+| created | datetime of creation | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_parsed_url.md b/doc/database/db_parsed_url.md
index 343e5a8bed..9b2912ccea 100644
--- a/doc/database/db_parsed_url.md
+++ b/doc/database/db_parsed_url.md
@@ -1,12 +1,15 @@
 Table parsed_url
-================
+===========
+cache for &#039;parse_url&#039; queries
 
-| Field        | Description                        | Type         | Null | Key | Default             | Extra |
-| ------------ | ---------------------------------- | ------------ | ---- | --- | ------------------- | ----- |
-| url          | page url                           | varchar(255) | NO   | PRI | NULL                |       |
-| guessing     | is the "guessing" mode active?     | tinyint(1)   | NO   | PRI | 0                   |       |
-| oembed       | is the data the result of oembed?  | tinyint(1)   | NO   | PRI | 0                   |       |
-| content      | page data                          | text         | NO   |     | NULL                |       |
-| created      | datetime of creation               | datetime     | NO   | MUL | 0001-01-01 00:00:00 |       |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| url_hash | page url hash | binary(64) | YES | PRI |  |  |    
+| guessing | is the &#039;guessing&#039; mode active? | boolean | YES | PRI | 0 |  |    
+| oembed | is the data the result of oembed? | boolean | YES | PRI | 0 |  |    
+| url | page url | text | YES |  |  |  |    
+| content | page data | mediumtext | NO |  |  |  |    
+| created | datetime of creation | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| expires | datetime of expiration | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_pconfig.md b/doc/database/db_pconfig.md
index a4ed10a359..2bffcff5ad 100644
--- a/doc/database/db_pconfig.md
+++ b/doc/database/db_pconfig.md
@@ -1,12 +1,13 @@
-Table pconfic
-=============
+Table pconfig
+===========
+personal (per user) configuration storage
 
-| Field | Description | Type       | Null | Key | Default | Extra          |
-|-------|-------------|------------|------|-----|---------|----------------|
-| id    |             | int(11)    | NO   | PRI | NULL    | auto_increment |
-| uid   |             | int(11)    | NO   | MUL | 0       |                |
-| cat   |             | char(255)  | NO   |     |         |                |
-| k     |             | char(255)  | NO   |     |         |                |
-| v     |             | mediumtext | NO   |     | NULL    |                |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | Primary key | int unsigned | YES | PRI |  | auto_increment |    
+| uid | User id | mediumint unsigned | YES |  | 0 |  |    
+| cat | Category | varchar(50) | YES |  |  |  |    
+| k | Key | varchar(100) | YES |  |  |  |    
+| v | Value | mediumtext | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_permissionset.md b/doc/database/db_permissionset.md
new file mode 100644
index 0000000000..0e60ff3800
--- /dev/null
+++ b/doc/database/db_permissionset.md
@@ -0,0 +1,14 @@
+Table permissionset
+===========
+
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| uid | Owner id of this permission set | mediumint unsigned | YES |  | 0 |  |    
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | NO |  |  |  |    
+| allow_gid | Access Control - list of allowed groups | mediumtext | NO |  |  |  |    
+| deny_cid | Access Control - list of denied contact.id | mediumtext | NO |  |  |  |    
+| deny_gid | Access Control - list of denied groups | mediumtext | NO |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_photo.md b/doc/database/db_photo.md
index 2bb7473e21..ef8f2b1824 100644
--- a/doc/database/db_photo.md
+++ b/doc/database/db_photo.md
@@ -1,29 +1,35 @@
 Table photo
 ===========
+photo storage
 
-| Field       | Description                                            | Type             | Null | Key | Default             | Extra           |
-| ----------- | ------------------------------------------------------ | ---------------- | ---- | --- | ------------------- | --------------- |
-| id          | sequential ID                                          | int(10) unsigned | NO   | PRI | NULL                | auto_increment  |
-| uid         | user.id of the owner of this data                      | int(10) unsigned | NO   | MUL | 0                   |                 |
-| contact-id  | contact.id                                             | int(10) unsigned | NO   |     | 0                   |                 |
-| guid        | A unique identifier for this photo                     | varchar(64)      | NO   | MUL |                     |                 |
-| resource-id |                                                        | varchar(255)     | NO   | MUL |                     |                 |
-| created     | creation date                                          | datetime         | NO   |     | 0001-01-01 00:00:00 |                 |
-| edited      | last edited date                                       | datetime         | NO   |     | 0001-01-01 00:00:00 |                 |
-| title       |                                                        | varchar(255)     | NO   |     |                     |                 |
-| desc        |                                                        | text             | NO   |     | NULL                |                 |
-| album       | The name of the album to which the photo belongs       | varchar(255)     | NO   |     |                     |                 |
-| filename    |                                                        | varchar(255)     | NO   |     |                     |                 |
-| type        |  image type                                            | varchar(128)     | NO   |     | image/jpeg          |                 |
-| height      |                                                        | smallint(6)      | NO   |     | 0                   |                 |
-| width       |                                                        | smallint(6)      | NO   |     | 0                   |                 |
-| size        |                                                        | int(10) unsigned | NO   |     | 0                   |                 |
-| data        |                                                        | mediumblob       | NO   |     | NULL                |                 |
-| scale       |                                                        | tinyint(3)       | NO   |     | 0                   |                 |
-| profile     |                                                        | tinyint(1)       | NO   |     | 0                   |                 |
-| allow_cid   | Access Control - list of allowed contact.id '<19><78>' | mediumtext       | NO   |     | NULL                |                 |
-| allow_gid   | Access Control - list of allowed groups                | mediumtext       | NO   |     | NULL                |                 |
-| deny_cid    | Access Control - list of denied contact.id             | mediumtext       | NO   |     | NULL                |                 |
-| deny_gid    | Access Control - list of denied groups                 | mediumtext       | NO   |     | NULL                |                 |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
+| contact-id | contact.id | int unsigned | YES |  | 0 |  |    
+| guid | A unique identifier for this photo | char(16) | YES |  |  |  |    
+| resource-id |  | char(32) | YES |  |  |  |    
+| hash | hash value of the photo | char(32) | NO |  |  |  |    
+| created | creation date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| edited | last edited date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| title |  | varchar(255) | YES |  |  |  |    
+| desc |  | text | NO |  |  |  |    
+| album | The name of the album to which the photo belongs | varchar(255) | YES |  |  |  |    
+| filename |  | varchar(255) | YES |  |  |  |    
+| type |  | varchar(30) | YES |  | image/jpeg |  |    
+| height |  | smallint unsigned | YES |  | 0 |  |    
+| width |  | smallint unsigned | YES |  | 0 |  |    
+| datasize |  | int unsigned | YES |  | 0 |  |    
+| data |  | mediumblob | YES |  |  |  |    
+| scale |  | tinyint unsigned | YES |  | 0 |  |    
+| profile |  | boolean | YES |  | 0 |  |    
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | NO |  |  |  |    
+| allow_gid | Access Control - list of allowed groups | mediumtext | NO |  |  |  |    
+| deny_cid | Access Control - list of denied contact.id | mediumtext | NO |  |  |  |    
+| deny_gid | Access Control - list of denied groups | mediumtext | NO |  |  |  |    
+| accessible | Make photo publicly accessible, ignoring permissions | boolean | YES |  | 0 |  |    
+| backend-class | Storage backend class | tinytext | NO |  |  |  |    
+| backend-ref | Storage backend data reference | text | NO |  |  |  |    
+| updated |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_poll.md b/doc/database/db_poll.md
deleted file mode 100644
index fd89b345c1..0000000000
--- a/doc/database/db_poll.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Table poll
-==========
-
-| Field | Description | Type       | Null | Key | Default | Extra          |
-|-------|-------------|------------|------|-----|---------|----------------|
-| id    |             | int(11)    | NO   | PRI | NULL    | auto_increment |
-| uid   |             | int(11)    | NO   | MUL | 0       |                |
-| q0    |             | mediumtext | NO   |     | NULL    |                |
-| q1    |             | mediumtext | NO   |     | NULL    |                |
-| q2    |             | mediumtext | NO   |     | NULL    |                |
-| q3    |             | mediumtext | NO   |     | NULL    |                |
-| q4    |             | mediumtext | NO   |     | NULL    |                |
-| q5    |             | mediumtext | NO   |     | NULL    |                |
-| q6    |             | mediumtext | NO   |     | NULL    |                |
-| q7    |             | mediumtext | NO   |     | NULL    |                |
-| q8    |             | mediumtext | NO   |     | NULL    |                |
-| q9    |             | mediumtext | NO   |     | NULL    |                |
-
-Return to [database documentation](help/database)
diff --git a/doc/database/db_poll_result.md b/doc/database/db_poll_result.md
deleted file mode 100644
index 5a732d0adf..0000000000
--- a/doc/database/db_poll_result.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Table poll_result
-=================
-
-| Field   | Description      | Type    | Null | Key | Default | Extra          |
-|---------|------------------|---------|------|-----|---------|----------------|
-| id      | sequential ID    | int(11) | NO   | PRI | NULL    | auto_increment |
-| poll_id |                  | int(11) | NO   | MUL | 0       |                |
-| choice  |                  | int(11) | NO   | MUL | 0       |                |
-
-Return to [database documentation](help/database)
diff --git a/doc/database/db_post-category.md b/doc/database/db_post-category.md
new file mode 100644
index 0000000000..3765072d0e
--- /dev/null
+++ b/doc/database/db_post-category.md
@@ -0,0 +1,12 @@
+Table post-category
+===========
+post relation to categories
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
+| uid | User id | mediumint unsigned | YES | PRI | 0 |  |    
+| type |  | tinyint unsigned | YES | PRI | 0 |  |    
+| tid |  | int unsigned | YES | PRI | 0 |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_post-content.md b/doc/database/db_post-content.md
new file mode 100644
index 0000000000..65e051cbdb
--- /dev/null
+++ b/doc/database/db_post-content.md
@@ -0,0 +1,25 @@
+Table post-content
+===========
+Content for all posts
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
+| title | item title | varchar(255) | YES |  |  |  |    
+| content-warning |  | varchar(255) | YES |  |  |  |    
+| body | item body content | mediumtext | NO |  |  |  |    
+| raw-body | Body without embedded media links | mediumtext | NO |  |  |  |    
+| location | text location where this item originated | varchar(255) | YES |  |  |  |    
+| coord | longitude/latitude pair representing location where this item originated | varchar(255) | YES |  |  |  |    
+| language | Language information about this post | text | NO |  |  |  |    
+| app | application which generated this item | varchar(255) | YES |  |  |  |    
+| rendered-hash |  | varchar(32) | YES |  |  |  |    
+| rendered-html | item.body converted to html | mediumtext | NO |  |  |  |    
+| object-type | ActivityStreams object type | varchar(100) | YES |  |  |  |    
+| object | JSON encoded object structure unless it is an implied object (normal post) | text | NO |  |  |  |    
+| target-type | ActivityStreams target type if applicable (URI) | varchar(100) | YES |  |  |  |    
+| target | JSON encoded target structure if used | text | NO |  |  |  |    
+| resource-id | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32) | YES |  |  |  |    
+| plink | permalink or URL to a displayable copy of the message at its source | varchar(255) | YES |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_post-delivery-data.md b/doc/database/db_post-delivery-data.md
new file mode 100644
index 0000000000..d9efbe1804
--- /dev/null
+++ b/doc/database/db_post-delivery-data.md
@@ -0,0 +1,19 @@
+Table post-delivery-data
+===========
+Delivery data for items
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
+| postopts | External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery | text | NO |  |  |  |    
+| inform | Additional receivers of the linked item | mediumtext | NO |  |  |  |    
+| queue_count | Initial number of delivery recipients, used as item.delivery_queue_count | mediumint | YES |  | 0 |  |    
+| queue_done | Number of successful deliveries, used as item.delivery_queue_done | mediumint | YES |  | 0 |  |    
+| queue_failed | Number of unsuccessful deliveries, used as item.delivery_queue_failed | mediumint | YES |  | 0 |  |    
+| activitypub | Number of successful deliveries via ActivityPub | mediumint | YES |  | 0 |  |    
+| dfrn | Number of successful deliveries via DFRN | mediumint | YES |  | 0 |  |    
+| legacy_dfrn | Number of successful deliveries via legacy DFRN | mediumint | YES |  | 0 |  |    
+| diaspora | Number of successful deliveries via Diaspora | mediumint | YES |  | 0 |  |    
+| ostatus | Number of successful deliveries via OStatus | mediumint | YES |  | 0 |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_post-media.md b/doc/database/db_post-media.md
new file mode 100644
index 0000000000..4115301c0a
--- /dev/null
+++ b/doc/database/db_post-media.md
@@ -0,0 +1,27 @@
+Table post-media
+===========
+Attached media
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES |  |  |  |    
+| url | Media URL | varbinary(511) | YES |  |  |  |    
+| type | Media type | tinyint unsigned | YES |  | 0 |  |    
+| mimetype |  | varchar(60) | NO |  |  |  |    
+| height | Height of the media | smallint unsigned | NO |  |  |  |    
+| width | Width of the media | smallint unsigned | NO |  |  |  |    
+| size | Media size | int unsigned | NO |  |  |  |    
+| preview | Preview URL | varbinary(255) | NO |  |  |  |    
+| preview-height | Height of the preview picture | smallint unsigned | NO |  |  |  |    
+| preview-width | Width of the preview picture | smallint unsigned | NO |  |  |  |    
+| description |  | text | NO |  |  |  |    
+| name | Name of the media | varchar(255) | NO |  |  |  |    
+| author-url | URL of the author of the media | varbinary(255) | NO |  |  |  |    
+| author-name | Name of the author of the media | varchar(255) | NO |  |  |  |    
+| author-image | Image of the author of the media | varbinary(255) | NO |  |  |  |    
+| publisher-url | URL of the publisher of the media | varbinary(255) | NO |  |  |  |    
+| publisher-name | Name of the publisher of the media | varchar(255) | NO |  |  |  |    
+| publisher-image | Image of the publisher of the media | varbinary(255) | NO |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_post-tag.md b/doc/database/db_post-tag.md
new file mode 100644
index 0000000000..6beccad706
--- /dev/null
+++ b/doc/database/db_post-tag.md
@@ -0,0 +1,12 @@
+Table post-tag
+===========
+post relation to tags
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
+| type |  | tinyint unsigned | YES | PRI | 0 |  |    
+| tid |  | int unsigned | YES | PRI | 0 |  |    
+| cid | Contact id of the mentioned public contact | int unsigned | YES | PRI | 0 |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_post-thread-user.md b/doc/database/db_post-thread-user.md
new file mode 100644
index 0000000000..375728050d
--- /dev/null
+++ b/doc/database/db_post-thread-user.md
@@ -0,0 +1,31 @@
+Table post-thread-user
+===========
+Thread related data per user
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
+| owner-id | Item owner | int unsigned | YES |  | 0 |  |    
+| author-id | Item author | int unsigned | YES |  | 0 |  |    
+| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | NO |  |  |  |    
+| network |  | char(4) | YES |  |  |  |    
+| created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| received |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| changed | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| commented |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| uid | Owner id which owns this copy of the item | mediumint unsigned | YES | PRI | 0 |  |    
+| pinned | The thread is pinned on the profile page | boolean | YES |  | 0 |  |    
+| starred |  | boolean | YES |  | 0 |  |    
+| ignored | Ignore updates for this thread | boolean | YES |  | 0 |  |    
+| wall | This item was posted to the wall of uid | boolean | YES |  | 0 |  |    
+| mention |  | boolean | YES |  | 0 |  |    
+| pubmail |  | boolean | YES |  | 0 |  |    
+| forum_mode |  | tinyint unsigned | YES |  | 0 |  |    
+| contact-id | contact.id | int unsigned | YES |  | 0 |  |    
+| unseen | post has not been seen | boolean | YES |  | 1 |  |    
+| hidden | Marker to hide the post from the user | boolean | YES |  | 0 |  |    
+| origin | item originated at this site | boolean | YES |  | 0 |  |    
+| psid | ID of the permission set of this post | int unsigned | NO |  |  |  |    
+| post-user-id | Id of the post-user table | int unsigned | NO |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_post-thread.md b/doc/database/db_post-thread.md
new file mode 100644
index 0000000000..301a16a66f
--- /dev/null
+++ b/doc/database/db_post-thread.md
@@ -0,0 +1,17 @@
+Table post-thread
+===========
+Thread related data
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
+| owner-id | Item owner | int unsigned | YES |  | 0 |  |    
+| author-id | Item author | int unsigned | YES |  | 0 |  |    
+| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | NO |  |  |  |    
+| network |  | char(4) | YES |  |  |  |    
+| created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| received |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| changed | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| commented |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_post-user-notification.md b/doc/database/db_post-user-notification.md
new file mode 100644
index 0000000000..4ceea2a683
--- /dev/null
+++ b/doc/database/db_post-user-notification.md
@@ -0,0 +1,11 @@
+Table post-user-notification
+===========
+User post notifications
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
+| uid | Owner id which owns this copy of the item | mediumint unsigned | YES | PRI |  |  |    
+| notification-type |  | tinyint unsigned | YES |  | 0 |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_post-user.md b/doc/database/db_post-user.md
new file mode 100644
index 0000000000..da6312b1de
--- /dev/null
+++ b/doc/database/db_post-user.md
@@ -0,0 +1,38 @@
+Table post-user
+===========
+User specific post data
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id |  | int unsigned | YES | PRI |  | auto_increment |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES |  |  |  |    
+| parent-uri-id | Id of the item-uri table that contains the parent uri | int unsigned | NO |  |  |  |    
+| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | NO |  |  |  |    
+| external-id | Id of the item-uri table entry that contains the external uri | int unsigned | NO |  |  |  |    
+| created | Creation timestamp. | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| edited | Date of last edit (default is created) | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| received | datetime | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| gravity |  | tinyint unsigned | YES |  | 0 |  |    
+| network | Network from where the item comes from | char(4) | YES |  |  |  |    
+| owner-id | Link to the contact table with uid=0 of the owner of this item | int unsigned | YES |  | 0 |  |    
+| author-id | Link to the contact table with uid=0 of the author of this item | int unsigned | YES |  | 0 |  |    
+| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | NO |  |  |  |    
+| post-type | Post type (personal note, image, article, ...) | tinyint unsigned | YES |  | 0 |  |    
+| post-reason | Reason why the post arrived at the user | tinyint unsigned | YES |  | 0 |  |    
+| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | NO |  |  |  |    
+| private | 0=public, 1=private, 2=unlisted | tinyint unsigned | YES |  | 0 |  |    
+| global |  | boolean | YES |  | 0 |  |    
+| visible |  | boolean | YES |  | 0 |  |    
+| deleted | item has been marked for deletion | boolean | YES |  | 0 |  |    
+| uid | Owner id which owns this copy of the item | mediumint unsigned | YES |  |  |  |    
+| protocol | Protocol used to deliver the item for this user | tinyint unsigned | NO |  |  |  |    
+| contact-id | contact.id | int unsigned | YES |  | 0 |  |    
+| event-id | Used to link to the event.id | int unsigned | NO |  |  |  |    
+| unseen | post has not been seen | boolean | YES |  | 1 |  |    
+| hidden | Marker to hide the post from the user | boolean | YES |  | 0 |  |    
+| notification-type |  | tinyint unsigned | YES |  | 0 |  |    
+| wall | This item was posted to the wall of uid | boolean | YES |  | 0 |  |    
+| origin | item originated at this site | boolean | YES |  | 0 |  |    
+| psid | ID of the permission set of this post | int unsigned | NO |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_post.md b/doc/database/db_post.md
new file mode 100644
index 0000000000..f8e09b05b0
--- /dev/null
+++ b/doc/database/db_post.md
@@ -0,0 +1,26 @@
+Table post
+===========
+Structure for all posts
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
+| parent-uri-id | Id of the item-uri table that contains the parent uri | int unsigned | NO |  |  |  |    
+| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | NO |  |  |  |    
+| external-id | Id of the item-uri table entry that contains the external uri | int unsigned | NO |  |  |  |    
+| created | Creation timestamp. | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| edited | Date of last edit (default is created) | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| received | datetime | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| gravity |  | tinyint unsigned | YES |  | 0 |  |    
+| network | Network from where the item comes from | char(4) | YES |  |  |  |    
+| owner-id | Link to the contact table with uid=0 of the owner of this item | int unsigned | YES |  | 0 |  |    
+| author-id | Link to the contact table with uid=0 of the author of this item | int unsigned | YES |  | 0 |  |    
+| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | NO |  |  |  |    
+| post-type | Post type (personal note, image, article, ...) | tinyint unsigned | YES |  | 0 |  |    
+| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | NO |  |  |  |    
+| private | 0=public, 1=private, 2=unlisted | tinyint unsigned | YES |  | 0 |  |    
+| global |  | boolean | YES |  | 0 |  |    
+| visible |  | boolean | YES |  | 0 |  |    
+| deleted | item has been marked for deletion | boolean | YES |  | 0 |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_process.md b/doc/database/db_process.md
new file mode 100644
index 0000000000..8a2ad1ac88
--- /dev/null
+++ b/doc/database/db_process.md
@@ -0,0 +1,11 @@
+Table process
+===========
+Currently running system processes
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| pid |  | int unsigned | YES | PRI |  |  |    
+| command |  | varbinary(32) | YES |  |  |  |    
+| created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_profile.md b/doc/database/db_profile.md
index 375e06635a..eb2297023b 100644
--- a/doc/database/db_profile.md
+++ b/doc/database/db_profile.md
@@ -1,48 +1,50 @@
 Table profile
-=============
+===========
+user profiles data
 
-| Field        | Description                                   | Type         | Null | Key | Default             | Extra          |
-|--------------|-----------------------------------------------|--------------|------|-----|---------------------|----------------|
-| id           | sequential ID                                 | int(11)      | NO   | PRI | NULL                | auto_increment |
-| uid          | user.id of the owner of this data             | int(11)      | NO   |     | 0                   |                |
-| profile-name | Name of the profile                           | varchar(255) | NO   |     |                     |                |
-| is-default   | Mark this profile as default profile          | tinyint(1)   | NO   |     | 0                   |                |
-| hide-friends | Hide friend list from viewers of this profile | tinyint(1)   | NO   |     | 0                   |                |
-| name         |                                               | varchar(255) | NO   |     |                     |                |
-| pdesc        | Deprecated                                    | varchar(255) | NO   |     |                     |                |
-| dob          | Day of birth                                  | varchar(32)  | NO   |     | 0001-01-01          |                |
-| address      |                                               | varchar(255) | NO   |     |                     |                |
-| locality     |                                               | varchar(255) | NO   |     |                     |                |
-| region       |                                               | varchar(255) | NO   |     |                     |                |
-| postal-code  |                                               | varchar(32)  | NO   |     |                     |                |
-| country-name |                                               | varchar(255) | NO   |     |                     |                |
-| hometown     | Deprecated                                    | varchar(255) | NO   | MUL |                     |                |
-| gender       | Deprecated                                    | varchar(32)  | NO   |     |                     |                |
-| marital      | Deprecated                                    | varchar(255) | NO   |     |                     |                |
-| with         | Deprecated                                    | text         | NO   |     | NULL                |                |
-| howlong      | Deprecated                                    | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
-| sexual       | Deprecated                                    | varchar(255) | NO   |     |                     |                |
-| politic      | Deprecated                                    | varchar(255) | NO   |     |                     |                |
-| religion     | Deprecated                                    | varchar(255) | NO   |     |                     |                |
-| pub_keywords |                                               | text         | NO   |     | NULL                |                |
-| prv_keywords |                                               | text         | NO   |     | NULL                |                |
-| likes        | Deprecated                                    | text         | NO   |     | NULL                |                |
-| dislikes     | Deprecated                                    | text         | NO   |     | NULL                |                |
-| about        | Profile description                           | text         | NO   |     |                     |                |
-| summary      | Deprecated                                    | varchar(255) | NO   |     |                     |                |
-| music        | Deprecated                                    | text         | NO   |     | NULL                |                |
-| book         | Deprecated                                    | text         | NO   |     | NULL                |                |
-| tv           | Deprecated                                    | text         | NO   |     | NULL                |                |
-| film         | Deprecated                                    | text         | NO   |     | NULL                |                |
-| interest     | Deprecated                                    | text         | NO   |     | NULL                |                |
-| romance      | Deprecated                                    | text         | NO   |     | NULL                |                |
-| work         | Deprecated                                    | text         | NO   |     | NULL                |                |
-| education    | Deprecated                                    | text         | NO   |     | NULL                |                |
-| contact      | Deprecated                                    | text         | NO   |     | NULL                |                |
-| homepage     |                                               | varchar(255) | NO   |     |                     |                |
-| photo        |                                               | varchar(255) | NO   |     |                     |                |
-| thumb        |                                               | varchar(255) | NO   |     |                     |                |
-| publish      | publish default profile in local directory    | tinyint(1)   | NO   |     | 0                   |                |
-| net-publish  | publish profile in global directory           | tinyint(1)   | NO   |     | 0                   |                |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
+| profile-name | Deprecated | varchar(255) | NO |  |  |  |    
+| is-default | Deprecated | boolean | NO |  |  |  |    
+| hide-friends | Hide friend list from viewers of this profile | boolean | YES |  | 0 |  |    
+| name |  | varchar(255) | YES |  |  |  |    
+| pdesc | Deprecated | varchar(255) | NO |  |  |  |    
+| dob | Day of birth | varchar(32) | YES |  | 0000-00-00 |  |    
+| address |  | varchar(255) | YES |  |  |  |    
+| locality |  | varchar(255) | YES |  |  |  |    
+| region |  | varchar(255) | YES |  |  |  |    
+| postal-code |  | varchar(32) | YES |  |  |  |    
+| country-name |  | varchar(255) | YES |  |  |  |    
+| hometown | Deprecated | varchar(255) | NO |  |  |  |    
+| gender | Deprecated | varchar(32) | NO |  |  |  |    
+| marital | Deprecated | varchar(255) | NO |  |  |  |    
+| with | Deprecated | text | NO |  |  |  |    
+| howlong | Deprecated | datetime | NO |  |  |  |    
+| sexual | Deprecated | varchar(255) | NO |  |  |  |    
+| politic | Deprecated | varchar(255) | NO |  |  |  |    
+| religion | Deprecated | varchar(255) | NO |  |  |  |    
+| pub_keywords |  | text | NO |  |  |  |    
+| prv_keywords |  | text | NO |  |  |  |    
+| likes | Deprecated | text | NO |  |  |  |    
+| dislikes | Deprecated | text | NO |  |  |  |    
+| about | Profile description | text | NO |  |  |  |    
+| summary | Deprecated | varchar(255) | NO |  |  |  |    
+| music | Deprecated | text | NO |  |  |  |    
+| book | Deprecated | text | NO |  |  |  |    
+| tv | Deprecated | text | NO |  |  |  |    
+| film | Deprecated | text | NO |  |  |  |    
+| interest | Deprecated | text | NO |  |  |  |    
+| romance | Deprecated | text | NO |  |  |  |    
+| work | Deprecated | text | NO |  |  |  |    
+| education | Deprecated | text | NO |  |  |  |    
+| contact | Deprecated | text | NO |  |  |  |    
+| homepage |  | varchar(255) | YES |  |  |  |    
+| xmpp |  | varchar(255) | YES |  |  |  |    
+| photo |  | varchar(255) | YES |  |  |  |    
+| thumb |  | varchar(255) | YES |  |  |  |    
+| publish | publish default profile in local directory | boolean | YES |  | 0 |  |    
+| net-publish | publish profile in global directory | boolean | YES |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_profile_check.md b/doc/database/db_profile_check.md
index 411da06d30..ed8c936fcb 100644
--- a/doc/database/db_profile_check.md
+++ b/doc/database/db_profile_check.md
@@ -1,13 +1,14 @@
 Table profile_check
-===================
+===========
+DFRN remote auth use
 
-| Field    | Description   | Type             | Null | Key | Default | Extra           |
-| -------- | ------------- | ---------------- | ---- | --- | ------- | --------------- |
-| id       | sequential ID | int(10) unsigned | NO   | PRI | NULL    | auto_increment  |
-| uid      | user.id       | int(10) unsigned | NO   |     | 0       |                 |
-| cid      | contact.id    | int(10) unsigned | NO   |     | 0       |                 |
-| dfrn_id  |               | varchar(255)     | NO   |     |         |                 |
-| sec      |               | varchar(255)     | NO   |     | 0       |                 |
-| expire   |               | int(11)          | NO   |     | NULL    |                 |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| uid | User id | mediumint unsigned | YES |  | 0 |  |    
+| cid | contact.id | int unsigned | YES |  | 0 |  |    
+| dfrn_id |  | varchar(255) | YES |  |  |  |    
+| sec |  | varchar(255) | YES |  |  |  |    
+| expire |  | int unsigned | YES |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_profile_field.md b/doc/database/db_profile_field.md
new file mode 100644
index 0000000000..9a0b9fda11
--- /dev/null
+++ b/doc/database/db_profile_field.md
@@ -0,0 +1,16 @@
+Table profile_field
+===========
+Custom profile fields
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| uid | Owner user id | mediumint unsigned | YES |  | 0 |  |    
+| order | Field ordering per user | mediumint unsigned | YES |  | 1 |  |    
+| psid | ID of the permission set of this profile field - 0 = public | int unsigned | NO |  |  |  |    
+| label | Label of the field | varchar(255) | YES |  |  |  |    
+| value | Value of the field | text | NO |  |  |  |    
+| created | creation time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| edited | last edit time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_push_subscriber.md b/doc/database/db_push_subscriber.md
index b766ccb46c..97b3f0fc06 100644
--- a/doc/database/db_push_subscriber.md
+++ b/doc/database/db_push_subscriber.md
@@ -1,10 +1,18 @@
 Table push_subscriber
-=====================
+===========
+Used for OStatus: Contains feed subscribers
 
-| Field   | Description      | Type    | Null | Key | Default | Extra          |
-|---------|------------------|---------|------|-----|---------|----------------|
-| id      | sequential ID    | int(11) | NO   | PRI | NULL    | auto_increment |
-| poll_id |                  | int(11) | NO   | MUL | 0       |                |
-| choice  |                  | int(11) | NO   | MUL | 0       |                |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| uid | User id | mediumint unsigned | YES |  | 0 |  |    
+| callback_url |  | varchar(255) | YES |  |  |  |    
+| topic |  | varchar(255) | YES |  |  |  |    
+| nickname |  | varchar(255) | YES |  |  |  |    
+| push | Retrial counter | tinyint | YES |  | 0 |  |    
+| last_update | Date of last successful trial | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| next_try | Next retrial date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| renewed | Date of last subscription renewal | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| secret |  | varchar(255) | YES |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_queue.md b/doc/database/db_queue.md
deleted file mode 100644
index 6b19f02f28..0000000000
--- a/doc/database/db_queue.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Table queue
-===========
-
-| Field   | Description      | Type        | Null | Key | Default             | Extra          |
-|---------|------------------|-------------|------|-----|---------------------|----------------|
-| id      | sequential ID    | int(11)     | NO   | PRI | NULL                | auto_increment |
-| cid     |                  | int(11)     | NO   | MUL | 0                   |                |
-| network |                  | varchar(32) | NO   | MUL |                     |                |
-| created |                  | datetime    | NO   | MUL | 0001-01-01 00:00:00 |                |
-| last    |                  | datetime    | NO   | MUL | 0001-01-01 00:00:00 |                |
-| content |                  | mediumtext  | NO   |     | NULL                |                |
-| batch   |                  | tinyint(1)  | NO   | MUL | 0                   |                |
-
-Return to [database documentation](help/database)
diff --git a/doc/database/db_register.md b/doc/database/db_register.md
index 974a2dc673..f2bc2c28d5 100644
--- a/doc/database/db_register.md
+++ b/doc/database/db_register.md
@@ -1,13 +1,15 @@
 Table register
-==============
+===========
+registrations requiring admin approval
 
-| Field    | Description   | Type             | Null | Key | Default             | Extra           |
-| -------- | ------------- | ---------------- | ---- | --- | ------------------- | --------------- |
-| id       | sequential ID | int(11) unsigned | NO   | PRI | NULL                | auto_increment  |
-| hash     |               | varchar(255)     | NO   |     |                     |                 |
-| created  |               | datetime         | NO   |     | 0001-01-01 00:00:00 |                 |
-| uid      | user.id       | int(11) unsigned | NO   |     |                     |                 |
-| password |               | varchar(255)     | NO   |     |                     |                 |
-| language |               | varchar(16)      | NO   |     |                     |                 |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| hash |  | varchar(255) | YES |  |  |  |    
+| created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| uid | User id | mediumint unsigned | YES |  | 0 |  |    
+| password |  | varchar(255) | YES |  |  |  |    
+| language |  | varchar(16) | YES |  |  |  |    
+| note |  | text | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_search.md b/doc/database/db_search.md
index 63d0a46b40..a5f5e11f26 100644
--- a/doc/database/db_search.md
+++ b/doc/database/db_search.md
@@ -1,10 +1,11 @@
 Table search
-============
+===========
 
-| Field | Description      | Type         | Null | Key | Default | Extra          |
-|-------|------------------|--------------|------|-----|---------|----------------|
-| id    | sequential ID    | int(11)      | NO   | PRI | NULL    | auto_increment |
-| uid   |                  | int(11)      | NO   | MUL | 0       |                |
-| term  |                  | varchar(255) | NO   | MUL |         |                |
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| uid | User id | mediumint unsigned | YES |  | 0 |  |    
+| term |  | varchar(255) | YES |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_session.md b/doc/database/db_session.md
index 1e87c24d03..1e3e1f3776 100644
--- a/doc/database/db_session.md
+++ b/doc/database/db_session.md
@@ -1,11 +1,12 @@
 Table session
-=============
+===========
+web session storage
 
-| Field  | Description   | Type                | Null | Key | Default | Extra           |
-| ------ | ------------- | ------------------- | ---- | --- | ------- | --------------- |
-| id     | sequential ID | bigint(20) unsigned | NO   | PRI | NULL    | auto_increment  |
-| sid    |               | varchar(255)        | NO   | MUL |         |                 |
-| data   |               | text                | NO   |     | NULL    |                 |
-| expire |               | int(10) unsigned    | NO   | MUL | 0       |                 |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | bigint unsigned | YES | PRI |  | auto_increment |    
+| sid |  | varbinary(255) | YES |  |  |  |    
+| data |  | text | NO |  |  |  |    
+| expire |  | int unsigned | YES |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_sign.md b/doc/database/db_sign.md
deleted file mode 100644
index 6986613e59..0000000000
--- a/doc/database/db_sign.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Table sign
-==========
-
-| Field        | Description   | Type             | Null | Key | Default | Extra           |
-| ------------ | ------------- | ---------------- | ---- | --- | ------- | --------------- |
-| id           | sequential ID | int(10) unsigned | NO   | PRI | NULL    | auto_increment  |
-| iid          | item.id       | int(10) unsigned | NO   | MUL | 0       |                 |
-| signed_text  |               | mediumtext       | NO   |     | NULL    |                 |
-| signature    |               | text             | NO   |     | NULL    |                 |
-| signer       |               | varchar(255)     | NO   |     |         |                 |
-
-Return to [database documentation](help/database)
diff --git a/doc/database/db_storage.md b/doc/database/db_storage.md
new file mode 100644
index 0000000000..77795196b4
--- /dev/null
+++ b/doc/database/db_storage.md
@@ -0,0 +1,10 @@
+Table storage
+===========
+Data stored by Database storage backend
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | Auto incremented image data id | int unsigned | YES | PRI |  | auto_increment |    
+| data | file data | longblob | YES |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_tag.md b/doc/database/db_tag.md
new file mode 100644
index 0000000000..bc7cfa4f50
--- /dev/null
+++ b/doc/database/db_tag.md
@@ -0,0 +1,11 @@
+Table tag
+===========
+tags and mentions
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id |  | int unsigned | YES | PRI |  | auto_increment |    
+| name |  | varchar(96) | YES |  |  |  |    
+| url |  | varbinary(255) | YES |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_term.md b/doc/database/db_term.md
deleted file mode 100644
index d18bf1c3b1..0000000000
--- a/doc/database/db_term.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Table term
-==========
-
-| Field    | Description   | Type                | Null | Key | Default             | Extra          |
-|----------| ------------- |---------------------|------|-----|---------------------|----------------|
-| tid      |               | int(10) unsigned    | NO   | PRI | NULL                | auto_increment |
-| oid      |               | int(10) unsigned    | NO   | MUL | 0                   |                |
-| otype    |               | tinyint(3) unsigned | NO   | MUL | 0                   |                |
-| type     |               | tinyint(3) unsigned | NO   | MUL | 0                   |                |
-| term     |               | varchar(255)        | NO   |     |                     |                |
-| url      |               | varchar(255)        | NO   |     |                     |                |
-| aid      |               | int(10) unsigned    | NO   |     | 0                   |                |
-| uid      |               | int(10) unsigned    | NO   | MUL | 0                   |                |
-| guid     |               | varchar(255)        | NO   | MUL |                     |                |
-| created  |               | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
-| received |               | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
-| global   |               | tinyint(1)          | NO   |     | 0                   |                |
-
-Return to [database documentation](help/database)
diff --git a/doc/database/db_thread.md b/doc/database/db_thread.md
deleted file mode 100644
index 13b70b4511..0000000000
--- a/doc/database/db_thread.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Table thread
-============
-
-| Field       | Description      | Type             | Null | Key | Default             | Extra |
-|-------------|------------------|------------------|------|-----|---------------------|-------|
-| iid         | sequential ID    | int(10) unsigned | NO   | PRI | 0                   |       |
-| uid         |                  | int(10) unsigned | NO   | MUL | 0                   |       |
-| contact-id  |                  | int(11) unsigned | NO   |     | 0                   |       |
-| gcontact-id | Global Contact   | int(11) unsigned | NO   |     | 0                   |       |
-| owner-id    | Item owner       | int(11) unsigned | NO   | MUL | 0                   |       |
-| author-id   | Item author      | int(11) unsigned | NO   | MUL | 0                   |       |
-| created     |                  | datetime         | NO   | MUL | 0001-01-01 00:00:00 |       |
-| edited      |                  | datetime         | NO   |     | 0001-01-01 00:00:00 |       |
-| commented   |                  | datetime         | NO   | MUL | 0001-01-01 00:00:00 |       |
-| received    |                  | datetime         | NO   |     | 0001-01-01 00:00:00 |       |
-| changed     |                  | datetime         | NO   |     | 0001-01-01 00:00:00 |       |
-| wall        |                  | tinyint(1)       | NO   | MUL | 0                   |       |
-| private     |                  | tinyint(1)       | NO   |     | 0                   |       |
-| pubmail     |                  | tinyint(1)       | NO   |     | 0                   |       |
-| moderated   |                  | tinyint(1)       | NO   |     | 0                   |       |
-| visible     |                  | tinyint(1)       | NO   |     | 0                   |       |
-| spam        |                  | tinyint(1)       | NO   |     | 0                   |       |
-| starred     |                  | tinyint(1)       | NO   |     | 0                   |       |
-| ignored     |                  | tinyint(1)       | NO   |     | 0                   |       |
-| bookmark    |                  | tinyint(1)       | NO   |     | 0                   |       |
-| unseen      |                  | tinyint(1)       | NO   |     | 1                   |       |
-| deleted     |                  | tinyint(1)       | NO   |     | 0                   |       |
-| origin      |                  | tinyint(1)       | NO   |     | 0                   |       |
-| forum_mode  |                  | tinyint(1)       | NO   |     | 0                   |       |
-| mention     |                  | tinyint(1)       | NO   |     | 0                   |       |
-| network     |                  | varchar(32)      | NO   |     |                     |       |
-
-Return to [database documentation](help/database)
diff --git a/doc/database/db_tokens.md b/doc/database/db_tokens.md
index 3b3778d68c..ade6543660 100644
--- a/doc/database/db_tokens.md
+++ b/doc/database/db_tokens.md
@@ -1,13 +1,14 @@
 Table tokens
-============
+===========
+OAuth usage
 
-| Field      | Description | Type         | Null | Key | Default | Extra |
-| ---------- | ----------- | ------------ | ---- | --- | ------- | ----- |
-| id         |             | varchar(40)  | NO   | PRI | NULL    |       |
-| secret     |             | text         | NO   |     | NULL    |       |
-| client_id  |             | varchar(20)  | NO   |     |         |       |
-| expires    |             | int(11)      | NO   |     | 0       |       |
-| scope      |             | varchar(200) | NO   |     |         |       |
-| uid        |             | int(11)      | NO   |     | 0       |       |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id |  | varchar(40) | YES | PRI |  |  |    
+| secret |  | text | NO |  |  |  |    
+| client_id |  | varchar(20) | YES |  |  |  |    
+| expires |  | int | YES |  | 0 |  |    
+| scope |  | varchar(200) | YES |  |  |  |    
+| uid | User id | mediumint unsigned | YES |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_user-contact.md b/doc/database/db_user-contact.md
new file mode 100644
index 0000000000..a08cf3153d
--- /dev/null
+++ b/doc/database/db_user-contact.md
@@ -0,0 +1,13 @@
+Table user-contact
+===========
+User specific public contact data
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| cid | Contact id of the linked public contact | int unsigned | YES | PRI | 0 |  |    
+| uid | User id | mediumint unsigned | YES | PRI | 0 |  |    
+| blocked | Contact is completely blocked for this user | boolean | NO |  |  |  |    
+| ignored | Posts from this contact are ignored | boolean | NO |  |  |  |    
+| collapsed | Posts from this contact are collapsed | boolean | NO |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_user.md b/doc/database/db_user.md
index 7033bcc896..03c6820ea1 100644
--- a/doc/database/db_user.md
+++ b/doc/database/db_user.md
@@ -1,77 +1,53 @@
 Table user
-==========
+===========
+The local users
 
-| Field                    | Description                                                                             | Type                | Null | Key | Default             | Extra          |
-|--------------------------|-----------------------------------------------------------------------------------------|---------------------|------|-----|---------------------|----------------|
-| uid                      | sequential ID                                                                           | int(11)             | NO   | PRI | NULL                | auto_increment |
-| guid                     | A unique identifier for this user                                                       | varchar(64)         | NO   |     |                     |                |
-| username                 | Name that this user is known by                                                         | varchar(255)        | NO   |     |                     |                |
-| password                 | encrypted password                                                                      | varchar(255)        | NO   |     |                     |                |
-| nickname                 | nick- and user name                                                                     | varchar(255)        | NO   | MUL |                     |                |
-| email                    | the users email address                                                                 | varchar(255)        | NO   |     |                     |                |
-| openid                   |                                                                                         | varchar(255)        | NO   |     |                     |                |
-| timezone                 | PHP-legal timezone                                                                      | varchar(128)        | NO   |     |                     |                |
-| language                 | default language                                                                        | varchar(32)         | NO   |     | en                  |                |
-| register_date            | timestamp of registration                                                               | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
-| login_date               | timestamp of last login                                                                 | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
-| default-location         | Default for item.location                                                               | varchar(255)        | NO   |     |                     |                |
-| allow_location           | 1 allows to display the location                                                        | tinyint(1)          | NO   |     | 0                   |                |
-| theme                    | user theme preference                                                                   | varchar(255)        | NO   |     |                     |                |
-| pubkey                   | RSA public key 4096 bit                                                                 | text                | NO   |     | NULL                |                |
-| prvkey                   | RSA private key 4096 bit                                                                | text                | NO   |     | NULL                |                |
-| spubkey                  |                                                                                         | text                | NO   |     | NULL                |                |
-| sprvkey                  |                                                                                         | text                | NO   |     | NULL                |                |
-| verified                 | user is verified through email                                                          | tinyint(1) unsigned | NO   |     | 0                   |                |
-| blocked                  | 1 for user is blocked                                                                   | tinyint(1) unsigned | NO   |     | 0                   |                |
-| blockwall                | Prohibit contacts to post to the profile page of the user                               | tinyint(1) unsigned | NO   |     | 0                   |                |
-| hidewall                 | Hide profile details from unkown viewers                                                | tinyint(1) unsigned | NO   |     | 0                   |                |
-| blocktags                | Prohibit contacts to tag the post of this user                                          | tinyint(1) unsigned | NO   |     | 0                   |                |
-| unkmail                  | Permit unknown people to send private mails to this user                                | tinyint(1)          | NO   |     | 0                   |                |
-| cntunkmail               |                                                                                         | int(11)             | NO   |     | 10                  |                |
-| notify-flags             | email notification options                                                              | int(11) unsigned    | NO   |     | 65535               |                |
-| page-flags               | page/profile type                                                                       | int(11) unsigned    | NO   |     | 0                   |                |
-| prvnets                  |                                                                                         | tinyint(1)          | NO   |     | 0                   |                |
-| pwdreset                 |                                                                                         | varchar(255)        | NO   |     |                     |                |
-| maxreq                   |                                                                                         | int(11)             | NO   |     | 10                  |                |
-| expire                   |                                                                                         | int(11) unsigned    | NO   |     | 0                   |                |
-| account_removed          | if 1 the account is removed                                                             | tinyint(1)          | NO   |     | 0                   |                |
-| account_expired          |                                                                                         | tinyint(1)          | NO   |     | 0                   |                |
-| account_expires_on       | timestamp when account expires and will be deleted                                      | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
-| expire_notification_sent | timestamp of last warning of account expiration                                         | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
-| def_gid                  |                                                                                         | int(11)             | NO   |     | 0                   |                |
-| allow_cid                | default permission for this user                                                        | mediumtext          | NO   |     | NULL                |                |
-| allow_gid                | default permission for this user                                                        | mediumtext          | NO   |     | NULL                |                |
-| deny_cid                 | default permission for this user                                                        | mediumtext          | NO   |     | NULL                |                |
-| deny_gid                 | default permission for this user                                                        | mediumtext          | NO   |     | NULL                |                |
-| openidserver             |                                                                                         | text                | NO   |     | NULL                |                |
-
-```
-/**
-* page-flags
-*/
-define ( 'PAGE_NORMAL',            0 );
-define ( 'PAGE_SOAPBOX',           1 );
-define ( 'PAGE_COMMUNITY',         2 );
-define ( 'PAGE_FREELOVE',          3 );
-define ( 'PAGE_BLOG',              4 );
-define ( 'PAGE_PRVGROUP',          5 );
-
-/**
-* notify-flags
-*/
-define ( 'NOTIFY_INTRO',    0x0001 );
-define ( 'NOTIFY_CONFIRM',  0x0002 );
-define ( 'NOTIFY_WALL',     0x0004 );
-define ( 'NOTIFY_COMMENT',  0x0008 );
-define ( 'NOTIFY_MAIL',     0x0010 );
-define ( 'NOTIFY_SUGGEST',  0x0020 );
-define ( 'NOTIFY_PROFILE',  0x0040 );
-define ( 'NOTIFY_TAGSELF',  0x0080 );
-define ( 'NOTIFY_TAGSHARE', 0x0100 );
-define ( 'NOTIFY_POKE',     0x0200 );
-define ( 'NOTIFY_SHARE',    0x0400 );
-
-define ( 'NOTIFY_SYSTEM',   0x8000 );
-```
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| uid | sequential ID | mediumint unsigned | YES | PRI |  | auto_increment |    
+| parent-uid | The parent user that has full control about this user | mediumint unsigned | NO |  |  |  |    
+| guid | A unique identifier for this user | varchar(64) | YES |  |  |  |    
+| username | Name that this user is known by | varchar(255) | YES |  |  |  |    
+| password | encrypted password | varchar(255) | YES |  |  |  |    
+| legacy_password | Is the password hash double-hashed? | boolean | YES |  | 0 |  |    
+| nickname | nick- and user name | varchar(255) | YES |  |  |  |    
+| email | the users email address | varchar(255) | YES |  |  |  |    
+| openid |  | varchar(255) | YES |  |  |  |    
+| timezone | PHP-legal timezone | varchar(128) | YES |  |  |  |    
+| language | default language | varchar(32) | YES |  | en |  |    
+| register_date | timestamp of registration | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| login_date | timestamp of last login | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| default-location | Default for item.location | varchar(255) | YES |  |  |  |    
+| allow_location | 1 allows to display the location | boolean | YES |  | 0 |  |    
+| theme | user theme preference | varchar(255) | YES |  |  |  |    
+| pubkey | RSA public key 4096 bit | text | NO |  |  |  |    
+| prvkey | RSA private key 4096 bit | text | NO |  |  |  |    
+| spubkey |  | text | NO |  |  |  |    
+| sprvkey |  | text | NO |  |  |  |    
+| verified | user is verified through email | boolean | YES |  | 0 |  |    
+| blocked | 1 for user is blocked | boolean | YES |  | 0 |  |    
+| blockwall | Prohibit contacts to post to the profile page of the user | boolean | YES |  | 0 |  |    
+| hidewall | Hide profile details from unkown viewers | boolean | YES |  | 0 |  |    
+| blocktags | Prohibit contacts to tag the post of this user | boolean | YES |  | 0 |  |    
+| unkmail | Permit unknown people to send private mails to this user | boolean | YES |  | 0 |  |    
+| cntunkmail |  | int unsigned | YES |  | 10 |  |    
+| notify-flags | email notification options | smallint unsigned | YES |  | 65535 |  |    
+| page-flags | page/profile type | tinyint unsigned | YES |  | 0 |  |    
+| account-type |  | tinyint unsigned | YES |  | 0 |  |    
+| prvnets |  | boolean | YES |  | 0 |  |    
+| pwdreset | Password reset request token | varchar(255) | NO |  |  |  |    
+| pwdreset_time | Timestamp of the last password reset request | datetime | NO |  |  |  |    
+| maxreq |  | int unsigned | YES |  | 10 |  |    
+| expire |  | int unsigned | YES |  | 0 |  |    
+| account_removed | if 1 the account is removed | boolean | YES |  | 0 |  |    
+| account_expired |  | boolean | YES |  | 0 |  |    
+| account_expires_on | timestamp when account expires and will be deleted | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| expire_notification_sent | timestamp of last warning of account expiration | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| def_gid |  | int unsigned | YES |  | 0 |  |    
+| allow_cid | default permission for this user | mediumtext | NO |  |  |  |    
+| allow_gid | default permission for this user | mediumtext | NO |  |  |  |    
+| deny_cid | default permission for this user | mediumtext | NO |  |  |  |    
+| deny_gid | default permission for this user | mediumtext | NO |  |  |  |    
+| openidserver |  | text | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_userd.md b/doc/database/db_userd.md
index 80e3084757..99baabcc66 100644
--- a/doc/database/db_userd.md
+++ b/doc/database/db_userd.md
@@ -1,9 +1,10 @@
 Table userd
 ===========
+Deleted usernames
 
-| Field    | Description      | Type         | Null | Key | Default | Extra          |
-|----------|------------------|--------------|------|-----|---------|----------------|
-| id       | sequential ID    | int(11)      | NO   | PRI | NULL    | auto_increment |
-| username |                  | varchar(255) | NO   | MUL | NULL    |                |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| username |  | varchar(255) | YES |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_verb.md b/doc/database/db_verb.md
new file mode 100644
index 0000000000..7e01f1f8e6
--- /dev/null
+++ b/doc/database/db_verb.md
@@ -0,0 +1,10 @@
+Table verb
+===========
+Activity Verbs
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id |  | smallint unsigned | YES | PRI |  | auto_increment |    
+| name |  | varchar(100) | YES |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_worker-ipc.md b/doc/database/db_worker-ipc.md
new file mode 100644
index 0000000000..ef8c97301e
--- /dev/null
+++ b/doc/database/db_worker-ipc.md
@@ -0,0 +1,10 @@
+Table worker-ipc
+===========
+Inter process communication between the frontend and the worker
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| key |  | int | YES | PRI |  |  |    
+| jobs | Flag for outstanding jobs | boolean | NO |  |  |  |    
+
+Return to [database documentation](help/database)
diff --git a/doc/database/db_workerqueue.md b/doc/database/db_workerqueue.md
index 182358a4c4..0a14e0aecb 100644
--- a/doc/database/db_workerqueue.md
+++ b/doc/database/db_workerqueue.md
@@ -1,14 +1,18 @@
 Table workerqueue
-=================
+===========
+Background tasks queue entries
 
-| Field     | Description      | Type                | Null | Key | Default             | Extra          |
-|-----------|------------------|---------------------|------|-----|---------------------|----------------|
-| id        | sequential ID    | int(11)             | NO   | PRI | NULL                | auto_increment |
-| parameter |                  | text                | NO   |     | NULL                |                |
-| priority  |                  | tinyint(3) unsigned | NO   |     | 0                   |                |
-| created   |                  | datetime            | NO   | MUL | 0001-01-01 00:00:00 |                |
-| pid       |                  | int(11)             | NO   |     | 0                   |                |
-| executed  |                  | datetime            | NO   |     | 0001-01-01 00:00:00 |                |
-| done      | set to 1 if done | tinyint(1)          | NO   |     | 0                   |                |
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+| id | Auto incremented worker task id | int unsigned | YES | PRI |  | auto_increment |    
+| command | Task command | varchar(100) | NO |  |  |  |    
+| parameter | Task parameter | mediumtext | NO |  |  |  |    
+| priority | Task priority | tinyint unsigned | YES |  | 0 |  |    
+| created | Creation date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| pid | Process id of the worker | int unsigned | YES |  | 0 |  |    
+| executed | Execution date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| next_try | Next retrial date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| retrial | Retrial counter | tinyint | YES |  | 0 |  |    
+| done | Marked 1 when the task was done - will be deleted later | boolean | YES |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/src/Console/DatabaseStructure.php b/src/Console/DatabaseStructure.php
index c6d708eb71..b44400c01a 100644
--- a/src/Console/DatabaseStructure.php
+++ b/src/Console/DatabaseStructure.php
@@ -120,6 +120,7 @@ HELP;
 				$output = ob_get_clean();
 				break;
 			case "dumpsql":
+				DBStructure::writeStructure();
 				ob_start();
 				DBStructure::printStructure($basePath);
 				$output = ob_get_clean();
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 914846590b..f7a5963c7c 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -24,6 +24,7 @@ namespace Friendica\Database;
 use Exception;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Item;
 use Friendica\Model\User;
@@ -159,6 +160,41 @@ class DBStructure
 		return DI::l10n()->t('Errors encountered performing database changes: ') . $message . EOL;
 	}
 
+	public static function writeStructure()
+	{
+		Renderer::registerTemplateEngine('Friendica\Render\FriendicaSmartyEngine');
+
+		$tables = [];
+		foreach (self::definition(null) as $name => $definition) {
+			$fields = [];
+			foreach ($definition['fields'] as $key => $value) {
+				$field = [];
+				$field['name']    = $key;
+				$field['comment'] = $value['comment'] ?? '';
+				$field['type']    = $value['type'];
+				$field['notnull'] = ($value['not null'] ?? false) ? 'YES' : 'NO';
+				$field['primary'] = ($value['primary'] ?? false) ? 'PRI' : '';
+				$field['default'] = $value['default'] ?? '';
+				$field['extra']   = $value['extra'] ?? '';
+		
+				$fields[] = $field;
+			}
+			$tables[] = ['name' => $name, 'comment' => $definition['comment']];
+			$content = Renderer::replaceMacros(Renderer::getMarkupTemplate('structure.tpl'), [
+				'$name'    => $name,
+				'$comment' => $definition['comment'],
+				'$fields'  => $fields,
+			]);
+			$filename = DI::basePath() . '/doc/database/db_' . $name . '.md';
+			file_put_contents($filename, $content);
+		}
+		$content = Renderer::replaceMacros(Renderer::getMarkupTemplate('tables.tpl'), [
+			'$tables'  => $tables,	
+		]);
+		$filename = DI::basePath() . '/doc/database.md';
+		file_put_contents($filename, $content);		
+	}
+
 	public static function printStructure($basePath)
 	{
 		$database = self::definition($basePath, false);
diff --git a/view/templates/structure.tpl b/view/templates/structure.tpl
new file mode 100644
index 0000000000..91ba2eb315
--- /dev/null
+++ b/view/templates/structure.tpl
@@ -0,0 +1,11 @@
+Table {{$name}}
+===========
+{{$comment}}
+
+| Field | Description | Type | Null | Key | Default | Extra |
+| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
+{{foreach $fields as $field}}
+| {{$field.name}} | {{$field.comment}} | {{$field.type}} | {{$field.notnull}} | {{$field.primary}} | {{$field.default}} | {{$field.extra}} |    
+{{/foreach}}
+
+Return to [database documentation](help/database)
diff --git a/view/templates/tables.tpl b/view/templates/tables.tpl
new file mode 100644
index 0000000000..8fdd12a37b
--- /dev/null
+++ b/view/templates/tables.tpl
@@ -0,0 +1,10 @@
+Database Tables
+===============
+
+* [Home](help)
+
+| Table | Description |
+|-------|-------------|
+{{foreach $tables as $table}}
+| [{{$table.name}}](help/database/db_{{$table.name}}) | {{$table.comment}} |
+{{/foreach}}

From bb5e6d248b384192ab070108afbfb58acbee3fc3 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 13 Jun 2021 20:56:14 +0000
Subject: [PATCH 03/14] Added sort order

---
 doc/database.md              | 20 ++++++++++----------
 src/Database/DBStructure.php |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/doc/database.md b/doc/database.md
index 4e22add378..5e5413916d 100644
--- a/doc/database.md
+++ b/doc/database.md
@@ -5,14 +5,6 @@ Database Tables
 
 | Table | Description |
 |-------|-------------|
-| [gserver](help/database/db_gserver) | Global servers |
-| [user](help/database/db_user) | The local users |
-| [contact](help/database/db_contact) | contact table |
-| [item-uri](help/database/db_item-uri) | URI and GUID for items |
-| [tag](help/database/db_tag) | tags and mentions |
-| [clients](help/database/db_clients) | OAuth usage |
-| [permissionset](help/database/db_permissionset) |  |
-| [verb](help/database/db_verb) | Activity Verbs |
 | [2fa_app_specific_password](help/database/db_2fa_app_specific_password) | Two-factor app-specific _password |
 | [2fa_recovery_codes](help/database/db_2fa_recovery_codes) | Two-factor authentication recovery codes |
 | [2fa_trusted_browser](help/database/db_2fa_trusted_browser) | Two-factor authentication trusted browsers |
@@ -24,7 +16,9 @@ Database Tables
 | [auth_codes](help/database/db_auth_codes) | OAuth usage |
 | [cache](help/database/db_cache) | Stores temporary data |
 | [challenge](help/database/db_challenge) |  |
+| [clients](help/database/db_clients) | OAuth usage |
 | [config](help/database/db_config) | main configuration storage |
+| [contact](help/database/db_contact) | contact table |
 | [contact-relation](help/database/db_contact-relation) | Contact relations |
 | [conv](help/database/db_conv) | private messages |
 | [conversation](help/database/db_conversation) | Raw data and structure information for messages |
@@ -35,11 +29,13 @@ Database Tables
 | [fsuggest](help/database/db_fsuggest) | friend suggestion stuff |
 | [group](help/database/db_group) | privacy groups, group info |
 | [group_member](help/database/db_group_member) | privacy groups, member info |
+| [gserver](help/database/db_gserver) | Global servers |
 | [gserver-tag](help/database/db_gserver-tag) | Tags that the server has subscribed |
 | [hook](help/database/db_hook) | addon hook registry |
 | [host](help/database/db_host) | Hostname |
 | [inbox-status](help/database/db_inbox-status) | Status of ActivityPub inboxes |
 | [intro](help/database/db_intro) |  |
+| [item-uri](help/database/db_item-uri) | URI and GUID for items |
 | [locks](help/database/db_locks) |  |
 | [mail](help/database/db_mail) | private messages |
 | [mailacct](help/database/db_mailacct) | Mail account data for fetching mails |
@@ -51,6 +47,7 @@ Database Tables
 | [openwebauth-token](help/database/db_openwebauth-token) | Store OpenWebAuth token to verify contacts |
 | [parsed_url](help/database/db_parsed_url) | cache for &#039;parse_url&#039; queries |
 | [pconfig](help/database/db_pconfig) | personal (per user) configuration storage |
+| [permissionset](help/database/db_permissionset) |  |
 | [photo](help/database/db_photo) | photo storage |
 | [post](help/database/db_post) | Structure for all posts |
 | [post-category](help/database/db_post-category) | post relation to categories |
@@ -59,8 +56,8 @@ Database Tables
 | [post-media](help/database/db_post-media) | Attached media |
 | [post-tag](help/database/db_post-tag) | post relation to tags |
 | [post-thread](help/database/db_post-thread) | Thread related data |
-| [post-user](help/database/db_post-user) | User specific post data |
 | [post-thread-user](help/database/db_post-thread-user) | Thread related data per user |
+| [post-user](help/database/db_post-user) | User specific post data |
 | [post-user-notification](help/database/db_post-user-notification) | User post notifications |
 | [process](help/database/db_process) | Currently running system processes |
 | [profile](help/database/db_profile) | user profiles data |
@@ -71,8 +68,11 @@ Database Tables
 | [search](help/database/db_search) |  |
 | [session](help/database/db_session) | web session storage |
 | [storage](help/database/db_storage) | Data stored by Database storage backend |
+| [tag](help/database/db_tag) | tags and mentions |
 | [tokens](help/database/db_tokens) | OAuth usage |
-| [userd](help/database/db_userd) | Deleted usernames |
+| [user](help/database/db_user) | The local users |
 | [user-contact](help/database/db_user-contact) | User specific public contact data |
+| [userd](help/database/db_userd) | Deleted usernames |
+| [verb](help/database/db_verb) | Activity Verbs |
 | [worker-ipc](help/database/db_worker-ipc) | Inter process communication between the frontend and the worker |
 | [workerqueue](help/database/db_workerqueue) | Background tasks queue entries |
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index f7a5963c7c..d1975f5042 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -188,6 +188,7 @@ class DBStructure
 			$filename = DI::basePath() . '/doc/database/db_' . $name . '.md';
 			file_put_contents($filename, $content);
 		}
+		asort($tables);
 		$content = Renderer::replaceMacros(Renderer::getMarkupTemplate('tables.tpl'), [
 			'$tables'  => $tables,	
 		]);

From 31db9dbef7f6a4f98a6c29d15493bcffb0c39929 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 14 Jun 2021 05:08:01 +0000
Subject: [PATCH 04/14] Added default value "NULL"

---
 doc/database/db_2fa_app_specific_password.md | 12 ++---
 doc/database/db_2fa_recovery_codes.md        |  8 +--
 doc/database/db_2fa_trusted_browser.md       | 10 ++--
 doc/database/db_addon.md                     |  2 +-
 doc/database/db_apcontact.md                 | 38 +++++++-------
 doc/database/db_application-token.md         | 20 ++++----
 doc/database/db_application.md               | 22 ++++----
 doc/database/db_attach.md                    | 16 +++---
 doc/database/db_auth_codes.md                |  2 +-
 doc/database/db_cache.md                     |  4 +-
 doc/database/db_challenge.md                 |  2 +-
 doc/database/db_clients.md                   |  6 +--
 doc/database/db_config.md                    |  4 +-
 doc/database/db_contact.md                   | 40 +++++++--------
 doc/database/db_conv.md                      |  6 +--
 doc/database/db_conversation.md              |  4 +-
 doc/database/db_delayed-post.md              |  8 +--
 doc/database/db_diaspora-interaction.md      |  4 +-
 doc/database/db_event.md                     | 16 +++---
 doc/database/db_fcontact.md                  |  4 +-
 doc/database/db_fsuggest.md                  |  4 +-
 doc/database/db_group.md                     |  2 +-
 doc/database/db_group_member.md              |  2 +-
 doc/database/db_gserver.md                   | 10 ++--
 doc/database/db_hook.md                      |  2 +-
 doc/database/db_host.md                      |  2 +-
 doc/database/db_inbox-status.md              |  2 +-
 doc/database/db_intro.md                     |  6 +--
 doc/database/db_item-uri.md                  |  6 +--
 doc/database/db_locks.md                     |  2 +-
 doc/database/db_mail.md                      | 18 +++----
 doc/database/db_mailacct.md                  |  4 +-
 doc/database/db_manage.md                    |  2 +-
 doc/database/db_notification.md              | 16 +++---
 doc/database/db_notify-threads.md            |  6 +--
 doc/database/db_notify.md                    | 16 +++---
 doc/database/db_oembed.md                    |  6 +--
 doc/database/db_openwebauth-token.md         |  2 +-
 doc/database/db_parsed_url.md                |  6 +--
 doc/database/db_pconfig.md                   |  4 +-
 doc/database/db_permissionset.md             | 10 ++--
 doc/database/db_photo.md                     | 20 ++++----
 doc/database/db_post-category.md             |  2 +-
 doc/database/db_post-content.md              | 14 ++---
 doc/database/db_post-delivery-data.md        |  6 +--
 doc/database/db_post-media.md                | 36 ++++++-------
 doc/database/db_post-tag.md                  |  2 +-
 doc/database/db_post-thread-user.md          |  8 +--
 doc/database/db_post-thread.md               |  4 +-
 doc/database/db_post-user-notification.md    |  4 +-
 doc/database/db_post-user.md                 | 22 ++++----
 doc/database/db_post.md                      | 12 ++---
 doc/database/db_process.md                   |  2 +-
 doc/database/db_profile.md                   | 54 ++++++++++----------
 doc/database/db_profile_check.md             |  2 +-
 doc/database/db_profile_field.md             |  6 +--
 doc/database/db_push_subscriber.md           |  2 +-
 doc/database/db_register.md                  |  4 +-
 doc/database/db_search.md                    |  2 +-
 doc/database/db_session.md                   |  4 +-
 doc/database/db_storage.md                   |  4 +-
 doc/database/db_tag.md                       |  2 +-
 doc/database/db_tokens.md                    |  4 +-
 doc/database/db_user-contact.md              |  6 +--
 doc/database/db_user.md                      | 26 +++++-----
 doc/database/db_userd.md                     |  4 +-
 doc/database/db_verb.md                      |  2 +-
 doc/database/db_worker-ipc.md                |  4 +-
 doc/database/db_workerqueue.md               |  6 +--
 src/Database/DBStructure.php                 |  2 +-
 70 files changed, 311 insertions(+), 311 deletions(-)

diff --git a/doc/database/db_2fa_app_specific_password.md b/doc/database/db_2fa_app_specific_password.md
index 9e3680b768..660319e041 100644
--- a/doc/database/db_2fa_app_specific_password.md
+++ b/doc/database/db_2fa_app_specific_password.md
@@ -4,11 +4,11 @@ Two-factor app-specific _password
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | Password ID for revocation | mediumint unsigned | YES | PRI |  | auto_increment |    
-| uid | User ID | mediumint unsigned | YES |  |  |  |    
-| description | Description of the usage of the password | varchar(255) | NO |  |  |  |    
-| hashed_password | Hashed password | varchar(255) | YES |  |  |  |    
-| generated | Datetime the password was generated | datetime | YES |  |  |  |    
-| last_used | Datetime the password was last used | datetime | NO |  |  |  |    
+| id | Password ID for revocation | mediumint unsigned | YES | PRI | NULL | auto_increment |    
+| uid | User ID | mediumint unsigned | YES |  | NULL |  |    
+| description | Description of the usage of the password | varchar(255) | NO |  | NULL |  |    
+| hashed_password | Hashed password | varchar(255) | YES |  | NULL |  |    
+| generated | Datetime the password was generated | datetime | YES |  | NULL |  |    
+| last_used | Datetime the password was last used | datetime | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_2fa_recovery_codes.md b/doc/database/db_2fa_recovery_codes.md
index 7b3b9d649c..aec9bbd559 100644
--- a/doc/database/db_2fa_recovery_codes.md
+++ b/doc/database/db_2fa_recovery_codes.md
@@ -4,9 +4,9 @@ Two-factor authentication recovery codes
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uid | User ID | mediumint unsigned | YES | PRI |  |  |    
-| code | Recovery code string | varchar(50) | YES | PRI |  |  |    
-| generated | Datetime the code was generated | datetime | YES |  |  |  |    
-| used | Datetime the code was used | datetime | NO |  |  |  |    
+| uid | User ID | mediumint unsigned | YES | PRI | NULL |  |    
+| code | Recovery code string | varchar(50) | YES | PRI | NULL |  |    
+| generated | Datetime the code was generated | datetime | YES |  | NULL |  |    
+| used | Datetime the code was used | datetime | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_2fa_trusted_browser.md b/doc/database/db_2fa_trusted_browser.md
index 29be4646a7..f3b3365627 100644
--- a/doc/database/db_2fa_trusted_browser.md
+++ b/doc/database/db_2fa_trusted_browser.md
@@ -4,10 +4,10 @@ Two-factor authentication trusted browsers
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| cookie_hash | Trusted cookie hash | varchar(80) | YES | PRI |  |  |    
-| uid | User ID | mediumint unsigned | YES |  |  |  |    
-| user_agent | User agent string | text | NO |  |  |  |    
-| created | Datetime the trusted browser was recorded | datetime | YES |  |  |  |    
-| last_used | Datetime the trusted browser was last used | datetime | NO |  |  |  |    
+| cookie_hash | Trusted cookie hash | varchar(80) | YES | PRI | NULL |  |    
+| uid | User ID | mediumint unsigned | YES |  | NULL |  |    
+| user_agent | User agent string | text | NO |  | NULL |  |    
+| created | Datetime the trusted browser was recorded | datetime | YES |  | NULL |  |    
+| last_used | Datetime the trusted browser was last used | datetime | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_addon.md b/doc/database/db_addon.md
index db3a5d44bb..91918adef1 100644
--- a/doc/database/db_addon.md
+++ b/doc/database/db_addon.md
@@ -4,7 +4,7 @@ registered addons
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | YES | PRI |  | auto_increment |    
+| id |  | int unsigned | YES | PRI | NULL | auto_increment |    
 | name | addon base (file)name | varchar(50) | YES |  |  |  |    
 | version | currently unused | varchar(50) | YES |  |  |  |    
 | installed | currently always 1 | boolean | YES |  | 0 |  |    
diff --git a/doc/database/db_apcontact.md b/doc/database/db_apcontact.md
index bea394bc22..69d33fe6c4 100644
--- a/doc/database/db_apcontact.md
+++ b/doc/database/db_apcontact.md
@@ -4,26 +4,26 @@ ActivityPub compatible contacts - used in the ActivityPub implementation
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| url | URL of the contact | varbinary(255) | YES | PRI |  |  |    
-| uuid |  | varchar(255) | NO |  |  |  |    
-| type |  | varchar(20) | YES |  |  |  |    
-| following |  | varchar(255) | NO |  |  |  |    
-| followers |  | varchar(255) | NO |  |  |  |    
-| inbox |  | varchar(255) | YES |  |  |  |    
-| outbox |  | varchar(255) | NO |  |  |  |    
-| sharedinbox |  | varchar(255) | NO |  |  |  |    
-| manually-approve |  | boolean | NO |  |  |  |    
+| url | URL of the contact | varbinary(255) | YES | PRI | NULL |  |    
+| uuid |  | varchar(255) | NO |  | NULL |  |    
+| type |  | varchar(20) | YES |  | NULL |  |    
+| following |  | varchar(255) | NO |  | NULL |  |    
+| followers |  | varchar(255) | NO |  | NULL |  |    
+| inbox |  | varchar(255) | YES |  | NULL |  |    
+| outbox |  | varchar(255) | NO |  | NULL |  |    
+| sharedinbox |  | varchar(255) | NO |  | NULL |  |    
+| manually-approve |  | boolean | NO |  | NULL |  |    
 | nick |  | varchar(255) | YES |  |  |  |    
-| name |  | varchar(255) | NO |  |  |  |    
-| about |  | text | NO |  |  |  |    
-| photo |  | varchar(255) | NO |  |  |  |    
-| addr |  | varchar(255) | NO |  |  |  |    
-| alias |  | varchar(255) | NO |  |  |  |    
-| pubkey |  | text | NO |  |  |  |    
-| subscribe |  | varchar(255) | NO |  |  |  |    
-| baseurl | baseurl of the ap contact | varchar(255) | NO |  |  |  |    
-| gsid | Global Server ID | int unsigned | NO |  |  |  |    
-| generator | Name of the contact&#039;s system | varchar(255) | NO |  |  |  |    
+| name |  | varchar(255) | NO |  | NULL |  |    
+| about |  | text | NO |  | NULL |  |    
+| photo |  | varchar(255) | NO |  | NULL |  |    
+| addr |  | varchar(255) | NO |  | NULL |  |    
+| alias |  | varchar(255) | NO |  | NULL |  |    
+| pubkey |  | text | NO |  | NULL |  |    
+| subscribe |  | varchar(255) | NO |  | NULL |  |    
+| baseurl | baseurl of the ap contact | varchar(255) | NO |  | NULL |  |    
+| gsid | Global Server ID | int unsigned | NO |  | NULL |  |    
+| generator | Name of the contact&#039;s system | varchar(255) | NO |  | NULL |  |    
 | following_count | Number of following contacts | int unsigned | NO |  | 0 |  |    
 | followers_count | Number of followers | int unsigned | NO |  | 0 |  |    
 | statuses_count | Number of posts | int unsigned | NO |  | 0 |  |    
diff --git a/doc/database/db_application-token.md b/doc/database/db_application-token.md
index 8b3d601ff7..af2b8d6613 100644
--- a/doc/database/db_application-token.md
+++ b/doc/database/db_application-token.md
@@ -4,15 +4,15 @@ OAuth user token
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| application-id |  | int unsigned | YES | PRI |  |  |    
-| uid | Owner User id | mediumint unsigned | YES | PRI |  |  |    
-| code |  | varchar(64) | YES |  |  |  |    
-| access_token |  | varchar(64) | YES |  |  |  |    
-| created_at | creation time | datetime | YES |  |  |  |    
-| scopes |  | varchar(255) | NO |  |  |  |    
-| read | Read scope | boolean | NO |  |  |  |    
-| write | Write scope | boolean | NO |  |  |  |    
-| follow | Follow scope | boolean | NO |  |  |  |    
-| push | Push scope | boolean | NO |  |  |  |    
+| application-id |  | int unsigned | YES | PRI | NULL |  |    
+| uid | Owner User id | mediumint unsigned | YES | PRI | NULL |  |    
+| code |  | varchar(64) | YES |  | NULL |  |    
+| access_token |  | varchar(64) | YES |  | NULL |  |    
+| created_at | creation time | datetime | YES |  | NULL |  |    
+| scopes |  | varchar(255) | NO |  | NULL |  |    
+| read | Read scope | boolean | NO |  | NULL |  |    
+| write | Write scope | boolean | NO |  | NULL |  |    
+| follow | Follow scope | boolean | NO |  | NULL |  |    
+| push | Push scope | boolean | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_application.md b/doc/database/db_application.md
index 26b9232660..799b01fa16 100644
--- a/doc/database/db_application.md
+++ b/doc/database/db_application.md
@@ -4,16 +4,16 @@ OAuth application
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | generated index | int unsigned | YES | PRI |  | auto_increment |    
-| client_id |  | varchar(64) | YES |  |  |  |    
-| client_secret |  | varchar(64) | YES |  |  |  |    
-| name |  | varchar(255) | YES |  |  |  |    
-| redirect_uri |  | varchar(255) | YES |  |  |  |    
-| website |  | varchar(255) | NO |  |  |  |    
-| scopes |  | varchar(255) | NO |  |  |  |    
-| read | Read scope | boolean | NO |  |  |  |    
-| write | Write scope | boolean | NO |  |  |  |    
-| follow | Follow scope | boolean | NO |  |  |  |    
-| push | Push scope | boolean | NO |  |  |  |    
+| id | generated index | int unsigned | YES | PRI | NULL | auto_increment |    
+| client_id |  | varchar(64) | YES |  | NULL |  |    
+| client_secret |  | varchar(64) | YES |  | NULL |  |    
+| name |  | varchar(255) | YES |  | NULL |  |    
+| redirect_uri |  | varchar(255) | YES |  | NULL |  |    
+| website |  | varchar(255) | NO |  | NULL |  |    
+| scopes |  | varchar(255) | NO |  | NULL |  |    
+| read | Read scope | boolean | NO |  | NULL |  |    
+| write | Write scope | boolean | NO |  | NULL |  |    
+| follow | Follow scope | boolean | NO |  | NULL |  |    
+| push | Push scope | boolean | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_attach.md b/doc/database/db_attach.md
index e35003c368..ee546d54e8 100644
--- a/doc/database/db_attach.md
+++ b/doc/database/db_attach.md
@@ -4,20 +4,20 @@ file attachments
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | generated index | int unsigned | YES | PRI |  | auto_increment |    
+| id | generated index | int unsigned | YES | PRI | NULL | auto_increment |    
 | uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
 | hash | hash | varchar(64) | YES |  |  |  |    
 | filename | filename of original | varchar(255) | YES |  |  |  |    
 | filetype | mimetype | varchar(64) | YES |  |  |  |    
 | filesize | size in bytes | int unsigned | YES |  | 0 |  |    
-| data | file data | longblob | YES |  |  |  |    
+| data | file data | longblob | YES |  | NULL |  |    
 | created | creation time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | edited | last edit time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt; | mediumtext | NO |  |  |  |    
-| allow_gid | Access Control - list of allowed groups | mediumtext | NO |  |  |  |    
-| deny_cid | Access Control - list of denied contact.id | mediumtext | NO |  |  |  |    
-| deny_gid | Access Control - list of denied groups | mediumtext | NO |  |  |  |    
-| backend-class | Storage backend class | tinytext | NO |  |  |  |    
-| backend-ref | Storage backend data reference | text | NO |  |  |  |    
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt; | mediumtext | NO |  | NULL |  |    
+| allow_gid | Access Control - list of allowed groups | mediumtext | NO |  | NULL |  |    
+| deny_cid | Access Control - list of denied contact.id | mediumtext | NO |  | NULL |  |    
+| deny_gid | Access Control - list of denied groups | mediumtext | NO |  | NULL |  |    
+| backend-class | Storage backend class | tinytext | NO |  | NULL |  |    
+| backend-ref | Storage backend data reference | text | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_auth_codes.md b/doc/database/db_auth_codes.md
index 6a33a30a14..51d78aa5a3 100644
--- a/doc/database/db_auth_codes.md
+++ b/doc/database/db_auth_codes.md
@@ -4,7 +4,7 @@ OAuth usage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | varchar(40) | YES | PRI |  |  |    
+| id |  | varchar(40) | YES | PRI | NULL |  |    
 | client_id |  | varchar(20) | YES |  |  |  |    
 | redirect_uri |  | varchar(200) | YES |  |  |  |    
 | expires |  | int | YES |  | 0 |  |    
diff --git a/doc/database/db_cache.md b/doc/database/db_cache.md
index 328f485e05..1d1d552c3a 100644
--- a/doc/database/db_cache.md
+++ b/doc/database/db_cache.md
@@ -4,8 +4,8 @@ Stores temporary data
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| k | cache key | varbinary(255) | YES | PRI |  |  |    
-| v | cached serialized value | mediumtext | NO |  |  |  |    
+| k | cache key | varbinary(255) | YES | PRI | NULL |  |    
+| v | cached serialized value | mediumtext | NO |  | NULL |  |    
 | expires | datetime of cache expiration | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | updated | datetime of cache insertion | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
diff --git a/doc/database/db_challenge.md b/doc/database/db_challenge.md
index 59534ba137..d3633f1860 100644
--- a/doc/database/db_challenge.md
+++ b/doc/database/db_challenge.md
@@ -4,7 +4,7 @@ Table challenge
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | challenge |  | varchar(255) | YES |  |  |  |    
 | dfrn-id |  | varchar(255) | YES |  |  |  |    
 | expire |  | int unsigned | YES |  | 0 |  |    
diff --git a/doc/database/db_clients.md b/doc/database/db_clients.md
index 89025d428b..acbcaea2c7 100644
--- a/doc/database/db_clients.md
+++ b/doc/database/db_clients.md
@@ -4,11 +4,11 @@ OAuth usage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| client_id |  | varchar(20) | YES | PRI |  |  |    
+| client_id |  | varchar(20) | YES | PRI | NULL |  |    
 | pw |  | varchar(20) | YES |  |  |  |    
 | redirect_uri |  | varchar(200) | YES |  |  |  |    
-| name |  | text | NO |  |  |  |    
-| icon |  | text | NO |  |  |  |    
+| name |  | text | NO |  | NULL |  |    
+| icon |  | text | NO |  | NULL |  |    
 | uid | User id | mediumint unsigned | YES |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_config.md b/doc/database/db_config.md
index 994b1a8713..e2fb6149fc 100644
--- a/doc/database/db_config.md
+++ b/doc/database/db_config.md
@@ -4,9 +4,9 @@ main configuration storage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | YES | PRI |  | auto_increment |    
+| id |  | int unsigned | YES | PRI | NULL | auto_increment |    
 | cat |  | varbinary(50) | YES |  |  |  |    
 | k |  | varbinary(50) | YES |  |  |  |    
-| v |  | mediumtext | NO |  |  |  |    
+| v |  | mediumtext | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_contact.md b/doc/database/db_contact.md
index 108157fc09..e362e33458 100644
--- a/doc/database/db_contact.md
+++ b/doc/database/db_contact.md
@@ -4,7 +4,7 @@ contact table
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
 | created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | updated | Date of last contact update | datetime | NO |  | 0001-01-01 00:00:00 |  |    
@@ -17,8 +17,8 @@ contact table
 | name | Name that this contact is known by | varchar(255) | YES |  |  |  |    
 | nick | Nick- and user name of the contact | varchar(255) | YES |  |  |  |    
 | location |  | varchar(255) | NO |  |  |  |    
-| about |  | text | NO |  |  |  |    
-| keywords | public keywords (interests) of the contact | text | NO |  |  |  |    
+| about |  | text | NO |  | NULL |  |    
+| keywords | public keywords (interests) of the contact | text | NO |  | NULL |  |    
 | gender | Deprecated | varchar(32) | YES |  |  |  |    
 | xmpp |  | varchar(255) | YES |  |  |  |    
 | attag |  | varchar(255) | YES |  |  |  |    
@@ -26,22 +26,22 @@ contact table
 | photo | Link to the profile photo of the contact | varchar(255) | NO |  |  |  |    
 | thumb | Link to the profile photo (thumb size) | varchar(255) | NO |  |  |  |    
 | micro | Link to the profile photo (micro size) | varchar(255) | NO |  |  |  |    
-| site-pubkey |  | text | NO |  |  |  |    
+| site-pubkey |  | text | NO |  | NULL |  |    
 | issued-id |  | varchar(255) | YES |  |  |  |    
 | dfrn-id |  | varchar(255) | YES |  |  |  |    
 | url |  | varchar(255) | YES |  |  |  |    
 | nurl |  | varchar(255) | YES |  |  |  |    
 | addr |  | varchar(255) | YES |  |  |  |    
 | alias |  | varchar(255) | YES |  |  |  |    
-| pubkey | RSA public key 4096 bit | text | NO |  |  |  |    
-| prvkey | RSA private key 4096 bit | text | NO |  |  |  |    
+| pubkey | RSA public key 4096 bit | text | NO |  | NULL |  |    
+| prvkey | RSA private key 4096 bit | text | NO |  | NULL |  |    
 | batch |  | varchar(255) | YES |  |  |  |    
-| request |  | varchar(255) | NO |  |  |  |    
-| notify |  | varchar(255) | NO |  |  |  |    
-| poll |  | varchar(255) | NO |  |  |  |    
-| confirm |  | varchar(255) | NO |  |  |  |    
-| subscribe |  | varchar(255) | NO |  |  |  |    
-| poco |  | varchar(255) | NO |  |  |  |    
+| request |  | varchar(255) | NO |  | NULL |  |    
+| notify |  | varchar(255) | NO |  | NULL |  |    
+| poll |  | varchar(255) | NO |  | NULL |  |    
+| confirm |  | varchar(255) | NO |  | NULL |  |    
+| subscribe |  | varchar(255) | NO |  | NULL |  |    
+| poco |  | varchar(255) | NO |  | NULL |  |    
 | aes_allow |  | boolean | YES |  | 0 |  |    
 | ret-aes |  | boolean | YES |  | 0 |  |    
 | usehub |  | boolean | YES |  | 0 |  |    
@@ -50,7 +50,7 @@ contact table
 | last-update | Date of the last try to update the contact info | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | success_update | Date of the last successful contact update | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | failure_update | Date of the last failed update | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| failed | Connection failed | boolean | NO |  |  |  |    
+| failed | Connection failed | boolean | NO |  | NULL |  |    
 | name-date |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | uri-date |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | avatar-date |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
@@ -59,13 +59,13 @@ contact table
 | last-discovery | date of the last follower discovery | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | priority |  | tinyint unsigned | YES |  | 0 |  |    
 | blocked | Node-wide block status | boolean | YES |  | 1 |  |    
-| block_reason | Node-wide block reason | text | NO |  |  |  |    
+| block_reason | Node-wide block reason | text | NO |  | NULL |  |    
 | readonly | posts of the contact are readonly | boolean | YES |  | 0 |  |    
 | writable |  | boolean | YES |  | 0 |  |    
 | forum | contact is a forum | boolean | YES |  | 0 |  |    
 | prv | contact is a private group | boolean | YES |  | 0 |  |    
 | contact-type |  | tinyint | YES |  | 0 |  |    
-| manually-approve |  | boolean | NO |  |  |  |    
+| manually-approve |  | boolean | NO |  | NULL |  |    
 | hidden |  | boolean | YES |  | 0 |  |    
 | archive |  | boolean | YES |  | 0 |  |    
 | pending |  | boolean | YES |  | 1 |  |    
@@ -74,15 +74,15 @@ contact table
 | unsearchable | Contact prefers to not be searchable | boolean | YES |  | 0 |  |    
 | sensitive | Contact posts sensitive content | boolean | YES |  | 0 |  |    
 | baseurl | baseurl of the contact | varchar(255) | NO |  |  |  |    
-| gsid | Global Server ID | int unsigned | NO |  |  |  |    
-| reason |  | text | NO |  |  |  |    
+| gsid | Global Server ID | int unsigned | NO |  | NULL |  |    
+| reason |  | text | NO |  | NULL |  |    
 | closeness |  | tinyint unsigned | YES |  | 99 |  |    
-| info |  | mediumtext | NO |  |  |  |    
-| profile-id | Deprecated | int unsigned | NO |  |  |  |    
+| info |  | mediumtext | NO |  | NULL |  |    
+| profile-id | Deprecated | int unsigned | NO |  | NULL |  |    
 | bdyear |  | varchar(4) | YES |  |  |  |    
 | bd |  | date | YES |  | 0001-01-01 |  |    
 | notify_new_posts |  | boolean | YES |  | 0 |  |    
 | fetch_further_information |  | tinyint unsigned | YES |  | 0 |  |    
-| ffi_keyword_denylist |  | text | NO |  |  |  |    
+| ffi_keyword_denylist |  | text | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_conv.md b/doc/database/db_conv.md
index bcea6012d6..d3e40ebbec 100644
--- a/doc/database/db_conv.md
+++ b/doc/database/db_conv.md
@@ -4,13 +4,13 @@ private messages
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | guid | A unique identifier for this conversation | varchar(255) | YES |  |  |  |    
-| recips | sender_handle;recipient_handle | text | NO |  |  |  |    
+| recips | sender_handle;recipient_handle | text | NO |  | NULL |  |    
 | uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
 | creator | handle of creator | varchar(255) | YES |  |  |  |    
 | created | creation timestamp | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | updated | edited timestamp | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| subject | subject of initial message | text | NO |  |  |  |    
+| subject | subject of initial message | text | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_conversation.md b/doc/database/db_conversation.md
index e9ce966905..6c1d5d8ce9 100644
--- a/doc/database/db_conversation.md
+++ b/doc/database/db_conversation.md
@@ -4,13 +4,13 @@ Raw data and structure information for messages
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| item-uri | Original URI of the item - unrelated to the table with the same name | varbinary(255) | YES | PRI |  |  |    
+| item-uri | Original URI of the item - unrelated to the table with the same name | varbinary(255) | YES | PRI | NULL |  |    
 | reply-to-uri | URI to which this item is a reply | varbinary(255) | YES |  |  |  |    
 | conversation-uri | GNU Social conversation URI | varbinary(255) | YES |  |  |  |    
 | conversation-href | GNU Social conversation link | varbinary(255) | YES |  |  |  |    
 | protocol | The protocol of the item | tinyint unsigned | YES |  | 255 |  |    
 | direction | How the message arrived here: 1=push, 2=pull | tinyint unsigned | YES |  | 0 |  |    
-| source | Original source | mediumtext | NO |  |  |  |    
+| source | Original source | mediumtext | NO |  | NULL |  |    
 | received | Receiving date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_delayed-post.md b/doc/database/db_delayed-post.md
index 3f83f49c24..732131a602 100644
--- a/doc/database/db_delayed-post.md
+++ b/doc/database/db_delayed-post.md
@@ -4,9 +4,9 @@ Posts that are about to be distributed at a later time
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | YES | PRI |  | auto_increment |    
-| uri | URI of the post that will be distributed later | varchar(255) | NO |  |  |  |    
-| uid | Owner User id | mediumint unsigned | NO |  |  |  |    
-| delayed | delay time | datetime | NO |  |  |  |    
+| id |  | int unsigned | YES | PRI | NULL | auto_increment |    
+| uri | URI of the post that will be distributed later | varchar(255) | NO |  | NULL |  |    
+| uid | Owner User id | mediumint unsigned | NO |  | NULL |  |    
+| delayed | delay time | datetime | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_diaspora-interaction.md b/doc/database/db_diaspora-interaction.md
index f2906e9d27..f8435b71dc 100644
--- a/doc/database/db_diaspora-interaction.md
+++ b/doc/database/db_diaspora-interaction.md
@@ -4,7 +4,7 @@ Signed Diaspora Interaction
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
-| interaction | The Diaspora interaction | mediumtext | NO |  |  |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
+| interaction | The Diaspora interaction | mediumtext | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_event.md b/doc/database/db_event.md
index 9c46939f3c..d7ef08fcdc 100644
--- a/doc/database/db_event.md
+++ b/doc/database/db_event.md
@@ -4,7 +4,7 @@ Events
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | guid |  | varchar(255) | YES |  |  |  |    
 | uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
 | cid | contact_id (ID of the contact in contact table) | int unsigned | YES |  | 0 |  |    
@@ -13,16 +13,16 @@ Events
 | edited | last edit time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | start | event start time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | finish | event end time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| summary | short description or title of the event | text | NO |  |  |  |    
-| desc | event description | text | NO |  |  |  |    
-| location | event location | text | NO |  |  |  |    
+| summary | short description or title of the event | text | NO |  | NULL |  |    
+| desc | event description | text | NO |  | NULL |  |    
+| location | event location | text | NO |  | NULL |  |    
 | type | event or birthday | varchar(20) | YES |  |  |  |    
 | nofinish | if event does have no end this is 1 | boolean | YES |  | 0 |  |    
 | adjust | adjust to timezone of the recipient (0 or 1) | boolean | YES |  | 1 |  |    
 | ignore | 0 or 1 | boolean | YES |  | 0 |  |    
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | NO |  |  |  |    
-| allow_gid | Access Control - list of allowed groups | mediumtext | NO |  |  |  |    
-| deny_cid | Access Control - list of denied contact.id | mediumtext | NO |  |  |  |    
-| deny_gid | Access Control - list of denied groups | mediumtext | NO |  |  |  |    
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | NO |  | NULL |  |    
+| allow_gid | Access Control - list of allowed groups | mediumtext | NO |  | NULL |  |    
+| deny_cid | Access Control - list of denied contact.id | mediumtext | NO |  | NULL |  |    
+| deny_gid | Access Control - list of denied groups | mediumtext | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_fcontact.md b/doc/database/db_fcontact.md
index ed468633d0..c38df0a04e 100644
--- a/doc/database/db_fcontact.md
+++ b/doc/database/db_fcontact.md
@@ -4,7 +4,7 @@ Diaspora compatible contacts - used in the Diaspora implementation
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | guid | unique id | varchar(255) | YES |  |  |  |    
 | url |  | varchar(255) | YES |  |  |  |    
 | name |  | varchar(255) | YES |  |  |  |    
@@ -19,7 +19,7 @@ Diaspora compatible contacts - used in the Diaspora implementation
 | priority |  | tinyint unsigned | YES |  | 0 |  |    
 | network |  | char(4) | YES |  |  |  |    
 | alias |  | varchar(255) | YES |  |  |  |    
-| pubkey |  | text | NO |  |  |  |    
+| pubkey |  | text | NO |  | NULL |  |    
 | updated |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_fsuggest.md b/doc/database/db_fsuggest.md
index 66865b5063..8b37f268e6 100644
--- a/doc/database/db_fsuggest.md
+++ b/doc/database/db_fsuggest.md
@@ -4,14 +4,14 @@ friend suggestion stuff
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | YES | PRI |  | auto_increment |    
+| id |  | int unsigned | YES | PRI | NULL | auto_increment |    
 | uid | User id | mediumint unsigned | YES |  | 0 |  |    
 | cid |  | int unsigned | YES |  | 0 |  |    
 | name |  | varchar(255) | YES |  |  |  |    
 | url |  | varchar(255) | YES |  |  |  |    
 | request |  | varchar(255) | YES |  |  |  |    
 | photo |  | varchar(255) | YES |  |  |  |    
-| note |  | text | NO |  |  |  |    
+| note |  | text | NO |  | NULL |  |    
 | created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_group.md b/doc/database/db_group.md
index f4f60436cd..d9eb2a4ddf 100644
--- a/doc/database/db_group.md
+++ b/doc/database/db_group.md
@@ -4,7 +4,7 @@ privacy groups, group info
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
 | visible | 1 indicates the member list is not private | boolean | YES |  | 0 |  |    
 | deleted | 1 indicates the group has been deleted | boolean | YES |  | 0 |  |    
diff --git a/doc/database/db_group_member.md b/doc/database/db_group_member.md
index a4ecfdf7db..db53bb5670 100644
--- a/doc/database/db_group_member.md
+++ b/doc/database/db_group_member.md
@@ -4,7 +4,7 @@ privacy groups, member info
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | gid | groups.id of the associated group | int unsigned | YES |  | 0 |  |    
 | contact-id | contact.id of the member assigned to the associated group | int unsigned | YES |  | 0 |  |    
 
diff --git a/doc/database/db_gserver.md b/doc/database/db_gserver.md
index 919363def7..6efc2a9f92 100644
--- a/doc/database/db_gserver.md
+++ b/doc/database/db_gserver.md
@@ -4,28 +4,28 @@ Global servers
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | url |  | varchar(255) | YES |  |  |  |    
 | nurl |  | varchar(255) | YES |  |  |  |    
 | version |  | varchar(255) | YES |  |  |  |    
 | site_name |  | varchar(255) | YES |  |  |  |    
-| info |  | text | NO |  |  |  |    
+| info |  | text | NO |  | NULL |  |    
 | register_policy |  | tinyint | YES |  | 0 |  |    
 | registered-users | Number of registered users | int unsigned | YES |  | 0 |  |    
 | directory-type | Type of directory service (Poco, Mastodon) | tinyint | NO |  | 0 |  |    
 | poco |  | varchar(255) | YES |  |  |  |    
 | noscrape |  | varchar(255) | YES |  |  |  |    
 | network |  | char(4) | YES |  |  |  |    
-| protocol | The protocol of the server | tinyint unsigned | NO |  |  |  |    
+| protocol | The protocol of the server | tinyint unsigned | NO |  | NULL |  |    
 | platform |  | varchar(255) | YES |  |  |  |    
 | relay-subscribe | Has the server subscribed to the relay system | boolean | YES |  | 0 |  |    
 | relay-scope | The scope of messages that the server wants to get | varchar(10) | YES |  |  |  |    
-| detection-method | Method that had been used to detect that server | tinyint unsigned | NO |  |  |  |    
+| detection-method | Method that had been used to detect that server | tinyint unsigned | NO |  | NULL |  |    
 | created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | last_poco_query |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 | last_contact | Last successful connection request | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 | last_failure | Last failed connection request | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| failed | Connection failed | boolean | NO |  |  |  |    
+| failed | Connection failed | boolean | NO |  | NULL |  |    
 | next_contact | Next connection request | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_hook.md b/doc/database/db_hook.md
index 71be258f3d..44fcf5668c 100644
--- a/doc/database/db_hook.md
+++ b/doc/database/db_hook.md
@@ -4,7 +4,7 @@ addon hook registry
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | hook | name of hook | varbinary(100) | YES |  |  |  |    
 | file | relative filename of hook handler | varbinary(200) | YES |  |  |  |    
 | function | function name of hook handler | varbinary(200) | YES |  |  |  |    
diff --git a/doc/database/db_host.md b/doc/database/db_host.md
index 0ce2932286..befb04d608 100644
--- a/doc/database/db_host.md
+++ b/doc/database/db_host.md
@@ -4,7 +4,7 @@ Hostname
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | tinyint unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | tinyint unsigned | YES | PRI | NULL | auto_increment |    
 | name | The hostname | varchar(128) | YES |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_inbox-status.md b/doc/database/db_inbox-status.md
index 93e99dc5d4..81dbb84932 100644
--- a/doc/database/db_inbox-status.md
+++ b/doc/database/db_inbox-status.md
@@ -4,7 +4,7 @@ Status of ActivityPub inboxes
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| url | URL of the inbox | varbinary(255) | YES | PRI |  |  |    
+| url | URL of the inbox | varbinary(255) | YES | PRI | NULL |  |    
 | created | Creation date of this entry | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | success | Date of the last successful delivery | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | failure | Date of the last failed delivery | datetime | YES |  | 0001-01-01 00:00:00 |  |    
diff --git a/doc/database/db_intro.md b/doc/database/db_intro.md
index a05494de5c..34444303d4 100644
--- a/doc/database/db_intro.md
+++ b/doc/database/db_intro.md
@@ -4,13 +4,13 @@ Table intro
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | uid | User id | mediumint unsigned | YES |  | 0 |  |    
-| fid |  | int unsigned | NO |  |  |  |    
+| fid |  | int unsigned | NO |  | NULL |  |    
 | contact-id |  | int unsigned | YES |  | 0 |  |    
 | knowyou |  | boolean | YES |  | 0 |  |    
 | duplex |  | boolean | YES |  | 0 |  |    
-| note |  | text | NO |  |  |  |    
+| note |  | text | NO |  | NULL |  |    
 | hash |  | varchar(255) | YES |  |  |  |    
 | datetime |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | blocked |  | boolean | YES |  | 1 |  |    
diff --git a/doc/database/db_item-uri.md b/doc/database/db_item-uri.md
index 5f1d447147..1fb4f9b950 100644
--- a/doc/database/db_item-uri.md
+++ b/doc/database/db_item-uri.md
@@ -4,8 +4,8 @@ URI and GUID for items
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | YES | PRI |  | auto_increment |    
-| uri | URI of an item | varbinary(255) | YES |  |  |  |    
-| guid | A unique identifier for an item | varbinary(255) | NO |  |  |  |    
+| id |  | int unsigned | YES | PRI | NULL | auto_increment |    
+| uri | URI of an item | varbinary(255) | YES |  | NULL |  |    
+| guid | A unique identifier for an item | varbinary(255) | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_locks.md b/doc/database/db_locks.md
index 3c219c2cc5..774e9ed9b1 100644
--- a/doc/database/db_locks.md
+++ b/doc/database/db_locks.md
@@ -4,7 +4,7 @@ Table locks
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | name |  | varchar(128) | YES |  |  |  |    
 | locked |  | boolean | YES |  | 0 |  |    
 | pid | Process ID | int unsigned | YES |  | 0 |  |    
diff --git a/doc/database/db_mail.md b/doc/database/db_mail.md
index 43c9baf33c..75ecf6a9f4 100644
--- a/doc/database/db_mail.md
+++ b/doc/database/db_mail.md
@@ -4,27 +4,27 @@ private messages
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
 | guid | A unique identifier for this private message | varchar(255) | YES |  |  |  |    
 | from-name | name of the sender | varchar(255) | YES |  |  |  |    
 | from-photo | contact photo link of the sender | varchar(255) | YES |  |  |  |    
 | from-url | profile linke of the sender | varchar(255) | YES |  |  |  |    
-| contact-id | contact.id | varchar(255) | NO |  |  |  |    
-| author-id | Link to the contact table with uid=0 of the author of the mail | int unsigned | NO |  |  |  |    
-| convid | conv.id | int unsigned | NO |  |  |  |    
+| contact-id | contact.id | varchar(255) | NO |  | NULL |  |    
+| author-id | Link to the contact table with uid=0 of the author of the mail | int unsigned | NO |  | NULL |  |    
+| convid | conv.id | int unsigned | NO |  | NULL |  |    
 | title |  | varchar(255) | YES |  |  |  |    
-| body |  | mediumtext | NO |  |  |  |    
+| body |  | mediumtext | NO |  | NULL |  |    
 | seen | if message visited it is 1 | boolean | YES |  | 0 |  |    
 | reply |  | boolean | YES |  | 0 |  |    
 | replied |  | boolean | YES |  | 0 |  |    
 | unknown | if sender not in the contact table this is 1 | boolean | YES |  | 0 |  |    
 | uri |  | varchar(255) | YES |  |  |  |    
-| uri-id | Item-uri id of the related mail | int unsigned | NO |  |  |  |    
+| uri-id | Item-uri id of the related mail | int unsigned | NO |  | NULL |  |    
 | parent-uri |  | varchar(255) | YES |  |  |  |    
-| parent-uri-id | Item-uri id of the parent of the related mail | int unsigned | NO |  |  |  |    
-| thr-parent |  | varchar(255) | NO |  |  |  |    
-| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | NO |  |  |  |    
+| parent-uri-id | Item-uri id of the parent of the related mail | int unsigned | NO |  | NULL |  |    
+| thr-parent |  | varchar(255) | NO |  | NULL |  |    
+| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | NO |  | NULL |  |    
 | created | creation time of the private message | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_mailacct.md b/doc/database/db_mailacct.md
index 2c2b4e7af4..898116fd08 100644
--- a/doc/database/db_mailacct.md
+++ b/doc/database/db_mailacct.md
@@ -4,14 +4,14 @@ Mail account data for fetching mails
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | uid | User id | mediumint unsigned | YES |  | 0 |  |    
 | server |  | varchar(255) | YES |  |  |  |    
 | port |  | smallint unsigned | YES |  | 0 |  |    
 | ssltype |  | varchar(16) | YES |  |  |  |    
 | mailbox |  | varchar(255) | YES |  |  |  |    
 | user |  | varchar(255) | YES |  |  |  |    
-| pass |  | text | NO |  |  |  |    
+| pass |  | text | NO |  | NULL |  |    
 | reply_to |  | varchar(255) | YES |  |  |  |    
 | action |  | tinyint unsigned | YES |  | 0 |  |    
 | movetofolder |  | varchar(255) | YES |  |  |  |    
diff --git a/doc/database/db_manage.md b/doc/database/db_manage.md
index 94994ec9b0..53d44a4d42 100644
--- a/doc/database/db_manage.md
+++ b/doc/database/db_manage.md
@@ -4,7 +4,7 @@ table of accounts that can manage each other
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | uid | User id | mediumint unsigned | YES |  | 0 |  |    
 | mid | User id | mediumint unsigned | YES |  | 0 |  |    
 
diff --git a/doc/database/db_notification.md b/doc/database/db_notification.md
index f4e524d73c..51240b493f 100644
--- a/doc/database/db_notification.md
+++ b/doc/database/db_notification.md
@@ -4,14 +4,14 @@ notifications
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
-| uid | Owner User id | mediumint unsigned | NO |  |  |  |    
-| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | NO |  |  |  |    
-| type |  | tinyint unsigned | NO |  |  |  |    
-| actor-id | Link to the contact table with uid=0 of the actor that caused the notification | int unsigned | NO |  |  |  |    
-| target-uri-id | Item-uri id of the related post | int unsigned | NO |  |  |  |    
-| parent-uri-id | Item-uri id of the parent of the related post | int unsigned | NO |  |  |  |    
-| created |  | datetime | NO |  |  |  |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
+| uid | Owner User id | mediumint unsigned | NO |  | NULL |  |    
+| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | NO |  | NULL |  |    
+| type |  | tinyint unsigned | NO |  | NULL |  |    
+| actor-id | Link to the contact table with uid=0 of the actor that caused the notification | int unsigned | NO |  | NULL |  |    
+| target-uri-id | Item-uri id of the related post | int unsigned | NO |  | NULL |  |    
+| parent-uri-id | Item-uri id of the parent of the related post | int unsigned | NO |  | NULL |  |    
+| created |  | datetime | NO |  | NULL |  |    
 | seen |  | boolean | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notify-threads.md b/doc/database/db_notify-threads.md
index a788e82242..18c443444c 100644
--- a/doc/database/db_notify-threads.md
+++ b/doc/database/db_notify-threads.md
@@ -4,10 +4,10 @@ Table notify-threads
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | notify-id |  | int unsigned | YES |  | 0 |  |    
-| master-parent-item | Deprecated | int unsigned | NO |  |  |  |    
-| master-parent-uri-id | Item-uri id of the parent of the related post | int unsigned | NO |  |  |  |    
+| master-parent-item | Deprecated | int unsigned | NO |  | NULL |  |    
+| master-parent-uri-id | Item-uri id of the parent of the related post | int unsigned | NO |  | NULL |  |    
 | parent-item |  | int unsigned | YES |  | 0 |  |    
 | receiver-uid | User id | mediumint unsigned | YES |  | 0 |  |    
 
diff --git a/doc/database/db_notify.md b/doc/database/db_notify.md
index 360e93ba24..58d4d923d2 100644
--- a/doc/database/db_notify.md
+++ b/doc/database/db_notify.md
@@ -4,23 +4,23 @@ notifications
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | type |  | smallint unsigned | YES |  | 0 |  |    
 | name |  | varchar(255) | YES |  |  |  |    
 | url |  | varchar(255) | YES |  |  |  |    
 | photo |  | varchar(255) | YES |  |  |  |    
 | date |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| msg |  | mediumtext | NO |  |  |  |    
+| msg |  | mediumtext | NO |  | NULL |  |    
 | uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
 | link |  | varchar(255) | YES |  |  |  |    
-| iid |  | int unsigned | NO |  |  |  |    
-| parent |  | int unsigned | NO |  |  |  |    
-| uri-id | Item-uri id of the related post | int unsigned | NO |  |  |  |    
-| parent-uri-id | Item-uri id of the parent of the related post | int unsigned | NO |  |  |  |    
+| iid |  | int unsigned | NO |  | NULL |  |    
+| parent |  | int unsigned | NO |  | NULL |  |    
+| uri-id | Item-uri id of the related post | int unsigned | NO |  | NULL |  |    
+| parent-uri-id | Item-uri id of the parent of the related post | int unsigned | NO |  | NULL |  |    
 | seen |  | boolean | YES |  | 0 |  |    
 | verb |  | varchar(100) | YES |  |  |  |    
 | otype |  | varchar(10) | YES |  |  |  |    
-| name_cache | Cached bbcode parsing of name | tinytext | NO |  |  |  |    
-| msg_cache | Cached bbcode parsing of msg | mediumtext | NO |  |  |  |    
+| name_cache | Cached bbcode parsing of name | tinytext | NO |  | NULL |  |    
+| msg_cache | Cached bbcode parsing of msg | mediumtext | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_oembed.md b/doc/database/db_oembed.md
index e08af5f010..e74bfb7100 100644
--- a/doc/database/db_oembed.md
+++ b/doc/database/db_oembed.md
@@ -4,9 +4,9 @@ cache for OEmbed queries
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| url | page url | varbinary(255) | YES | PRI |  |  |    
-| maxwidth | Maximum width passed to Oembed | mediumint unsigned | YES | PRI |  |  |    
-| content | OEmbed data of the page | mediumtext | NO |  |  |  |    
+| url | page url | varbinary(255) | YES | PRI | NULL |  |    
+| maxwidth | Maximum width passed to Oembed | mediumint unsigned | YES | PRI | NULL |  |    
+| content | OEmbed data of the page | mediumtext | NO |  | NULL |  |    
 | created | datetime of creation | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_openwebauth-token.md b/doc/database/db_openwebauth-token.md
index 98fa7b6a41..3b2cab3726 100644
--- a/doc/database/db_openwebauth-token.md
+++ b/doc/database/db_openwebauth-token.md
@@ -4,7 +4,7 @@ Store OpenWebAuth token to verify contacts
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | uid | User id - currently unused | mediumint unsigned | YES |  | 0 |  |    
 | type | Verify type | varchar(32) | YES |  |  |  |    
 | token | A generated token | varchar(255) | YES |  |  |  |    
diff --git a/doc/database/db_parsed_url.md b/doc/database/db_parsed_url.md
index 9b2912ccea..bf4b7117f5 100644
--- a/doc/database/db_parsed_url.md
+++ b/doc/database/db_parsed_url.md
@@ -4,11 +4,11 @@ cache for &#039;parse_url&#039; queries
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| url_hash | page url hash | binary(64) | YES | PRI |  |  |    
+| url_hash | page url hash | binary(64) | YES | PRI | NULL |  |    
 | guessing | is the &#039;guessing&#039; mode active? | boolean | YES | PRI | 0 |  |    
 | oembed | is the data the result of oembed? | boolean | YES | PRI | 0 |  |    
-| url | page url | text | YES |  |  |  |    
-| content | page data | mediumtext | NO |  |  |  |    
+| url | page url | text | YES |  | NULL |  |    
+| content | page data | mediumtext | NO |  | NULL |  |    
 | created | datetime of creation | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | expires | datetime of expiration | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
diff --git a/doc/database/db_pconfig.md b/doc/database/db_pconfig.md
index 2bffcff5ad..7c71d53053 100644
--- a/doc/database/db_pconfig.md
+++ b/doc/database/db_pconfig.md
@@ -4,10 +4,10 @@ personal (per user) configuration storage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | Primary key | int unsigned | YES | PRI |  | auto_increment |    
+| id | Primary key | int unsigned | YES | PRI | NULL | auto_increment |    
 | uid | User id | mediumint unsigned | YES |  | 0 |  |    
 | cat | Category | varchar(50) | YES |  |  |  |    
 | k | Key | varchar(100) | YES |  |  |  |    
-| v | Value | mediumtext | NO |  |  |  |    
+| v | Value | mediumtext | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_permissionset.md b/doc/database/db_permissionset.md
index 0e60ff3800..3086d8a943 100644
--- a/doc/database/db_permissionset.md
+++ b/doc/database/db_permissionset.md
@@ -4,11 +4,11 @@ Table permissionset
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | uid | Owner id of this permission set | mediumint unsigned | YES |  | 0 |  |    
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | NO |  |  |  |    
-| allow_gid | Access Control - list of allowed groups | mediumtext | NO |  |  |  |    
-| deny_cid | Access Control - list of denied contact.id | mediumtext | NO |  |  |  |    
-| deny_gid | Access Control - list of denied groups | mediumtext | NO |  |  |  |    
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | NO |  | NULL |  |    
+| allow_gid | Access Control - list of allowed groups | mediumtext | NO |  | NULL |  |    
+| deny_cid | Access Control - list of denied contact.id | mediumtext | NO |  | NULL |  |    
+| deny_gid | Access Control - list of denied groups | mediumtext | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_photo.md b/doc/database/db_photo.md
index ef8f2b1824..3834e72a49 100644
--- a/doc/database/db_photo.md
+++ b/doc/database/db_photo.md
@@ -4,32 +4,32 @@ photo storage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
 | contact-id | contact.id | int unsigned | YES |  | 0 |  |    
 | guid | A unique identifier for this photo | char(16) | YES |  |  |  |    
 | resource-id |  | char(32) | YES |  |  |  |    
-| hash | hash value of the photo | char(32) | NO |  |  |  |    
+| hash | hash value of the photo | char(32) | NO |  | NULL |  |    
 | created | creation date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | edited | last edited date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | title |  | varchar(255) | YES |  |  |  |    
-| desc |  | text | NO |  |  |  |    
+| desc |  | text | NO |  | NULL |  |    
 | album | The name of the album to which the photo belongs | varchar(255) | YES |  |  |  |    
 | filename |  | varchar(255) | YES |  |  |  |    
 | type |  | varchar(30) | YES |  | image/jpeg |  |    
 | height |  | smallint unsigned | YES |  | 0 |  |    
 | width |  | smallint unsigned | YES |  | 0 |  |    
 | datasize |  | int unsigned | YES |  | 0 |  |    
-| data |  | mediumblob | YES |  |  |  |    
+| data |  | mediumblob | YES |  | NULL |  |    
 | scale |  | tinyint unsigned | YES |  | 0 |  |    
 | profile |  | boolean | YES |  | 0 |  |    
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | NO |  |  |  |    
-| allow_gid | Access Control - list of allowed groups | mediumtext | NO |  |  |  |    
-| deny_cid | Access Control - list of denied contact.id | mediumtext | NO |  |  |  |    
-| deny_gid | Access Control - list of denied groups | mediumtext | NO |  |  |  |    
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | NO |  | NULL |  |    
+| allow_gid | Access Control - list of allowed groups | mediumtext | NO |  | NULL |  |    
+| deny_cid | Access Control - list of denied contact.id | mediumtext | NO |  | NULL |  |    
+| deny_gid | Access Control - list of denied groups | mediumtext | NO |  | NULL |  |    
 | accessible | Make photo publicly accessible, ignoring permissions | boolean | YES |  | 0 |  |    
-| backend-class | Storage backend class | tinytext | NO |  |  |  |    
-| backend-ref | Storage backend data reference | text | NO |  |  |  |    
+| backend-class | Storage backend class | tinytext | NO |  | NULL |  |    
+| backend-ref | Storage backend data reference | text | NO |  | NULL |  |    
 | updated |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-category.md b/doc/database/db_post-category.md
index 3765072d0e..9be89de455 100644
--- a/doc/database/db_post-category.md
+++ b/doc/database/db_post-category.md
@@ -4,7 +4,7 @@ post relation to categories
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
 | uid | User id | mediumint unsigned | YES | PRI | 0 |  |    
 | type |  | tinyint unsigned | YES | PRI | 0 |  |    
 | tid |  | int unsigned | YES | PRI | 0 |  |    
diff --git a/doc/database/db_post-content.md b/doc/database/db_post-content.md
index 65e051cbdb..c75c417227 100644
--- a/doc/database/db_post-content.md
+++ b/doc/database/db_post-content.md
@@ -4,21 +4,21 @@ Content for all posts
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
 | title | item title | varchar(255) | YES |  |  |  |    
 | content-warning |  | varchar(255) | YES |  |  |  |    
-| body | item body content | mediumtext | NO |  |  |  |    
-| raw-body | Body without embedded media links | mediumtext | NO |  |  |  |    
+| body | item body content | mediumtext | NO |  | NULL |  |    
+| raw-body | Body without embedded media links | mediumtext | NO |  | NULL |  |    
 | location | text location where this item originated | varchar(255) | YES |  |  |  |    
 | coord | longitude/latitude pair representing location where this item originated | varchar(255) | YES |  |  |  |    
-| language | Language information about this post | text | NO |  |  |  |    
+| language | Language information about this post | text | NO |  | NULL |  |    
 | app | application which generated this item | varchar(255) | YES |  |  |  |    
 | rendered-hash |  | varchar(32) | YES |  |  |  |    
-| rendered-html | item.body converted to html | mediumtext | NO |  |  |  |    
+| rendered-html | item.body converted to html | mediumtext | NO |  | NULL |  |    
 | object-type | ActivityStreams object type | varchar(100) | YES |  |  |  |    
-| object | JSON encoded object structure unless it is an implied object (normal post) | text | NO |  |  |  |    
+| object | JSON encoded object structure unless it is an implied object (normal post) | text | NO |  | NULL |  |    
 | target-type | ActivityStreams target type if applicable (URI) | varchar(100) | YES |  |  |  |    
-| target | JSON encoded target structure if used | text | NO |  |  |  |    
+| target | JSON encoded target structure if used | text | NO |  | NULL |  |    
 | resource-id | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32) | YES |  |  |  |    
 | plink | permalink or URL to a displayable copy of the message at its source | varchar(255) | YES |  |  |  |    
 
diff --git a/doc/database/db_post-delivery-data.md b/doc/database/db_post-delivery-data.md
index d9efbe1804..bf3289e266 100644
--- a/doc/database/db_post-delivery-data.md
+++ b/doc/database/db_post-delivery-data.md
@@ -4,9 +4,9 @@ Delivery data for items
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
-| postopts | External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery | text | NO |  |  |  |    
-| inform | Additional receivers of the linked item | mediumtext | NO |  |  |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
+| postopts | External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery | text | NO |  | NULL |  |    
+| inform | Additional receivers of the linked item | mediumtext | NO |  | NULL |  |    
 | queue_count | Initial number of delivery recipients, used as item.delivery_queue_count | mediumint | YES |  | 0 |  |    
 | queue_done | Number of successful deliveries, used as item.delivery_queue_done | mediumint | YES |  | 0 |  |    
 | queue_failed | Number of unsuccessful deliveries, used as item.delivery_queue_failed | mediumint | YES |  | 0 |  |    
diff --git a/doc/database/db_post-media.md b/doc/database/db_post-media.md
index 4115301c0a..58f1ed7030 100644
--- a/doc/database/db_post-media.md
+++ b/doc/database/db_post-media.md
@@ -4,24 +4,24 @@ Attached media
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES |  |  |  |    
-| url | Media URL | varbinary(511) | YES |  |  |  |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES |  | NULL |  |    
+| url | Media URL | varbinary(511) | YES |  | NULL |  |    
 | type | Media type | tinyint unsigned | YES |  | 0 |  |    
-| mimetype |  | varchar(60) | NO |  |  |  |    
-| height | Height of the media | smallint unsigned | NO |  |  |  |    
-| width | Width of the media | smallint unsigned | NO |  |  |  |    
-| size | Media size | int unsigned | NO |  |  |  |    
-| preview | Preview URL | varbinary(255) | NO |  |  |  |    
-| preview-height | Height of the preview picture | smallint unsigned | NO |  |  |  |    
-| preview-width | Width of the preview picture | smallint unsigned | NO |  |  |  |    
-| description |  | text | NO |  |  |  |    
-| name | Name of the media | varchar(255) | NO |  |  |  |    
-| author-url | URL of the author of the media | varbinary(255) | NO |  |  |  |    
-| author-name | Name of the author of the media | varchar(255) | NO |  |  |  |    
-| author-image | Image of the author of the media | varbinary(255) | NO |  |  |  |    
-| publisher-url | URL of the publisher of the media | varbinary(255) | NO |  |  |  |    
-| publisher-name | Name of the publisher of the media | varchar(255) | NO |  |  |  |    
-| publisher-image | Image of the publisher of the media | varbinary(255) | NO |  |  |  |    
+| mimetype |  | varchar(60) | NO |  | NULL |  |    
+| height | Height of the media | smallint unsigned | NO |  | NULL |  |    
+| width | Width of the media | smallint unsigned | NO |  | NULL |  |    
+| size | Media size | int unsigned | NO |  | NULL |  |    
+| preview | Preview URL | varbinary(255) | NO |  | NULL |  |    
+| preview-height | Height of the preview picture | smallint unsigned | NO |  | NULL |  |    
+| preview-width | Width of the preview picture | smallint unsigned | NO |  | NULL |  |    
+| description |  | text | NO |  | NULL |  |    
+| name | Name of the media | varchar(255) | NO |  | NULL |  |    
+| author-url | URL of the author of the media | varbinary(255) | NO |  | NULL |  |    
+| author-name | Name of the author of the media | varchar(255) | NO |  | NULL |  |    
+| author-image | Image of the author of the media | varbinary(255) | NO |  | NULL |  |    
+| publisher-url | URL of the publisher of the media | varbinary(255) | NO |  | NULL |  |    
+| publisher-name | Name of the publisher of the media | varchar(255) | NO |  | NULL |  |    
+| publisher-image | Image of the publisher of the media | varbinary(255) | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-tag.md b/doc/database/db_post-tag.md
index 6beccad706..9c33ec2ae4 100644
--- a/doc/database/db_post-tag.md
+++ b/doc/database/db_post-tag.md
@@ -4,7 +4,7 @@ post relation to tags
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
 | type |  | tinyint unsigned | YES | PRI | 0 |  |    
 | tid |  | int unsigned | YES | PRI | 0 |  |    
 | cid | Contact id of the mentioned public contact | int unsigned | YES | PRI | 0 |  |    
diff --git a/doc/database/db_post-thread-user.md b/doc/database/db_post-thread-user.md
index 375728050d..9a3a996fcc 100644
--- a/doc/database/db_post-thread-user.md
+++ b/doc/database/db_post-thread-user.md
@@ -4,10 +4,10 @@ Thread related data per user
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
 | owner-id | Item owner | int unsigned | YES |  | 0 |  |    
 | author-id | Item author | int unsigned | YES |  | 0 |  |    
-| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | NO |  |  |  |    
+| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | NO |  | NULL |  |    
 | network |  | char(4) | YES |  |  |  |    
 | created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | received |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
@@ -25,7 +25,7 @@ Thread related data per user
 | unseen | post has not been seen | boolean | YES |  | 1 |  |    
 | hidden | Marker to hide the post from the user | boolean | YES |  | 0 |  |    
 | origin | item originated at this site | boolean | YES |  | 0 |  |    
-| psid | ID of the permission set of this post | int unsigned | NO |  |  |  |    
-| post-user-id | Id of the post-user table | int unsigned | NO |  |  |  |    
+| psid | ID of the permission set of this post | int unsigned | NO |  | NULL |  |    
+| post-user-id | Id of the post-user table | int unsigned | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-thread.md b/doc/database/db_post-thread.md
index 301a16a66f..49fac4fd91 100644
--- a/doc/database/db_post-thread.md
+++ b/doc/database/db_post-thread.md
@@ -4,10 +4,10 @@ Thread related data
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
 | owner-id | Item owner | int unsigned | YES |  | 0 |  |    
 | author-id | Item author | int unsigned | YES |  | 0 |  |    
-| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | NO |  |  |  |    
+| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | NO |  | NULL |  |    
 | network |  | char(4) | YES |  |  |  |    
 | created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | received |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
diff --git a/doc/database/db_post-user-notification.md b/doc/database/db_post-user-notification.md
index 4ceea2a683..01727e2667 100644
--- a/doc/database/db_post-user-notification.md
+++ b/doc/database/db_post-user-notification.md
@@ -4,8 +4,8 @@ User post notifications
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
-| uid | Owner id which owns this copy of the item | mediumint unsigned | YES | PRI |  |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
+| uid | Owner id which owns this copy of the item | mediumint unsigned | YES | PRI | NULL |  |    
 | notification-type |  | tinyint unsigned | YES |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-user.md b/doc/database/db_post-user.md
index da6312b1de..58fa6f902a 100644
--- a/doc/database/db_post-user.md
+++ b/doc/database/db_post-user.md
@@ -4,11 +4,11 @@ User specific post data
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | YES | PRI |  | auto_increment |    
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES |  |  |  |    
-| parent-uri-id | Id of the item-uri table that contains the parent uri | int unsigned | NO |  |  |  |    
-| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | NO |  |  |  |    
-| external-id | Id of the item-uri table entry that contains the external uri | int unsigned | NO |  |  |  |    
+| id |  | int unsigned | YES | PRI | NULL | auto_increment |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES |  | NULL |  |    
+| parent-uri-id | Id of the item-uri table that contains the parent uri | int unsigned | NO |  | NULL |  |    
+| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | NO |  | NULL |  |    
+| external-id | Id of the item-uri table entry that contains the external uri | int unsigned | NO |  | NULL |  |    
 | created | Creation timestamp. | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | edited | Date of last edit (default is created) | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | received | datetime | datetime | YES |  | 0001-01-01 00:00:00 |  |    
@@ -16,23 +16,23 @@ User specific post data
 | network | Network from where the item comes from | char(4) | YES |  |  |  |    
 | owner-id | Link to the contact table with uid=0 of the owner of this item | int unsigned | YES |  | 0 |  |    
 | author-id | Link to the contact table with uid=0 of the author of this item | int unsigned | YES |  | 0 |  |    
-| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | NO |  |  |  |    
+| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | NO |  | NULL |  |    
 | post-type | Post type (personal note, image, article, ...) | tinyint unsigned | YES |  | 0 |  |    
 | post-reason | Reason why the post arrived at the user | tinyint unsigned | YES |  | 0 |  |    
-| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | NO |  |  |  |    
+| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | NO |  | NULL |  |    
 | private | 0=public, 1=private, 2=unlisted | tinyint unsigned | YES |  | 0 |  |    
 | global |  | boolean | YES |  | 0 |  |    
 | visible |  | boolean | YES |  | 0 |  |    
 | deleted | item has been marked for deletion | boolean | YES |  | 0 |  |    
-| uid | Owner id which owns this copy of the item | mediumint unsigned | YES |  |  |  |    
-| protocol | Protocol used to deliver the item for this user | tinyint unsigned | NO |  |  |  |    
+| uid | Owner id which owns this copy of the item | mediumint unsigned | YES |  | NULL |  |    
+| protocol | Protocol used to deliver the item for this user | tinyint unsigned | NO |  | NULL |  |    
 | contact-id | contact.id | int unsigned | YES |  | 0 |  |    
-| event-id | Used to link to the event.id | int unsigned | NO |  |  |  |    
+| event-id | Used to link to the event.id | int unsigned | NO |  | NULL |  |    
 | unseen | post has not been seen | boolean | YES |  | 1 |  |    
 | hidden | Marker to hide the post from the user | boolean | YES |  | 0 |  |    
 | notification-type |  | tinyint unsigned | YES |  | 0 |  |    
 | wall | This item was posted to the wall of uid | boolean | YES |  | 0 |  |    
 | origin | item originated at this site | boolean | YES |  | 0 |  |    
-| psid | ID of the permission set of this post | int unsigned | NO |  |  |  |    
+| psid | ID of the permission set of this post | int unsigned | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post.md b/doc/database/db_post.md
index f8e09b05b0..020e5e9c9f 100644
--- a/doc/database/db_post.md
+++ b/doc/database/db_post.md
@@ -4,10 +4,10 @@ Structure for all posts
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI |  |  |    
-| parent-uri-id | Id of the item-uri table that contains the parent uri | int unsigned | NO |  |  |  |    
-| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | NO |  |  |  |    
-| external-id | Id of the item-uri table entry that contains the external uri | int unsigned | NO |  |  |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
+| parent-uri-id | Id of the item-uri table that contains the parent uri | int unsigned | NO |  | NULL |  |    
+| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | NO |  | NULL |  |    
+| external-id | Id of the item-uri table entry that contains the external uri | int unsigned | NO |  | NULL |  |    
 | created | Creation timestamp. | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | edited | Date of last edit (default is created) | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | received | datetime | datetime | YES |  | 0001-01-01 00:00:00 |  |    
@@ -15,9 +15,9 @@ Structure for all posts
 | network | Network from where the item comes from | char(4) | YES |  |  |  |    
 | owner-id | Link to the contact table with uid=0 of the owner of this item | int unsigned | YES |  | 0 |  |    
 | author-id | Link to the contact table with uid=0 of the author of this item | int unsigned | YES |  | 0 |  |    
-| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | NO |  |  |  |    
+| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | NO |  | NULL |  |    
 | post-type | Post type (personal note, image, article, ...) | tinyint unsigned | YES |  | 0 |  |    
-| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | NO |  |  |  |    
+| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | NO |  | NULL |  |    
 | private | 0=public, 1=private, 2=unlisted | tinyint unsigned | YES |  | 0 |  |    
 | global |  | boolean | YES |  | 0 |  |    
 | visible |  | boolean | YES |  | 0 |  |    
diff --git a/doc/database/db_process.md b/doc/database/db_process.md
index 8a2ad1ac88..2c92fc84d3 100644
--- a/doc/database/db_process.md
+++ b/doc/database/db_process.md
@@ -4,7 +4,7 @@ Currently running system processes
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| pid |  | int unsigned | YES | PRI |  |  |    
+| pid |  | int unsigned | YES | PRI | NULL |  |    
 | command |  | varbinary(32) | YES |  |  |  |    
 | created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
diff --git a/doc/database/db_profile.md b/doc/database/db_profile.md
index eb2297023b..aa0e36066f 100644
--- a/doc/database/db_profile.md
+++ b/doc/database/db_profile.md
@@ -4,42 +4,42 @@ user profiles data
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
-| profile-name | Deprecated | varchar(255) | NO |  |  |  |    
-| is-default | Deprecated | boolean | NO |  |  |  |    
+| profile-name | Deprecated | varchar(255) | NO |  | NULL |  |    
+| is-default | Deprecated | boolean | NO |  | NULL |  |    
 | hide-friends | Hide friend list from viewers of this profile | boolean | YES |  | 0 |  |    
 | name |  | varchar(255) | YES |  |  |  |    
-| pdesc | Deprecated | varchar(255) | NO |  |  |  |    
+| pdesc | Deprecated | varchar(255) | NO |  | NULL |  |    
 | dob | Day of birth | varchar(32) | YES |  | 0000-00-00 |  |    
 | address |  | varchar(255) | YES |  |  |  |    
 | locality |  | varchar(255) | YES |  |  |  |    
 | region |  | varchar(255) | YES |  |  |  |    
 | postal-code |  | varchar(32) | YES |  |  |  |    
 | country-name |  | varchar(255) | YES |  |  |  |    
-| hometown | Deprecated | varchar(255) | NO |  |  |  |    
-| gender | Deprecated | varchar(32) | NO |  |  |  |    
-| marital | Deprecated | varchar(255) | NO |  |  |  |    
-| with | Deprecated | text | NO |  |  |  |    
-| howlong | Deprecated | datetime | NO |  |  |  |    
-| sexual | Deprecated | varchar(255) | NO |  |  |  |    
-| politic | Deprecated | varchar(255) | NO |  |  |  |    
-| religion | Deprecated | varchar(255) | NO |  |  |  |    
-| pub_keywords |  | text | NO |  |  |  |    
-| prv_keywords |  | text | NO |  |  |  |    
-| likes | Deprecated | text | NO |  |  |  |    
-| dislikes | Deprecated | text | NO |  |  |  |    
-| about | Profile description | text | NO |  |  |  |    
-| summary | Deprecated | varchar(255) | NO |  |  |  |    
-| music | Deprecated | text | NO |  |  |  |    
-| book | Deprecated | text | NO |  |  |  |    
-| tv | Deprecated | text | NO |  |  |  |    
-| film | Deprecated | text | NO |  |  |  |    
-| interest | Deprecated | text | NO |  |  |  |    
-| romance | Deprecated | text | NO |  |  |  |    
-| work | Deprecated | text | NO |  |  |  |    
-| education | Deprecated | text | NO |  |  |  |    
-| contact | Deprecated | text | NO |  |  |  |    
+| hometown | Deprecated | varchar(255) | NO |  | NULL |  |    
+| gender | Deprecated | varchar(32) | NO |  | NULL |  |    
+| marital | Deprecated | varchar(255) | NO |  | NULL |  |    
+| with | Deprecated | text | NO |  | NULL |  |    
+| howlong | Deprecated | datetime | NO |  | NULL |  |    
+| sexual | Deprecated | varchar(255) | NO |  | NULL |  |    
+| politic | Deprecated | varchar(255) | NO |  | NULL |  |    
+| religion | Deprecated | varchar(255) | NO |  | NULL |  |    
+| pub_keywords |  | text | NO |  | NULL |  |    
+| prv_keywords |  | text | NO |  | NULL |  |    
+| likes | Deprecated | text | NO |  | NULL |  |    
+| dislikes | Deprecated | text | NO |  | NULL |  |    
+| about | Profile description | text | NO |  | NULL |  |    
+| summary | Deprecated | varchar(255) | NO |  | NULL |  |    
+| music | Deprecated | text | NO |  | NULL |  |    
+| book | Deprecated | text | NO |  | NULL |  |    
+| tv | Deprecated | text | NO |  | NULL |  |    
+| film | Deprecated | text | NO |  | NULL |  |    
+| interest | Deprecated | text | NO |  | NULL |  |    
+| romance | Deprecated | text | NO |  | NULL |  |    
+| work | Deprecated | text | NO |  | NULL |  |    
+| education | Deprecated | text | NO |  | NULL |  |    
+| contact | Deprecated | text | NO |  | NULL |  |    
 | homepage |  | varchar(255) | YES |  |  |  |    
 | xmpp |  | varchar(255) | YES |  |  |  |    
 | photo |  | varchar(255) | YES |  |  |  |    
diff --git a/doc/database/db_profile_check.md b/doc/database/db_profile_check.md
index ed8c936fcb..b41a102732 100644
--- a/doc/database/db_profile_check.md
+++ b/doc/database/db_profile_check.md
@@ -4,7 +4,7 @@ DFRN remote auth use
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | uid | User id | mediumint unsigned | YES |  | 0 |  |    
 | cid | contact.id | int unsigned | YES |  | 0 |  |    
 | dfrn_id |  | varchar(255) | YES |  |  |  |    
diff --git a/doc/database/db_profile_field.md b/doc/database/db_profile_field.md
index 9a0b9fda11..4018f1256f 100644
--- a/doc/database/db_profile_field.md
+++ b/doc/database/db_profile_field.md
@@ -4,12 +4,12 @@ Custom profile fields
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | uid | Owner user id | mediumint unsigned | YES |  | 0 |  |    
 | order | Field ordering per user | mediumint unsigned | YES |  | 1 |  |    
-| psid | ID of the permission set of this profile field - 0 = public | int unsigned | NO |  |  |  |    
+| psid | ID of the permission set of this profile field - 0 = public | int unsigned | NO |  | NULL |  |    
 | label | Label of the field | varchar(255) | YES |  |  |  |    
-| value | Value of the field | text | NO |  |  |  |    
+| value | Value of the field | text | NO |  | NULL |  |    
 | created | creation time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | edited | last edit time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
diff --git a/doc/database/db_push_subscriber.md b/doc/database/db_push_subscriber.md
index 97b3f0fc06..d745db6d2e 100644
--- a/doc/database/db_push_subscriber.md
+++ b/doc/database/db_push_subscriber.md
@@ -4,7 +4,7 @@ Used for OStatus: Contains feed subscribers
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | uid | User id | mediumint unsigned | YES |  | 0 |  |    
 | callback_url |  | varchar(255) | YES |  |  |  |    
 | topic |  | varchar(255) | YES |  |  |  |    
diff --git a/doc/database/db_register.md b/doc/database/db_register.md
index f2bc2c28d5..fe2f18ba84 100644
--- a/doc/database/db_register.md
+++ b/doc/database/db_register.md
@@ -4,12 +4,12 @@ registrations requiring admin approval
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | hash |  | varchar(255) | YES |  |  |  |    
 | created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | uid | User id | mediumint unsigned | YES |  | 0 |  |    
 | password |  | varchar(255) | YES |  |  |  |    
 | language |  | varchar(16) | YES |  |  |  |    
-| note |  | text | NO |  |  |  |    
+| note |  | text | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_search.md b/doc/database/db_search.md
index a5f5e11f26..994a3ffbf2 100644
--- a/doc/database/db_search.md
+++ b/doc/database/db_search.md
@@ -4,7 +4,7 @@ Table search
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
 | uid | User id | mediumint unsigned | YES |  | 0 |  |    
 | term |  | varchar(255) | YES |  |  |  |    
 
diff --git a/doc/database/db_session.md b/doc/database/db_session.md
index 1e3e1f3776..80916366a2 100644
--- a/doc/database/db_session.md
+++ b/doc/database/db_session.md
@@ -4,9 +4,9 @@ web session storage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | bigint unsigned | YES | PRI |  | auto_increment |    
+| id | sequential ID | bigint unsigned | YES | PRI | NULL | auto_increment |    
 | sid |  | varbinary(255) | YES |  |  |  |    
-| data |  | text | NO |  |  |  |    
+| data |  | text | NO |  | NULL |  |    
 | expire |  | int unsigned | YES |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_storage.md b/doc/database/db_storage.md
index 77795196b4..376f0cb225 100644
--- a/doc/database/db_storage.md
+++ b/doc/database/db_storage.md
@@ -4,7 +4,7 @@ Data stored by Database storage backend
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | Auto incremented image data id | int unsigned | YES | PRI |  | auto_increment |    
-| data | file data | longblob | YES |  |  |  |    
+| id | Auto incremented image data id | int unsigned | YES | PRI | NULL | auto_increment |    
+| data | file data | longblob | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_tag.md b/doc/database/db_tag.md
index bc7cfa4f50..3fb7d7d8fc 100644
--- a/doc/database/db_tag.md
+++ b/doc/database/db_tag.md
@@ -4,7 +4,7 @@ tags and mentions
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | YES | PRI |  | auto_increment |    
+| id |  | int unsigned | YES | PRI | NULL | auto_increment |    
 | name |  | varchar(96) | YES |  |  |  |    
 | url |  | varbinary(255) | YES |  |  |  |    
 
diff --git a/doc/database/db_tokens.md b/doc/database/db_tokens.md
index ade6543660..93510a16e7 100644
--- a/doc/database/db_tokens.md
+++ b/doc/database/db_tokens.md
@@ -4,8 +4,8 @@ OAuth usage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | varchar(40) | YES | PRI |  |  |    
-| secret |  | text | NO |  |  |  |    
+| id |  | varchar(40) | YES | PRI | NULL |  |    
+| secret |  | text | NO |  | NULL |  |    
 | client_id |  | varchar(20) | YES |  |  |  |    
 | expires |  | int | YES |  | 0 |  |    
 | scope |  | varchar(200) | YES |  |  |  |    
diff --git a/doc/database/db_user-contact.md b/doc/database/db_user-contact.md
index a08cf3153d..2c208735a7 100644
--- a/doc/database/db_user-contact.md
+++ b/doc/database/db_user-contact.md
@@ -6,8 +6,8 @@ User specific public contact data
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
 | cid | Contact id of the linked public contact | int unsigned | YES | PRI | 0 |  |    
 | uid | User id | mediumint unsigned | YES | PRI | 0 |  |    
-| blocked | Contact is completely blocked for this user | boolean | NO |  |  |  |    
-| ignored | Posts from this contact are ignored | boolean | NO |  |  |  |    
-| collapsed | Posts from this contact are collapsed | boolean | NO |  |  |  |    
+| blocked | Contact is completely blocked for this user | boolean | NO |  | NULL |  |    
+| ignored | Posts from this contact are ignored | boolean | NO |  | NULL |  |    
+| collapsed | Posts from this contact are collapsed | boolean | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_user.md b/doc/database/db_user.md
index 03c6820ea1..8f055b1bc2 100644
--- a/doc/database/db_user.md
+++ b/doc/database/db_user.md
@@ -4,8 +4,8 @@ The local users
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uid | sequential ID | mediumint unsigned | YES | PRI |  | auto_increment |    
-| parent-uid | The parent user that has full control about this user | mediumint unsigned | NO |  |  |  |    
+| uid | sequential ID | mediumint unsigned | YES | PRI | NULL | auto_increment |    
+| parent-uid | The parent user that has full control about this user | mediumint unsigned | NO |  | NULL |  |    
 | guid | A unique identifier for this user | varchar(64) | YES |  |  |  |    
 | username | Name that this user is known by | varchar(255) | YES |  |  |  |    
 | password | encrypted password | varchar(255) | YES |  |  |  |    
@@ -20,10 +20,10 @@ The local users
 | default-location | Default for item.location | varchar(255) | YES |  |  |  |    
 | allow_location | 1 allows to display the location | boolean | YES |  | 0 |  |    
 | theme | user theme preference | varchar(255) | YES |  |  |  |    
-| pubkey | RSA public key 4096 bit | text | NO |  |  |  |    
-| prvkey | RSA private key 4096 bit | text | NO |  |  |  |    
-| spubkey |  | text | NO |  |  |  |    
-| sprvkey |  | text | NO |  |  |  |    
+| pubkey | RSA public key 4096 bit | text | NO |  | NULL |  |    
+| prvkey | RSA private key 4096 bit | text | NO |  | NULL |  |    
+| spubkey |  | text | NO |  | NULL |  |    
+| sprvkey |  | text | NO |  | NULL |  |    
 | verified | user is verified through email | boolean | YES |  | 0 |  |    
 | blocked | 1 for user is blocked | boolean | YES |  | 0 |  |    
 | blockwall | Prohibit contacts to post to the profile page of the user | boolean | YES |  | 0 |  |    
@@ -35,8 +35,8 @@ The local users
 | page-flags | page/profile type | tinyint unsigned | YES |  | 0 |  |    
 | account-type |  | tinyint unsigned | YES |  | 0 |  |    
 | prvnets |  | boolean | YES |  | 0 |  |    
-| pwdreset | Password reset request token | varchar(255) | NO |  |  |  |    
-| pwdreset_time | Timestamp of the last password reset request | datetime | NO |  |  |  |    
+| pwdreset | Password reset request token | varchar(255) | NO |  | NULL |  |    
+| pwdreset_time | Timestamp of the last password reset request | datetime | NO |  | NULL |  |    
 | maxreq |  | int unsigned | YES |  | 10 |  |    
 | expire |  | int unsigned | YES |  | 0 |  |    
 | account_removed | if 1 the account is removed | boolean | YES |  | 0 |  |    
@@ -44,10 +44,10 @@ The local users
 | account_expires_on | timestamp when account expires and will be deleted | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | expire_notification_sent | timestamp of last warning of account expiration | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | def_gid |  | int unsigned | YES |  | 0 |  |    
-| allow_cid | default permission for this user | mediumtext | NO |  |  |  |    
-| allow_gid | default permission for this user | mediumtext | NO |  |  |  |    
-| deny_cid | default permission for this user | mediumtext | NO |  |  |  |    
-| deny_gid | default permission for this user | mediumtext | NO |  |  |  |    
-| openidserver |  | text | NO |  |  |  |    
+| allow_cid | default permission for this user | mediumtext | NO |  | NULL |  |    
+| allow_gid | default permission for this user | mediumtext | NO |  | NULL |  |    
+| deny_cid | default permission for this user | mediumtext | NO |  | NULL |  |    
+| deny_gid | default permission for this user | mediumtext | NO |  | NULL |  |    
+| openidserver |  | text | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_userd.md b/doc/database/db_userd.md
index 99baabcc66..42cc72c3cb 100644
--- a/doc/database/db_userd.md
+++ b/doc/database/db_userd.md
@@ -4,7 +4,7 @@ Deleted usernames
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI |  | auto_increment |    
-| username |  | varchar(255) | YES |  |  |  |    
+| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
+| username |  | varchar(255) | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_verb.md b/doc/database/db_verb.md
index 7e01f1f8e6..73871a07ca 100644
--- a/doc/database/db_verb.md
+++ b/doc/database/db_verb.md
@@ -4,7 +4,7 @@ Activity Verbs
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | smallint unsigned | YES | PRI |  | auto_increment |    
+| id |  | smallint unsigned | YES | PRI | NULL | auto_increment |    
 | name |  | varchar(100) | YES |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_worker-ipc.md b/doc/database/db_worker-ipc.md
index ef8c97301e..5246974f57 100644
--- a/doc/database/db_worker-ipc.md
+++ b/doc/database/db_worker-ipc.md
@@ -4,7 +4,7 @@ Inter process communication between the frontend and the worker
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| key |  | int | YES | PRI |  |  |    
-| jobs | Flag for outstanding jobs | boolean | NO |  |  |  |    
+| key |  | int | YES | PRI | NULL |  |    
+| jobs | Flag for outstanding jobs | boolean | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_workerqueue.md b/doc/database/db_workerqueue.md
index 0a14e0aecb..ec10ba5496 100644
--- a/doc/database/db_workerqueue.md
+++ b/doc/database/db_workerqueue.md
@@ -4,9 +4,9 @@ Background tasks queue entries
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | Auto incremented worker task id | int unsigned | YES | PRI |  | auto_increment |    
-| command | Task command | varchar(100) | NO |  |  |  |    
-| parameter | Task parameter | mediumtext | NO |  |  |  |    
+| id | Auto incremented worker task id | int unsigned | YES | PRI | NULL | auto_increment |    
+| command | Task command | varchar(100) | NO |  | NULL |  |    
+| parameter | Task parameter | mediumtext | NO |  | NULL |  |    
 | priority | Task priority | tinyint unsigned | YES |  | 0 |  |    
 | created | Creation date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 | pid | Process id of the worker | int unsigned | YES |  | 0 |  |    
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index d1975f5042..888ac73e67 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -174,7 +174,7 @@ class DBStructure
 				$field['type']    = $value['type'];
 				$field['notnull'] = ($value['not null'] ?? false) ? 'YES' : 'NO';
 				$field['primary'] = ($value['primary'] ?? false) ? 'PRI' : '';
-				$field['default'] = $value['default'] ?? '';
+				$field['default'] = $value['default'] ?? 'NULL';
 				$field['extra']   = $value['extra'] ?? '';
 		
 				$fields[] = $field;

From a827f948c867ceebf60d82b0740032512be23302 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 14 Jun 2021 05:14:09 +0000
Subject: [PATCH 05/14] Reversed "null"

---
 doc/database/db_2fa_app_specific_password.md |  12 +-
 doc/database/db_2fa_recovery_codes.md        |   8 +-
 doc/database/db_2fa_trusted_browser.md       |  10 +-
 doc/database/db_addon.md                     |  14 +-
 doc/database/db_apcontact.md                 |  48 +++---
 doc/database/db_application-token.md         |  20 +--
 doc/database/db_application.md               |  22 +--
 doc/database/db_attach.md                    |  30 ++--
 doc/database/db_auth_codes.md                |  10 +-
 doc/database/db_cache.md                     |   8 +-
 doc/database/db_challenge.md                 |  12 +-
 doc/database/db_clients.md                   |  12 +-
 doc/database/db_config.md                    |   8 +-
 doc/database/db_contact-relation.md          |  10 +-
 doc/database/db_contact.md                   | 160 +++++++++----------
 doc/database/db_conv.md                      |  16 +-
 doc/database/db_conversation.md              |  16 +-
 doc/database/db_delayed-post.md              |   8 +-
 doc/database/db_diaspora-interaction.md      |   4 +-
 doc/database/db_event.md                     |  40 ++---
 doc/database/db_fcontact.md                  |  34 ++--
 doc/database/db_fsuggest.md                  |  18 +--
 doc/database/db_group.md                     |  10 +-
 doc/database/db_group_member.md              |   6 +-
 doc/database/db_gserver-tag.md               |   4 +-
 doc/database/db_gserver.md                   |  46 +++---
 doc/database/db_hook.md                      |  10 +-
 doc/database/db_host.md                      |   4 +-
 doc/database/db_inbox-status.md              |  14 +-
 doc/database/db_intro.md                     |  22 +--
 doc/database/db_item-uri.md                  |   6 +-
 doc/database/db_locks.md                     |  10 +-
 doc/database/db_mail.md                      |  44 ++---
 doc/database/db_mailacct.md                  |  26 +--
 doc/database/db_manage.md                    |   6 +-
 doc/database/db_notification.md              |  18 +--
 doc/database/db_notify-threads.md            |  12 +-
 doc/database/db_notify.md                    |  36 ++---
 doc/database/db_oembed.md                    |   8 +-
 doc/database/db_openwebauth-token.md         |  12 +-
 doc/database/db_parsed_url.md                |  14 +-
 doc/database/db_pconfig.md                   |  10 +-
 doc/database/db_permissionset.md             |  12 +-
 doc/database/db_photo.md                     |  54 +++----
 doc/database/db_post-category.md             |   8 +-
 doc/database/db_post-content.md              |  34 ++--
 doc/database/db_post-delivery-data.md        |  22 +--
 doc/database/db_post-media.md                |  38 ++---
 doc/database/db_post-tag.md                  |   8 +-
 doc/database/db_post-thread-user.md          |  46 +++---
 doc/database/db_post-thread.md               |  18 +--
 doc/database/db_post-user-notification.md    |   6 +-
 doc/database/db_post-user.md                 |  60 +++----
 doc/database/db_post.md                      |  36 ++---
 doc/database/db_process.md                   |   6 +-
 doc/database/db_profile.md                   |  84 +++++-----
 doc/database/db_profile_check.md             |  12 +-
 doc/database/db_profile_field.md             |  16 +-
 doc/database/db_push_subscriber.md           |  20 +--
 doc/database/db_register.md                  |  14 +-
 doc/database/db_search.md                    |   6 +-
 doc/database/db_session.md                   |   8 +-
 doc/database/db_storage.md                   |   4 +-
 doc/database/db_tag.md                       |   6 +-
 doc/database/db_tokens.md                    |  12 +-
 doc/database/db_user-contact.md              |  10 +-
 doc/database/db_user.md                      |  90 +++++------
 doc/database/db_userd.md                     |   4 +-
 doc/database/db_verb.md                      |   4 +-
 doc/database/db_worker-ipc.md                |   4 +-
 doc/database/db_workerqueue.md               |  20 +--
 src/Database/DBStructure.php                 |   2 +-
 view/templates/structure.tpl                 |   2 +-
 73 files changed, 752 insertions(+), 752 deletions(-)

diff --git a/doc/database/db_2fa_app_specific_password.md b/doc/database/db_2fa_app_specific_password.md
index 660319e041..654de9a6e6 100644
--- a/doc/database/db_2fa_app_specific_password.md
+++ b/doc/database/db_2fa_app_specific_password.md
@@ -4,11 +4,11 @@ Two-factor app-specific _password
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | Password ID for revocation | mediumint unsigned | YES | PRI | NULL | auto_increment |    
-| uid | User ID | mediumint unsigned | YES |  | NULL |  |    
-| description | Description of the usage of the password | varchar(255) | NO |  | NULL |  |    
-| hashed_password | Hashed password | varchar(255) | YES |  | NULL |  |    
-| generated | Datetime the password was generated | datetime | YES |  | NULL |  |    
-| last_used | Datetime the password was last used | datetime | NO |  | NULL |  |    
+| id | Password ID for revocation | mediumint unsigned | NO | PRI | NULL | auto_increment |    
+| uid | User ID | mediumint unsigned | NO |  | NULL |  |    
+| description | Description of the usage of the password | varchar(255) | YES |  | NULL |  |    
+| hashed_password | Hashed password | varchar(255) | NO |  | NULL |  |    
+| generated | Datetime the password was generated | datetime | NO |  | NULL |  |    
+| last_used | Datetime the password was last used | datetime | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_2fa_recovery_codes.md b/doc/database/db_2fa_recovery_codes.md
index aec9bbd559..61bd520d91 100644
--- a/doc/database/db_2fa_recovery_codes.md
+++ b/doc/database/db_2fa_recovery_codes.md
@@ -4,9 +4,9 @@ Two-factor authentication recovery codes
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uid | User ID | mediumint unsigned | YES | PRI | NULL |  |    
-| code | Recovery code string | varchar(50) | YES | PRI | NULL |  |    
-| generated | Datetime the code was generated | datetime | YES |  | NULL |  |    
-| used | Datetime the code was used | datetime | NO |  | NULL |  |    
+| uid | User ID | mediumint unsigned | NO | PRI | NULL |  |    
+| code | Recovery code string | varchar(50) | NO | PRI | NULL |  |    
+| generated | Datetime the code was generated | datetime | NO |  | NULL |  |    
+| used | Datetime the code was used | datetime | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_2fa_trusted_browser.md b/doc/database/db_2fa_trusted_browser.md
index f3b3365627..ccb426880a 100644
--- a/doc/database/db_2fa_trusted_browser.md
+++ b/doc/database/db_2fa_trusted_browser.md
@@ -4,10 +4,10 @@ Two-factor authentication trusted browsers
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| cookie_hash | Trusted cookie hash | varchar(80) | YES | PRI | NULL |  |    
-| uid | User ID | mediumint unsigned | YES |  | NULL |  |    
-| user_agent | User agent string | text | NO |  | NULL |  |    
-| created | Datetime the trusted browser was recorded | datetime | YES |  | NULL |  |    
-| last_used | Datetime the trusted browser was last used | datetime | NO |  | NULL |  |    
+| cookie_hash | Trusted cookie hash | varchar(80) | NO | PRI | NULL |  |    
+| uid | User ID | mediumint unsigned | NO |  | NULL |  |    
+| user_agent | User agent string | text | YES |  | NULL |  |    
+| created | Datetime the trusted browser was recorded | datetime | NO |  | NULL |  |    
+| last_used | Datetime the trusted browser was last used | datetime | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_addon.md b/doc/database/db_addon.md
index 91918adef1..ae8507af0d 100644
--- a/doc/database/db_addon.md
+++ b/doc/database/db_addon.md
@@ -4,12 +4,12 @@ registered addons
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | YES | PRI | NULL | auto_increment |    
-| name | addon base (file)name | varchar(50) | YES |  |  |  |    
-| version | currently unused | varchar(50) | YES |  |  |  |    
-| installed | currently always 1 | boolean | YES |  | 0 |  |    
-| hidden | currently unused | boolean | YES |  | 0 |  |    
-| timestamp | file timestamp to check for reloads | int unsigned | YES |  | 0 |  |    
-| plugin_admin | 1 = has admin config, 0 = has no admin config | boolean | YES |  | 0 |  |    
+| id |  | int unsigned | NO | PRI | NULL | auto_increment |    
+| name | addon base (file)name | varchar(50) | NO |  |  |  |    
+| version | currently unused | varchar(50) | NO |  |  |  |    
+| installed | currently always 1 | boolean | NO |  | 0 |  |    
+| hidden | currently unused | boolean | NO |  | 0 |  |    
+| timestamp | file timestamp to check for reloads | int unsigned | NO |  | 0 |  |    
+| plugin_admin | 1 = has admin config, 0 = has no admin config | boolean | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_apcontact.md b/doc/database/db_apcontact.md
index 69d33fe6c4..9cff3af0cd 100644
--- a/doc/database/db_apcontact.md
+++ b/doc/database/db_apcontact.md
@@ -4,29 +4,29 @@ ActivityPub compatible contacts - used in the ActivityPub implementation
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| url | URL of the contact | varbinary(255) | YES | PRI | NULL |  |    
-| uuid |  | varchar(255) | NO |  | NULL |  |    
-| type |  | varchar(20) | YES |  | NULL |  |    
-| following |  | varchar(255) | NO |  | NULL |  |    
-| followers |  | varchar(255) | NO |  | NULL |  |    
-| inbox |  | varchar(255) | YES |  | NULL |  |    
-| outbox |  | varchar(255) | NO |  | NULL |  |    
-| sharedinbox |  | varchar(255) | NO |  | NULL |  |    
-| manually-approve |  | boolean | NO |  | NULL |  |    
-| nick |  | varchar(255) | YES |  |  |  |    
-| name |  | varchar(255) | NO |  | NULL |  |    
-| about |  | text | NO |  | NULL |  |    
-| photo |  | varchar(255) | NO |  | NULL |  |    
-| addr |  | varchar(255) | NO |  | NULL |  |    
-| alias |  | varchar(255) | NO |  | NULL |  |    
-| pubkey |  | text | NO |  | NULL |  |    
-| subscribe |  | varchar(255) | NO |  | NULL |  |    
-| baseurl | baseurl of the ap contact | varchar(255) | NO |  | NULL |  |    
-| gsid | Global Server ID | int unsigned | NO |  | NULL |  |    
-| generator | Name of the contact&#039;s system | varchar(255) | NO |  | NULL |  |    
-| following_count | Number of following contacts | int unsigned | NO |  | 0 |  |    
-| followers_count | Number of followers | int unsigned | NO |  | 0 |  |    
-| statuses_count | Number of posts | int unsigned | NO |  | 0 |  |    
-| updated |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| url | URL of the contact | varbinary(255) | NO | PRI | NULL |  |    
+| uuid |  | varchar(255) | YES |  | NULL |  |    
+| type |  | varchar(20) | NO |  | NULL |  |    
+| following |  | varchar(255) | YES |  | NULL |  |    
+| followers |  | varchar(255) | YES |  | NULL |  |    
+| inbox |  | varchar(255) | NO |  | NULL |  |    
+| outbox |  | varchar(255) | YES |  | NULL |  |    
+| sharedinbox |  | varchar(255) | YES |  | NULL |  |    
+| manually-approve |  | boolean | YES |  | NULL |  |    
+| nick |  | varchar(255) | NO |  |  |  |    
+| name |  | varchar(255) | YES |  | NULL |  |    
+| about |  | text | YES |  | NULL |  |    
+| photo |  | varchar(255) | YES |  | NULL |  |    
+| addr |  | varchar(255) | YES |  | NULL |  |    
+| alias |  | varchar(255) | YES |  | NULL |  |    
+| pubkey |  | text | YES |  | NULL |  |    
+| subscribe |  | varchar(255) | YES |  | NULL |  |    
+| baseurl | baseurl of the ap contact | varchar(255) | YES |  | NULL |  |    
+| gsid | Global Server ID | int unsigned | YES |  | NULL |  |    
+| generator | Name of the contact&#039;s system | varchar(255) | YES |  | NULL |  |    
+| following_count | Number of following contacts | int unsigned | YES |  | 0 |  |    
+| followers_count | Number of followers | int unsigned | YES |  | 0 |  |    
+| statuses_count | Number of posts | int unsigned | YES |  | 0 |  |    
+| updated |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_application-token.md b/doc/database/db_application-token.md
index af2b8d6613..c847c32181 100644
--- a/doc/database/db_application-token.md
+++ b/doc/database/db_application-token.md
@@ -4,15 +4,15 @@ OAuth user token
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| application-id |  | int unsigned | YES | PRI | NULL |  |    
-| uid | Owner User id | mediumint unsigned | YES | PRI | NULL |  |    
-| code |  | varchar(64) | YES |  | NULL |  |    
-| access_token |  | varchar(64) | YES |  | NULL |  |    
-| created_at | creation time | datetime | YES |  | NULL |  |    
-| scopes |  | varchar(255) | NO |  | NULL |  |    
-| read | Read scope | boolean | NO |  | NULL |  |    
-| write | Write scope | boolean | NO |  | NULL |  |    
-| follow | Follow scope | boolean | NO |  | NULL |  |    
-| push | Push scope | boolean | NO |  | NULL |  |    
+| application-id |  | int unsigned | NO | PRI | NULL |  |    
+| uid | Owner User id | mediumint unsigned | NO | PRI | NULL |  |    
+| code |  | varchar(64) | NO |  | NULL |  |    
+| access_token |  | varchar(64) | NO |  | NULL |  |    
+| created_at | creation time | datetime | NO |  | NULL |  |    
+| scopes |  | varchar(255) | YES |  | NULL |  |    
+| read | Read scope | boolean | YES |  | NULL |  |    
+| write | Write scope | boolean | YES |  | NULL |  |    
+| follow | Follow scope | boolean | YES |  | NULL |  |    
+| push | Push scope | boolean | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_application.md b/doc/database/db_application.md
index 799b01fa16..261c982047 100644
--- a/doc/database/db_application.md
+++ b/doc/database/db_application.md
@@ -4,16 +4,16 @@ OAuth application
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | generated index | int unsigned | YES | PRI | NULL | auto_increment |    
-| client_id |  | varchar(64) | YES |  | NULL |  |    
-| client_secret |  | varchar(64) | YES |  | NULL |  |    
-| name |  | varchar(255) | YES |  | NULL |  |    
-| redirect_uri |  | varchar(255) | YES |  | NULL |  |    
-| website |  | varchar(255) | NO |  | NULL |  |    
-| scopes |  | varchar(255) | NO |  | NULL |  |    
-| read | Read scope | boolean | NO |  | NULL |  |    
-| write | Write scope | boolean | NO |  | NULL |  |    
-| follow | Follow scope | boolean | NO |  | NULL |  |    
-| push | Push scope | boolean | NO |  | NULL |  |    
+| id | generated index | int unsigned | NO | PRI | NULL | auto_increment |    
+| client_id |  | varchar(64) | NO |  | NULL |  |    
+| client_secret |  | varchar(64) | NO |  | NULL |  |    
+| name |  | varchar(255) | NO |  | NULL |  |    
+| redirect_uri |  | varchar(255) | NO |  | NULL |  |    
+| website |  | varchar(255) | YES |  | NULL |  |    
+| scopes |  | varchar(255) | YES |  | NULL |  |    
+| read | Read scope | boolean | YES |  | NULL |  |    
+| write | Write scope | boolean | YES |  | NULL |  |    
+| follow | Follow scope | boolean | YES |  | NULL |  |    
+| push | Push scope | boolean | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_attach.md b/doc/database/db_attach.md
index ee546d54e8..fec3f8b242 100644
--- a/doc/database/db_attach.md
+++ b/doc/database/db_attach.md
@@ -4,20 +4,20 @@ file attachments
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | generated index | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
-| hash | hash | varchar(64) | YES |  |  |  |    
-| filename | filename of original | varchar(255) | YES |  |  |  |    
-| filetype | mimetype | varchar(64) | YES |  |  |  |    
-| filesize | size in bytes | int unsigned | YES |  | 0 |  |    
-| data | file data | longblob | YES |  | NULL |  |    
-| created | creation time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| edited | last edit time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt; | mediumtext | NO |  | NULL |  |    
-| allow_gid | Access Control - list of allowed groups | mediumtext | NO |  | NULL |  |    
-| deny_cid | Access Control - list of denied contact.id | mediumtext | NO |  | NULL |  |    
-| deny_gid | Access Control - list of denied groups | mediumtext | NO |  | NULL |  |    
-| backend-class | Storage backend class | tinytext | NO |  | NULL |  |    
-| backend-ref | Storage backend data reference | text | NO |  | NULL |  |    
+| id | generated index | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
+| hash | hash | varchar(64) | NO |  |  |  |    
+| filename | filename of original | varchar(255) | NO |  |  |  |    
+| filetype | mimetype | varchar(64) | NO |  |  |  |    
+| filesize | size in bytes | int unsigned | NO |  | 0 |  |    
+| data | file data | longblob | NO |  | NULL |  |    
+| created | creation time | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| edited | last edit time | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt; | mediumtext | YES |  | NULL |  |    
+| allow_gid | Access Control - list of allowed groups | mediumtext | YES |  | NULL |  |    
+| deny_cid | Access Control - list of denied contact.id | mediumtext | YES |  | NULL |  |    
+| deny_gid | Access Control - list of denied groups | mediumtext | YES |  | NULL |  |    
+| backend-class | Storage backend class | tinytext | YES |  | NULL |  |    
+| backend-ref | Storage backend data reference | text | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_auth_codes.md b/doc/database/db_auth_codes.md
index 51d78aa5a3..51cad7595e 100644
--- a/doc/database/db_auth_codes.md
+++ b/doc/database/db_auth_codes.md
@@ -4,10 +4,10 @@ OAuth usage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | varchar(40) | YES | PRI | NULL |  |    
-| client_id |  | varchar(20) | YES |  |  |  |    
-| redirect_uri |  | varchar(200) | YES |  |  |  |    
-| expires |  | int | YES |  | 0 |  |    
-| scope |  | varchar(250) | YES |  |  |  |    
+| id |  | varchar(40) | NO | PRI | NULL |  |    
+| client_id |  | varchar(20) | NO |  |  |  |    
+| redirect_uri |  | varchar(200) | NO |  |  |  |    
+| expires |  | int | NO |  | 0 |  |    
+| scope |  | varchar(250) | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_cache.md b/doc/database/db_cache.md
index 1d1d552c3a..403fbf8649 100644
--- a/doc/database/db_cache.md
+++ b/doc/database/db_cache.md
@@ -4,9 +4,9 @@ Stores temporary data
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| k | cache key | varbinary(255) | YES | PRI | NULL |  |    
-| v | cached serialized value | mediumtext | NO |  | NULL |  |    
-| expires | datetime of cache expiration | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| updated | datetime of cache insertion | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| k | cache key | varbinary(255) | NO | PRI | NULL |  |    
+| v | cached serialized value | mediumtext | YES |  | NULL |  |    
+| expires | datetime of cache expiration | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| updated | datetime of cache insertion | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_challenge.md b/doc/database/db_challenge.md
index d3633f1860..54ffd252cf 100644
--- a/doc/database/db_challenge.md
+++ b/doc/database/db_challenge.md
@@ -4,11 +4,11 @@ Table challenge
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| challenge |  | varchar(255) | YES |  |  |  |    
-| dfrn-id |  | varchar(255) | YES |  |  |  |    
-| expire |  | int unsigned | YES |  | 0 |  |    
-| type |  | varchar(255) | YES |  |  |  |    
-| last_update |  | varchar(255) | YES |  |  |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| challenge |  | varchar(255) | NO |  |  |  |    
+| dfrn-id |  | varchar(255) | NO |  |  |  |    
+| expire |  | int unsigned | NO |  | 0 |  |    
+| type |  | varchar(255) | NO |  |  |  |    
+| last_update |  | varchar(255) | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_clients.md b/doc/database/db_clients.md
index acbcaea2c7..8f72824846 100644
--- a/doc/database/db_clients.md
+++ b/doc/database/db_clients.md
@@ -4,11 +4,11 @@ OAuth usage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| client_id |  | varchar(20) | YES | PRI | NULL |  |    
-| pw |  | varchar(20) | YES |  |  |  |    
-| redirect_uri |  | varchar(200) | YES |  |  |  |    
-| name |  | text | NO |  | NULL |  |    
-| icon |  | text | NO |  | NULL |  |    
-| uid | User id | mediumint unsigned | YES |  | 0 |  |    
+| client_id |  | varchar(20) | NO | PRI | NULL |  |    
+| pw |  | varchar(20) | NO |  |  |  |    
+| redirect_uri |  | varchar(200) | NO |  |  |  |    
+| name |  | text | YES |  | NULL |  |    
+| icon |  | text | YES |  | NULL |  |    
+| uid | User id | mediumint unsigned | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_config.md b/doc/database/db_config.md
index e2fb6149fc..0eba8f11af 100644
--- a/doc/database/db_config.md
+++ b/doc/database/db_config.md
@@ -4,9 +4,9 @@ main configuration storage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | YES | PRI | NULL | auto_increment |    
-| cat |  | varbinary(50) | YES |  |  |  |    
-| k |  | varbinary(50) | YES |  |  |  |    
-| v |  | mediumtext | NO |  | NULL |  |    
+| id |  | int unsigned | NO | PRI | NULL | auto_increment |    
+| cat |  | varbinary(50) | NO |  |  |  |    
+| k |  | varbinary(50) | NO |  |  |  |    
+| v |  | mediumtext | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_contact-relation.md b/doc/database/db_contact-relation.md
index 5077cd753f..4fe92a7756 100644
--- a/doc/database/db_contact-relation.md
+++ b/doc/database/db_contact-relation.md
@@ -4,10 +4,10 @@ Contact relations
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| cid | contact the related contact had interacted with | int unsigned | YES | PRI | 0 |  |    
-| relation-cid | related contact who had interacted with the contact | int unsigned | YES | PRI | 0 |  |    
-| last-interaction | Date of the last interaction | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| follow-updated | Date of the last update of the contact relationship | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| follows |  | boolean | YES |  | 0 |  |    
+| cid | contact the related contact had interacted with | int unsigned | NO | PRI | 0 |  |    
+| relation-cid | related contact who had interacted with the contact | int unsigned | NO | PRI | 0 |  |    
+| last-interaction | Date of the last interaction | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| follow-updated | Date of the last update of the contact relationship | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| follows |  | boolean | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_contact.md b/doc/database/db_contact.md
index e362e33458..35b94cdd77 100644
--- a/doc/database/db_contact.md
+++ b/doc/database/db_contact.md
@@ -4,85 +4,85 @@ contact table
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
-| created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| updated | Date of last contact update | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| self | 1 if the contact is the user him/her self | boolean | YES |  | 0 |  |    
-| remote_self |  | boolean | YES |  | 0 |  |    
-| rel | The kind of the relation between the user and the contact | tinyint unsigned | YES |  | 0 |  |    
-| duplex |  | boolean | YES |  | 0 |  |    
-| network | Network of the contact | char(4) | YES |  |  |  |    
-| protocol | Protocol of the contact | char(4) | YES |  |  |  |    
-| name | Name that this contact is known by | varchar(255) | YES |  |  |  |    
-| nick | Nick- and user name of the contact | varchar(255) | YES |  |  |  |    
-| location |  | varchar(255) | NO |  |  |  |    
-| about |  | text | NO |  | NULL |  |    
-| keywords | public keywords (interests) of the contact | text | NO |  | NULL |  |    
-| gender | Deprecated | varchar(32) | YES |  |  |  |    
-| xmpp |  | varchar(255) | YES |  |  |  |    
-| attag |  | varchar(255) | YES |  |  |  |    
-| avatar |  | varchar(255) | YES |  |  |  |    
-| photo | Link to the profile photo of the contact | varchar(255) | NO |  |  |  |    
-| thumb | Link to the profile photo (thumb size) | varchar(255) | NO |  |  |  |    
-| micro | Link to the profile photo (micro size) | varchar(255) | NO |  |  |  |    
-| site-pubkey |  | text | NO |  | NULL |  |    
-| issued-id |  | varchar(255) | YES |  |  |  |    
-| dfrn-id |  | varchar(255) | YES |  |  |  |    
-| url |  | varchar(255) | YES |  |  |  |    
-| nurl |  | varchar(255) | YES |  |  |  |    
-| addr |  | varchar(255) | YES |  |  |  |    
-| alias |  | varchar(255) | YES |  |  |  |    
-| pubkey | RSA public key 4096 bit | text | NO |  | NULL |  |    
-| prvkey | RSA private key 4096 bit | text | NO |  | NULL |  |    
-| batch |  | varchar(255) | YES |  |  |  |    
-| request |  | varchar(255) | NO |  | NULL |  |    
-| notify |  | varchar(255) | NO |  | NULL |  |    
-| poll |  | varchar(255) | NO |  | NULL |  |    
-| confirm |  | varchar(255) | NO |  | NULL |  |    
-| subscribe |  | varchar(255) | NO |  | NULL |  |    
-| poco |  | varchar(255) | NO |  | NULL |  |    
-| aes_allow |  | boolean | YES |  | 0 |  |    
-| ret-aes |  | boolean | YES |  | 0 |  |    
-| usehub |  | boolean | YES |  | 0 |  |    
-| subhub |  | boolean | YES |  | 0 |  |    
-| hub-verify |  | varchar(255) | YES |  |  |  |    
-| last-update | Date of the last try to update the contact info | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| success_update | Date of the last successful contact update | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| failure_update | Date of the last failed update | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| failed | Connection failed | boolean | NO |  | NULL |  |    
-| name-date |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| uri-date |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| avatar-date |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| term-date |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| last-item | date of the last post | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| last-discovery | date of the last follower discovery | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| priority |  | tinyint unsigned | YES |  | 0 |  |    
-| blocked | Node-wide block status | boolean | YES |  | 1 |  |    
-| block_reason | Node-wide block reason | text | NO |  | NULL |  |    
-| readonly | posts of the contact are readonly | boolean | YES |  | 0 |  |    
-| writable |  | boolean | YES |  | 0 |  |    
-| forum | contact is a forum | boolean | YES |  | 0 |  |    
-| prv | contact is a private group | boolean | YES |  | 0 |  |    
-| contact-type |  | tinyint | YES |  | 0 |  |    
-| manually-approve |  | boolean | NO |  | NULL |  |    
-| hidden |  | boolean | YES |  | 0 |  |    
-| archive |  | boolean | YES |  | 0 |  |    
-| pending |  | boolean | YES |  | 1 |  |    
-| deleted | Contact has been deleted | boolean | YES |  | 0 |  |    
-| rating |  | tinyint | YES |  | 0 |  |    
-| unsearchable | Contact prefers to not be searchable | boolean | YES |  | 0 |  |    
-| sensitive | Contact posts sensitive content | boolean | YES |  | 0 |  |    
-| baseurl | baseurl of the contact | varchar(255) | NO |  |  |  |    
-| gsid | Global Server ID | int unsigned | NO |  | NULL |  |    
-| reason |  | text | NO |  | NULL |  |    
-| closeness |  | tinyint unsigned | YES |  | 99 |  |    
-| info |  | mediumtext | NO |  | NULL |  |    
-| profile-id | Deprecated | int unsigned | NO |  | NULL |  |    
-| bdyear |  | varchar(4) | YES |  |  |  |    
-| bd |  | date | YES |  | 0001-01-01 |  |    
-| notify_new_posts |  | boolean | YES |  | 0 |  |    
-| fetch_further_information |  | tinyint unsigned | YES |  | 0 |  |    
-| ffi_keyword_denylist |  | text | NO |  | NULL |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
+| created |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| updated | Date of last contact update | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| self | 1 if the contact is the user him/her self | boolean | NO |  | 0 |  |    
+| remote_self |  | boolean | NO |  | 0 |  |    
+| rel | The kind of the relation between the user and the contact | tinyint unsigned | NO |  | 0 |  |    
+| duplex |  | boolean | NO |  | 0 |  |    
+| network | Network of the contact | char(4) | NO |  |  |  |    
+| protocol | Protocol of the contact | char(4) | NO |  |  |  |    
+| name | Name that this contact is known by | varchar(255) | NO |  |  |  |    
+| nick | Nick- and user name of the contact | varchar(255) | NO |  |  |  |    
+| location |  | varchar(255) | YES |  |  |  |    
+| about |  | text | YES |  | NULL |  |    
+| keywords | public keywords (interests) of the contact | text | YES |  | NULL |  |    
+| gender | Deprecated | varchar(32) | NO |  |  |  |    
+| xmpp |  | varchar(255) | NO |  |  |  |    
+| attag |  | varchar(255) | NO |  |  |  |    
+| avatar |  | varchar(255) | NO |  |  |  |    
+| photo | Link to the profile photo of the contact | varchar(255) | YES |  |  |  |    
+| thumb | Link to the profile photo (thumb size) | varchar(255) | YES |  |  |  |    
+| micro | Link to the profile photo (micro size) | varchar(255) | YES |  |  |  |    
+| site-pubkey |  | text | YES |  | NULL |  |    
+| issued-id |  | varchar(255) | NO |  |  |  |    
+| dfrn-id |  | varchar(255) | NO |  |  |  |    
+| url |  | varchar(255) | NO |  |  |  |    
+| nurl |  | varchar(255) | NO |  |  |  |    
+| addr |  | varchar(255) | NO |  |  |  |    
+| alias |  | varchar(255) | NO |  |  |  |    
+| pubkey | RSA public key 4096 bit | text | YES |  | NULL |  |    
+| prvkey | RSA private key 4096 bit | text | YES |  | NULL |  |    
+| batch |  | varchar(255) | NO |  |  |  |    
+| request |  | varchar(255) | YES |  | NULL |  |    
+| notify |  | varchar(255) | YES |  | NULL |  |    
+| poll |  | varchar(255) | YES |  | NULL |  |    
+| confirm |  | varchar(255) | YES |  | NULL |  |    
+| subscribe |  | varchar(255) | YES |  | NULL |  |    
+| poco |  | varchar(255) | YES |  | NULL |  |    
+| aes_allow |  | boolean | NO |  | 0 |  |    
+| ret-aes |  | boolean | NO |  | 0 |  |    
+| usehub |  | boolean | NO |  | 0 |  |    
+| subhub |  | boolean | NO |  | 0 |  |    
+| hub-verify |  | varchar(255) | NO |  |  |  |    
+| last-update | Date of the last try to update the contact info | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| success_update | Date of the last successful contact update | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| failure_update | Date of the last failed update | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| failed | Connection failed | boolean | YES |  | NULL |  |    
+| name-date |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| uri-date |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| avatar-date |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| term-date |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| last-item | date of the last post | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| last-discovery | date of the last follower discovery | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| priority |  | tinyint unsigned | NO |  | 0 |  |    
+| blocked | Node-wide block status | boolean | NO |  | 1 |  |    
+| block_reason | Node-wide block reason | text | YES |  | NULL |  |    
+| readonly | posts of the contact are readonly | boolean | NO |  | 0 |  |    
+| writable |  | boolean | NO |  | 0 |  |    
+| forum | contact is a forum | boolean | NO |  | 0 |  |    
+| prv | contact is a private group | boolean | NO |  | 0 |  |    
+| contact-type |  | tinyint | NO |  | 0 |  |    
+| manually-approve |  | boolean | YES |  | NULL |  |    
+| hidden |  | boolean | NO |  | 0 |  |    
+| archive |  | boolean | NO |  | 0 |  |    
+| pending |  | boolean | NO |  | 1 |  |    
+| deleted | Contact has been deleted | boolean | NO |  | 0 |  |    
+| rating |  | tinyint | NO |  | 0 |  |    
+| unsearchable | Contact prefers to not be searchable | boolean | NO |  | 0 |  |    
+| sensitive | Contact posts sensitive content | boolean | NO |  | 0 |  |    
+| baseurl | baseurl of the contact | varchar(255) | YES |  |  |  |    
+| gsid | Global Server ID | int unsigned | YES |  | NULL |  |    
+| reason |  | text | YES |  | NULL |  |    
+| closeness |  | tinyint unsigned | NO |  | 99 |  |    
+| info |  | mediumtext | YES |  | NULL |  |    
+| profile-id | Deprecated | int unsigned | YES |  | NULL |  |    
+| bdyear |  | varchar(4) | NO |  |  |  |    
+| bd |  | date | NO |  | 0001-01-01 |  |    
+| notify_new_posts |  | boolean | NO |  | 0 |  |    
+| fetch_further_information |  | tinyint unsigned | NO |  | 0 |  |    
+| ffi_keyword_denylist |  | text | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_conv.md b/doc/database/db_conv.md
index d3e40ebbec..e07ee44844 100644
--- a/doc/database/db_conv.md
+++ b/doc/database/db_conv.md
@@ -4,13 +4,13 @@ private messages
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| guid | A unique identifier for this conversation | varchar(255) | YES |  |  |  |    
-| recips | sender_handle;recipient_handle | text | NO |  | NULL |  |    
-| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
-| creator | handle of creator | varchar(255) | YES |  |  |  |    
-| created | creation timestamp | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| updated | edited timestamp | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| subject | subject of initial message | text | NO |  | NULL |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| guid | A unique identifier for this conversation | varchar(255) | NO |  |  |  |    
+| recips | sender_handle;recipient_handle | text | YES |  | NULL |  |    
+| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
+| creator | handle of creator | varchar(255) | NO |  |  |  |    
+| created | creation timestamp | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| updated | edited timestamp | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| subject | subject of initial message | text | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_conversation.md b/doc/database/db_conversation.md
index 6c1d5d8ce9..bcc531a495 100644
--- a/doc/database/db_conversation.md
+++ b/doc/database/db_conversation.md
@@ -4,13 +4,13 @@ Raw data and structure information for messages
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| item-uri | Original URI of the item - unrelated to the table with the same name | varbinary(255) | YES | PRI | NULL |  |    
-| reply-to-uri | URI to which this item is a reply | varbinary(255) | YES |  |  |  |    
-| conversation-uri | GNU Social conversation URI | varbinary(255) | YES |  |  |  |    
-| conversation-href | GNU Social conversation link | varbinary(255) | YES |  |  |  |    
-| protocol | The protocol of the item | tinyint unsigned | YES |  | 255 |  |    
-| direction | How the message arrived here: 1=push, 2=pull | tinyint unsigned | YES |  | 0 |  |    
-| source | Original source | mediumtext | NO |  | NULL |  |    
-| received | Receiving date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| item-uri | Original URI of the item - unrelated to the table with the same name | varbinary(255) | NO | PRI | NULL |  |    
+| reply-to-uri | URI to which this item is a reply | varbinary(255) | NO |  |  |  |    
+| conversation-uri | GNU Social conversation URI | varbinary(255) | NO |  |  |  |    
+| conversation-href | GNU Social conversation link | varbinary(255) | NO |  |  |  |    
+| protocol | The protocol of the item | tinyint unsigned | NO |  | 255 |  |    
+| direction | How the message arrived here: 1=push, 2=pull | tinyint unsigned | NO |  | 0 |  |    
+| source | Original source | mediumtext | YES |  | NULL |  |    
+| received | Receiving date | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_delayed-post.md b/doc/database/db_delayed-post.md
index 732131a602..40e644ec45 100644
--- a/doc/database/db_delayed-post.md
+++ b/doc/database/db_delayed-post.md
@@ -4,9 +4,9 @@ Posts that are about to be distributed at a later time
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | YES | PRI | NULL | auto_increment |    
-| uri | URI of the post that will be distributed later | varchar(255) | NO |  | NULL |  |    
-| uid | Owner User id | mediumint unsigned | NO |  | NULL |  |    
-| delayed | delay time | datetime | NO |  | NULL |  |    
+| id |  | int unsigned | NO | PRI | NULL | auto_increment |    
+| uri | URI of the post that will be distributed later | varchar(255) | YES |  | NULL |  |    
+| uid | Owner User id | mediumint unsigned | YES |  | NULL |  |    
+| delayed | delay time | datetime | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_diaspora-interaction.md b/doc/database/db_diaspora-interaction.md
index f8435b71dc..8a971cd3dd 100644
--- a/doc/database/db_diaspora-interaction.md
+++ b/doc/database/db_diaspora-interaction.md
@@ -4,7 +4,7 @@ Signed Diaspora Interaction
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
-| interaction | The Diaspora interaction | mediumtext | NO |  | NULL |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
+| interaction | The Diaspora interaction | mediumtext | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_event.md b/doc/database/db_event.md
index d7ef08fcdc..e8c55a5b33 100644
--- a/doc/database/db_event.md
+++ b/doc/database/db_event.md
@@ -4,25 +4,25 @@ Events
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| guid |  | varchar(255) | YES |  |  |  |    
-| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
-| cid | contact_id (ID of the contact in contact table) | int unsigned | YES |  | 0 |  |    
-| uri |  | varchar(255) | YES |  |  |  |    
-| created | creation time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| edited | last edit time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| start | event start time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| finish | event end time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| summary | short description or title of the event | text | NO |  | NULL |  |    
-| desc | event description | text | NO |  | NULL |  |    
-| location | event location | text | NO |  | NULL |  |    
-| type | event or birthday | varchar(20) | YES |  |  |  |    
-| nofinish | if event does have no end this is 1 | boolean | YES |  | 0 |  |    
-| adjust | adjust to timezone of the recipient (0 or 1) | boolean | YES |  | 1 |  |    
-| ignore | 0 or 1 | boolean | YES |  | 0 |  |    
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | NO |  | NULL |  |    
-| allow_gid | Access Control - list of allowed groups | mediumtext | NO |  | NULL |  |    
-| deny_cid | Access Control - list of denied contact.id | mediumtext | NO |  | NULL |  |    
-| deny_gid | Access Control - list of denied groups | mediumtext | NO |  | NULL |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| guid |  | varchar(255) | NO |  |  |  |    
+| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
+| cid | contact_id (ID of the contact in contact table) | int unsigned | NO |  | 0 |  |    
+| uri |  | varchar(255) | NO |  |  |  |    
+| created | creation time | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| edited | last edit time | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| start | event start time | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| finish | event end time | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| summary | short description or title of the event | text | YES |  | NULL |  |    
+| desc | event description | text | YES |  | NULL |  |    
+| location | event location | text | YES |  | NULL |  |    
+| type | event or birthday | varchar(20) | NO |  |  |  |    
+| nofinish | if event does have no end this is 1 | boolean | NO |  | 0 |  |    
+| adjust | adjust to timezone of the recipient (0 or 1) | boolean | NO |  | 1 |  |    
+| ignore | 0 or 1 | boolean | NO |  | 0 |  |    
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | YES |  | NULL |  |    
+| allow_gid | Access Control - list of allowed groups | mediumtext | YES |  | NULL |  |    
+| deny_cid | Access Control - list of denied contact.id | mediumtext | YES |  | NULL |  |    
+| deny_gid | Access Control - list of denied groups | mediumtext | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_fcontact.md b/doc/database/db_fcontact.md
index c38df0a04e..d78d55fe4a 100644
--- a/doc/database/db_fcontact.md
+++ b/doc/database/db_fcontact.md
@@ -4,22 +4,22 @@ Diaspora compatible contacts - used in the Diaspora implementation
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| guid | unique id | varchar(255) | YES |  |  |  |    
-| url |  | varchar(255) | YES |  |  |  |    
-| name |  | varchar(255) | YES |  |  |  |    
-| photo |  | varchar(255) | YES |  |  |  |    
-| request |  | varchar(255) | YES |  |  |  |    
-| nick |  | varchar(255) | YES |  |  |  |    
-| addr |  | varchar(255) | YES |  |  |  |    
-| batch |  | varchar(255) | YES |  |  |  |    
-| notify |  | varchar(255) | YES |  |  |  |    
-| poll |  | varchar(255) | YES |  |  |  |    
-| confirm |  | varchar(255) | YES |  |  |  |    
-| priority |  | tinyint unsigned | YES |  | 0 |  |    
-| network |  | char(4) | YES |  |  |  |    
-| alias |  | varchar(255) | YES |  |  |  |    
-| pubkey |  | text | NO |  | NULL |  |    
-| updated |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| guid | unique id | varchar(255) | NO |  |  |  |    
+| url |  | varchar(255) | NO |  |  |  |    
+| name |  | varchar(255) | NO |  |  |  |    
+| photo |  | varchar(255) | NO |  |  |  |    
+| request |  | varchar(255) | NO |  |  |  |    
+| nick |  | varchar(255) | NO |  |  |  |    
+| addr |  | varchar(255) | NO |  |  |  |    
+| batch |  | varchar(255) | NO |  |  |  |    
+| notify |  | varchar(255) | NO |  |  |  |    
+| poll |  | varchar(255) | NO |  |  |  |    
+| confirm |  | varchar(255) | NO |  |  |  |    
+| priority |  | tinyint unsigned | NO |  | 0 |  |    
+| network |  | char(4) | NO |  |  |  |    
+| alias |  | varchar(255) | NO |  |  |  |    
+| pubkey |  | text | YES |  | NULL |  |    
+| updated |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_fsuggest.md b/doc/database/db_fsuggest.md
index 8b37f268e6..11325b6472 100644
--- a/doc/database/db_fsuggest.md
+++ b/doc/database/db_fsuggest.md
@@ -4,14 +4,14 @@ friend suggestion stuff
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | User id | mediumint unsigned | YES |  | 0 |  |    
-| cid |  | int unsigned | YES |  | 0 |  |    
-| name |  | varchar(255) | YES |  |  |  |    
-| url |  | varchar(255) | YES |  |  |  |    
-| request |  | varchar(255) | YES |  |  |  |    
-| photo |  | varchar(255) | YES |  |  |  |    
-| note |  | text | NO |  | NULL |  |    
-| created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| id |  | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | User id | mediumint unsigned | NO |  | 0 |  |    
+| cid |  | int unsigned | NO |  | 0 |  |    
+| name |  | varchar(255) | NO |  |  |  |    
+| url |  | varchar(255) | NO |  |  |  |    
+| request |  | varchar(255) | NO |  |  |  |    
+| photo |  | varchar(255) | NO |  |  |  |    
+| note |  | text | YES |  | NULL |  |    
+| created |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_group.md b/doc/database/db_group.md
index d9eb2a4ddf..1f4d0e588f 100644
--- a/doc/database/db_group.md
+++ b/doc/database/db_group.md
@@ -4,10 +4,10 @@ privacy groups, group info
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
-| visible | 1 indicates the member list is not private | boolean | YES |  | 0 |  |    
-| deleted | 1 indicates the group has been deleted | boolean | YES |  | 0 |  |    
-| name | human readable name of group | varchar(255) | YES |  |  |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
+| visible | 1 indicates the member list is not private | boolean | NO |  | 0 |  |    
+| deleted | 1 indicates the group has been deleted | boolean | NO |  | 0 |  |    
+| name | human readable name of group | varchar(255) | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_group_member.md b/doc/database/db_group_member.md
index db53bb5670..fa1c64d2eb 100644
--- a/doc/database/db_group_member.md
+++ b/doc/database/db_group_member.md
@@ -4,8 +4,8 @@ privacy groups, member info
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| gid | groups.id of the associated group | int unsigned | YES |  | 0 |  |    
-| contact-id | contact.id of the member assigned to the associated group | int unsigned | YES |  | 0 |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| gid | groups.id of the associated group | int unsigned | NO |  | 0 |  |    
+| contact-id | contact.id of the member assigned to the associated group | int unsigned | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_gserver-tag.md b/doc/database/db_gserver-tag.md
index 96a5f02f49..985845c43d 100644
--- a/doc/database/db_gserver-tag.md
+++ b/doc/database/db_gserver-tag.md
@@ -4,7 +4,7 @@ Tags that the server has subscribed
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| gserver-id | The id of the gserver | int unsigned | YES | PRI | 0 |  |    
-| tag | Tag that the server has subscribed | varchar(100) | YES | PRI |  |  |    
+| gserver-id | The id of the gserver | int unsigned | NO | PRI | 0 |  |    
+| tag | Tag that the server has subscribed | varchar(100) | NO | PRI |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_gserver.md b/doc/database/db_gserver.md
index 6efc2a9f92..bfbf4ec85f 100644
--- a/doc/database/db_gserver.md
+++ b/doc/database/db_gserver.md
@@ -4,28 +4,28 @@ Global servers
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| url |  | varchar(255) | YES |  |  |  |    
-| nurl |  | varchar(255) | YES |  |  |  |    
-| version |  | varchar(255) | YES |  |  |  |    
-| site_name |  | varchar(255) | YES |  |  |  |    
-| info |  | text | NO |  | NULL |  |    
-| register_policy |  | tinyint | YES |  | 0 |  |    
-| registered-users | Number of registered users | int unsigned | YES |  | 0 |  |    
-| directory-type | Type of directory service (Poco, Mastodon) | tinyint | NO |  | 0 |  |    
-| poco |  | varchar(255) | YES |  |  |  |    
-| noscrape |  | varchar(255) | YES |  |  |  |    
-| network |  | char(4) | YES |  |  |  |    
-| protocol | The protocol of the server | tinyint unsigned | NO |  | NULL |  |    
-| platform |  | varchar(255) | YES |  |  |  |    
-| relay-subscribe | Has the server subscribed to the relay system | boolean | YES |  | 0 |  |    
-| relay-scope | The scope of messages that the server wants to get | varchar(10) | YES |  |  |  |    
-| detection-method | Method that had been used to detect that server | tinyint unsigned | NO |  | NULL |  |    
-| created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| last_poco_query |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| last_contact | Last successful connection request | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| last_failure | Last failed connection request | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| failed | Connection failed | boolean | NO |  | NULL |  |    
-| next_contact | Next connection request | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| url |  | varchar(255) | NO |  |  |  |    
+| nurl |  | varchar(255) | NO |  |  |  |    
+| version |  | varchar(255) | NO |  |  |  |    
+| site_name |  | varchar(255) | NO |  |  |  |    
+| info |  | text | YES |  | NULL |  |    
+| register_policy |  | tinyint | NO |  | 0 |  |    
+| registered-users | Number of registered users | int unsigned | NO |  | 0 |  |    
+| directory-type | Type of directory service (Poco, Mastodon) | tinyint | YES |  | 0 |  |    
+| poco |  | varchar(255) | NO |  |  |  |    
+| noscrape |  | varchar(255) | NO |  |  |  |    
+| network |  | char(4) | NO |  |  |  |    
+| protocol | The protocol of the server | tinyint unsigned | YES |  | NULL |  |    
+| platform |  | varchar(255) | NO |  |  |  |    
+| relay-subscribe | Has the server subscribed to the relay system | boolean | NO |  | 0 |  |    
+| relay-scope | The scope of messages that the server wants to get | varchar(10) | NO |  |  |  |    
+| detection-method | Method that had been used to detect that server | tinyint unsigned | YES |  | NULL |  |    
+| created |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| last_poco_query |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| last_contact | Last successful connection request | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| last_failure | Last failed connection request | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| failed | Connection failed | boolean | YES |  | NULL |  |    
+| next_contact | Next connection request | datetime | YES |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_hook.md b/doc/database/db_hook.md
index 44fcf5668c..dbf4f79016 100644
--- a/doc/database/db_hook.md
+++ b/doc/database/db_hook.md
@@ -4,10 +4,10 @@ addon hook registry
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| hook | name of hook | varbinary(100) | YES |  |  |  |    
-| file | relative filename of hook handler | varbinary(200) | YES |  |  |  |    
-| function | function name of hook handler | varbinary(200) | YES |  |  |  |    
-| priority | not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order | smallint unsigned | YES |  | 0 |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| hook | name of hook | varbinary(100) | NO |  |  |  |    
+| file | relative filename of hook handler | varbinary(200) | NO |  |  |  |    
+| function | function name of hook handler | varbinary(200) | NO |  |  |  |    
+| priority | not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order | smallint unsigned | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_host.md b/doc/database/db_host.md
index befb04d608..586f2b4501 100644
--- a/doc/database/db_host.md
+++ b/doc/database/db_host.md
@@ -4,7 +4,7 @@ Hostname
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | tinyint unsigned | YES | PRI | NULL | auto_increment |    
-| name | The hostname | varchar(128) | YES |  |  |  |    
+| id | sequential ID | tinyint unsigned | NO | PRI | NULL | auto_increment |    
+| name | The hostname | varchar(128) | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_inbox-status.md b/doc/database/db_inbox-status.md
index 81dbb84932..19b3c43e5f 100644
--- a/doc/database/db_inbox-status.md
+++ b/doc/database/db_inbox-status.md
@@ -4,12 +4,12 @@ Status of ActivityPub inboxes
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| url | URL of the inbox | varbinary(255) | YES | PRI | NULL |  |    
-| created | Creation date of this entry | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| success | Date of the last successful delivery | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| failure | Date of the last failed delivery | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| previous | Previous delivery date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| archive | Is the inbox archived? | boolean | YES |  | 0 |  |    
-| shared | Is it a shared inbox? | boolean | YES |  | 0 |  |    
+| url | URL of the inbox | varbinary(255) | NO | PRI | NULL |  |    
+| created | Creation date of this entry | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| success | Date of the last successful delivery | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| failure | Date of the last failed delivery | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| previous | Previous delivery date | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| archive | Is the inbox archived? | boolean | NO |  | 0 |  |    
+| shared | Is it a shared inbox? | boolean | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_intro.md b/doc/database/db_intro.md
index 34444303d4..7aa162bddc 100644
--- a/doc/database/db_intro.md
+++ b/doc/database/db_intro.md
@@ -4,16 +4,16 @@ Table intro
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | User id | mediumint unsigned | YES |  | 0 |  |    
-| fid |  | int unsigned | NO |  | NULL |  |    
-| contact-id |  | int unsigned | YES |  | 0 |  |    
-| knowyou |  | boolean | YES |  | 0 |  |    
-| duplex |  | boolean | YES |  | 0 |  |    
-| note |  | text | NO |  | NULL |  |    
-| hash |  | varchar(255) | YES |  |  |  |    
-| datetime |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| blocked |  | boolean | YES |  | 1 |  |    
-| ignore |  | boolean | YES |  | 0 |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | User id | mediumint unsigned | NO |  | 0 |  |    
+| fid |  | int unsigned | YES |  | NULL |  |    
+| contact-id |  | int unsigned | NO |  | 0 |  |    
+| knowyou |  | boolean | NO |  | 0 |  |    
+| duplex |  | boolean | NO |  | 0 |  |    
+| note |  | text | YES |  | NULL |  |    
+| hash |  | varchar(255) | NO |  |  |  |    
+| datetime |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| blocked |  | boolean | NO |  | 1 |  |    
+| ignore |  | boolean | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_item-uri.md b/doc/database/db_item-uri.md
index 1fb4f9b950..85c7a40b3c 100644
--- a/doc/database/db_item-uri.md
+++ b/doc/database/db_item-uri.md
@@ -4,8 +4,8 @@ URI and GUID for items
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | YES | PRI | NULL | auto_increment |    
-| uri | URI of an item | varbinary(255) | YES |  | NULL |  |    
-| guid | A unique identifier for an item | varbinary(255) | NO |  | NULL |  |    
+| id |  | int unsigned | NO | PRI | NULL | auto_increment |    
+| uri | URI of an item | varbinary(255) | NO |  | NULL |  |    
+| guid | A unique identifier for an item | varbinary(255) | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_locks.md b/doc/database/db_locks.md
index 774e9ed9b1..cf56a00719 100644
--- a/doc/database/db_locks.md
+++ b/doc/database/db_locks.md
@@ -4,10 +4,10 @@ Table locks
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| name |  | varchar(128) | YES |  |  |  |    
-| locked |  | boolean | YES |  | 0 |  |    
-| pid | Process ID | int unsigned | YES |  | 0 |  |    
-| expires | datetime of cache expiration | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| name |  | varchar(128) | NO |  |  |  |    
+| locked |  | boolean | NO |  | 0 |  |    
+| pid | Process ID | int unsigned | NO |  | 0 |  |    
+| expires | datetime of cache expiration | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_mail.md b/doc/database/db_mail.md
index 75ecf6a9f4..2f96d639d3 100644
--- a/doc/database/db_mail.md
+++ b/doc/database/db_mail.md
@@ -4,27 +4,27 @@ private messages
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
-| guid | A unique identifier for this private message | varchar(255) | YES |  |  |  |    
-| from-name | name of the sender | varchar(255) | YES |  |  |  |    
-| from-photo | contact photo link of the sender | varchar(255) | YES |  |  |  |    
-| from-url | profile linke of the sender | varchar(255) | YES |  |  |  |    
-| contact-id | contact.id | varchar(255) | NO |  | NULL |  |    
-| author-id | Link to the contact table with uid=0 of the author of the mail | int unsigned | NO |  | NULL |  |    
-| convid | conv.id | int unsigned | NO |  | NULL |  |    
-| title |  | varchar(255) | YES |  |  |  |    
-| body |  | mediumtext | NO |  | NULL |  |    
-| seen | if message visited it is 1 | boolean | YES |  | 0 |  |    
-| reply |  | boolean | YES |  | 0 |  |    
-| replied |  | boolean | YES |  | 0 |  |    
-| unknown | if sender not in the contact table this is 1 | boolean | YES |  | 0 |  |    
-| uri |  | varchar(255) | YES |  |  |  |    
-| uri-id | Item-uri id of the related mail | int unsigned | NO |  | NULL |  |    
-| parent-uri |  | varchar(255) | YES |  |  |  |    
-| parent-uri-id | Item-uri id of the parent of the related mail | int unsigned | NO |  | NULL |  |    
-| thr-parent |  | varchar(255) | NO |  | NULL |  |    
-| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | NO |  | NULL |  |    
-| created | creation time of the private message | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
+| guid | A unique identifier for this private message | varchar(255) | NO |  |  |  |    
+| from-name | name of the sender | varchar(255) | NO |  |  |  |    
+| from-photo | contact photo link of the sender | varchar(255) | NO |  |  |  |    
+| from-url | profile linke of the sender | varchar(255) | NO |  |  |  |    
+| contact-id | contact.id | varchar(255) | YES |  | NULL |  |    
+| author-id | Link to the contact table with uid=0 of the author of the mail | int unsigned | YES |  | NULL |  |    
+| convid | conv.id | int unsigned | YES |  | NULL |  |    
+| title |  | varchar(255) | NO |  |  |  |    
+| body |  | mediumtext | YES |  | NULL |  |    
+| seen | if message visited it is 1 | boolean | NO |  | 0 |  |    
+| reply |  | boolean | NO |  | 0 |  |    
+| replied |  | boolean | NO |  | 0 |  |    
+| unknown | if sender not in the contact table this is 1 | boolean | NO |  | 0 |  |    
+| uri |  | varchar(255) | NO |  |  |  |    
+| uri-id | Item-uri id of the related mail | int unsigned | YES |  | NULL |  |    
+| parent-uri |  | varchar(255) | NO |  |  |  |    
+| parent-uri-id | Item-uri id of the parent of the related mail | int unsigned | YES |  | NULL |  |    
+| thr-parent |  | varchar(255) | YES |  | NULL |  |    
+| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | YES |  | NULL |  |    
+| created | creation time of the private message | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_mailacct.md b/doc/database/db_mailacct.md
index 898116fd08..ec2f5cb54e 100644
--- a/doc/database/db_mailacct.md
+++ b/doc/database/db_mailacct.md
@@ -4,18 +4,18 @@ Mail account data for fetching mails
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | User id | mediumint unsigned | YES |  | 0 |  |    
-| server |  | varchar(255) | YES |  |  |  |    
-| port |  | smallint unsigned | YES |  | 0 |  |    
-| ssltype |  | varchar(16) | YES |  |  |  |    
-| mailbox |  | varchar(255) | YES |  |  |  |    
-| user |  | varchar(255) | YES |  |  |  |    
-| pass |  | text | NO |  | NULL |  |    
-| reply_to |  | varchar(255) | YES |  |  |  |    
-| action |  | tinyint unsigned | YES |  | 0 |  |    
-| movetofolder |  | varchar(255) | YES |  |  |  |    
-| pubmail |  | boolean | YES |  | 0 |  |    
-| last_check |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | User id | mediumint unsigned | NO |  | 0 |  |    
+| server |  | varchar(255) | NO |  |  |  |    
+| port |  | smallint unsigned | NO |  | 0 |  |    
+| ssltype |  | varchar(16) | NO |  |  |  |    
+| mailbox |  | varchar(255) | NO |  |  |  |    
+| user |  | varchar(255) | NO |  |  |  |    
+| pass |  | text | YES |  | NULL |  |    
+| reply_to |  | varchar(255) | NO |  |  |  |    
+| action |  | tinyint unsigned | NO |  | 0 |  |    
+| movetofolder |  | varchar(255) | NO |  |  |  |    
+| pubmail |  | boolean | NO |  | 0 |  |    
+| last_check |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_manage.md b/doc/database/db_manage.md
index 53d44a4d42..645bba4925 100644
--- a/doc/database/db_manage.md
+++ b/doc/database/db_manage.md
@@ -4,8 +4,8 @@ table of accounts that can manage each other
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | User id | mediumint unsigned | YES |  | 0 |  |    
-| mid | User id | mediumint unsigned | YES |  | 0 |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | User id | mediumint unsigned | NO |  | 0 |  |    
+| mid | User id | mediumint unsigned | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notification.md b/doc/database/db_notification.md
index 51240b493f..6a6f0c81d5 100644
--- a/doc/database/db_notification.md
+++ b/doc/database/db_notification.md
@@ -4,14 +4,14 @@ notifications
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | Owner User id | mediumint unsigned | NO |  | NULL |  |    
-| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | NO |  | NULL |  |    
-| type |  | tinyint unsigned | NO |  | NULL |  |    
-| actor-id | Link to the contact table with uid=0 of the actor that caused the notification | int unsigned | NO |  | NULL |  |    
-| target-uri-id | Item-uri id of the related post | int unsigned | NO |  | NULL |  |    
-| parent-uri-id | Item-uri id of the parent of the related post | int unsigned | NO |  | NULL |  |    
-| created |  | datetime | NO |  | NULL |  |    
-| seen |  | boolean | NO |  | 0 |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | Owner User id | mediumint unsigned | YES |  | NULL |  |    
+| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | YES |  | NULL |  |    
+| type |  | tinyint unsigned | YES |  | NULL |  |    
+| actor-id | Link to the contact table with uid=0 of the actor that caused the notification | int unsigned | YES |  | NULL |  |    
+| target-uri-id | Item-uri id of the related post | int unsigned | YES |  | NULL |  |    
+| parent-uri-id | Item-uri id of the parent of the related post | int unsigned | YES |  | NULL |  |    
+| created |  | datetime | YES |  | NULL |  |    
+| seen |  | boolean | YES |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notify-threads.md b/doc/database/db_notify-threads.md
index 18c443444c..11d98b4c0a 100644
--- a/doc/database/db_notify-threads.md
+++ b/doc/database/db_notify-threads.md
@@ -4,11 +4,11 @@ Table notify-threads
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| notify-id |  | int unsigned | YES |  | 0 |  |    
-| master-parent-item | Deprecated | int unsigned | NO |  | NULL |  |    
-| master-parent-uri-id | Item-uri id of the parent of the related post | int unsigned | NO |  | NULL |  |    
-| parent-item |  | int unsigned | YES |  | 0 |  |    
-| receiver-uid | User id | mediumint unsigned | YES |  | 0 |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| notify-id |  | int unsigned | NO |  | 0 |  |    
+| master-parent-item | Deprecated | int unsigned | YES |  | NULL |  |    
+| master-parent-uri-id | Item-uri id of the parent of the related post | int unsigned | YES |  | NULL |  |    
+| parent-item |  | int unsigned | NO |  | 0 |  |    
+| receiver-uid | User id | mediumint unsigned | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notify.md b/doc/database/db_notify.md
index 58d4d923d2..07263ab4dc 100644
--- a/doc/database/db_notify.md
+++ b/doc/database/db_notify.md
@@ -4,23 +4,23 @@ notifications
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| type |  | smallint unsigned | YES |  | 0 |  |    
-| name |  | varchar(255) | YES |  |  |  |    
-| url |  | varchar(255) | YES |  |  |  |    
-| photo |  | varchar(255) | YES |  |  |  |    
-| date |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| msg |  | mediumtext | NO |  | NULL |  |    
-| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
-| link |  | varchar(255) | YES |  |  |  |    
-| iid |  | int unsigned | NO |  | NULL |  |    
-| parent |  | int unsigned | NO |  | NULL |  |    
-| uri-id | Item-uri id of the related post | int unsigned | NO |  | NULL |  |    
-| parent-uri-id | Item-uri id of the parent of the related post | int unsigned | NO |  | NULL |  |    
-| seen |  | boolean | YES |  | 0 |  |    
-| verb |  | varchar(100) | YES |  |  |  |    
-| otype |  | varchar(10) | YES |  |  |  |    
-| name_cache | Cached bbcode parsing of name | tinytext | NO |  | NULL |  |    
-| msg_cache | Cached bbcode parsing of msg | mediumtext | NO |  | NULL |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| type |  | smallint unsigned | NO |  | 0 |  |    
+| name |  | varchar(255) | NO |  |  |  |    
+| url |  | varchar(255) | NO |  |  |  |    
+| photo |  | varchar(255) | NO |  |  |  |    
+| date |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| msg |  | mediumtext | YES |  | NULL |  |    
+| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
+| link |  | varchar(255) | NO |  |  |  |    
+| iid |  | int unsigned | YES |  | NULL |  |    
+| parent |  | int unsigned | YES |  | NULL |  |    
+| uri-id | Item-uri id of the related post | int unsigned | YES |  | NULL |  |    
+| parent-uri-id | Item-uri id of the parent of the related post | int unsigned | YES |  | NULL |  |    
+| seen |  | boolean | NO |  | 0 |  |    
+| verb |  | varchar(100) | NO |  |  |  |    
+| otype |  | varchar(10) | NO |  |  |  |    
+| name_cache | Cached bbcode parsing of name | tinytext | YES |  | NULL |  |    
+| msg_cache | Cached bbcode parsing of msg | mediumtext | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_oembed.md b/doc/database/db_oembed.md
index e74bfb7100..09b9fbbf4c 100644
--- a/doc/database/db_oembed.md
+++ b/doc/database/db_oembed.md
@@ -4,9 +4,9 @@ cache for OEmbed queries
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| url | page url | varbinary(255) | YES | PRI | NULL |  |    
-| maxwidth | Maximum width passed to Oembed | mediumint unsigned | YES | PRI | NULL |  |    
-| content | OEmbed data of the page | mediumtext | NO |  | NULL |  |    
-| created | datetime of creation | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| url | page url | varbinary(255) | NO | PRI | NULL |  |    
+| maxwidth | Maximum width passed to Oembed | mediumint unsigned | NO | PRI | NULL |  |    
+| content | OEmbed data of the page | mediumtext | YES |  | NULL |  |    
+| created | datetime of creation | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_openwebauth-token.md b/doc/database/db_openwebauth-token.md
index 3b2cab3726..71a04b0d12 100644
--- a/doc/database/db_openwebauth-token.md
+++ b/doc/database/db_openwebauth-token.md
@@ -4,11 +4,11 @@ Store OpenWebAuth token to verify contacts
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | User id - currently unused | mediumint unsigned | YES |  | 0 |  |    
-| type | Verify type | varchar(32) | YES |  |  |  |    
-| token | A generated token | varchar(255) | YES |  |  |  |    
-| meta |  | varchar(255) | YES |  |  |  |    
-| created | datetime of creation | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | User id - currently unused | mediumint unsigned | NO |  | 0 |  |    
+| type | Verify type | varchar(32) | NO |  |  |  |    
+| token | A generated token | varchar(255) | NO |  |  |  |    
+| meta |  | varchar(255) | NO |  |  |  |    
+| created | datetime of creation | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_parsed_url.md b/doc/database/db_parsed_url.md
index bf4b7117f5..8f8bd7bdd7 100644
--- a/doc/database/db_parsed_url.md
+++ b/doc/database/db_parsed_url.md
@@ -4,12 +4,12 @@ cache for &#039;parse_url&#039; queries
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| url_hash | page url hash | binary(64) | YES | PRI | NULL |  |    
-| guessing | is the &#039;guessing&#039; mode active? | boolean | YES | PRI | 0 |  |    
-| oembed | is the data the result of oembed? | boolean | YES | PRI | 0 |  |    
-| url | page url | text | YES |  | NULL |  |    
-| content | page data | mediumtext | NO |  | NULL |  |    
-| created | datetime of creation | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| expires | datetime of expiration | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| url_hash | page url hash | binary(64) | NO | PRI | NULL |  |    
+| guessing | is the &#039;guessing&#039; mode active? | boolean | NO | PRI | 0 |  |    
+| oembed | is the data the result of oembed? | boolean | NO | PRI | 0 |  |    
+| url | page url | text | NO |  | NULL |  |    
+| content | page data | mediumtext | YES |  | NULL |  |    
+| created | datetime of creation | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| expires | datetime of expiration | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_pconfig.md b/doc/database/db_pconfig.md
index 7c71d53053..c927093782 100644
--- a/doc/database/db_pconfig.md
+++ b/doc/database/db_pconfig.md
@@ -4,10 +4,10 @@ personal (per user) configuration storage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | Primary key | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | User id | mediumint unsigned | YES |  | 0 |  |    
-| cat | Category | varchar(50) | YES |  |  |  |    
-| k | Key | varchar(100) | YES |  |  |  |    
-| v | Value | mediumtext | NO |  | NULL |  |    
+| id | Primary key | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | User id | mediumint unsigned | NO |  | 0 |  |    
+| cat | Category | varchar(50) | NO |  |  |  |    
+| k | Key | varchar(100) | NO |  |  |  |    
+| v | Value | mediumtext | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_permissionset.md b/doc/database/db_permissionset.md
index 3086d8a943..3bcbef86e7 100644
--- a/doc/database/db_permissionset.md
+++ b/doc/database/db_permissionset.md
@@ -4,11 +4,11 @@ Table permissionset
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | Owner id of this permission set | mediumint unsigned | YES |  | 0 |  |    
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | NO |  | NULL |  |    
-| allow_gid | Access Control - list of allowed groups | mediumtext | NO |  | NULL |  |    
-| deny_cid | Access Control - list of denied contact.id | mediumtext | NO |  | NULL |  |    
-| deny_gid | Access Control - list of denied groups | mediumtext | NO |  | NULL |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | Owner id of this permission set | mediumint unsigned | NO |  | 0 |  |    
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | YES |  | NULL |  |    
+| allow_gid | Access Control - list of allowed groups | mediumtext | YES |  | NULL |  |    
+| deny_cid | Access Control - list of denied contact.id | mediumtext | YES |  | NULL |  |    
+| deny_gid | Access Control - list of denied groups | mediumtext | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_photo.md b/doc/database/db_photo.md
index 3834e72a49..80b74b6d2e 100644
--- a/doc/database/db_photo.md
+++ b/doc/database/db_photo.md
@@ -4,32 +4,32 @@ photo storage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
-| contact-id | contact.id | int unsigned | YES |  | 0 |  |    
-| guid | A unique identifier for this photo | char(16) | YES |  |  |  |    
-| resource-id |  | char(32) | YES |  |  |  |    
-| hash | hash value of the photo | char(32) | NO |  | NULL |  |    
-| created | creation date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| edited | last edited date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| title |  | varchar(255) | YES |  |  |  |    
-| desc |  | text | NO |  | NULL |  |    
-| album | The name of the album to which the photo belongs | varchar(255) | YES |  |  |  |    
-| filename |  | varchar(255) | YES |  |  |  |    
-| type |  | varchar(30) | YES |  | image/jpeg |  |    
-| height |  | smallint unsigned | YES |  | 0 |  |    
-| width |  | smallint unsigned | YES |  | 0 |  |    
-| datasize |  | int unsigned | YES |  | 0 |  |    
-| data |  | mediumblob | YES |  | NULL |  |    
-| scale |  | tinyint unsigned | YES |  | 0 |  |    
-| profile |  | boolean | YES |  | 0 |  |    
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | NO |  | NULL |  |    
-| allow_gid | Access Control - list of allowed groups | mediumtext | NO |  | NULL |  |    
-| deny_cid | Access Control - list of denied contact.id | mediumtext | NO |  | NULL |  |    
-| deny_gid | Access Control - list of denied groups | mediumtext | NO |  | NULL |  |    
-| accessible | Make photo publicly accessible, ignoring permissions | boolean | YES |  | 0 |  |    
-| backend-class | Storage backend class | tinytext | NO |  | NULL |  |    
-| backend-ref | Storage backend data reference | text | NO |  | NULL |  |    
-| updated |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
+| contact-id | contact.id | int unsigned | NO |  | 0 |  |    
+| guid | A unique identifier for this photo | char(16) | NO |  |  |  |    
+| resource-id |  | char(32) | NO |  |  |  |    
+| hash | hash value of the photo | char(32) | YES |  | NULL |  |    
+| created | creation date | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| edited | last edited date | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| title |  | varchar(255) | NO |  |  |  |    
+| desc |  | text | YES |  | NULL |  |    
+| album | The name of the album to which the photo belongs | varchar(255) | NO |  |  |  |    
+| filename |  | varchar(255) | NO |  |  |  |    
+| type |  | varchar(30) | NO |  | image/jpeg |  |    
+| height |  | smallint unsigned | NO |  | 0 |  |    
+| width |  | smallint unsigned | NO |  | 0 |  |    
+| datasize |  | int unsigned | NO |  | 0 |  |    
+| data |  | mediumblob | NO |  | NULL |  |    
+| scale |  | tinyint unsigned | NO |  | 0 |  |    
+| profile |  | boolean | NO |  | 0 |  |    
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | YES |  | NULL |  |    
+| allow_gid | Access Control - list of allowed groups | mediumtext | YES |  | NULL |  |    
+| deny_cid | Access Control - list of denied contact.id | mediumtext | YES |  | NULL |  |    
+| deny_gid | Access Control - list of denied groups | mediumtext | YES |  | NULL |  |    
+| accessible | Make photo publicly accessible, ignoring permissions | boolean | NO |  | 0 |  |    
+| backend-class | Storage backend class | tinytext | YES |  | NULL |  |    
+| backend-ref | Storage backend data reference | text | YES |  | NULL |  |    
+| updated |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-category.md b/doc/database/db_post-category.md
index 9be89de455..ecb0793c5e 100644
--- a/doc/database/db_post-category.md
+++ b/doc/database/db_post-category.md
@@ -4,9 +4,9 @@ post relation to categories
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
-| uid | User id | mediumint unsigned | YES | PRI | 0 |  |    
-| type |  | tinyint unsigned | YES | PRI | 0 |  |    
-| tid |  | int unsigned | YES | PRI | 0 |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
+| uid | User id | mediumint unsigned | NO | PRI | 0 |  |    
+| type |  | tinyint unsigned | NO | PRI | 0 |  |    
+| tid |  | int unsigned | NO | PRI | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-content.md b/doc/database/db_post-content.md
index c75c417227..69aa06c4ba 100644
--- a/doc/database/db_post-content.md
+++ b/doc/database/db_post-content.md
@@ -4,22 +4,22 @@ Content for all posts
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
-| title | item title | varchar(255) | YES |  |  |  |    
-| content-warning |  | varchar(255) | YES |  |  |  |    
-| body | item body content | mediumtext | NO |  | NULL |  |    
-| raw-body | Body without embedded media links | mediumtext | NO |  | NULL |  |    
-| location | text location where this item originated | varchar(255) | YES |  |  |  |    
-| coord | longitude/latitude pair representing location where this item originated | varchar(255) | YES |  |  |  |    
-| language | Language information about this post | text | NO |  | NULL |  |    
-| app | application which generated this item | varchar(255) | YES |  |  |  |    
-| rendered-hash |  | varchar(32) | YES |  |  |  |    
-| rendered-html | item.body converted to html | mediumtext | NO |  | NULL |  |    
-| object-type | ActivityStreams object type | varchar(100) | YES |  |  |  |    
-| object | JSON encoded object structure unless it is an implied object (normal post) | text | NO |  | NULL |  |    
-| target-type | ActivityStreams target type if applicable (URI) | varchar(100) | YES |  |  |  |    
-| target | JSON encoded target structure if used | text | NO |  | NULL |  |    
-| resource-id | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32) | YES |  |  |  |    
-| plink | permalink or URL to a displayable copy of the message at its source | varchar(255) | YES |  |  |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
+| title | item title | varchar(255) | NO |  |  |  |    
+| content-warning |  | varchar(255) | NO |  |  |  |    
+| body | item body content | mediumtext | YES |  | NULL |  |    
+| raw-body | Body without embedded media links | mediumtext | YES |  | NULL |  |    
+| location | text location where this item originated | varchar(255) | NO |  |  |  |    
+| coord | longitude/latitude pair representing location where this item originated | varchar(255) | NO |  |  |  |    
+| language | Language information about this post | text | YES |  | NULL |  |    
+| app | application which generated this item | varchar(255) | NO |  |  |  |    
+| rendered-hash |  | varchar(32) | NO |  |  |  |    
+| rendered-html | item.body converted to html | mediumtext | YES |  | NULL |  |    
+| object-type | ActivityStreams object type | varchar(100) | NO |  |  |  |    
+| object | JSON encoded object structure unless it is an implied object (normal post) | text | YES |  | NULL |  |    
+| target-type | ActivityStreams target type if applicable (URI) | varchar(100) | NO |  |  |  |    
+| target | JSON encoded target structure if used | text | YES |  | NULL |  |    
+| resource-id | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32) | NO |  |  |  |    
+| plink | permalink or URL to a displayable copy of the message at its source | varchar(255) | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-delivery-data.md b/doc/database/db_post-delivery-data.md
index bf3289e266..8a333dada9 100644
--- a/doc/database/db_post-delivery-data.md
+++ b/doc/database/db_post-delivery-data.md
@@ -4,16 +4,16 @@ Delivery data for items
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
-| postopts | External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery | text | NO |  | NULL |  |    
-| inform | Additional receivers of the linked item | mediumtext | NO |  | NULL |  |    
-| queue_count | Initial number of delivery recipients, used as item.delivery_queue_count | mediumint | YES |  | 0 |  |    
-| queue_done | Number of successful deliveries, used as item.delivery_queue_done | mediumint | YES |  | 0 |  |    
-| queue_failed | Number of unsuccessful deliveries, used as item.delivery_queue_failed | mediumint | YES |  | 0 |  |    
-| activitypub | Number of successful deliveries via ActivityPub | mediumint | YES |  | 0 |  |    
-| dfrn | Number of successful deliveries via DFRN | mediumint | YES |  | 0 |  |    
-| legacy_dfrn | Number of successful deliveries via legacy DFRN | mediumint | YES |  | 0 |  |    
-| diaspora | Number of successful deliveries via Diaspora | mediumint | YES |  | 0 |  |    
-| ostatus | Number of successful deliveries via OStatus | mediumint | YES |  | 0 |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
+| postopts | External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery | text | YES |  | NULL |  |    
+| inform | Additional receivers of the linked item | mediumtext | YES |  | NULL |  |    
+| queue_count | Initial number of delivery recipients, used as item.delivery_queue_count | mediumint | NO |  | 0 |  |    
+| queue_done | Number of successful deliveries, used as item.delivery_queue_done | mediumint | NO |  | 0 |  |    
+| queue_failed | Number of unsuccessful deliveries, used as item.delivery_queue_failed | mediumint | NO |  | 0 |  |    
+| activitypub | Number of successful deliveries via ActivityPub | mediumint | NO |  | 0 |  |    
+| dfrn | Number of successful deliveries via DFRN | mediumint | NO |  | 0 |  |    
+| legacy_dfrn | Number of successful deliveries via legacy DFRN | mediumint | NO |  | 0 |  |    
+| diaspora | Number of successful deliveries via Diaspora | mediumint | NO |  | 0 |  |    
+| ostatus | Number of successful deliveries via OStatus | mediumint | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-media.md b/doc/database/db_post-media.md
index 58f1ed7030..bf5f1dfe52 100644
--- a/doc/database/db_post-media.md
+++ b/doc/database/db_post-media.md
@@ -4,24 +4,24 @@ Attached media
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES |  | NULL |  |    
-| url | Media URL | varbinary(511) | YES |  | NULL |  |    
-| type | Media type | tinyint unsigned | YES |  | 0 |  |    
-| mimetype |  | varchar(60) | NO |  | NULL |  |    
-| height | Height of the media | smallint unsigned | NO |  | NULL |  |    
-| width | Width of the media | smallint unsigned | NO |  | NULL |  |    
-| size | Media size | int unsigned | NO |  | NULL |  |    
-| preview | Preview URL | varbinary(255) | NO |  | NULL |  |    
-| preview-height | Height of the preview picture | smallint unsigned | NO |  | NULL |  |    
-| preview-width | Width of the preview picture | smallint unsigned | NO |  | NULL |  |    
-| description |  | text | NO |  | NULL |  |    
-| name | Name of the media | varchar(255) | NO |  | NULL |  |    
-| author-url | URL of the author of the media | varbinary(255) | NO |  | NULL |  |    
-| author-name | Name of the author of the media | varchar(255) | NO |  | NULL |  |    
-| author-image | Image of the author of the media | varbinary(255) | NO |  | NULL |  |    
-| publisher-url | URL of the publisher of the media | varbinary(255) | NO |  | NULL |  |    
-| publisher-name | Name of the publisher of the media | varchar(255) | NO |  | NULL |  |    
-| publisher-image | Image of the publisher of the media | varbinary(255) | NO |  | NULL |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO |  | NULL |  |    
+| url | Media URL | varbinary(511) | NO |  | NULL |  |    
+| type | Media type | tinyint unsigned | NO |  | 0 |  |    
+| mimetype |  | varchar(60) | YES |  | NULL |  |    
+| height | Height of the media | smallint unsigned | YES |  | NULL |  |    
+| width | Width of the media | smallint unsigned | YES |  | NULL |  |    
+| size | Media size | int unsigned | YES |  | NULL |  |    
+| preview | Preview URL | varbinary(255) | YES |  | NULL |  |    
+| preview-height | Height of the preview picture | smallint unsigned | YES |  | NULL |  |    
+| preview-width | Width of the preview picture | smallint unsigned | YES |  | NULL |  |    
+| description |  | text | YES |  | NULL |  |    
+| name | Name of the media | varchar(255) | YES |  | NULL |  |    
+| author-url | URL of the author of the media | varbinary(255) | YES |  | NULL |  |    
+| author-name | Name of the author of the media | varchar(255) | YES |  | NULL |  |    
+| author-image | Image of the author of the media | varbinary(255) | YES |  | NULL |  |    
+| publisher-url | URL of the publisher of the media | varbinary(255) | YES |  | NULL |  |    
+| publisher-name | Name of the publisher of the media | varchar(255) | YES |  | NULL |  |    
+| publisher-image | Image of the publisher of the media | varbinary(255) | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-tag.md b/doc/database/db_post-tag.md
index 9c33ec2ae4..5223ef9f4f 100644
--- a/doc/database/db_post-tag.md
+++ b/doc/database/db_post-tag.md
@@ -4,9 +4,9 @@ post relation to tags
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
-| type |  | tinyint unsigned | YES | PRI | 0 |  |    
-| tid |  | int unsigned | YES | PRI | 0 |  |    
-| cid | Contact id of the mentioned public contact | int unsigned | YES | PRI | 0 |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
+| type |  | tinyint unsigned | NO | PRI | 0 |  |    
+| tid |  | int unsigned | NO | PRI | 0 |  |    
+| cid | Contact id of the mentioned public contact | int unsigned | NO | PRI | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-thread-user.md b/doc/database/db_post-thread-user.md
index 9a3a996fcc..02b7b22d54 100644
--- a/doc/database/db_post-thread-user.md
+++ b/doc/database/db_post-thread-user.md
@@ -4,28 +4,28 @@ Thread related data per user
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
-| owner-id | Item owner | int unsigned | YES |  | 0 |  |    
-| author-id | Item author | int unsigned | YES |  | 0 |  |    
-| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | NO |  | NULL |  |    
-| network |  | char(4) | YES |  |  |  |    
-| created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| received |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| changed | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| commented |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| uid | Owner id which owns this copy of the item | mediumint unsigned | YES | PRI | 0 |  |    
-| pinned | The thread is pinned on the profile page | boolean | YES |  | 0 |  |    
-| starred |  | boolean | YES |  | 0 |  |    
-| ignored | Ignore updates for this thread | boolean | YES |  | 0 |  |    
-| wall | This item was posted to the wall of uid | boolean | YES |  | 0 |  |    
-| mention |  | boolean | YES |  | 0 |  |    
-| pubmail |  | boolean | YES |  | 0 |  |    
-| forum_mode |  | tinyint unsigned | YES |  | 0 |  |    
-| contact-id | contact.id | int unsigned | YES |  | 0 |  |    
-| unseen | post has not been seen | boolean | YES |  | 1 |  |    
-| hidden | Marker to hide the post from the user | boolean | YES |  | 0 |  |    
-| origin | item originated at this site | boolean | YES |  | 0 |  |    
-| psid | ID of the permission set of this post | int unsigned | NO |  | NULL |  |    
-| post-user-id | Id of the post-user table | int unsigned | NO |  | NULL |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
+| owner-id | Item owner | int unsigned | NO |  | 0 |  |    
+| author-id | Item author | int unsigned | NO |  | 0 |  |    
+| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | YES |  | NULL |  |    
+| network |  | char(4) | NO |  |  |  |    
+| created |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| received |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| changed | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| commented |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| uid | Owner id which owns this copy of the item | mediumint unsigned | NO | PRI | 0 |  |    
+| pinned | The thread is pinned on the profile page | boolean | NO |  | 0 |  |    
+| starred |  | boolean | NO |  | 0 |  |    
+| ignored | Ignore updates for this thread | boolean | NO |  | 0 |  |    
+| wall | This item was posted to the wall of uid | boolean | NO |  | 0 |  |    
+| mention |  | boolean | NO |  | 0 |  |    
+| pubmail |  | boolean | NO |  | 0 |  |    
+| forum_mode |  | tinyint unsigned | NO |  | 0 |  |    
+| contact-id | contact.id | int unsigned | NO |  | 0 |  |    
+| unseen | post has not been seen | boolean | NO |  | 1 |  |    
+| hidden | Marker to hide the post from the user | boolean | NO |  | 0 |  |    
+| origin | item originated at this site | boolean | NO |  | 0 |  |    
+| psid | ID of the permission set of this post | int unsigned | YES |  | NULL |  |    
+| post-user-id | Id of the post-user table | int unsigned | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-thread.md b/doc/database/db_post-thread.md
index 49fac4fd91..af0124b160 100644
--- a/doc/database/db_post-thread.md
+++ b/doc/database/db_post-thread.md
@@ -4,14 +4,14 @@ Thread related data
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
-| owner-id | Item owner | int unsigned | YES |  | 0 |  |    
-| author-id | Item author | int unsigned | YES |  | 0 |  |    
-| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | NO |  | NULL |  |    
-| network |  | char(4) | YES |  |  |  |    
-| created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| received |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| changed | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| commented |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
+| owner-id | Item owner | int unsigned | NO |  | 0 |  |    
+| author-id | Item author | int unsigned | NO |  | 0 |  |    
+| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | YES |  | NULL |  |    
+| network |  | char(4) | NO |  |  |  |    
+| created |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| received |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| changed | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| commented |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-user-notification.md b/doc/database/db_post-user-notification.md
index 01727e2667..6696fc3ac3 100644
--- a/doc/database/db_post-user-notification.md
+++ b/doc/database/db_post-user-notification.md
@@ -4,8 +4,8 @@ User post notifications
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
-| uid | Owner id which owns this copy of the item | mediumint unsigned | YES | PRI | NULL |  |    
-| notification-type |  | tinyint unsigned | YES |  | 0 |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
+| uid | Owner id which owns this copy of the item | mediumint unsigned | NO | PRI | NULL |  |    
+| notification-type |  | tinyint unsigned | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-user.md b/doc/database/db_post-user.md
index 58fa6f902a..964ccf45cf 100644
--- a/doc/database/db_post-user.md
+++ b/doc/database/db_post-user.md
@@ -4,35 +4,35 @@ User specific post data
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | YES | PRI | NULL | auto_increment |    
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES |  | NULL |  |    
-| parent-uri-id | Id of the item-uri table that contains the parent uri | int unsigned | NO |  | NULL |  |    
-| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | NO |  | NULL |  |    
-| external-id | Id of the item-uri table entry that contains the external uri | int unsigned | NO |  | NULL |  |    
-| created | Creation timestamp. | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| edited | Date of last edit (default is created) | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| received | datetime | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| gravity |  | tinyint unsigned | YES |  | 0 |  |    
-| network | Network from where the item comes from | char(4) | YES |  |  |  |    
-| owner-id | Link to the contact table with uid=0 of the owner of this item | int unsigned | YES |  | 0 |  |    
-| author-id | Link to the contact table with uid=0 of the author of this item | int unsigned | YES |  | 0 |  |    
-| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | NO |  | NULL |  |    
-| post-type | Post type (personal note, image, article, ...) | tinyint unsigned | YES |  | 0 |  |    
-| post-reason | Reason why the post arrived at the user | tinyint unsigned | YES |  | 0 |  |    
-| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | NO |  | NULL |  |    
-| private | 0=public, 1=private, 2=unlisted | tinyint unsigned | YES |  | 0 |  |    
-| global |  | boolean | YES |  | 0 |  |    
-| visible |  | boolean | YES |  | 0 |  |    
-| deleted | item has been marked for deletion | boolean | YES |  | 0 |  |    
-| uid | Owner id which owns this copy of the item | mediumint unsigned | YES |  | NULL |  |    
-| protocol | Protocol used to deliver the item for this user | tinyint unsigned | NO |  | NULL |  |    
-| contact-id | contact.id | int unsigned | YES |  | 0 |  |    
-| event-id | Used to link to the event.id | int unsigned | NO |  | NULL |  |    
-| unseen | post has not been seen | boolean | YES |  | 1 |  |    
-| hidden | Marker to hide the post from the user | boolean | YES |  | 0 |  |    
-| notification-type |  | tinyint unsigned | YES |  | 0 |  |    
-| wall | This item was posted to the wall of uid | boolean | YES |  | 0 |  |    
-| origin | item originated at this site | boolean | YES |  | 0 |  |    
-| psid | ID of the permission set of this post | int unsigned | NO |  | NULL |  |    
+| id |  | int unsigned | NO | PRI | NULL | auto_increment |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO |  | NULL |  |    
+| parent-uri-id | Id of the item-uri table that contains the parent uri | int unsigned | YES |  | NULL |  |    
+| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | YES |  | NULL |  |    
+| external-id | Id of the item-uri table entry that contains the external uri | int unsigned | YES |  | NULL |  |    
+| created | Creation timestamp. | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| edited | Date of last edit (default is created) | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| received | datetime | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| gravity |  | tinyint unsigned | NO |  | 0 |  |    
+| network | Network from where the item comes from | char(4) | NO |  |  |  |    
+| owner-id | Link to the contact table with uid=0 of the owner of this item | int unsigned | NO |  | 0 |  |    
+| author-id | Link to the contact table with uid=0 of the author of this item | int unsigned | NO |  | 0 |  |    
+| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | YES |  | NULL |  |    
+| post-type | Post type (personal note, image, article, ...) | tinyint unsigned | NO |  | 0 |  |    
+| post-reason | Reason why the post arrived at the user | tinyint unsigned | NO |  | 0 |  |    
+| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | YES |  | NULL |  |    
+| private | 0=public, 1=private, 2=unlisted | tinyint unsigned | NO |  | 0 |  |    
+| global |  | boolean | NO |  | 0 |  |    
+| visible |  | boolean | NO |  | 0 |  |    
+| deleted | item has been marked for deletion | boolean | NO |  | 0 |  |    
+| uid | Owner id which owns this copy of the item | mediumint unsigned | NO |  | NULL |  |    
+| protocol | Protocol used to deliver the item for this user | tinyint unsigned | YES |  | NULL |  |    
+| contact-id | contact.id | int unsigned | NO |  | 0 |  |    
+| event-id | Used to link to the event.id | int unsigned | YES |  | NULL |  |    
+| unseen | post has not been seen | boolean | NO |  | 1 |  |    
+| hidden | Marker to hide the post from the user | boolean | NO |  | 0 |  |    
+| notification-type |  | tinyint unsigned | NO |  | 0 |  |    
+| wall | This item was posted to the wall of uid | boolean | NO |  | 0 |  |    
+| origin | item originated at this site | boolean | NO |  | 0 |  |    
+| psid | ID of the permission set of this post | int unsigned | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post.md b/doc/database/db_post.md
index 020e5e9c9f..1367bcb770 100644
--- a/doc/database/db_post.md
+++ b/doc/database/db_post.md
@@ -4,23 +4,23 @@ Structure for all posts
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | YES | PRI | NULL |  |    
-| parent-uri-id | Id of the item-uri table that contains the parent uri | int unsigned | NO |  | NULL |  |    
-| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | NO |  | NULL |  |    
-| external-id | Id of the item-uri table entry that contains the external uri | int unsigned | NO |  | NULL |  |    
-| created | Creation timestamp. | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| edited | Date of last edit (default is created) | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| received | datetime | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| gravity |  | tinyint unsigned | YES |  | 0 |  |    
-| network | Network from where the item comes from | char(4) | YES |  |  |  |    
-| owner-id | Link to the contact table with uid=0 of the owner of this item | int unsigned | YES |  | 0 |  |    
-| author-id | Link to the contact table with uid=0 of the author of this item | int unsigned | YES |  | 0 |  |    
-| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | NO |  | NULL |  |    
-| post-type | Post type (personal note, image, article, ...) | tinyint unsigned | YES |  | 0 |  |    
-| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | NO |  | NULL |  |    
-| private | 0=public, 1=private, 2=unlisted | tinyint unsigned | YES |  | 0 |  |    
-| global |  | boolean | YES |  | 0 |  |    
-| visible |  | boolean | YES |  | 0 |  |    
-| deleted | item has been marked for deletion | boolean | YES |  | 0 |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
+| parent-uri-id | Id of the item-uri table that contains the parent uri | int unsigned | YES |  | NULL |  |    
+| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | YES |  | NULL |  |    
+| external-id | Id of the item-uri table entry that contains the external uri | int unsigned | YES |  | NULL |  |    
+| created | Creation timestamp. | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| edited | Date of last edit (default is created) | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| received | datetime | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| gravity |  | tinyint unsigned | NO |  | 0 |  |    
+| network | Network from where the item comes from | char(4) | NO |  |  |  |    
+| owner-id | Link to the contact table with uid=0 of the owner of this item | int unsigned | NO |  | 0 |  |    
+| author-id | Link to the contact table with uid=0 of the author of this item | int unsigned | NO |  | 0 |  |    
+| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | YES |  | NULL |  |    
+| post-type | Post type (personal note, image, article, ...) | tinyint unsigned | NO |  | 0 |  |    
+| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | YES |  | NULL |  |    
+| private | 0=public, 1=private, 2=unlisted | tinyint unsigned | NO |  | 0 |  |    
+| global |  | boolean | NO |  | 0 |  |    
+| visible |  | boolean | NO |  | 0 |  |    
+| deleted | item has been marked for deletion | boolean | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_process.md b/doc/database/db_process.md
index 2c92fc84d3..9284130b56 100644
--- a/doc/database/db_process.md
+++ b/doc/database/db_process.md
@@ -4,8 +4,8 @@ Currently running system processes
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| pid |  | int unsigned | YES | PRI | NULL |  |    
-| command |  | varbinary(32) | YES |  |  |  |    
-| created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| pid |  | int unsigned | NO | PRI | NULL |  |    
+| command |  | varbinary(32) | NO |  |  |  |    
+| created |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_profile.md b/doc/database/db_profile.md
index aa0e36066f..c7ee655696 100644
--- a/doc/database/db_profile.md
+++ b/doc/database/db_profile.md
@@ -4,47 +4,47 @@ user profiles data
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | Owner User id | mediumint unsigned | YES |  | 0 |  |    
-| profile-name | Deprecated | varchar(255) | NO |  | NULL |  |    
-| is-default | Deprecated | boolean | NO |  | NULL |  |    
-| hide-friends | Hide friend list from viewers of this profile | boolean | YES |  | 0 |  |    
-| name |  | varchar(255) | YES |  |  |  |    
-| pdesc | Deprecated | varchar(255) | NO |  | NULL |  |    
-| dob | Day of birth | varchar(32) | YES |  | 0000-00-00 |  |    
-| address |  | varchar(255) | YES |  |  |  |    
-| locality |  | varchar(255) | YES |  |  |  |    
-| region |  | varchar(255) | YES |  |  |  |    
-| postal-code |  | varchar(32) | YES |  |  |  |    
-| country-name |  | varchar(255) | YES |  |  |  |    
-| hometown | Deprecated | varchar(255) | NO |  | NULL |  |    
-| gender | Deprecated | varchar(32) | NO |  | NULL |  |    
-| marital | Deprecated | varchar(255) | NO |  | NULL |  |    
-| with | Deprecated | text | NO |  | NULL |  |    
-| howlong | Deprecated | datetime | NO |  | NULL |  |    
-| sexual | Deprecated | varchar(255) | NO |  | NULL |  |    
-| politic | Deprecated | varchar(255) | NO |  | NULL |  |    
-| religion | Deprecated | varchar(255) | NO |  | NULL |  |    
-| pub_keywords |  | text | NO |  | NULL |  |    
-| prv_keywords |  | text | NO |  | NULL |  |    
-| likes | Deprecated | text | NO |  | NULL |  |    
-| dislikes | Deprecated | text | NO |  | NULL |  |    
-| about | Profile description | text | NO |  | NULL |  |    
-| summary | Deprecated | varchar(255) | NO |  | NULL |  |    
-| music | Deprecated | text | NO |  | NULL |  |    
-| book | Deprecated | text | NO |  | NULL |  |    
-| tv | Deprecated | text | NO |  | NULL |  |    
-| film | Deprecated | text | NO |  | NULL |  |    
-| interest | Deprecated | text | NO |  | NULL |  |    
-| romance | Deprecated | text | NO |  | NULL |  |    
-| work | Deprecated | text | NO |  | NULL |  |    
-| education | Deprecated | text | NO |  | NULL |  |    
-| contact | Deprecated | text | NO |  | NULL |  |    
-| homepage |  | varchar(255) | YES |  |  |  |    
-| xmpp |  | varchar(255) | YES |  |  |  |    
-| photo |  | varchar(255) | YES |  |  |  |    
-| thumb |  | varchar(255) | YES |  |  |  |    
-| publish | publish default profile in local directory | boolean | YES |  | 0 |  |    
-| net-publish | publish profile in global directory | boolean | YES |  | 0 |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
+| profile-name | Deprecated | varchar(255) | YES |  | NULL |  |    
+| is-default | Deprecated | boolean | YES |  | NULL |  |    
+| hide-friends | Hide friend list from viewers of this profile | boolean | NO |  | 0 |  |    
+| name |  | varchar(255) | NO |  |  |  |    
+| pdesc | Deprecated | varchar(255) | YES |  | NULL |  |    
+| dob | Day of birth | varchar(32) | NO |  | 0000-00-00 |  |    
+| address |  | varchar(255) | NO |  |  |  |    
+| locality |  | varchar(255) | NO |  |  |  |    
+| region |  | varchar(255) | NO |  |  |  |    
+| postal-code |  | varchar(32) | NO |  |  |  |    
+| country-name |  | varchar(255) | NO |  |  |  |    
+| hometown | Deprecated | varchar(255) | YES |  | NULL |  |    
+| gender | Deprecated | varchar(32) | YES |  | NULL |  |    
+| marital | Deprecated | varchar(255) | YES |  | NULL |  |    
+| with | Deprecated | text | YES |  | NULL |  |    
+| howlong | Deprecated | datetime | YES |  | NULL |  |    
+| sexual | Deprecated | varchar(255) | YES |  | NULL |  |    
+| politic | Deprecated | varchar(255) | YES |  | NULL |  |    
+| religion | Deprecated | varchar(255) | YES |  | NULL |  |    
+| pub_keywords |  | text | YES |  | NULL |  |    
+| prv_keywords |  | text | YES |  | NULL |  |    
+| likes | Deprecated | text | YES |  | NULL |  |    
+| dislikes | Deprecated | text | YES |  | NULL |  |    
+| about | Profile description | text | YES |  | NULL |  |    
+| summary | Deprecated | varchar(255) | YES |  | NULL |  |    
+| music | Deprecated | text | YES |  | NULL |  |    
+| book | Deprecated | text | YES |  | NULL |  |    
+| tv | Deprecated | text | YES |  | NULL |  |    
+| film | Deprecated | text | YES |  | NULL |  |    
+| interest | Deprecated | text | YES |  | NULL |  |    
+| romance | Deprecated | text | YES |  | NULL |  |    
+| work | Deprecated | text | YES |  | NULL |  |    
+| education | Deprecated | text | YES |  | NULL |  |    
+| contact | Deprecated | text | YES |  | NULL |  |    
+| homepage |  | varchar(255) | NO |  |  |  |    
+| xmpp |  | varchar(255) | NO |  |  |  |    
+| photo |  | varchar(255) | NO |  |  |  |    
+| thumb |  | varchar(255) | NO |  |  |  |    
+| publish | publish default profile in local directory | boolean | NO |  | 0 |  |    
+| net-publish | publish profile in global directory | boolean | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_profile_check.md b/doc/database/db_profile_check.md
index b41a102732..b2eea14ae6 100644
--- a/doc/database/db_profile_check.md
+++ b/doc/database/db_profile_check.md
@@ -4,11 +4,11 @@ DFRN remote auth use
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | User id | mediumint unsigned | YES |  | 0 |  |    
-| cid | contact.id | int unsigned | YES |  | 0 |  |    
-| dfrn_id |  | varchar(255) | YES |  |  |  |    
-| sec |  | varchar(255) | YES |  |  |  |    
-| expire |  | int unsigned | YES |  | 0 |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | User id | mediumint unsigned | NO |  | 0 |  |    
+| cid | contact.id | int unsigned | NO |  | 0 |  |    
+| dfrn_id |  | varchar(255) | NO |  |  |  |    
+| sec |  | varchar(255) | NO |  |  |  |    
+| expire |  | int unsigned | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_profile_field.md b/doc/database/db_profile_field.md
index 4018f1256f..34a683cfba 100644
--- a/doc/database/db_profile_field.md
+++ b/doc/database/db_profile_field.md
@@ -4,13 +4,13 @@ Custom profile fields
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | Owner user id | mediumint unsigned | YES |  | 0 |  |    
-| order | Field ordering per user | mediumint unsigned | YES |  | 1 |  |    
-| psid | ID of the permission set of this profile field - 0 = public | int unsigned | NO |  | NULL |  |    
-| label | Label of the field | varchar(255) | YES |  |  |  |    
-| value | Value of the field | text | NO |  | NULL |  |    
-| created | creation time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| edited | last edit time | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | Owner user id | mediumint unsigned | NO |  | 0 |  |    
+| order | Field ordering per user | mediumint unsigned | NO |  | 1 |  |    
+| psid | ID of the permission set of this profile field - 0 = public | int unsigned | YES |  | NULL |  |    
+| label | Label of the field | varchar(255) | NO |  |  |  |    
+| value | Value of the field | text | YES |  | NULL |  |    
+| created | creation time | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| edited | last edit time | datetime | NO |  | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_push_subscriber.md b/doc/database/db_push_subscriber.md
index d745db6d2e..73af99b9ea 100644
--- a/doc/database/db_push_subscriber.md
+++ b/doc/database/db_push_subscriber.md
@@ -4,15 +4,15 @@ Used for OStatus: Contains feed subscribers
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | User id | mediumint unsigned | YES |  | 0 |  |    
-| callback_url |  | varchar(255) | YES |  |  |  |    
-| topic |  | varchar(255) | YES |  |  |  |    
-| nickname |  | varchar(255) | YES |  |  |  |    
-| push | Retrial counter | tinyint | YES |  | 0 |  |    
-| last_update | Date of last successful trial | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| next_try | Next retrial date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| renewed | Date of last subscription renewal | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| secret |  | varchar(255) | YES |  |  |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | User id | mediumint unsigned | NO |  | 0 |  |    
+| callback_url |  | varchar(255) | NO |  |  |  |    
+| topic |  | varchar(255) | NO |  |  |  |    
+| nickname |  | varchar(255) | NO |  |  |  |    
+| push | Retrial counter | tinyint | NO |  | 0 |  |    
+| last_update | Date of last successful trial | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| next_try | Next retrial date | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| renewed | Date of last subscription renewal | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| secret |  | varchar(255) | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_register.md b/doc/database/db_register.md
index fe2f18ba84..6751390112 100644
--- a/doc/database/db_register.md
+++ b/doc/database/db_register.md
@@ -4,12 +4,12 @@ registrations requiring admin approval
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| hash |  | varchar(255) | YES |  |  |  |    
-| created |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| uid | User id | mediumint unsigned | YES |  | 0 |  |    
-| password |  | varchar(255) | YES |  |  |  |    
-| language |  | varchar(16) | YES |  |  |  |    
-| note |  | text | NO |  | NULL |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| hash |  | varchar(255) | NO |  |  |  |    
+| created |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| uid | User id | mediumint unsigned | NO |  | 0 |  |    
+| password |  | varchar(255) | NO |  |  |  |    
+| language |  | varchar(16) | NO |  |  |  |    
+| note |  | text | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_search.md b/doc/database/db_search.md
index 994a3ffbf2..10deb6c187 100644
--- a/doc/database/db_search.md
+++ b/doc/database/db_search.md
@@ -4,8 +4,8 @@ Table search
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| uid | User id | mediumint unsigned | YES |  | 0 |  |    
-| term |  | varchar(255) | YES |  |  |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| uid | User id | mediumint unsigned | NO |  | 0 |  |    
+| term |  | varchar(255) | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_session.md b/doc/database/db_session.md
index 80916366a2..d607f74e7c 100644
--- a/doc/database/db_session.md
+++ b/doc/database/db_session.md
@@ -4,9 +4,9 @@ web session storage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | bigint unsigned | YES | PRI | NULL | auto_increment |    
-| sid |  | varbinary(255) | YES |  |  |  |    
-| data |  | text | NO |  | NULL |  |    
-| expire |  | int unsigned | YES |  | 0 |  |    
+| id | sequential ID | bigint unsigned | NO | PRI | NULL | auto_increment |    
+| sid |  | varbinary(255) | NO |  |  |  |    
+| data |  | text | YES |  | NULL |  |    
+| expire |  | int unsigned | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_storage.md b/doc/database/db_storage.md
index 376f0cb225..1984436265 100644
--- a/doc/database/db_storage.md
+++ b/doc/database/db_storage.md
@@ -4,7 +4,7 @@ Data stored by Database storage backend
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | Auto incremented image data id | int unsigned | YES | PRI | NULL | auto_increment |    
-| data | file data | longblob | YES |  | NULL |  |    
+| id | Auto incremented image data id | int unsigned | NO | PRI | NULL | auto_increment |    
+| data | file data | longblob | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_tag.md b/doc/database/db_tag.md
index 3fb7d7d8fc..8d7ae354f1 100644
--- a/doc/database/db_tag.md
+++ b/doc/database/db_tag.md
@@ -4,8 +4,8 @@ tags and mentions
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | YES | PRI | NULL | auto_increment |    
-| name |  | varchar(96) | YES |  |  |  |    
-| url |  | varbinary(255) | YES |  |  |  |    
+| id |  | int unsigned | NO | PRI | NULL | auto_increment |    
+| name |  | varchar(96) | NO |  |  |  |    
+| url |  | varbinary(255) | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_tokens.md b/doc/database/db_tokens.md
index 93510a16e7..712bb05fdd 100644
--- a/doc/database/db_tokens.md
+++ b/doc/database/db_tokens.md
@@ -4,11 +4,11 @@ OAuth usage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | varchar(40) | YES | PRI | NULL |  |    
-| secret |  | text | NO |  | NULL |  |    
-| client_id |  | varchar(20) | YES |  |  |  |    
-| expires |  | int | YES |  | 0 |  |    
-| scope |  | varchar(200) | YES |  |  |  |    
-| uid | User id | mediumint unsigned | YES |  | 0 |  |    
+| id |  | varchar(40) | NO | PRI | NULL |  |    
+| secret |  | text | YES |  | NULL |  |    
+| client_id |  | varchar(20) | NO |  |  |  |    
+| expires |  | int | NO |  | 0 |  |    
+| scope |  | varchar(200) | NO |  |  |  |    
+| uid | User id | mediumint unsigned | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_user-contact.md b/doc/database/db_user-contact.md
index 2c208735a7..762c350395 100644
--- a/doc/database/db_user-contact.md
+++ b/doc/database/db_user-contact.md
@@ -4,10 +4,10 @@ User specific public contact data
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| cid | Contact id of the linked public contact | int unsigned | YES | PRI | 0 |  |    
-| uid | User id | mediumint unsigned | YES | PRI | 0 |  |    
-| blocked | Contact is completely blocked for this user | boolean | NO |  | NULL |  |    
-| ignored | Posts from this contact are ignored | boolean | NO |  | NULL |  |    
-| collapsed | Posts from this contact are collapsed | boolean | NO |  | NULL |  |    
+| cid | Contact id of the linked public contact | int unsigned | NO | PRI | 0 |  |    
+| uid | User id | mediumint unsigned | NO | PRI | 0 |  |    
+| blocked | Contact is completely blocked for this user | boolean | YES |  | NULL |  |    
+| ignored | Posts from this contact are ignored | boolean | YES |  | NULL |  |    
+| collapsed | Posts from this contact are collapsed | boolean | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_user.md b/doc/database/db_user.md
index 8f055b1bc2..0794b7bcb1 100644
--- a/doc/database/db_user.md
+++ b/doc/database/db_user.md
@@ -4,50 +4,50 @@ The local users
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uid | sequential ID | mediumint unsigned | YES | PRI | NULL | auto_increment |    
-| parent-uid | The parent user that has full control about this user | mediumint unsigned | NO |  | NULL |  |    
-| guid | A unique identifier for this user | varchar(64) | YES |  |  |  |    
-| username | Name that this user is known by | varchar(255) | YES |  |  |  |    
-| password | encrypted password | varchar(255) | YES |  |  |  |    
-| legacy_password | Is the password hash double-hashed? | boolean | YES |  | 0 |  |    
-| nickname | nick- and user name | varchar(255) | YES |  |  |  |    
-| email | the users email address | varchar(255) | YES |  |  |  |    
-| openid |  | varchar(255) | YES |  |  |  |    
-| timezone | PHP-legal timezone | varchar(128) | YES |  |  |  |    
-| language | default language | varchar(32) | YES |  | en |  |    
-| register_date | timestamp of registration | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| login_date | timestamp of last login | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| default-location | Default for item.location | varchar(255) | YES |  |  |  |    
-| allow_location | 1 allows to display the location | boolean | YES |  | 0 |  |    
-| theme | user theme preference | varchar(255) | YES |  |  |  |    
-| pubkey | RSA public key 4096 bit | text | NO |  | NULL |  |    
-| prvkey | RSA private key 4096 bit | text | NO |  | NULL |  |    
-| spubkey |  | text | NO |  | NULL |  |    
-| sprvkey |  | text | NO |  | NULL |  |    
-| verified | user is verified through email | boolean | YES |  | 0 |  |    
-| blocked | 1 for user is blocked | boolean | YES |  | 0 |  |    
-| blockwall | Prohibit contacts to post to the profile page of the user | boolean | YES |  | 0 |  |    
-| hidewall | Hide profile details from unkown viewers | boolean | YES |  | 0 |  |    
-| blocktags | Prohibit contacts to tag the post of this user | boolean | YES |  | 0 |  |    
-| unkmail | Permit unknown people to send private mails to this user | boolean | YES |  | 0 |  |    
-| cntunkmail |  | int unsigned | YES |  | 10 |  |    
-| notify-flags | email notification options | smallint unsigned | YES |  | 65535 |  |    
-| page-flags | page/profile type | tinyint unsigned | YES |  | 0 |  |    
-| account-type |  | tinyint unsigned | YES |  | 0 |  |    
-| prvnets |  | boolean | YES |  | 0 |  |    
-| pwdreset | Password reset request token | varchar(255) | NO |  | NULL |  |    
-| pwdreset_time | Timestamp of the last password reset request | datetime | NO |  | NULL |  |    
-| maxreq |  | int unsigned | YES |  | 10 |  |    
-| expire |  | int unsigned | YES |  | 0 |  |    
-| account_removed | if 1 the account is removed | boolean | YES |  | 0 |  |    
-| account_expired |  | boolean | YES |  | 0 |  |    
-| account_expires_on | timestamp when account expires and will be deleted | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| expire_notification_sent | timestamp of last warning of account expiration | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| def_gid |  | int unsigned | YES |  | 0 |  |    
-| allow_cid | default permission for this user | mediumtext | NO |  | NULL |  |    
-| allow_gid | default permission for this user | mediumtext | NO |  | NULL |  |    
-| deny_cid | default permission for this user | mediumtext | NO |  | NULL |  |    
-| deny_gid | default permission for this user | mediumtext | NO |  | NULL |  |    
-| openidserver |  | text | NO |  | NULL |  |    
+| uid | sequential ID | mediumint unsigned | NO | PRI | NULL | auto_increment |    
+| parent-uid | The parent user that has full control about this user | mediumint unsigned | YES |  | NULL |  |    
+| guid | A unique identifier for this user | varchar(64) | NO |  |  |  |    
+| username | Name that this user is known by | varchar(255) | NO |  |  |  |    
+| password | encrypted password | varchar(255) | NO |  |  |  |    
+| legacy_password | Is the password hash double-hashed? | boolean | NO |  | 0 |  |    
+| nickname | nick- and user name | varchar(255) | NO |  |  |  |    
+| email | the users email address | varchar(255) | NO |  |  |  |    
+| openid |  | varchar(255) | NO |  |  |  |    
+| timezone | PHP-legal timezone | varchar(128) | NO |  |  |  |    
+| language | default language | varchar(32) | NO |  | en |  |    
+| register_date | timestamp of registration | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| login_date | timestamp of last login | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| default-location | Default for item.location | varchar(255) | NO |  |  |  |    
+| allow_location | 1 allows to display the location | boolean | NO |  | 0 |  |    
+| theme | user theme preference | varchar(255) | NO |  |  |  |    
+| pubkey | RSA public key 4096 bit | text | YES |  | NULL |  |    
+| prvkey | RSA private key 4096 bit | text | YES |  | NULL |  |    
+| spubkey |  | text | YES |  | NULL |  |    
+| sprvkey |  | text | YES |  | NULL |  |    
+| verified | user is verified through email | boolean | NO |  | 0 |  |    
+| blocked | 1 for user is blocked | boolean | NO |  | 0 |  |    
+| blockwall | Prohibit contacts to post to the profile page of the user | boolean | NO |  | 0 |  |    
+| hidewall | Hide profile details from unkown viewers | boolean | NO |  | 0 |  |    
+| blocktags | Prohibit contacts to tag the post of this user | boolean | NO |  | 0 |  |    
+| unkmail | Permit unknown people to send private mails to this user | boolean | NO |  | 0 |  |    
+| cntunkmail |  | int unsigned | NO |  | 10 |  |    
+| notify-flags | email notification options | smallint unsigned | NO |  | 65535 |  |    
+| page-flags | page/profile type | tinyint unsigned | NO |  | 0 |  |    
+| account-type |  | tinyint unsigned | NO |  | 0 |  |    
+| prvnets |  | boolean | NO |  | 0 |  |    
+| pwdreset | Password reset request token | varchar(255) | YES |  | NULL |  |    
+| pwdreset_time | Timestamp of the last password reset request | datetime | YES |  | NULL |  |    
+| maxreq |  | int unsigned | NO |  | 10 |  |    
+| expire |  | int unsigned | NO |  | 0 |  |    
+| account_removed | if 1 the account is removed | boolean | NO |  | 0 |  |    
+| account_expired |  | boolean | NO |  | 0 |  |    
+| account_expires_on | timestamp when account expires and will be deleted | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| expire_notification_sent | timestamp of last warning of account expiration | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| def_gid |  | int unsigned | NO |  | 0 |  |    
+| allow_cid | default permission for this user | mediumtext | YES |  | NULL |  |    
+| allow_gid | default permission for this user | mediumtext | YES |  | NULL |  |    
+| deny_cid | default permission for this user | mediumtext | YES |  | NULL |  |    
+| deny_gid | default permission for this user | mediumtext | YES |  | NULL |  |    
+| openidserver |  | text | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_userd.md b/doc/database/db_userd.md
index 42cc72c3cb..5006033e96 100644
--- a/doc/database/db_userd.md
+++ b/doc/database/db_userd.md
@@ -4,7 +4,7 @@ Deleted usernames
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | YES | PRI | NULL | auto_increment |    
-| username |  | varchar(255) | YES |  | NULL |  |    
+| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| username |  | varchar(255) | NO |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_verb.md b/doc/database/db_verb.md
index 73871a07ca..4aa171f301 100644
--- a/doc/database/db_verb.md
+++ b/doc/database/db_verb.md
@@ -4,7 +4,7 @@ Activity Verbs
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | smallint unsigned | YES | PRI | NULL | auto_increment |    
-| name |  | varchar(100) | YES |  |  |  |    
+| id |  | smallint unsigned | NO | PRI | NULL | auto_increment |    
+| name |  | varchar(100) | NO |  |  |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_worker-ipc.md b/doc/database/db_worker-ipc.md
index 5246974f57..2da8021e44 100644
--- a/doc/database/db_worker-ipc.md
+++ b/doc/database/db_worker-ipc.md
@@ -4,7 +4,7 @@ Inter process communication between the frontend and the worker
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| key |  | int | YES | PRI | NULL |  |    
-| jobs | Flag for outstanding jobs | boolean | NO |  | NULL |  |    
+| key |  | int | NO | PRI | NULL |  |    
+| jobs | Flag for outstanding jobs | boolean | YES |  | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_workerqueue.md b/doc/database/db_workerqueue.md
index ec10ba5496..00768c3b55 100644
--- a/doc/database/db_workerqueue.md
+++ b/doc/database/db_workerqueue.md
@@ -4,15 +4,15 @@ Background tasks queue entries
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | Auto incremented worker task id | int unsigned | YES | PRI | NULL | auto_increment |    
-| command | Task command | varchar(100) | NO |  | NULL |  |    
-| parameter | Task parameter | mediumtext | NO |  | NULL |  |    
-| priority | Task priority | tinyint unsigned | YES |  | 0 |  |    
-| created | Creation date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| pid | Process id of the worker | int unsigned | YES |  | 0 |  |    
-| executed | Execution date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| next_try | Next retrial date | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| retrial | Retrial counter | tinyint | YES |  | 0 |  |    
-| done | Marked 1 when the task was done - will be deleted later | boolean | YES |  | 0 |  |    
+| id | Auto incremented worker task id | int unsigned | NO | PRI | NULL | auto_increment |    
+| command | Task command | varchar(100) | YES |  | NULL |  |    
+| parameter | Task parameter | mediumtext | YES |  | NULL |  |    
+| priority | Task priority | tinyint unsigned | NO |  | 0 |  |    
+| created | Creation date | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| pid | Process id of the worker | int unsigned | NO |  | 0 |  |    
+| executed | Execution date | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| next_try | Next retrial date | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| retrial | Retrial counter | tinyint | NO |  | 0 |  |    
+| done | Marked 1 when the task was done - will be deleted later | boolean | NO |  | 0 |  |    
 
 Return to [database documentation](help/database)
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 888ac73e67..bb66bcb3fd 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -172,7 +172,7 @@ class DBStructure
 				$field['name']    = $key;
 				$field['comment'] = $value['comment'] ?? '';
 				$field['type']    = $value['type'];
-				$field['notnull'] = ($value['not null'] ?? false) ? 'YES' : 'NO';
+				$field['null']    = ($value['not null'] ?? false) ? 'NO' : 'YES';
 				$field['primary'] = ($value['primary'] ?? false) ? 'PRI' : '';
 				$field['default'] = $value['default'] ?? 'NULL';
 				$field['extra']   = $value['extra'] ?? '';
diff --git a/view/templates/structure.tpl b/view/templates/structure.tpl
index 91ba2eb315..15049ab575 100644
--- a/view/templates/structure.tpl
+++ b/view/templates/structure.tpl
@@ -5,7 +5,7 @@ Table {{$name}}
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
 {{foreach $fields as $field}}
-| {{$field.name}} | {{$field.comment}} | {{$field.type}} | {{$field.notnull}} | {{$field.primary}} | {{$field.default}} | {{$field.extra}} |    
+| {{$field.name}} | {{$field.comment}} | {{$field.type}} | {{$field.null}} | {{$field.primary}} | {{$field.default}} | {{$field.extra}} |    
 {{/foreach}}
 
 Return to [database documentation](help/database)

From 4095e6c9be01943c3b074d9a9061a01ff5fafcee Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 14 Jun 2021 05:33:47 +0000
Subject: [PATCH 06/14] Pad the lengths of the columns

---
 doc/database/db_2fa_app_specific_password.md |  12 +-
 doc/database/db_2fa_recovery_codes.md        |   8 +-
 doc/database/db_2fa_trusted_browser.md       |  10 +-
 doc/database/db_addon.md                     |  14 +-
 doc/database/db_apcontact.md                 |  48 +++---
 doc/database/db_application-token.md         |  20 +--
 doc/database/db_application.md               |  22 +--
 doc/database/db_attach.md                    |  30 ++--
 doc/database/db_auth_codes.md                |  10 +-
 doc/database/db_cache.md                     |   8 +-
 doc/database/db_challenge.md                 |  12 +-
 doc/database/db_clients.md                   |  12 +-
 doc/database/db_config.md                    |   8 +-
 doc/database/db_contact-relation.md          |  10 +-
 doc/database/db_contact.md                   | 160 +++++++++----------
 doc/database/db_conv.md                      |  16 +-
 doc/database/db_conversation.md              |  16 +-
 doc/database/db_delayed-post.md              |   8 +-
 doc/database/db_diaspora-interaction.md      |   4 +-
 doc/database/db_event.md                     |  40 ++---
 doc/database/db_fcontact.md                  |  34 ++--
 doc/database/db_fsuggest.md                  |  18 +--
 doc/database/db_group.md                     |  10 +-
 doc/database/db_group_member.md              |   6 +-
 doc/database/db_gserver-tag.md               |   4 +-
 doc/database/db_gserver.md                   |  46 +++---
 doc/database/db_hook.md                      |  10 +-
 doc/database/db_host.md                      |   4 +-
 doc/database/db_inbox-status.md              |  14 +-
 doc/database/db_intro.md                     |  22 +--
 doc/database/db_item-uri.md                  |   6 +-
 doc/database/db_locks.md                     |  10 +-
 doc/database/db_mail.md                      |  44 ++---
 doc/database/db_mailacct.md                  |  26 +--
 doc/database/db_manage.md                    |   6 +-
 doc/database/db_notification.md              |  18 +--
 doc/database/db_notify-threads.md            |  12 +-
 doc/database/db_notify.md                    |  36 ++---
 doc/database/db_oembed.md                    |   8 +-
 doc/database/db_openwebauth-token.md         |  12 +-
 doc/database/db_parsed_url.md                |  14 +-
 doc/database/db_pconfig.md                   |  10 +-
 doc/database/db_permissionset.md             |  12 +-
 doc/database/db_photo.md                     |  54 +++----
 doc/database/db_post-category.md             |   8 +-
 doc/database/db_post-content.md              |  34 ++--
 doc/database/db_post-delivery-data.md        |  22 +--
 doc/database/db_post-media.md                |  38 ++---
 doc/database/db_post-tag.md                  |   8 +-
 doc/database/db_post-thread-user.md          |  46 +++---
 doc/database/db_post-thread.md               |  18 +--
 doc/database/db_post-user-notification.md    |   6 +-
 doc/database/db_post-user.md                 |  60 +++----
 doc/database/db_post.md                      |  36 ++---
 doc/database/db_process.md                   |   6 +-
 doc/database/db_profile.md                   |  84 +++++-----
 doc/database/db_profile_check.md             |  12 +-
 doc/database/db_profile_field.md             |  16 +-
 doc/database/db_push_subscriber.md           |  20 +--
 doc/database/db_register.md                  |  14 +-
 doc/database/db_search.md                    |   6 +-
 doc/database/db_session.md                   |   8 +-
 doc/database/db_storage.md                   |   4 +-
 doc/database/db_tag.md                       |   6 +-
 doc/database/db_tokens.md                    |  12 +-
 doc/database/db_user-contact.md              |  10 +-
 doc/database/db_user.md                      |  90 +++++------
 doc/database/db_userd.md                     |   4 +-
 doc/database/db_verb.md                      |   4 +-
 doc/database/db_worker-ipc.md                |   4 +-
 doc/database/db_workerqueue.md               |  20 +--
 src/Database/DBStructure.php                 |  12 +-
 72 files changed, 761 insertions(+), 751 deletions(-)

diff --git a/doc/database/db_2fa_app_specific_password.md b/doc/database/db_2fa_app_specific_password.md
index 654de9a6e6..f34716329e 100644
--- a/doc/database/db_2fa_app_specific_password.md
+++ b/doc/database/db_2fa_app_specific_password.md
@@ -4,11 +4,11 @@ Two-factor app-specific _password
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | Password ID for revocation | mediumint unsigned | NO | PRI | NULL | auto_increment |    
-| uid | User ID | mediumint unsigned | NO |  | NULL |  |    
-| description | Description of the usage of the password | varchar(255) | YES |  | NULL |  |    
-| hashed_password | Hashed password | varchar(255) | NO |  | NULL |  |    
-| generated | Datetime the password was generated | datetime | NO |  | NULL |  |    
-| last_used | Datetime the password was last used | datetime | YES |  | NULL |  |    
+| id              | Password ID for revocation               | mediumint unsigned | NO  | PRI | NULL | auto_increment |    
+| uid             | User ID                                  | mediumint unsigned | NO  |     | NULL |                |    
+| description     | Description of the usage of the password | varchar(255)       | YES |     | NULL |                |    
+| hashed_password | Hashed password                          | varchar(255)       | NO  |     | NULL |                |    
+| generated       | Datetime the password was generated      | datetime           | NO  |     | NULL |                |    
+| last_used       | Datetime the password was last used      | datetime           | YES |     | NULL |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_2fa_recovery_codes.md b/doc/database/db_2fa_recovery_codes.md
index 61bd520d91..22c4d85e3d 100644
--- a/doc/database/db_2fa_recovery_codes.md
+++ b/doc/database/db_2fa_recovery_codes.md
@@ -4,9 +4,9 @@ Two-factor authentication recovery codes
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uid | User ID | mediumint unsigned | NO | PRI | NULL |  |    
-| code | Recovery code string | varchar(50) | NO | PRI | NULL |  |    
-| generated | Datetime the code was generated | datetime | NO |  | NULL |  |    
-| used | Datetime the code was used | datetime | YES |  | NULL |  |    
+| uid       | User ID                         | mediumint unsigned | NO  | PRI | NULL |  |    
+| code      | Recovery code string            | varchar(50)        | NO  | PRI | NULL |  |    
+| generated | Datetime the code was generated | datetime           | NO  |     | NULL |  |    
+| used      | Datetime the code was used      | datetime           | YES |     | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_2fa_trusted_browser.md b/doc/database/db_2fa_trusted_browser.md
index ccb426880a..0067ce41cf 100644
--- a/doc/database/db_2fa_trusted_browser.md
+++ b/doc/database/db_2fa_trusted_browser.md
@@ -4,10 +4,10 @@ Two-factor authentication trusted browsers
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| cookie_hash | Trusted cookie hash | varchar(80) | NO | PRI | NULL |  |    
-| uid | User ID | mediumint unsigned | NO |  | NULL |  |    
-| user_agent | User agent string | text | YES |  | NULL |  |    
-| created | Datetime the trusted browser was recorded | datetime | NO |  | NULL |  |    
-| last_used | Datetime the trusted browser was last used | datetime | YES |  | NULL |  |    
+| cookie_hash | Trusted cookie hash                        | varchar(80)        | NO  | PRI | NULL |  |    
+| uid         | User ID                                    | mediumint unsigned | NO  |     | NULL |  |    
+| user_agent  | User agent string                          | text               | YES |     | NULL |  |    
+| created     | Datetime the trusted browser was recorded  | datetime           | NO  |     | NULL |  |    
+| last_used   | Datetime the trusted browser was last used | datetime           | YES |     | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_addon.md b/doc/database/db_addon.md
index ae8507af0d..14853cd446 100644
--- a/doc/database/db_addon.md
+++ b/doc/database/db_addon.md
@@ -4,12 +4,12 @@ registered addons
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | NO | PRI | NULL | auto_increment |    
-| name | addon base (file)name | varchar(50) | NO |  |  |  |    
-| version | currently unused | varchar(50) | NO |  |  |  |    
-| installed | currently always 1 | boolean | NO |  | 0 |  |    
-| hidden | currently unused | boolean | NO |  | 0 |  |    
-| timestamp | file timestamp to check for reloads | int unsigned | NO |  | 0 |  |    
-| plugin_admin | 1 = has admin config, 0 = has no admin config | boolean | NO |  | 0 |  |    
+| id           |                                               | int unsigned | NO | PRI | NULL | auto_increment |    
+| name         | addon base (file)name                         | varchar(50)  | NO |     |      |                |    
+| version      | currently unused                              | varchar(50)  | NO |     |      |                |    
+| installed    | currently always 1                            | boolean      | NO |     | 0    |                |    
+| hidden       | currently unused                              | boolean      | NO |     | 0    |                |    
+| timestamp    | file timestamp to check for reloads           | int unsigned | NO |     | 0    |                |    
+| plugin_admin | 1 = has admin config, 0 = has no admin config | boolean      | NO |     | 0    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_apcontact.md b/doc/database/db_apcontact.md
index 9cff3af0cd..b22a15f8bd 100644
--- a/doc/database/db_apcontact.md
+++ b/doc/database/db_apcontact.md
@@ -4,29 +4,29 @@ ActivityPub compatible contacts - used in the ActivityPub implementation
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| url | URL of the contact | varbinary(255) | NO | PRI | NULL |  |    
-| uuid |  | varchar(255) | YES |  | NULL |  |    
-| type |  | varchar(20) | NO |  | NULL |  |    
-| following |  | varchar(255) | YES |  | NULL |  |    
-| followers |  | varchar(255) | YES |  | NULL |  |    
-| inbox |  | varchar(255) | NO |  | NULL |  |    
-| outbox |  | varchar(255) | YES |  | NULL |  |    
-| sharedinbox |  | varchar(255) | YES |  | NULL |  |    
-| manually-approve |  | boolean | YES |  | NULL |  |    
-| nick |  | varchar(255) | NO |  |  |  |    
-| name |  | varchar(255) | YES |  | NULL |  |    
-| about |  | text | YES |  | NULL |  |    
-| photo |  | varchar(255) | YES |  | NULL |  |    
-| addr |  | varchar(255) | YES |  | NULL |  |    
-| alias |  | varchar(255) | YES |  | NULL |  |    
-| pubkey |  | text | YES |  | NULL |  |    
-| subscribe |  | varchar(255) | YES |  | NULL |  |    
-| baseurl | baseurl of the ap contact | varchar(255) | YES |  | NULL |  |    
-| gsid | Global Server ID | int unsigned | YES |  | NULL |  |    
-| generator | Name of the contact&#039;s system | varchar(255) | YES |  | NULL |  |    
-| following_count | Number of following contacts | int unsigned | YES |  | 0 |  |    
-| followers_count | Number of followers | int unsigned | YES |  | 0 |  |    
-| statuses_count | Number of posts | int unsigned | YES |  | 0 |  |    
-| updated |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| url              | URL of the contact           | varbinary(255) | NO  | PRI | NULL                |  |    
+| uuid             |                              | varchar(255)   | YES |     | NULL                |  |    
+| type             |                              | varchar(20)    | NO  |     | NULL                |  |    
+| following        |                              | varchar(255)   | YES |     | NULL                |  |    
+| followers        |                              | varchar(255)   | YES |     | NULL                |  |    
+| inbox            |                              | varchar(255)   | NO  |     | NULL                |  |    
+| outbox           |                              | varchar(255)   | YES |     | NULL                |  |    
+| sharedinbox      |                              | varchar(255)   | YES |     | NULL                |  |    
+| manually-approve |                              | boolean        | YES |     | NULL                |  |    
+| nick             |                              | varchar(255)   | NO  |     |                     |  |    
+| name             |                              | varchar(255)   | YES |     | NULL                |  |    
+| about            |                              | text           | YES |     | NULL                |  |    
+| photo            |                              | varchar(255)   | YES |     | NULL                |  |    
+| addr             |                              | varchar(255)   | YES |     | NULL                |  |    
+| alias            |                              | varchar(255)   | YES |     | NULL                |  |    
+| pubkey           |                              | text           | YES |     | NULL                |  |    
+| subscribe        |                              | varchar(255)   | YES |     | NULL                |  |    
+| baseurl          | baseurl of the ap contact    | varchar(255)   | YES |     | NULL                |  |    
+| gsid             | Global Server ID             | int unsigned   | YES |     | NULL                |  |    
+| generator        | Name of the contact&#039;s system | varchar(255)   | YES |     | NULL                |  |    
+| following_count  | Number of following contacts | int unsigned   | YES |     | 0                   |  |    
+| followers_count  | Number of followers          | int unsigned   | YES |     | 0                   |  |    
+| statuses_count   | Number of posts              | int unsigned   | YES |     | 0                   |  |    
+| updated          |                              | datetime       | NO  |     | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_application-token.md b/doc/database/db_application-token.md
index c847c32181..ed9fb6d26e 100644
--- a/doc/database/db_application-token.md
+++ b/doc/database/db_application-token.md
@@ -4,15 +4,15 @@ OAuth user token
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| application-id |  | int unsigned | NO | PRI | NULL |  |    
-| uid | Owner User id | mediumint unsigned | NO | PRI | NULL |  |    
-| code |  | varchar(64) | NO |  | NULL |  |    
-| access_token |  | varchar(64) | NO |  | NULL |  |    
-| created_at | creation time | datetime | NO |  | NULL |  |    
-| scopes |  | varchar(255) | YES |  | NULL |  |    
-| read | Read scope | boolean | YES |  | NULL |  |    
-| write | Write scope | boolean | YES |  | NULL |  |    
-| follow | Follow scope | boolean | YES |  | NULL |  |    
-| push | Push scope | boolean | YES |  | NULL |  |    
+| application-id |               | int unsigned       | NO  | PRI | NULL |  |    
+| uid            | Owner User id | mediumint unsigned | NO  | PRI | NULL |  |    
+| code           |               | varchar(64)        | NO  |     | NULL |  |    
+| access_token   |               | varchar(64)        | NO  |     | NULL |  |    
+| created_at     | creation time | datetime           | NO  |     | NULL |  |    
+| scopes         |               | varchar(255)       | YES |     | NULL |  |    
+| read           | Read scope    | boolean            | YES |     | NULL |  |    
+| write          | Write scope   | boolean            | YES |     | NULL |  |    
+| follow         | Follow scope  | boolean            | YES |     | NULL |  |    
+| push           | Push scope    | boolean            | YES |     | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_application.md b/doc/database/db_application.md
index 261c982047..65281f394f 100644
--- a/doc/database/db_application.md
+++ b/doc/database/db_application.md
@@ -4,16 +4,16 @@ OAuth application
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | generated index | int unsigned | NO | PRI | NULL | auto_increment |    
-| client_id |  | varchar(64) | NO |  | NULL |  |    
-| client_secret |  | varchar(64) | NO |  | NULL |  |    
-| name |  | varchar(255) | NO |  | NULL |  |    
-| redirect_uri |  | varchar(255) | NO |  | NULL |  |    
-| website |  | varchar(255) | YES |  | NULL |  |    
-| scopes |  | varchar(255) | YES |  | NULL |  |    
-| read | Read scope | boolean | YES |  | NULL |  |    
-| write | Write scope | boolean | YES |  | NULL |  |    
-| follow | Follow scope | boolean | YES |  | NULL |  |    
-| push | Push scope | boolean | YES |  | NULL |  |    
+| id            | generated index | int unsigned | NO  | PRI | NULL | auto_increment |    
+| client_id     |                 | varchar(64)  | NO  |     | NULL |                |    
+| client_secret |                 | varchar(64)  | NO  |     | NULL |                |    
+| name          |                 | varchar(255) | NO  |     | NULL |                |    
+| redirect_uri  |                 | varchar(255) | NO  |     | NULL |                |    
+| website       |                 | varchar(255) | YES |     | NULL |                |    
+| scopes        |                 | varchar(255) | YES |     | NULL |                |    
+| read          | Read scope      | boolean      | YES |     | NULL |                |    
+| write         | Write scope     | boolean      | YES |     | NULL |                |    
+| follow        | Follow scope    | boolean      | YES |     | NULL |                |    
+| push          | Push scope      | boolean      | YES |     | NULL |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_attach.md b/doc/database/db_attach.md
index fec3f8b242..4e02b599ed 100644
--- a/doc/database/db_attach.md
+++ b/doc/database/db_attach.md
@@ -4,20 +4,20 @@ file attachments
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | generated index | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
-| hash | hash | varchar(64) | NO |  |  |  |    
-| filename | filename of original | varchar(255) | NO |  |  |  |    
-| filetype | mimetype | varchar(64) | NO |  |  |  |    
-| filesize | size in bytes | int unsigned | NO |  | 0 |  |    
-| data | file data | longblob | NO |  | NULL |  |    
-| created | creation time | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| edited | last edit time | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt; | mediumtext | YES |  | NULL |  |    
-| allow_gid | Access Control - list of allowed groups | mediumtext | YES |  | NULL |  |    
-| deny_cid | Access Control - list of denied contact.id | mediumtext | YES |  | NULL |  |    
-| deny_gid | Access Control - list of denied groups | mediumtext | YES |  | NULL |  |    
-| backend-class | Storage backend class | tinytext | YES |  | NULL |  |    
-| backend-ref | Storage backend data reference | text | YES |  | NULL |  |    
+| id            | generated index                                       | int unsigned       | NO  | PRI | NULL                | auto_increment |    
+| uid           | Owner User id                                         | mediumint unsigned | NO  |     | 0                   |                |    
+| hash          | hash                                                  | varchar(64)        | NO  |     |                     |                |    
+| filename      | filename of original                                  | varchar(255)       | NO  |     |                     |                |    
+| filetype      | mimetype                                              | varchar(64)        | NO  |     |                     |                |    
+| filesize      | size in bytes                                         | int unsigned       | NO  |     | 0                   |                |    
+| data          | file data                                             | longblob           | NO  |     | NULL                |                |    
+| created       | creation time                                         | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| edited        | last edit time                                        | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| allow_cid     | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt; | mediumtext         | YES |     | NULL                |                |    
+| allow_gid     | Access Control - list of allowed groups               | mediumtext         | YES |     | NULL                |                |    
+| deny_cid      | Access Control - list of denied contact.id            | mediumtext         | YES |     | NULL                |                |    
+| deny_gid      | Access Control - list of denied groups                | mediumtext         | YES |     | NULL                |                |    
+| backend-class | Storage backend class                                 | tinytext           | YES |     | NULL                |                |    
+| backend-ref   | Storage backend data reference                        | text               | YES |     | NULL                |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_auth_codes.md b/doc/database/db_auth_codes.md
index 51cad7595e..d7ab8640b7 100644
--- a/doc/database/db_auth_codes.md
+++ b/doc/database/db_auth_codes.md
@@ -4,10 +4,10 @@ OAuth usage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | varchar(40) | NO | PRI | NULL |  |    
-| client_id |  | varchar(20) | NO |  |  |  |    
-| redirect_uri |  | varchar(200) | NO |  |  |  |    
-| expires |  | int | NO |  | 0 |  |    
-| scope |  | varchar(250) | NO |  |  |  |    
+| id           |  | varchar(40)  | NO | PRI | NULL |  |    
+| client_id    |  | varchar(20)  | NO |     |      |  |    
+| redirect_uri |  | varchar(200) | NO |     |      |  |    
+| expires      |  | int          | NO |     | 0    |  |    
+| scope        |  | varchar(250) | NO |     |      |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_cache.md b/doc/database/db_cache.md
index 403fbf8649..08ef1479b9 100644
--- a/doc/database/db_cache.md
+++ b/doc/database/db_cache.md
@@ -4,9 +4,9 @@ Stores temporary data
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| k | cache key | varbinary(255) | NO | PRI | NULL |  |    
-| v | cached serialized value | mediumtext | YES |  | NULL |  |    
-| expires | datetime of cache expiration | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| updated | datetime of cache insertion | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| k       | cache key                    | varbinary(255) | NO  | PRI | NULL                |  |    
+| v       | cached serialized value      | mediumtext     | YES |     | NULL                |  |    
+| expires | datetime of cache expiration | datetime       | NO  |     | 0001-01-01 00:00:00 |  |    
+| updated | datetime of cache insertion  | datetime       | NO  |     | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_challenge.md b/doc/database/db_challenge.md
index 54ffd252cf..12746056e5 100644
--- a/doc/database/db_challenge.md
+++ b/doc/database/db_challenge.md
@@ -4,11 +4,11 @@ Table challenge
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| challenge |  | varchar(255) | NO |  |  |  |    
-| dfrn-id |  | varchar(255) | NO |  |  |  |    
-| expire |  | int unsigned | NO |  | 0 |  |    
-| type |  | varchar(255) | NO |  |  |  |    
-| last_update |  | varchar(255) | NO |  |  |  |    
+| id          | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| challenge   |               | varchar(255) | NO |     |      |                |    
+| dfrn-id     |               | varchar(255) | NO |     |      |                |    
+| expire      |               | int unsigned | NO |     | 0    |                |    
+| type        |               | varchar(255) | NO |     |      |                |    
+| last_update |               | varchar(255) | NO |     |      |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_clients.md b/doc/database/db_clients.md
index 8f72824846..631cb65392 100644
--- a/doc/database/db_clients.md
+++ b/doc/database/db_clients.md
@@ -4,11 +4,11 @@ OAuth usage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| client_id |  | varchar(20) | NO | PRI | NULL |  |    
-| pw |  | varchar(20) | NO |  |  |  |    
-| redirect_uri |  | varchar(200) | NO |  |  |  |    
-| name |  | text | YES |  | NULL |  |    
-| icon |  | text | YES |  | NULL |  |    
-| uid | User id | mediumint unsigned | NO |  | 0 |  |    
+| client_id    |         | varchar(20)        | NO  | PRI | NULL |  |    
+| pw           |         | varchar(20)        | NO  |     |      |  |    
+| redirect_uri |         | varchar(200)       | NO  |     |      |  |    
+| name         |         | text               | YES |     | NULL |  |    
+| icon         |         | text               | YES |     | NULL |  |    
+| uid          | User id | mediumint unsigned | NO  |     | 0    |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_config.md b/doc/database/db_config.md
index 0eba8f11af..ce4fe46249 100644
--- a/doc/database/db_config.md
+++ b/doc/database/db_config.md
@@ -4,9 +4,9 @@ main configuration storage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | NO | PRI | NULL | auto_increment |    
-| cat |  | varbinary(50) | NO |  |  |  |    
-| k |  | varbinary(50) | NO |  |  |  |    
-| v |  | mediumtext | YES |  | NULL |  |    
+| id  |  | int unsigned  | NO  | PRI | NULL | auto_increment |    
+| cat |  | varbinary(50) | NO  |     |      |                |    
+| k   |  | varbinary(50) | NO  |     |      |                |    
+| v   |  | mediumtext    | YES |     | NULL |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_contact-relation.md b/doc/database/db_contact-relation.md
index 4fe92a7756..80cd9db1fb 100644
--- a/doc/database/db_contact-relation.md
+++ b/doc/database/db_contact-relation.md
@@ -4,10 +4,10 @@ Contact relations
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| cid | contact the related contact had interacted with | int unsigned | NO | PRI | 0 |  |    
-| relation-cid | related contact who had interacted with the contact | int unsigned | NO | PRI | 0 |  |    
-| last-interaction | Date of the last interaction | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| follow-updated | Date of the last update of the contact relationship | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| follows |  | boolean | NO |  | 0 |  |    
+| cid              | contact the related contact had interacted with     | int unsigned | NO | PRI | 0                   |  |    
+| relation-cid     | related contact who had interacted with the contact | int unsigned | NO | PRI | 0                   |  |    
+| last-interaction | Date of the last interaction                        | datetime     | NO |     | 0001-01-01 00:00:00 |  |    
+| follow-updated   | Date of the last update of the contact relationship | datetime     | NO |     | 0001-01-01 00:00:00 |  |    
+| follows          |                                                     | boolean      | NO |     | 0                   |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_contact.md b/doc/database/db_contact.md
index 35b94cdd77..1343488799 100644
--- a/doc/database/db_contact.md
+++ b/doc/database/db_contact.md
@@ -4,85 +4,85 @@ contact table
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
-| created |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| updated | Date of last contact update | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| self | 1 if the contact is the user him/her self | boolean | NO |  | 0 |  |    
-| remote_self |  | boolean | NO |  | 0 |  |    
-| rel | The kind of the relation between the user and the contact | tinyint unsigned | NO |  | 0 |  |    
-| duplex |  | boolean | NO |  | 0 |  |    
-| network | Network of the contact | char(4) | NO |  |  |  |    
-| protocol | Protocol of the contact | char(4) | NO |  |  |  |    
-| name | Name that this contact is known by | varchar(255) | NO |  |  |  |    
-| nick | Nick- and user name of the contact | varchar(255) | NO |  |  |  |    
-| location |  | varchar(255) | YES |  |  |  |    
-| about |  | text | YES |  | NULL |  |    
-| keywords | public keywords (interests) of the contact | text | YES |  | NULL |  |    
-| gender | Deprecated | varchar(32) | NO |  |  |  |    
-| xmpp |  | varchar(255) | NO |  |  |  |    
-| attag |  | varchar(255) | NO |  |  |  |    
-| avatar |  | varchar(255) | NO |  |  |  |    
-| photo | Link to the profile photo of the contact | varchar(255) | YES |  |  |  |    
-| thumb | Link to the profile photo (thumb size) | varchar(255) | YES |  |  |  |    
-| micro | Link to the profile photo (micro size) | varchar(255) | YES |  |  |  |    
-| site-pubkey |  | text | YES |  | NULL |  |    
-| issued-id |  | varchar(255) | NO |  |  |  |    
-| dfrn-id |  | varchar(255) | NO |  |  |  |    
-| url |  | varchar(255) | NO |  |  |  |    
-| nurl |  | varchar(255) | NO |  |  |  |    
-| addr |  | varchar(255) | NO |  |  |  |    
-| alias |  | varchar(255) | NO |  |  |  |    
-| pubkey | RSA public key 4096 bit | text | YES |  | NULL |  |    
-| prvkey | RSA private key 4096 bit | text | YES |  | NULL |  |    
-| batch |  | varchar(255) | NO |  |  |  |    
-| request |  | varchar(255) | YES |  | NULL |  |    
-| notify |  | varchar(255) | YES |  | NULL |  |    
-| poll |  | varchar(255) | YES |  | NULL |  |    
-| confirm |  | varchar(255) | YES |  | NULL |  |    
-| subscribe |  | varchar(255) | YES |  | NULL |  |    
-| poco |  | varchar(255) | YES |  | NULL |  |    
-| aes_allow |  | boolean | NO |  | 0 |  |    
-| ret-aes |  | boolean | NO |  | 0 |  |    
-| usehub |  | boolean | NO |  | 0 |  |    
-| subhub |  | boolean | NO |  | 0 |  |    
-| hub-verify |  | varchar(255) | NO |  |  |  |    
-| last-update | Date of the last try to update the contact info | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| success_update | Date of the last successful contact update | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| failure_update | Date of the last failed update | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| failed | Connection failed | boolean | YES |  | NULL |  |    
-| name-date |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| uri-date |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| avatar-date |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| term-date |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| last-item | date of the last post | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| last-discovery | date of the last follower discovery | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| priority |  | tinyint unsigned | NO |  | 0 |  |    
-| blocked | Node-wide block status | boolean | NO |  | 1 |  |    
-| block_reason | Node-wide block reason | text | YES |  | NULL |  |    
-| readonly | posts of the contact are readonly | boolean | NO |  | 0 |  |    
-| writable |  | boolean | NO |  | 0 |  |    
-| forum | contact is a forum | boolean | NO |  | 0 |  |    
-| prv | contact is a private group | boolean | NO |  | 0 |  |    
-| contact-type |  | tinyint | NO |  | 0 |  |    
-| manually-approve |  | boolean | YES |  | NULL |  |    
-| hidden |  | boolean | NO |  | 0 |  |    
-| archive |  | boolean | NO |  | 0 |  |    
-| pending |  | boolean | NO |  | 1 |  |    
-| deleted | Contact has been deleted | boolean | NO |  | 0 |  |    
-| rating |  | tinyint | NO |  | 0 |  |    
-| unsearchable | Contact prefers to not be searchable | boolean | NO |  | 0 |  |    
-| sensitive | Contact posts sensitive content | boolean | NO |  | 0 |  |    
-| baseurl | baseurl of the contact | varchar(255) | YES |  |  |  |    
-| gsid | Global Server ID | int unsigned | YES |  | NULL |  |    
-| reason |  | text | YES |  | NULL |  |    
-| closeness |  | tinyint unsigned | NO |  | 99 |  |    
-| info |  | mediumtext | YES |  | NULL |  |    
-| profile-id | Deprecated | int unsigned | YES |  | NULL |  |    
-| bdyear |  | varchar(4) | NO |  |  |  |    
-| bd |  | date | NO |  | 0001-01-01 |  |    
-| notify_new_posts |  | boolean | NO |  | 0 |  |    
-| fetch_further_information |  | tinyint unsigned | NO |  | 0 |  |    
-| ffi_keyword_denylist |  | text | YES |  | NULL |  |    
+| id                        | sequential ID                                             | int unsigned       | NO  | PRI | NULL                | auto_increment |    
+| uid                       | Owner User id                                             | mediumint unsigned | NO  |     | 0                   |                |    
+| created                   |                                                           | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| updated                   | Date of last contact update                               | datetime           | YES |     | 0001-01-01 00:00:00 |                |    
+| self                      | 1 if the contact is the user him/her self                 | boolean            | NO  |     | 0                   |                |    
+| remote_self               |                                                           | boolean            | NO  |     | 0                   |                |    
+| rel                       | The kind of the relation between the user and the contact | tinyint unsigned   | NO  |     | 0                   |                |    
+| duplex                    |                                                           | boolean            | NO  |     | 0                   |                |    
+| network                   | Network of the contact                                    | char(4)            | NO  |     |                     |                |    
+| protocol                  | Protocol of the contact                                   | char(4)            | NO  |     |                     |                |    
+| name                      | Name that this contact is known by                        | varchar(255)       | NO  |     |                     |                |    
+| nick                      | Nick- and user name of the contact                        | varchar(255)       | NO  |     |                     |                |    
+| location                  |                                                           | varchar(255)       | YES |     |                     |                |    
+| about                     |                                                           | text               | YES |     | NULL                |                |    
+| keywords                  | public keywords (interests) of the contact                | text               | YES |     | NULL                |                |    
+| gender                    | Deprecated                                                | varchar(32)        | NO  |     |                     |                |    
+| xmpp                      |                                                           | varchar(255)       | NO  |     |                     |                |    
+| attag                     |                                                           | varchar(255)       | NO  |     |                     |                |    
+| avatar                    |                                                           | varchar(255)       | NO  |     |                     |                |    
+| photo                     | Link to the profile photo of the contact                  | varchar(255)       | YES |     |                     |                |    
+| thumb                     | Link to the profile photo (thumb size)                    | varchar(255)       | YES |     |                     |                |    
+| micro                     | Link to the profile photo (micro size)                    | varchar(255)       | YES |     |                     |                |    
+| site-pubkey               |                                                           | text               | YES |     | NULL                |                |    
+| issued-id                 |                                                           | varchar(255)       | NO  |     |                     |                |    
+| dfrn-id                   |                                                           | varchar(255)       | NO  |     |                     |                |    
+| url                       |                                                           | varchar(255)       | NO  |     |                     |                |    
+| nurl                      |                                                           | varchar(255)       | NO  |     |                     |                |    
+| addr                      |                                                           | varchar(255)       | NO  |     |                     |                |    
+| alias                     |                                                           | varchar(255)       | NO  |     |                     |                |    
+| pubkey                    | RSA public key 4096 bit                                   | text               | YES |     | NULL                |                |    
+| prvkey                    | RSA private key 4096 bit                                  | text               | YES |     | NULL                |                |    
+| batch                     |                                                           | varchar(255)       | NO  |     |                     |                |    
+| request                   |                                                           | varchar(255)       | YES |     | NULL                |                |    
+| notify                    |                                                           | varchar(255)       | YES |     | NULL                |                |    
+| poll                      |                                                           | varchar(255)       | YES |     | NULL                |                |    
+| confirm                   |                                                           | varchar(255)       | YES |     | NULL                |                |    
+| subscribe                 |                                                           | varchar(255)       | YES |     | NULL                |                |    
+| poco                      |                                                           | varchar(255)       | YES |     | NULL                |                |    
+| aes_allow                 |                                                           | boolean            | NO  |     | 0                   |                |    
+| ret-aes                   |                                                           | boolean            | NO  |     | 0                   |                |    
+| usehub                    |                                                           | boolean            | NO  |     | 0                   |                |    
+| subhub                    |                                                           | boolean            | NO  |     | 0                   |                |    
+| hub-verify                |                                                           | varchar(255)       | NO  |     |                     |                |    
+| last-update               | Date of the last try to update the contact info           | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| success_update            | Date of the last successful contact update                | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| failure_update            | Date of the last failed update                            | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| failed                    | Connection failed                                         | boolean            | YES |     | NULL                |                |    
+| name-date                 |                                                           | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| uri-date                  |                                                           | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| avatar-date               |                                                           | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| term-date                 |                                                           | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| last-item                 | date of the last post                                     | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| last-discovery            | date of the last follower discovery                       | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| priority                  |                                                           | tinyint unsigned   | NO  |     | 0                   |                |    
+| blocked                   | Node-wide block status                                    | boolean            | NO  |     | 1                   |                |    
+| block_reason              | Node-wide block reason                                    | text               | YES |     | NULL                |                |    
+| readonly                  | posts of the contact are readonly                         | boolean            | NO  |     | 0                   |                |    
+| writable                  |                                                           | boolean            | NO  |     | 0                   |                |    
+| forum                     | contact is a forum                                        | boolean            | NO  |     | 0                   |                |    
+| prv                       | contact is a private group                                | boolean            | NO  |     | 0                   |                |    
+| contact-type              |                                                           | tinyint            | NO  |     | 0                   |                |    
+| manually-approve          |                                                           | boolean            | YES |     | NULL                |                |    
+| hidden                    |                                                           | boolean            | NO  |     | 0                   |                |    
+| archive                   |                                                           | boolean            | NO  |     | 0                   |                |    
+| pending                   |                                                           | boolean            | NO  |     | 1                   |                |    
+| deleted                   | Contact has been deleted                                  | boolean            | NO  |     | 0                   |                |    
+| rating                    |                                                           | tinyint            | NO  |     | 0                   |                |    
+| unsearchable              | Contact prefers to not be searchable                      | boolean            | NO  |     | 0                   |                |    
+| sensitive                 | Contact posts sensitive content                           | boolean            | NO  |     | 0                   |                |    
+| baseurl                   | baseurl of the contact                                    | varchar(255)       | YES |     |                     |                |    
+| gsid                      | Global Server ID                                          | int unsigned       | YES |     | NULL                |                |    
+| reason                    |                                                           | text               | YES |     | NULL                |                |    
+| closeness                 |                                                           | tinyint unsigned   | NO  |     | 99                  |                |    
+| info                      |                                                           | mediumtext         | YES |     | NULL                |                |    
+| profile-id                | Deprecated                                                | int unsigned       | YES |     | NULL                |                |    
+| bdyear                    |                                                           | varchar(4)         | NO  |     |                     |                |    
+| bd                        |                                                           | date               | NO  |     | 0001-01-01          |                |    
+| notify_new_posts          |                                                           | boolean            | NO  |     | 0                   |                |    
+| fetch_further_information |                                                           | tinyint unsigned   | NO  |     | 0                   |                |    
+| ffi_keyword_denylist      |                                                           | text               | YES |     | NULL                |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_conv.md b/doc/database/db_conv.md
index e07ee44844..72ea495901 100644
--- a/doc/database/db_conv.md
+++ b/doc/database/db_conv.md
@@ -4,13 +4,13 @@ private messages
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| guid | A unique identifier for this conversation | varchar(255) | NO |  |  |  |    
-| recips | sender_handle;recipient_handle | text | YES |  | NULL |  |    
-| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
-| creator | handle of creator | varchar(255) | NO |  |  |  |    
-| created | creation timestamp | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| updated | edited timestamp | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| subject | subject of initial message | text | YES |  | NULL |  |    
+| id      | sequential ID                             | int unsigned       | NO  | PRI | NULL                | auto_increment |    
+| guid    | A unique identifier for this conversation | varchar(255)       | NO  |     |                     |                |    
+| recips  | sender_handle;recipient_handle            | text               | YES |     | NULL                |                |    
+| uid     | Owner User id                             | mediumint unsigned | NO  |     | 0                   |                |    
+| creator | handle of creator                         | varchar(255)       | NO  |     |                     |                |    
+| created | creation timestamp                        | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| updated | edited timestamp                          | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| subject | subject of initial message                | text               | YES |     | NULL                |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_conversation.md b/doc/database/db_conversation.md
index bcc531a495..212d2a76e3 100644
--- a/doc/database/db_conversation.md
+++ b/doc/database/db_conversation.md
@@ -4,13 +4,13 @@ Raw data and structure information for messages
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| item-uri | Original URI of the item - unrelated to the table with the same name | varbinary(255) | NO | PRI | NULL |  |    
-| reply-to-uri | URI to which this item is a reply | varbinary(255) | NO |  |  |  |    
-| conversation-uri | GNU Social conversation URI | varbinary(255) | NO |  |  |  |    
-| conversation-href | GNU Social conversation link | varbinary(255) | NO |  |  |  |    
-| protocol | The protocol of the item | tinyint unsigned | NO |  | 255 |  |    
-| direction | How the message arrived here: 1=push, 2=pull | tinyint unsigned | NO |  | 0 |  |    
-| source | Original source | mediumtext | YES |  | NULL |  |    
-| received | Receiving date | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| item-uri          | Original URI of the item - unrelated to the table with the same name | varbinary(255)   | NO  | PRI | NULL                |  |    
+| reply-to-uri      | URI to which this item is a reply                                    | varbinary(255)   | NO  |     |                     |  |    
+| conversation-uri  | GNU Social conversation URI                                          | varbinary(255)   | NO  |     |                     |  |    
+| conversation-href | GNU Social conversation link                                         | varbinary(255)   | NO  |     |                     |  |    
+| protocol          | The protocol of the item                                             | tinyint unsigned | NO  |     | 255                 |  |    
+| direction         | How the message arrived here: 1=push, 2=pull                         | tinyint unsigned | NO  |     | 0                   |  |    
+| source            | Original source                                                      | mediumtext       | YES |     | NULL                |  |    
+| received          | Receiving date                                                       | datetime         | NO  |     | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_delayed-post.md b/doc/database/db_delayed-post.md
index 40e644ec45..ab79f557a4 100644
--- a/doc/database/db_delayed-post.md
+++ b/doc/database/db_delayed-post.md
@@ -4,9 +4,9 @@ Posts that are about to be distributed at a later time
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | NO | PRI | NULL | auto_increment |    
-| uri | URI of the post that will be distributed later | varchar(255) | YES |  | NULL |  |    
-| uid | Owner User id | mediumint unsigned | YES |  | NULL |  |    
-| delayed | delay time | datetime | YES |  | NULL |  |    
+| id      |                                                | int unsigned       | NO  | PRI | NULL | auto_increment |    
+| uri     | URI of the post that will be distributed later | varchar(255)       | YES |     | NULL |                |    
+| uid     | Owner User id                                  | mediumint unsigned | YES |     | NULL |                |    
+| delayed | delay time                                     | datetime           | YES |     | NULL |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_diaspora-interaction.md b/doc/database/db_diaspora-interaction.md
index 8a971cd3dd..80bd5f196b 100644
--- a/doc/database/db_diaspora-interaction.md
+++ b/doc/database/db_diaspora-interaction.md
@@ -4,7 +4,7 @@ Signed Diaspora Interaction
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
-| interaction | The Diaspora interaction | mediumtext | YES |  | NULL |  |    
+| uri-id      | Id of the item-uri table entry that contains the item uri | int unsigned | NO  | PRI | NULL |  |    
+| interaction | The Diaspora interaction                                  | mediumtext   | YES |     | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_event.md b/doc/database/db_event.md
index e8c55a5b33..a227b78dbc 100644
--- a/doc/database/db_event.md
+++ b/doc/database/db_event.md
@@ -4,25 +4,25 @@ Events
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| guid |  | varchar(255) | NO |  |  |  |    
-| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
-| cid | contact_id (ID of the contact in contact table) | int unsigned | NO |  | 0 |  |    
-| uri |  | varchar(255) | NO |  |  |  |    
-| created | creation time | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| edited | last edit time | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| start | event start time | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| finish | event end time | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| summary | short description or title of the event | text | YES |  | NULL |  |    
-| desc | event description | text | YES |  | NULL |  |    
-| location | event location | text | YES |  | NULL |  |    
-| type | event or birthday | varchar(20) | NO |  |  |  |    
-| nofinish | if event does have no end this is 1 | boolean | NO |  | 0 |  |    
-| adjust | adjust to timezone of the recipient (0 or 1) | boolean | NO |  | 1 |  |    
-| ignore | 0 or 1 | boolean | NO |  | 0 |  |    
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | YES |  | NULL |  |    
-| allow_gid | Access Control - list of allowed groups | mediumtext | YES |  | NULL |  |    
-| deny_cid | Access Control - list of denied contact.id | mediumtext | YES |  | NULL |  |    
-| deny_gid | Access Control - list of denied groups | mediumtext | YES |  | NULL |  |    
+| id        | sequential ID                                          | int unsigned       | NO  | PRI | NULL                | auto_increment |    
+| guid      |                                                        | varchar(255)       | NO  |     |                     |                |    
+| uid       | Owner User id                                          | mediumint unsigned | NO  |     | 0                   |                |    
+| cid       | contact_id (ID of the contact in contact table)        | int unsigned       | NO  |     | 0                   |                |    
+| uri       |                                                        | varchar(255)       | NO  |     |                     |                |    
+| created   | creation time                                          | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| edited    | last edit time                                         | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| start     | event start time                                       | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| finish    | event end time                                         | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| summary   | short description or title of the event                | text               | YES |     | NULL                |                |    
+| desc      | event description                                      | text               | YES |     | NULL                |                |    
+| location  | event location                                         | text               | YES |     | NULL                |                |    
+| type      | event or birthday                                      | varchar(20)        | NO  |     |                     |                |    
+| nofinish  | if event does have no end this is 1                    | boolean            | NO  |     | 0                   |                |    
+| adjust    | adjust to timezone of the recipient (0 or 1)           | boolean            | NO  |     | 1                   |                |    
+| ignore    | 0 or 1                                                 | boolean            | NO  |     | 0                   |                |    
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES |     | NULL                |                |    
+| allow_gid | Access Control - list of allowed groups                | mediumtext         | YES |     | NULL                |                |    
+| deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES |     | NULL                |                |    
+| deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES |     | NULL                |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_fcontact.md b/doc/database/db_fcontact.md
index d78d55fe4a..b1b622a215 100644
--- a/doc/database/db_fcontact.md
+++ b/doc/database/db_fcontact.md
@@ -4,22 +4,22 @@ Diaspora compatible contacts - used in the Diaspora implementation
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| guid | unique id | varchar(255) | NO |  |  |  |    
-| url |  | varchar(255) | NO |  |  |  |    
-| name |  | varchar(255) | NO |  |  |  |    
-| photo |  | varchar(255) | NO |  |  |  |    
-| request |  | varchar(255) | NO |  |  |  |    
-| nick |  | varchar(255) | NO |  |  |  |    
-| addr |  | varchar(255) | NO |  |  |  |    
-| batch |  | varchar(255) | NO |  |  |  |    
-| notify |  | varchar(255) | NO |  |  |  |    
-| poll |  | varchar(255) | NO |  |  |  |    
-| confirm |  | varchar(255) | NO |  |  |  |    
-| priority |  | tinyint unsigned | NO |  | 0 |  |    
-| network |  | char(4) | NO |  |  |  |    
-| alias |  | varchar(255) | NO |  |  |  |    
-| pubkey |  | text | YES |  | NULL |  |    
-| updated |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| id       | sequential ID | int unsigned     | NO  | PRI | NULL                | auto_increment |    
+| guid     | unique id     | varchar(255)     | NO  |     |                     |                |    
+| url      |               | varchar(255)     | NO  |     |                     |                |    
+| name     |               | varchar(255)     | NO  |     |                     |                |    
+| photo    |               | varchar(255)     | NO  |     |                     |                |    
+| request  |               | varchar(255)     | NO  |     |                     |                |    
+| nick     |               | varchar(255)     | NO  |     |                     |                |    
+| addr     |               | varchar(255)     | NO  |     |                     |                |    
+| batch    |               | varchar(255)     | NO  |     |                     |                |    
+| notify   |               | varchar(255)     | NO  |     |                     |                |    
+| poll     |               | varchar(255)     | NO  |     |                     |                |    
+| confirm  |               | varchar(255)     | NO  |     |                     |                |    
+| priority |               | tinyint unsigned | NO  |     | 0                   |                |    
+| network  |               | char(4)          | NO  |     |                     |                |    
+| alias    |               | varchar(255)     | NO  |     |                     |                |    
+| pubkey   |               | text             | YES |     | NULL                |                |    
+| updated  |               | datetime         | NO  |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_fsuggest.md b/doc/database/db_fsuggest.md
index 11325b6472..206410ad94 100644
--- a/doc/database/db_fsuggest.md
+++ b/doc/database/db_fsuggest.md
@@ -4,14 +4,14 @@ friend suggestion stuff
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | User id | mediumint unsigned | NO |  | 0 |  |    
-| cid |  | int unsigned | NO |  | 0 |  |    
-| name |  | varchar(255) | NO |  |  |  |    
-| url |  | varchar(255) | NO |  |  |  |    
-| request |  | varchar(255) | NO |  |  |  |    
-| photo |  | varchar(255) | NO |  |  |  |    
-| note |  | text | YES |  | NULL |  |    
-| created |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| id      |         | int unsigned       | NO  | PRI | NULL                | auto_increment |    
+| uid     | User id | mediumint unsigned | NO  |     | 0                   |                |    
+| cid     |         | int unsigned       | NO  |     | 0                   |                |    
+| name    |         | varchar(255)       | NO  |     |                     |                |    
+| url     |         | varchar(255)       | NO  |     |                     |                |    
+| request |         | varchar(255)       | NO  |     |                     |                |    
+| photo   |         | varchar(255)       | NO  |     |                     |                |    
+| note    |         | text               | YES |     | NULL                |                |    
+| created |         | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_group.md b/doc/database/db_group.md
index 1f4d0e588f..11e6d667c7 100644
--- a/doc/database/db_group.md
+++ b/doc/database/db_group.md
@@ -4,10 +4,10 @@ privacy groups, group info
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
-| visible | 1 indicates the member list is not private | boolean | NO |  | 0 |  |    
-| deleted | 1 indicates the group has been deleted | boolean | NO |  | 0 |  |    
-| name | human readable name of group | varchar(255) | NO |  |  |  |    
+| id      | sequential ID                              | int unsigned       | NO | PRI | NULL | auto_increment |    
+| uid     | Owner User id                              | mediumint unsigned | NO |     | 0    |                |    
+| visible | 1 indicates the member list is not private | boolean            | NO |     | 0    |                |    
+| deleted | 1 indicates the group has been deleted     | boolean            | NO |     | 0    |                |    
+| name    | human readable name of group               | varchar(255)       | NO |     |      |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_group_member.md b/doc/database/db_group_member.md
index fa1c64d2eb..0169d276b1 100644
--- a/doc/database/db_group_member.md
+++ b/doc/database/db_group_member.md
@@ -4,8 +4,8 @@ privacy groups, member info
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| gid | groups.id of the associated group | int unsigned | NO |  | 0 |  |    
-| contact-id | contact.id of the member assigned to the associated group | int unsigned | NO |  | 0 |  |    
+| id         | sequential ID                                             | int unsigned | NO | PRI | NULL | auto_increment |    
+| gid        | groups.id of the associated group                         | int unsigned | NO |     | 0    |                |    
+| contact-id | contact.id of the member assigned to the associated group | int unsigned | NO |     | 0    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_gserver-tag.md b/doc/database/db_gserver-tag.md
index 985845c43d..9631f293ec 100644
--- a/doc/database/db_gserver-tag.md
+++ b/doc/database/db_gserver-tag.md
@@ -4,7 +4,7 @@ Tags that the server has subscribed
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| gserver-id | The id of the gserver | int unsigned | NO | PRI | 0 |  |    
-| tag | Tag that the server has subscribed | varchar(100) | NO | PRI |  |  |    
+| gserver-id | The id of the gserver              | int unsigned | NO | PRI | 0 |  |    
+| tag        | Tag that the server has subscribed | varchar(100) | NO | PRI |   |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_gserver.md b/doc/database/db_gserver.md
index bfbf4ec85f..220a8a17c8 100644
--- a/doc/database/db_gserver.md
+++ b/doc/database/db_gserver.md
@@ -4,28 +4,28 @@ Global servers
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| url |  | varchar(255) | NO |  |  |  |    
-| nurl |  | varchar(255) | NO |  |  |  |    
-| version |  | varchar(255) | NO |  |  |  |    
-| site_name |  | varchar(255) | NO |  |  |  |    
-| info |  | text | YES |  | NULL |  |    
-| register_policy |  | tinyint | NO |  | 0 |  |    
-| registered-users | Number of registered users | int unsigned | NO |  | 0 |  |    
-| directory-type | Type of directory service (Poco, Mastodon) | tinyint | YES |  | 0 |  |    
-| poco |  | varchar(255) | NO |  |  |  |    
-| noscrape |  | varchar(255) | NO |  |  |  |    
-| network |  | char(4) | NO |  |  |  |    
-| protocol | The protocol of the server | tinyint unsigned | YES |  | NULL |  |    
-| platform |  | varchar(255) | NO |  |  |  |    
-| relay-subscribe | Has the server subscribed to the relay system | boolean | NO |  | 0 |  |    
-| relay-scope | The scope of messages that the server wants to get | varchar(10) | NO |  |  |  |    
-| detection-method | Method that had been used to detect that server | tinyint unsigned | YES |  | NULL |  |    
-| created |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| last_poco_query |  | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| last_contact | Last successful connection request | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| last_failure | Last failed connection request | datetime | YES |  | 0001-01-01 00:00:00 |  |    
-| failed | Connection failed | boolean | YES |  | NULL |  |    
-| next_contact | Next connection request | datetime | YES |  | 0001-01-01 00:00:00 |  |    
+| id               | sequential ID                                      | int unsigned     | NO  | PRI | NULL                | auto_increment |    
+| url              |                                                    | varchar(255)     | NO  |     |                     |                |    
+| nurl             |                                                    | varchar(255)     | NO  |     |                     |                |    
+| version          |                                                    | varchar(255)     | NO  |     |                     |                |    
+| site_name        |                                                    | varchar(255)     | NO  |     |                     |                |    
+| info             |                                                    | text             | YES |     | NULL                |                |    
+| register_policy  |                                                    | tinyint          | NO  |     | 0                   |                |    
+| registered-users | Number of registered users                         | int unsigned     | NO  |     | 0                   |                |    
+| directory-type   | Type of directory service (Poco, Mastodon)         | tinyint          | YES |     | 0                   |                |    
+| poco             |                                                    | varchar(255)     | NO  |     |                     |                |    
+| noscrape         |                                                    | varchar(255)     | NO  |     |                     |                |    
+| network          |                                                    | char(4)          | NO  |     |                     |                |    
+| protocol         | The protocol of the server                         | tinyint unsigned | YES |     | NULL                |                |    
+| platform         |                                                    | varchar(255)     | NO  |     |                     |                |    
+| relay-subscribe  | Has the server subscribed to the relay system      | boolean          | NO  |     | 0                   |                |    
+| relay-scope      | The scope of messages that the server wants to get | varchar(10)      | NO  |     |                     |                |    
+| detection-method | Method that had been used to detect that server    | tinyint unsigned | YES |     | NULL                |                |    
+| created          |                                                    | datetime         | NO  |     | 0001-01-01 00:00:00 |                |    
+| last_poco_query  |                                                    | datetime         | YES |     | 0001-01-01 00:00:00 |                |    
+| last_contact     | Last successful connection request                 | datetime         | YES |     | 0001-01-01 00:00:00 |                |    
+| last_failure     | Last failed connection request                     | datetime         | YES |     | 0001-01-01 00:00:00 |                |    
+| failed           | Connection failed                                  | boolean          | YES |     | NULL                |                |    
+| next_contact     | Next connection request                            | datetime         | YES |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_hook.md b/doc/database/db_hook.md
index dbf4f79016..c6b6cf9d0e 100644
--- a/doc/database/db_hook.md
+++ b/doc/database/db_hook.md
@@ -4,10 +4,10 @@ addon hook registry
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| hook | name of hook | varbinary(100) | NO |  |  |  |    
-| file | relative filename of hook handler | varbinary(200) | NO |  |  |  |    
-| function | function name of hook handler | varbinary(200) | NO |  |  |  |    
-| priority | not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order | smallint unsigned | NO |  | 0 |  |    
+| id       | sequential ID                                                                                              | int unsigned      | NO | PRI | NULL | auto_increment |    
+| hook     | name of hook                                                                                               | varbinary(100)    | NO |     |      |                |    
+| file     | relative filename of hook handler                                                                          | varbinary(200)    | NO |     |      |                |    
+| function | function name of hook handler                                                                              | varbinary(200)    | NO |     |      |                |    
+| priority | not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order | smallint unsigned | NO |     | 0    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_host.md b/doc/database/db_host.md
index 586f2b4501..97c3bb5fe3 100644
--- a/doc/database/db_host.md
+++ b/doc/database/db_host.md
@@ -4,7 +4,7 @@ Hostname
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | tinyint unsigned | NO | PRI | NULL | auto_increment |    
-| name | The hostname | varchar(128) | NO |  |  |  |    
+| id   | sequential ID | tinyint unsigned | NO | PRI | NULL | auto_increment |    
+| name | The hostname  | varchar(128)     | NO |     |      |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_inbox-status.md b/doc/database/db_inbox-status.md
index 19b3c43e5f..882f601b2a 100644
--- a/doc/database/db_inbox-status.md
+++ b/doc/database/db_inbox-status.md
@@ -4,12 +4,12 @@ Status of ActivityPub inboxes
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| url | URL of the inbox | varbinary(255) | NO | PRI | NULL |  |    
-| created | Creation date of this entry | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| success | Date of the last successful delivery | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| failure | Date of the last failed delivery | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| previous | Previous delivery date | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| archive | Is the inbox archived? | boolean | NO |  | 0 |  |    
-| shared | Is it a shared inbox? | boolean | NO |  | 0 |  |    
+| url      | URL of the inbox                     | varbinary(255) | NO | PRI | NULL                |  |    
+| created  | Creation date of this entry          | datetime       | NO |     | 0001-01-01 00:00:00 |  |    
+| success  | Date of the last successful delivery | datetime       | NO |     | 0001-01-01 00:00:00 |  |    
+| failure  | Date of the last failed delivery     | datetime       | NO |     | 0001-01-01 00:00:00 |  |    
+| previous | Previous delivery date               | datetime       | NO |     | 0001-01-01 00:00:00 |  |    
+| archive  | Is the inbox archived?               | boolean        | NO |     | 0                   |  |    
+| shared   | Is it a shared inbox?                | boolean        | NO |     | 0                   |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_intro.md b/doc/database/db_intro.md
index 7aa162bddc..698fbe9189 100644
--- a/doc/database/db_intro.md
+++ b/doc/database/db_intro.md
@@ -4,16 +4,16 @@ Table intro
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | User id | mediumint unsigned | NO |  | 0 |  |    
-| fid |  | int unsigned | YES |  | NULL |  |    
-| contact-id |  | int unsigned | NO |  | 0 |  |    
-| knowyou |  | boolean | NO |  | 0 |  |    
-| duplex |  | boolean | NO |  | 0 |  |    
-| note |  | text | YES |  | NULL |  |    
-| hash |  | varchar(255) | NO |  |  |  |    
-| datetime |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| blocked |  | boolean | NO |  | 1 |  |    
-| ignore |  | boolean | NO |  | 0 |  |    
+| id         | sequential ID | int unsigned       | NO  | PRI | NULL                | auto_increment |    
+| uid        | User id       | mediumint unsigned | NO  |     | 0                   |                |    
+| fid        |               | int unsigned       | YES |     | NULL                |                |    
+| contact-id |               | int unsigned       | NO  |     | 0                   |                |    
+| knowyou    |               | boolean            | NO  |     | 0                   |                |    
+| duplex     |               | boolean            | NO  |     | 0                   |                |    
+| note       |               | text               | YES |     | NULL                |                |    
+| hash       |               | varchar(255)       | NO  |     |                     |                |    
+| datetime   |               | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| blocked    |               | boolean            | NO  |     | 1                   |                |    
+| ignore     |               | boolean            | NO  |     | 0                   |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_item-uri.md b/doc/database/db_item-uri.md
index 85c7a40b3c..cc7a28e3ab 100644
--- a/doc/database/db_item-uri.md
+++ b/doc/database/db_item-uri.md
@@ -4,8 +4,8 @@ URI and GUID for items
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | NO | PRI | NULL | auto_increment |    
-| uri | URI of an item | varbinary(255) | NO |  | NULL |  |    
-| guid | A unique identifier for an item | varbinary(255) | YES |  | NULL |  |    
+| id   |                                 | int unsigned   | NO  | PRI | NULL | auto_increment |    
+| uri  | URI of an item                  | varbinary(255) | NO  |     | NULL |                |    
+| guid | A unique identifier for an item | varbinary(255) | YES |     | NULL |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_locks.md b/doc/database/db_locks.md
index cf56a00719..94e39dee78 100644
--- a/doc/database/db_locks.md
+++ b/doc/database/db_locks.md
@@ -4,10 +4,10 @@ Table locks
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| name |  | varchar(128) | NO |  |  |  |    
-| locked |  | boolean | NO |  | 0 |  |    
-| pid | Process ID | int unsigned | NO |  | 0 |  |    
-| expires | datetime of cache expiration | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| id      | sequential ID                | int unsigned | NO | PRI | NULL                | auto_increment |    
+| name    |                              | varchar(128) | NO |     |                     |                |    
+| locked  |                              | boolean      | NO |     | 0                   |                |    
+| pid     | Process ID                   | int unsigned | NO |     | 0                   |                |    
+| expires | datetime of cache expiration | datetime     | NO |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_mail.md b/doc/database/db_mail.md
index 2f96d639d3..7ee8022559 100644
--- a/doc/database/db_mail.md
+++ b/doc/database/db_mail.md
@@ -4,27 +4,27 @@ private messages
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
-| guid | A unique identifier for this private message | varchar(255) | NO |  |  |  |    
-| from-name | name of the sender | varchar(255) | NO |  |  |  |    
-| from-photo | contact photo link of the sender | varchar(255) | NO |  |  |  |    
-| from-url | profile linke of the sender | varchar(255) | NO |  |  |  |    
-| contact-id | contact.id | varchar(255) | YES |  | NULL |  |    
-| author-id | Link to the contact table with uid=0 of the author of the mail | int unsigned | YES |  | NULL |  |    
-| convid | conv.id | int unsigned | YES |  | NULL |  |    
-| title |  | varchar(255) | NO |  |  |  |    
-| body |  | mediumtext | YES |  | NULL |  |    
-| seen | if message visited it is 1 | boolean | NO |  | 0 |  |    
-| reply |  | boolean | NO |  | 0 |  |    
-| replied |  | boolean | NO |  | 0 |  |    
-| unknown | if sender not in the contact table this is 1 | boolean | NO |  | 0 |  |    
-| uri |  | varchar(255) | NO |  |  |  |    
-| uri-id | Item-uri id of the related mail | int unsigned | YES |  | NULL |  |    
-| parent-uri |  | varchar(255) | NO |  |  |  |    
-| parent-uri-id | Item-uri id of the parent of the related mail | int unsigned | YES |  | NULL |  |    
-| thr-parent |  | varchar(255) | YES |  | NULL |  |    
-| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | YES |  | NULL |  |    
-| created | creation time of the private message | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| id            | sequential ID                                                  | int unsigned       | NO  | PRI | NULL                | auto_increment |    
+| uid           | Owner User id                                                  | mediumint unsigned | NO  |     | 0                   |                |    
+| guid          | A unique identifier for this private message                   | varchar(255)       | NO  |     |                     |                |    
+| from-name     | name of the sender                                             | varchar(255)       | NO  |     |                     |                |    
+| from-photo    | contact photo link of the sender                               | varchar(255)       | NO  |     |                     |                |    
+| from-url      | profile linke of the sender                                    | varchar(255)       | NO  |     |                     |                |    
+| contact-id    | contact.id                                                     | varchar(255)       | YES |     | NULL                |                |    
+| author-id     | Link to the contact table with uid=0 of the author of the mail | int unsigned       | YES |     | NULL                |                |    
+| convid        | conv.id                                                        | int unsigned       | YES |     | NULL                |                |    
+| title         |                                                                | varchar(255)       | NO  |     |                     |                |    
+| body          |                                                                | mediumtext         | YES |     | NULL                |                |    
+| seen          | if message visited it is 1                                     | boolean            | NO  |     | 0                   |                |    
+| reply         |                                                                | boolean            | NO  |     | 0                   |                |    
+| replied       |                                                                | boolean            | NO  |     | 0                   |                |    
+| unknown       | if sender not in the contact table this is 1                   | boolean            | NO  |     | 0                   |                |    
+| uri           |                                                                | varchar(255)       | NO  |     |                     |                |    
+| uri-id        | Item-uri id of the related mail                                | int unsigned       | YES |     | NULL                |                |    
+| parent-uri    |                                                                | varchar(255)       | NO  |     |                     |                |    
+| parent-uri-id | Item-uri id of the parent of the related mail                  | int unsigned       | YES |     | NULL                |                |    
+| thr-parent    |                                                                | varchar(255)       | YES |     | NULL                |                |    
+| thr-parent-id | Id of the item-uri table that contains the thread parent uri   | int unsigned       | YES |     | NULL                |                |    
+| created       | creation time of the private message                           | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_mailacct.md b/doc/database/db_mailacct.md
index ec2f5cb54e..cd3808d845 100644
--- a/doc/database/db_mailacct.md
+++ b/doc/database/db_mailacct.md
@@ -4,18 +4,18 @@ Mail account data for fetching mails
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | User id | mediumint unsigned | NO |  | 0 |  |    
-| server |  | varchar(255) | NO |  |  |  |    
-| port |  | smallint unsigned | NO |  | 0 |  |    
-| ssltype |  | varchar(16) | NO |  |  |  |    
-| mailbox |  | varchar(255) | NO |  |  |  |    
-| user |  | varchar(255) | NO |  |  |  |    
-| pass |  | text | YES |  | NULL |  |    
-| reply_to |  | varchar(255) | NO |  |  |  |    
-| action |  | tinyint unsigned | NO |  | 0 |  |    
-| movetofolder |  | varchar(255) | NO |  |  |  |    
-| pubmail |  | boolean | NO |  | 0 |  |    
-| last_check |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| id           | sequential ID | int unsigned       | NO  | PRI | NULL                | auto_increment |    
+| uid          | User id       | mediumint unsigned | NO  |     | 0                   |                |    
+| server       |               | varchar(255)       | NO  |     |                     |                |    
+| port         |               | smallint unsigned  | NO  |     | 0                   |                |    
+| ssltype      |               | varchar(16)        | NO  |     |                     |                |    
+| mailbox      |               | varchar(255)       | NO  |     |                     |                |    
+| user         |               | varchar(255)       | NO  |     |                     |                |    
+| pass         |               | text               | YES |     | NULL                |                |    
+| reply_to     |               | varchar(255)       | NO  |     |                     |                |    
+| action       |               | tinyint unsigned   | NO  |     | 0                   |                |    
+| movetofolder |               | varchar(255)       | NO  |     |                     |                |    
+| pubmail      |               | boolean            | NO  |     | 0                   |                |    
+| last_check   |               | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_manage.md b/doc/database/db_manage.md
index 645bba4925..42b255354c 100644
--- a/doc/database/db_manage.md
+++ b/doc/database/db_manage.md
@@ -4,8 +4,8 @@ table of accounts that can manage each other
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | User id | mediumint unsigned | NO |  | 0 |  |    
-| mid | User id | mediumint unsigned | NO |  | 0 |  |    
+| id  | sequential ID | int unsigned       | NO | PRI | NULL | auto_increment |    
+| uid | User id       | mediumint unsigned | NO |     | 0    |                |    
+| mid | User id       | mediumint unsigned | NO |     | 0    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notification.md b/doc/database/db_notification.md
index 6a6f0c81d5..5858151a3e 100644
--- a/doc/database/db_notification.md
+++ b/doc/database/db_notification.md
@@ -4,14 +4,14 @@ notifications
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | Owner User id | mediumint unsigned | YES |  | NULL |  |    
-| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | YES |  | NULL |  |    
-| type |  | tinyint unsigned | YES |  | NULL |  |    
-| actor-id | Link to the contact table with uid=0 of the actor that caused the notification | int unsigned | YES |  | NULL |  |    
-| target-uri-id | Item-uri id of the related post | int unsigned | YES |  | NULL |  |    
-| parent-uri-id | Item-uri id of the parent of the related post | int unsigned | YES |  | NULL |  |    
-| created |  | datetime | YES |  | NULL |  |    
-| seen |  | boolean | YES |  | 0 |  |    
+| id            | sequential ID                                                                  | int unsigned       | NO  | PRI | NULL | auto_increment |    
+| uid           | Owner User id                                                                  | mediumint unsigned | YES |     | NULL |                |    
+| vid           | Id of the verb table entry that contains the activity verbs                    | smallint unsigned  | YES |     | NULL |                |    
+| type          |                                                                                | tinyint unsigned   | YES |     | NULL |                |    
+| actor-id      | Link to the contact table with uid=0 of the actor that caused the notification | int unsigned       | YES |     | NULL |                |    
+| target-uri-id | Item-uri id of the related post                                                | int unsigned       | YES |     | NULL |                |    
+| parent-uri-id | Item-uri id of the parent of the related post                                  | int unsigned       | YES |     | NULL |                |    
+| created       |                                                                                | datetime           | YES |     | NULL |                |    
+| seen          |                                                                                | boolean            | YES |     | 0    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notify-threads.md b/doc/database/db_notify-threads.md
index 11d98b4c0a..24aba8093b 100644
--- a/doc/database/db_notify-threads.md
+++ b/doc/database/db_notify-threads.md
@@ -4,11 +4,11 @@ Table notify-threads
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| notify-id |  | int unsigned | NO |  | 0 |  |    
-| master-parent-item | Deprecated | int unsigned | YES |  | NULL |  |    
-| master-parent-uri-id | Item-uri id of the parent of the related post | int unsigned | YES |  | NULL |  |    
-| parent-item |  | int unsigned | NO |  | 0 |  |    
-| receiver-uid | User id | mediumint unsigned | NO |  | 0 |  |    
+| id                   | sequential ID                                 | int unsigned       | NO  | PRI | NULL | auto_increment |    
+| notify-id            |                                               | int unsigned       | NO  |     | 0    |                |    
+| master-parent-item   | Deprecated                                    | int unsigned       | YES |     | NULL |                |    
+| master-parent-uri-id | Item-uri id of the parent of the related post | int unsigned       | YES |     | NULL |                |    
+| parent-item          |                                               | int unsigned       | NO  |     | 0    |                |    
+| receiver-uid         | User id                                       | mediumint unsigned | NO  |     | 0    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notify.md b/doc/database/db_notify.md
index 07263ab4dc..79c1c73593 100644
--- a/doc/database/db_notify.md
+++ b/doc/database/db_notify.md
@@ -4,23 +4,23 @@ notifications
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| type |  | smallint unsigned | NO |  | 0 |  |    
-| name |  | varchar(255) | NO |  |  |  |    
-| url |  | varchar(255) | NO |  |  |  |    
-| photo |  | varchar(255) | NO |  |  |  |    
-| date |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| msg |  | mediumtext | YES |  | NULL |  |    
-| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
-| link |  | varchar(255) | NO |  |  |  |    
-| iid |  | int unsigned | YES |  | NULL |  |    
-| parent |  | int unsigned | YES |  | NULL |  |    
-| uri-id | Item-uri id of the related post | int unsigned | YES |  | NULL |  |    
-| parent-uri-id | Item-uri id of the parent of the related post | int unsigned | YES |  | NULL |  |    
-| seen |  | boolean | NO |  | 0 |  |    
-| verb |  | varchar(100) | NO |  |  |  |    
-| otype |  | varchar(10) | NO |  |  |  |    
-| name_cache | Cached bbcode parsing of name | tinytext | YES |  | NULL |  |    
-| msg_cache | Cached bbcode parsing of msg | mediumtext | YES |  | NULL |  |    
+| id            | sequential ID                                 | int unsigned       | NO  | PRI | NULL                | auto_increment |    
+| type          |                                               | smallint unsigned  | NO  |     | 0                   |                |    
+| name          |                                               | varchar(255)       | NO  |     |                     |                |    
+| url           |                                               | varchar(255)       | NO  |     |                     |                |    
+| photo         |                                               | varchar(255)       | NO  |     |                     |                |    
+| date          |                                               | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| msg           |                                               | mediumtext         | YES |     | NULL                |                |    
+| uid           | Owner User id                                 | mediumint unsigned | NO  |     | 0                   |                |    
+| link          |                                               | varchar(255)       | NO  |     |                     |                |    
+| iid           |                                               | int unsigned       | YES |     | NULL                |                |    
+| parent        |                                               | int unsigned       | YES |     | NULL                |                |    
+| uri-id        | Item-uri id of the related post               | int unsigned       | YES |     | NULL                |                |    
+| parent-uri-id | Item-uri id of the parent of the related post | int unsigned       | YES |     | NULL                |                |    
+| seen          |                                               | boolean            | NO  |     | 0                   |                |    
+| verb          |                                               | varchar(100)       | NO  |     |                     |                |    
+| otype         |                                               | varchar(10)        | NO  |     |                     |                |    
+| name_cache    | Cached bbcode parsing of name                 | tinytext           | YES |     | NULL                |                |    
+| msg_cache     | Cached bbcode parsing of msg                  | mediumtext         | YES |     | NULL                |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_oembed.md b/doc/database/db_oembed.md
index 09b9fbbf4c..3a264d7da0 100644
--- a/doc/database/db_oembed.md
+++ b/doc/database/db_oembed.md
@@ -4,9 +4,9 @@ cache for OEmbed queries
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| url | page url | varbinary(255) | NO | PRI | NULL |  |    
-| maxwidth | Maximum width passed to Oembed | mediumint unsigned | NO | PRI | NULL |  |    
-| content | OEmbed data of the page | mediumtext | YES |  | NULL |  |    
-| created | datetime of creation | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| url      | page url                       | varbinary(255)     | NO  | PRI | NULL                |  |    
+| maxwidth | Maximum width passed to Oembed | mediumint unsigned | NO  | PRI | NULL                |  |    
+| content  | OEmbed data of the page        | mediumtext         | YES |     | NULL                |  |    
+| created  | datetime of creation           | datetime           | NO  |     | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_openwebauth-token.md b/doc/database/db_openwebauth-token.md
index 71a04b0d12..ce30bbacff 100644
--- a/doc/database/db_openwebauth-token.md
+++ b/doc/database/db_openwebauth-token.md
@@ -4,11 +4,11 @@ Store OpenWebAuth token to verify contacts
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | User id - currently unused | mediumint unsigned | NO |  | 0 |  |    
-| type | Verify type | varchar(32) | NO |  |  |  |    
-| token | A generated token | varchar(255) | NO |  |  |  |    
-| meta |  | varchar(255) | NO |  |  |  |    
-| created | datetime of creation | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| id      | sequential ID              | int unsigned       | NO | PRI | NULL                | auto_increment |    
+| uid     | User id - currently unused | mediumint unsigned | NO |     | 0                   |                |    
+| type    | Verify type                | varchar(32)        | NO |     |                     |                |    
+| token   | A generated token          | varchar(255)       | NO |     |                     |                |    
+| meta    |                            | varchar(255)       | NO |     |                     |                |    
+| created | datetime of creation       | datetime           | NO |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_parsed_url.md b/doc/database/db_parsed_url.md
index 8f8bd7bdd7..757b8c0ab4 100644
--- a/doc/database/db_parsed_url.md
+++ b/doc/database/db_parsed_url.md
@@ -4,12 +4,12 @@ cache for &#039;parse_url&#039; queries
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| url_hash | page url hash | binary(64) | NO | PRI | NULL |  |    
-| guessing | is the &#039;guessing&#039; mode active? | boolean | NO | PRI | 0 |  |    
-| oembed | is the data the result of oembed? | boolean | NO | PRI | 0 |  |    
-| url | page url | text | NO |  | NULL |  |    
-| content | page data | mediumtext | YES |  | NULL |  |    
-| created | datetime of creation | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| expires | datetime of expiration | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| url_hash | page url hash                     | binary(64) | NO  | PRI | NULL                |  |    
+| guessing | is the &#039;guessing&#039; mode active?    | boolean    | NO  | PRI | 0                   |  |    
+| oembed   | is the data the result of oembed? | boolean    | NO  | PRI | 0                   |  |    
+| url      | page url                          | text       | NO  |     | NULL                |  |    
+| content  | page data                         | mediumtext | YES |     | NULL                |  |    
+| created  | datetime of creation              | datetime   | NO  |     | 0001-01-01 00:00:00 |  |    
+| expires  | datetime of expiration            | datetime   | NO  |     | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_pconfig.md b/doc/database/db_pconfig.md
index c927093782..99f9058777 100644
--- a/doc/database/db_pconfig.md
+++ b/doc/database/db_pconfig.md
@@ -4,10 +4,10 @@ personal (per user) configuration storage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | Primary key | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | User id | mediumint unsigned | NO |  | 0 |  |    
-| cat | Category | varchar(50) | NO |  |  |  |    
-| k | Key | varchar(100) | NO |  |  |  |    
-| v | Value | mediumtext | YES |  | NULL |  |    
+| id  | Primary key | int unsigned       | NO  | PRI | NULL | auto_increment |    
+| uid | User id     | mediumint unsigned | NO  |     | 0    |                |    
+| cat | Category    | varchar(50)        | NO  |     |      |                |    
+| k   | Key         | varchar(100)       | NO  |     |      |                |    
+| v   | Value       | mediumtext         | YES |     | NULL |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_permissionset.md b/doc/database/db_permissionset.md
index 3bcbef86e7..e492455242 100644
--- a/doc/database/db_permissionset.md
+++ b/doc/database/db_permissionset.md
@@ -4,11 +4,11 @@ Table permissionset
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | Owner id of this permission set | mediumint unsigned | NO |  | 0 |  |    
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | YES |  | NULL |  |    
-| allow_gid | Access Control - list of allowed groups | mediumtext | YES |  | NULL |  |    
-| deny_cid | Access Control - list of denied contact.id | mediumtext | YES |  | NULL |  |    
-| deny_gid | Access Control - list of denied groups | mediumtext | YES |  | NULL |  |    
+| id        | sequential ID                                          | int unsigned       | NO  | PRI | NULL | auto_increment |    
+| uid       | Owner id of this permission set                        | mediumint unsigned | NO  |     | 0    |                |    
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES |     | NULL |                |    
+| allow_gid | Access Control - list of allowed groups                | mediumtext         | YES |     | NULL |                |    
+| deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES |     | NULL |                |    
+| deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES |     | NULL |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_photo.md b/doc/database/db_photo.md
index 80b74b6d2e..10ae06f09e 100644
--- a/doc/database/db_photo.md
+++ b/doc/database/db_photo.md
@@ -4,32 +4,32 @@ photo storage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
-| contact-id | contact.id | int unsigned | NO |  | 0 |  |    
-| guid | A unique identifier for this photo | char(16) | NO |  |  |  |    
-| resource-id |  | char(32) | NO |  |  |  |    
-| hash | hash value of the photo | char(32) | YES |  | NULL |  |    
-| created | creation date | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| edited | last edited date | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| title |  | varchar(255) | NO |  |  |  |    
-| desc |  | text | YES |  | NULL |  |    
-| album | The name of the album to which the photo belongs | varchar(255) | NO |  |  |  |    
-| filename |  | varchar(255) | NO |  |  |  |    
-| type |  | varchar(30) | NO |  | image/jpeg |  |    
-| height |  | smallint unsigned | NO |  | 0 |  |    
-| width |  | smallint unsigned | NO |  | 0 |  |    
-| datasize |  | int unsigned | NO |  | 0 |  |    
-| data |  | mediumblob | NO |  | NULL |  |    
-| scale |  | tinyint unsigned | NO |  | 0 |  |    
-| profile |  | boolean | NO |  | 0 |  |    
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext | YES |  | NULL |  |    
-| allow_gid | Access Control - list of allowed groups | mediumtext | YES |  | NULL |  |    
-| deny_cid | Access Control - list of denied contact.id | mediumtext | YES |  | NULL |  |    
-| deny_gid | Access Control - list of denied groups | mediumtext | YES |  | NULL |  |    
-| accessible | Make photo publicly accessible, ignoring permissions | boolean | NO |  | 0 |  |    
-| backend-class | Storage backend class | tinytext | YES |  | NULL |  |    
-| backend-ref | Storage backend data reference | text | YES |  | NULL |  |    
-| updated |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| id            | sequential ID                                          | int unsigned       | NO  | PRI | NULL                | auto_increment |    
+| uid           | Owner User id                                          | mediumint unsigned | NO  |     | 0                   |                |    
+| contact-id    | contact.id                                             | int unsigned       | NO  |     | 0                   |                |    
+| guid          | A unique identifier for this photo                     | char(16)           | NO  |     |                     |                |    
+| resource-id   |                                                        | char(32)           | NO  |     |                     |                |    
+| hash          | hash value of the photo                                | char(32)           | YES |     | NULL                |                |    
+| created       | creation date                                          | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| edited        | last edited date                                       | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| title         |                                                        | varchar(255)       | NO  |     |                     |                |    
+| desc          |                                                        | text               | YES |     | NULL                |                |    
+| album         | The name of the album to which the photo belongs       | varchar(255)       | NO  |     |                     |                |    
+| filename      |                                                        | varchar(255)       | NO  |     |                     |                |    
+| type          |                                                        | varchar(30)        | NO  |     | image/jpeg          |                |    
+| height        |                                                        | smallint unsigned  | NO  |     | 0                   |                |    
+| width         |                                                        | smallint unsigned  | NO  |     | 0                   |                |    
+| datasize      |                                                        | int unsigned       | NO  |     | 0                   |                |    
+| data          |                                                        | mediumblob         | NO  |     | NULL                |                |    
+| scale         |                                                        | tinyint unsigned   | NO  |     | 0                   |                |    
+| profile       |                                                        | boolean            | NO  |     | 0                   |                |    
+| allow_cid     | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES |     | NULL                |                |    
+| allow_gid     | Access Control - list of allowed groups                | mediumtext         | YES |     | NULL                |                |    
+| deny_cid      | Access Control - list of denied contact.id             | mediumtext         | YES |     | NULL                |                |    
+| deny_gid      | Access Control - list of denied groups                 | mediumtext         | YES |     | NULL                |                |    
+| accessible    | Make photo publicly accessible, ignoring permissions   | boolean            | NO  |     | 0                   |                |    
+| backend-class | Storage backend class                                  | tinytext           | YES |     | NULL                |                |    
+| backend-ref   | Storage backend data reference                         | text               | YES |     | NULL                |                |    
+| updated       |                                                        | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-category.md b/doc/database/db_post-category.md
index ecb0793c5e..a4b847493d 100644
--- a/doc/database/db_post-category.md
+++ b/doc/database/db_post-category.md
@@ -4,9 +4,9 @@ post relation to categories
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
-| uid | User id | mediumint unsigned | NO | PRI | 0 |  |    
-| type |  | tinyint unsigned | NO | PRI | 0 |  |    
-| tid |  | int unsigned | NO | PRI | 0 |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned       | NO | PRI | NULL |  |    
+| uid    | User id                                                   | mediumint unsigned | NO | PRI | 0    |  |    
+| type   |                                                           | tinyint unsigned   | NO | PRI | 0    |  |    
+| tid    |                                                           | int unsigned       | NO | PRI | 0    |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-content.md b/doc/database/db_post-content.md
index 69aa06c4ba..232753223f 100644
--- a/doc/database/db_post-content.md
+++ b/doc/database/db_post-content.md
@@ -4,22 +4,22 @@ Content for all posts
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
-| title | item title | varchar(255) | NO |  |  |  |    
-| content-warning |  | varchar(255) | NO |  |  |  |    
-| body | item body content | mediumtext | YES |  | NULL |  |    
-| raw-body | Body without embedded media links | mediumtext | YES |  | NULL |  |    
-| location | text location where this item originated | varchar(255) | NO |  |  |  |    
-| coord | longitude/latitude pair representing location where this item originated | varchar(255) | NO |  |  |  |    
-| language | Language information about this post | text | YES |  | NULL |  |    
-| app | application which generated this item | varchar(255) | NO |  |  |  |    
-| rendered-hash |  | varchar(32) | NO |  |  |  |    
-| rendered-html | item.body converted to html | mediumtext | YES |  | NULL |  |    
-| object-type | ActivityStreams object type | varchar(100) | NO |  |  |  |    
-| object | JSON encoded object structure unless it is an implied object (normal post) | text | YES |  | NULL |  |    
-| target-type | ActivityStreams target type if applicable (URI) | varchar(100) | NO |  |  |  |    
-| target | JSON encoded target structure if used | text | YES |  | NULL |  |    
-| resource-id | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32) | NO |  |  |  |    
-| plink | permalink or URL to a displayable copy of the message at its source | varchar(255) | NO |  |  |  |    
+| uri-id          | Id of the item-uri table entry that contains the item uri                                                                 | int unsigned | NO  | PRI | NULL |  |    
+| title           | item title                                                                                                                | varchar(255) | NO  |     |      |  |    
+| content-warning |                                                                                                                           | varchar(255) | NO  |     |      |  |    
+| body            | item body content                                                                                                         | mediumtext   | YES |     | NULL |  |    
+| raw-body        | Body without embedded media links                                                                                         | mediumtext   | YES |     | NULL |  |    
+| location        | text location where this item originated                                                                                  | varchar(255) | NO  |     |      |  |    
+| coord           | longitude/latitude pair representing location where this item originated                                                  | varchar(255) | NO  |     |      |  |    
+| language        | Language information about this post                                                                                      | text         | YES |     | NULL |  |    
+| app             | application which generated this item                                                                                     | varchar(255) | NO  |     |      |  |    
+| rendered-hash   |                                                                                                                           | varchar(32)  | NO  |     |      |  |    
+| rendered-html   | item.body converted to html                                                                                               | mediumtext   | YES |     | NULL |  |    
+| object-type     | ActivityStreams object type                                                                                               | varchar(100) | NO  |     |      |  |    
+| object          | JSON encoded object structure unless it is an implied object (normal post)                                                | text         | YES |     | NULL |  |    
+| target-type     | ActivityStreams target type if applicable (URI)                                                                           | varchar(100) | NO  |     |      |  |    
+| target          | JSON encoded target structure if used                                                                                     | text         | YES |     | NULL |  |    
+| resource-id     | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32)  | NO  |     |      |  |    
+| plink           | permalink or URL to a displayable copy of the message at its source                                                       | varchar(255) | NO  |     |      |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-delivery-data.md b/doc/database/db_post-delivery-data.md
index 8a333dada9..30a91193ae 100644
--- a/doc/database/db_post-delivery-data.md
+++ b/doc/database/db_post-delivery-data.md
@@ -4,16 +4,16 @@ Delivery data for items
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
-| postopts | External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery | text | YES |  | NULL |  |    
-| inform | Additional receivers of the linked item | mediumtext | YES |  | NULL |  |    
-| queue_count | Initial number of delivery recipients, used as item.delivery_queue_count | mediumint | NO |  | 0 |  |    
-| queue_done | Number of successful deliveries, used as item.delivery_queue_done | mediumint | NO |  | 0 |  |    
-| queue_failed | Number of unsuccessful deliveries, used as item.delivery_queue_failed | mediumint | NO |  | 0 |  |    
-| activitypub | Number of successful deliveries via ActivityPub | mediumint | NO |  | 0 |  |    
-| dfrn | Number of successful deliveries via DFRN | mediumint | NO |  | 0 |  |    
-| legacy_dfrn | Number of successful deliveries via legacy DFRN | mediumint | NO |  | 0 |  |    
-| diaspora | Number of successful deliveries via Diaspora | mediumint | NO |  | 0 |  |    
-| ostatus | Number of successful deliveries via OStatus | mediumint | NO |  | 0 |  |    
+| uri-id       | Id of the item-uri table entry that contains the item uri                                                                                                  | int unsigned | NO  | PRI | NULL |  |    
+| postopts     | External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery | text         | YES |     | NULL |  |    
+| inform       | Additional receivers of the linked item                                                                                                                    | mediumtext   | YES |     | NULL |  |    
+| queue_count  | Initial number of delivery recipients, used as item.delivery_queue_count                                                                                   | mediumint    | NO  |     | 0    |  |    
+| queue_done   | Number of successful deliveries, used as item.delivery_queue_done                                                                                          | mediumint    | NO  |     | 0    |  |    
+| queue_failed | Number of unsuccessful deliveries, used as item.delivery_queue_failed                                                                                      | mediumint    | NO  |     | 0    |  |    
+| activitypub  | Number of successful deliveries via ActivityPub                                                                                                            | mediumint    | NO  |     | 0    |  |    
+| dfrn         | Number of successful deliveries via DFRN                                                                                                                   | mediumint    | NO  |     | 0    |  |    
+| legacy_dfrn  | Number of successful deliveries via legacy DFRN                                                                                                            | mediumint    | NO  |     | 0    |  |    
+| diaspora     | Number of successful deliveries via Diaspora                                                                                                               | mediumint    | NO  |     | 0    |  |    
+| ostatus      | Number of successful deliveries via OStatus                                                                                                                | mediumint    | NO  |     | 0    |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-media.md b/doc/database/db_post-media.md
index bf5f1dfe52..de3b0e43cd 100644
--- a/doc/database/db_post-media.md
+++ b/doc/database/db_post-media.md
@@ -4,24 +4,24 @@ Attached media
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO |  | NULL |  |    
-| url | Media URL | varbinary(511) | NO |  | NULL |  |    
-| type | Media type | tinyint unsigned | NO |  | 0 |  |    
-| mimetype |  | varchar(60) | YES |  | NULL |  |    
-| height | Height of the media | smallint unsigned | YES |  | NULL |  |    
-| width | Width of the media | smallint unsigned | YES |  | NULL |  |    
-| size | Media size | int unsigned | YES |  | NULL |  |    
-| preview | Preview URL | varbinary(255) | YES |  | NULL |  |    
-| preview-height | Height of the preview picture | smallint unsigned | YES |  | NULL |  |    
-| preview-width | Width of the preview picture | smallint unsigned | YES |  | NULL |  |    
-| description |  | text | YES |  | NULL |  |    
-| name | Name of the media | varchar(255) | YES |  | NULL |  |    
-| author-url | URL of the author of the media | varbinary(255) | YES |  | NULL |  |    
-| author-name | Name of the author of the media | varchar(255) | YES |  | NULL |  |    
-| author-image | Image of the author of the media | varbinary(255) | YES |  | NULL |  |    
-| publisher-url | URL of the publisher of the media | varbinary(255) | YES |  | NULL |  |    
-| publisher-name | Name of the publisher of the media | varchar(255) | YES |  | NULL |  |    
-| publisher-image | Image of the publisher of the media | varbinary(255) | YES |  | NULL |  |    
+| id              | sequential ID                                             | int unsigned      | NO  | PRI | NULL | auto_increment |    
+| uri-id          | Id of the item-uri table entry that contains the item uri | int unsigned      | NO  |     | NULL |                |    
+| url             | Media URL                                                 | varbinary(511)    | NO  |     | NULL |                |    
+| type            | Media type                                                | tinyint unsigned  | NO  |     | 0    |                |    
+| mimetype        |                                                           | varchar(60)       | YES |     | NULL |                |    
+| height          | Height of the media                                       | smallint unsigned | YES |     | NULL |                |    
+| width           | Width of the media                                        | smallint unsigned | YES |     | NULL |                |    
+| size            | Media size                                                | int unsigned      | YES |     | NULL |                |    
+| preview         | Preview URL                                               | varbinary(255)    | YES |     | NULL |                |    
+| preview-height  | Height of the preview picture                             | smallint unsigned | YES |     | NULL |                |    
+| preview-width   | Width of the preview picture                              | smallint unsigned | YES |     | NULL |                |    
+| description     |                                                           | text              | YES |     | NULL |                |    
+| name            | Name of the media                                         | varchar(255)      | YES |     | NULL |                |    
+| author-url      | URL of the author of the media                            | varbinary(255)    | YES |     | NULL |                |    
+| author-name     | Name of the author of the media                           | varchar(255)      | YES |     | NULL |                |    
+| author-image    | Image of the author of the media                          | varbinary(255)    | YES |     | NULL |                |    
+| publisher-url   | URL of the publisher of the media                         | varbinary(255)    | YES |     | NULL |                |    
+| publisher-name  | Name of the publisher of the media                        | varchar(255)      | YES |     | NULL |                |    
+| publisher-image | Image of the publisher of the media                       | varbinary(255)    | YES |     | NULL |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-tag.md b/doc/database/db_post-tag.md
index 5223ef9f4f..ae65cf9832 100644
--- a/doc/database/db_post-tag.md
+++ b/doc/database/db_post-tag.md
@@ -4,9 +4,9 @@ post relation to tags
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
-| type |  | tinyint unsigned | NO | PRI | 0 |  |    
-| tid |  | int unsigned | NO | PRI | 0 |  |    
-| cid | Contact id of the mentioned public contact | int unsigned | NO | PRI | 0 |  |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned     | NO | PRI | NULL |  |    
+| type   |                                                           | tinyint unsigned | NO | PRI | 0    |  |    
+| tid    |                                                           | int unsigned     | NO | PRI | 0    |  |    
+| cid    | Contact id of the mentioned public contact                | int unsigned     | NO | PRI | 0    |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-thread-user.md b/doc/database/db_post-thread-user.md
index 02b7b22d54..abb1ed8bda 100644
--- a/doc/database/db_post-thread-user.md
+++ b/doc/database/db_post-thread-user.md
@@ -4,28 +4,28 @@ Thread related data per user
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
-| owner-id | Item owner | int unsigned | NO |  | 0 |  |    
-| author-id | Item author | int unsigned | NO |  | 0 |  |    
-| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | YES |  | NULL |  |    
-| network |  | char(4) | NO |  |  |  |    
-| created |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| received |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| changed | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| commented |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| uid | Owner id which owns this copy of the item | mediumint unsigned | NO | PRI | 0 |  |    
-| pinned | The thread is pinned on the profile page | boolean | NO |  | 0 |  |    
-| starred |  | boolean | NO |  | 0 |  |    
-| ignored | Ignore updates for this thread | boolean | NO |  | 0 |  |    
-| wall | This item was posted to the wall of uid | boolean | NO |  | 0 |  |    
-| mention |  | boolean | NO |  | 0 |  |    
-| pubmail |  | boolean | NO |  | 0 |  |    
-| forum_mode |  | tinyint unsigned | NO |  | 0 |  |    
-| contact-id | contact.id | int unsigned | NO |  | 0 |  |    
-| unseen | post has not been seen | boolean | NO |  | 1 |  |    
-| hidden | Marker to hide the post from the user | boolean | NO |  | 0 |  |    
-| origin | item originated at this site | boolean | NO |  | 0 |  |    
-| psid | ID of the permission set of this post | int unsigned | YES |  | NULL |  |    
-| post-user-id | Id of the post-user table | int unsigned | YES |  | NULL |  |    
+| uri-id       | Id of the item-uri table entry that contains the item uri                                               | int unsigned       | NO  | PRI | NULL                |  |    
+| owner-id     | Item owner                                                                                              | int unsigned       | NO  |     | 0                   |  |    
+| author-id    | Item author                                                                                             | int unsigned       | NO  |     | 0                   |  |    
+| causer-id    | Link to the contact table with uid=0 of the contact that caused the item creation                       | int unsigned       | YES |     | NULL                |  |    
+| network      |                                                                                                         | char(4)            | NO  |     |                     |  |    
+| created      |                                                                                                         | datetime           | NO  |     | 0001-01-01 00:00:00 |  |    
+| received     |                                                                                                         | datetime           | NO  |     | 0001-01-01 00:00:00 |  |    
+| changed      | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime           | NO  |     | 0001-01-01 00:00:00 |  |    
+| commented    |                                                                                                         | datetime           | NO  |     | 0001-01-01 00:00:00 |  |    
+| uid          | Owner id which owns this copy of the item                                                               | mediumint unsigned | NO  | PRI | 0                   |  |    
+| pinned       | The thread is pinned on the profile page                                                                | boolean            | NO  |     | 0                   |  |    
+| starred      |                                                                                                         | boolean            | NO  |     | 0                   |  |    
+| ignored      | Ignore updates for this thread                                                                          | boolean            | NO  |     | 0                   |  |    
+| wall         | This item was posted to the wall of uid                                                                 | boolean            | NO  |     | 0                   |  |    
+| mention      |                                                                                                         | boolean            | NO  |     | 0                   |  |    
+| pubmail      |                                                                                                         | boolean            | NO  |     | 0                   |  |    
+| forum_mode   |                                                                                                         | tinyint unsigned   | NO  |     | 0                   |  |    
+| contact-id   | contact.id                                                                                              | int unsigned       | NO  |     | 0                   |  |    
+| unseen       | post has not been seen                                                                                  | boolean            | NO  |     | 1                   |  |    
+| hidden       | Marker to hide the post from the user                                                                   | boolean            | NO  |     | 0                   |  |    
+| origin       | item originated at this site                                                                            | boolean            | NO  |     | 0                   |  |    
+| psid         | ID of the permission set of this post                                                                   | int unsigned       | YES |     | NULL                |  |    
+| post-user-id | Id of the post-user table                                                                               | int unsigned       | YES |     | NULL                |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-thread.md b/doc/database/db_post-thread.md
index af0124b160..aca05c1e2a 100644
--- a/doc/database/db_post-thread.md
+++ b/doc/database/db_post-thread.md
@@ -4,14 +4,14 @@ Thread related data
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
-| owner-id | Item owner | int unsigned | NO |  | 0 |  |    
-| author-id | Item author | int unsigned | NO |  | 0 |  |    
-| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | YES |  | NULL |  |    
-| network |  | char(4) | NO |  |  |  |    
-| created |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| received |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| changed | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| commented |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| uri-id    | Id of the item-uri table entry that contains the item uri                                               | int unsigned | NO  | PRI | NULL                |  |    
+| owner-id  | Item owner                                                                                              | int unsigned | NO  |     | 0                   |  |    
+| author-id | Item author                                                                                             | int unsigned | NO  |     | 0                   |  |    
+| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation                       | int unsigned | YES |     | NULL                |  |    
+| network   |                                                                                                         | char(4)      | NO  |     |                     |  |    
+| created   |                                                                                                         | datetime     | NO  |     | 0001-01-01 00:00:00 |  |    
+| received  |                                                                                                         | datetime     | NO  |     | 0001-01-01 00:00:00 |  |    
+| changed   | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime     | NO  |     | 0001-01-01 00:00:00 |  |    
+| commented |                                                                                                         | datetime     | NO  |     | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-user-notification.md b/doc/database/db_post-user-notification.md
index 6696fc3ac3..8a93d7a566 100644
--- a/doc/database/db_post-user-notification.md
+++ b/doc/database/db_post-user-notification.md
@@ -4,8 +4,8 @@ User post notifications
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
-| uid | Owner id which owns this copy of the item | mediumint unsigned | NO | PRI | NULL |  |    
-| notification-type |  | tinyint unsigned | NO |  | 0 |  |    
+| uri-id            | Id of the item-uri table entry that contains the item uri | int unsigned       | NO | PRI | NULL |  |    
+| uid               | Owner id which owns this copy of the item                 | mediumint unsigned | NO | PRI | NULL |  |    
+| notification-type |                                                           | tinyint unsigned   | NO |     | 0    |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-user.md b/doc/database/db_post-user.md
index 964ccf45cf..247787f58e 100644
--- a/doc/database/db_post-user.md
+++ b/doc/database/db_post-user.md
@@ -4,35 +4,35 @@ User specific post data
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | NO | PRI | NULL | auto_increment |    
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO |  | NULL |  |    
-| parent-uri-id | Id of the item-uri table that contains the parent uri | int unsigned | YES |  | NULL |  |    
-| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | YES |  | NULL |  |    
-| external-id | Id of the item-uri table entry that contains the external uri | int unsigned | YES |  | NULL |  |    
-| created | Creation timestamp. | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| edited | Date of last edit (default is created) | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| received | datetime | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| gravity |  | tinyint unsigned | NO |  | 0 |  |    
-| network | Network from where the item comes from | char(4) | NO |  |  |  |    
-| owner-id | Link to the contact table with uid=0 of the owner of this item | int unsigned | NO |  | 0 |  |    
-| author-id | Link to the contact table with uid=0 of the author of this item | int unsigned | NO |  | 0 |  |    
-| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | YES |  | NULL |  |    
-| post-type | Post type (personal note, image, article, ...) | tinyint unsigned | NO |  | 0 |  |    
-| post-reason | Reason why the post arrived at the user | tinyint unsigned | NO |  | 0 |  |    
-| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | YES |  | NULL |  |    
-| private | 0=public, 1=private, 2=unlisted | tinyint unsigned | NO |  | 0 |  |    
-| global |  | boolean | NO |  | 0 |  |    
-| visible |  | boolean | NO |  | 0 |  |    
-| deleted | item has been marked for deletion | boolean | NO |  | 0 |  |    
-| uid | Owner id which owns this copy of the item | mediumint unsigned | NO |  | NULL |  |    
-| protocol | Protocol used to deliver the item for this user | tinyint unsigned | YES |  | NULL |  |    
-| contact-id | contact.id | int unsigned | NO |  | 0 |  |    
-| event-id | Used to link to the event.id | int unsigned | YES |  | NULL |  |    
-| unseen | post has not been seen | boolean | NO |  | 1 |  |    
-| hidden | Marker to hide the post from the user | boolean | NO |  | 0 |  |    
-| notification-type |  | tinyint unsigned | NO |  | 0 |  |    
-| wall | This item was posted to the wall of uid | boolean | NO |  | 0 |  |    
-| origin | item originated at this site | boolean | NO |  | 0 |  |    
-| psid | ID of the permission set of this post | int unsigned | YES |  | NULL |  |    
+| id                |                                                                                   | int unsigned       | NO  | PRI | NULL                | auto_increment |    
+| uri-id            | Id of the item-uri table entry that contains the item uri                         | int unsigned       | NO  |     | NULL                |                |    
+| parent-uri-id     | Id of the item-uri table that contains the parent uri                             | int unsigned       | YES |     | NULL                |                |    
+| thr-parent-id     | Id of the item-uri table that contains the thread parent uri                      | int unsigned       | YES |     | NULL                |                |    
+| external-id       | Id of the item-uri table entry that contains the external uri                     | int unsigned       | YES |     | NULL                |                |    
+| created           | Creation timestamp.                                                               | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| edited            | Date of last edit (default is created)                                            | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| received          | datetime                                                                          | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| gravity           |                                                                                   | tinyint unsigned   | NO  |     | 0                   |                |    
+| network           | Network from where the item comes from                                            | char(4)            | NO  |     |                     |                |    
+| owner-id          | Link to the contact table with uid=0 of the owner of this item                    | int unsigned       | NO  |     | 0                   |                |    
+| author-id         | Link to the contact table with uid=0 of the author of this item                   | int unsigned       | NO  |     | 0                   |                |    
+| causer-id         | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned       | YES |     | NULL                |                |    
+| post-type         | Post type (personal note, image, article, ...)                                    | tinyint unsigned   | NO  |     | 0                   |                |    
+| post-reason       | Reason why the post arrived at the user                                           | tinyint unsigned   | NO  |     | 0                   |                |    
+| vid               | Id of the verb table entry that contains the activity verbs                       | smallint unsigned  | YES |     | NULL                |                |    
+| private           | 0=public, 1=private, 2=unlisted                                                   | tinyint unsigned   | NO  |     | 0                   |                |    
+| global            |                                                                                   | boolean            | NO  |     | 0                   |                |    
+| visible           |                                                                                   | boolean            | NO  |     | 0                   |                |    
+| deleted           | item has been marked for deletion                                                 | boolean            | NO  |     | 0                   |                |    
+| uid               | Owner id which owns this copy of the item                                         | mediumint unsigned | NO  |     | NULL                |                |    
+| protocol          | Protocol used to deliver the item for this user                                   | tinyint unsigned   | YES |     | NULL                |                |    
+| contact-id        | contact.id                                                                        | int unsigned       | NO  |     | 0                   |                |    
+| event-id          | Used to link to the event.id                                                      | int unsigned       | YES |     | NULL                |                |    
+| unseen            | post has not been seen                                                            | boolean            | NO  |     | 1                   |                |    
+| hidden            | Marker to hide the post from the user                                             | boolean            | NO  |     | 0                   |                |    
+| notification-type |                                                                                   | tinyint unsigned   | NO  |     | 0                   |                |    
+| wall              | This item was posted to the wall of uid                                           | boolean            | NO  |     | 0                   |                |    
+| origin            | item originated at this site                                                      | boolean            | NO  |     | 0                   |                |    
+| psid              | ID of the permission set of this post                                             | int unsigned       | YES |     | NULL                |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post.md b/doc/database/db_post.md
index 1367bcb770..ac3cdf34d7 100644
--- a/doc/database/db_post.md
+++ b/doc/database/db_post.md
@@ -4,23 +4,23 @@ Structure for all posts
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL |  |    
-| parent-uri-id | Id of the item-uri table that contains the parent uri | int unsigned | YES |  | NULL |  |    
-| thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | YES |  | NULL |  |    
-| external-id | Id of the item-uri table entry that contains the external uri | int unsigned | YES |  | NULL |  |    
-| created | Creation timestamp. | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| edited | Date of last edit (default is created) | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| received | datetime | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| gravity |  | tinyint unsigned | NO |  | 0 |  |    
-| network | Network from where the item comes from | char(4) | NO |  |  |  |    
-| owner-id | Link to the contact table with uid=0 of the owner of this item | int unsigned | NO |  | 0 |  |    
-| author-id | Link to the contact table with uid=0 of the author of this item | int unsigned | NO |  | 0 |  |    
-| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned | YES |  | NULL |  |    
-| post-type | Post type (personal note, image, article, ...) | tinyint unsigned | NO |  | 0 |  |    
-| vid | Id of the verb table entry that contains the activity verbs | smallint unsigned | YES |  | NULL |  |    
-| private | 0=public, 1=private, 2=unlisted | tinyint unsigned | NO |  | 0 |  |    
-| global |  | boolean | NO |  | 0 |  |    
-| visible |  | boolean | NO |  | 0 |  |    
-| deleted | item has been marked for deletion | boolean | NO |  | 0 |  |    
+| uri-id        | Id of the item-uri table entry that contains the item uri                         | int unsigned      | NO  | PRI | NULL                |  |    
+| parent-uri-id | Id of the item-uri table that contains the parent uri                             | int unsigned      | YES |     | NULL                |  |    
+| thr-parent-id | Id of the item-uri table that contains the thread parent uri                      | int unsigned      | YES |     | NULL                |  |    
+| external-id   | Id of the item-uri table entry that contains the external uri                     | int unsigned      | YES |     | NULL                |  |    
+| created       | Creation timestamp.                                                               | datetime          | NO  |     | 0001-01-01 00:00:00 |  |    
+| edited        | Date of last edit (default is created)                                            | datetime          | NO  |     | 0001-01-01 00:00:00 |  |    
+| received      | datetime                                                                          | datetime          | NO  |     | 0001-01-01 00:00:00 |  |    
+| gravity       |                                                                                   | tinyint unsigned  | NO  |     | 0                   |  |    
+| network       | Network from where the item comes from                                            | char(4)           | NO  |     |                     |  |    
+| owner-id      | Link to the contact table with uid=0 of the owner of this item                    | int unsigned      | NO  |     | 0                   |  |    
+| author-id     | Link to the contact table with uid=0 of the author of this item                   | int unsigned      | NO  |     | 0                   |  |    
+| causer-id     | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned      | YES |     | NULL                |  |    
+| post-type     | Post type (personal note, image, article, ...)                                    | tinyint unsigned  | NO  |     | 0                   |  |    
+| vid           | Id of the verb table entry that contains the activity verbs                       | smallint unsigned | YES |     | NULL                |  |    
+| private       | 0=public, 1=private, 2=unlisted                                                   | tinyint unsigned  | NO  |     | 0                   |  |    
+| global        |                                                                                   | boolean           | NO  |     | 0                   |  |    
+| visible       |                                                                                   | boolean           | NO  |     | 0                   |  |    
+| deleted       | item has been marked for deletion                                                 | boolean           | NO  |     | 0                   |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_process.md b/doc/database/db_process.md
index 9284130b56..732aa001b2 100644
--- a/doc/database/db_process.md
+++ b/doc/database/db_process.md
@@ -4,8 +4,8 @@ Currently running system processes
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| pid |  | int unsigned | NO | PRI | NULL |  |    
-| command |  | varbinary(32) | NO |  |  |  |    
-| created |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| pid     |  | int unsigned  | NO | PRI | NULL                |  |    
+| command |  | varbinary(32) | NO |     |                     |  |    
+| created |  | datetime      | NO |     | 0001-01-01 00:00:00 |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_profile.md b/doc/database/db_profile.md
index c7ee655696..c8e27ddc0c 100644
--- a/doc/database/db_profile.md
+++ b/doc/database/db_profile.md
@@ -4,47 +4,47 @@ user profiles data
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | Owner User id | mediumint unsigned | NO |  | 0 |  |    
-| profile-name | Deprecated | varchar(255) | YES |  | NULL |  |    
-| is-default | Deprecated | boolean | YES |  | NULL |  |    
-| hide-friends | Hide friend list from viewers of this profile | boolean | NO |  | 0 |  |    
-| name |  | varchar(255) | NO |  |  |  |    
-| pdesc | Deprecated | varchar(255) | YES |  | NULL |  |    
-| dob | Day of birth | varchar(32) | NO |  | 0000-00-00 |  |    
-| address |  | varchar(255) | NO |  |  |  |    
-| locality |  | varchar(255) | NO |  |  |  |    
-| region |  | varchar(255) | NO |  |  |  |    
-| postal-code |  | varchar(32) | NO |  |  |  |    
-| country-name |  | varchar(255) | NO |  |  |  |    
-| hometown | Deprecated | varchar(255) | YES |  | NULL |  |    
-| gender | Deprecated | varchar(32) | YES |  | NULL |  |    
-| marital | Deprecated | varchar(255) | YES |  | NULL |  |    
-| with | Deprecated | text | YES |  | NULL |  |    
-| howlong | Deprecated | datetime | YES |  | NULL |  |    
-| sexual | Deprecated | varchar(255) | YES |  | NULL |  |    
-| politic | Deprecated | varchar(255) | YES |  | NULL |  |    
-| religion | Deprecated | varchar(255) | YES |  | NULL |  |    
-| pub_keywords |  | text | YES |  | NULL |  |    
-| prv_keywords |  | text | YES |  | NULL |  |    
-| likes | Deprecated | text | YES |  | NULL |  |    
-| dislikes | Deprecated | text | YES |  | NULL |  |    
-| about | Profile description | text | YES |  | NULL |  |    
-| summary | Deprecated | varchar(255) | YES |  | NULL |  |    
-| music | Deprecated | text | YES |  | NULL |  |    
-| book | Deprecated | text | YES |  | NULL |  |    
-| tv | Deprecated | text | YES |  | NULL |  |    
-| film | Deprecated | text | YES |  | NULL |  |    
-| interest | Deprecated | text | YES |  | NULL |  |    
-| romance | Deprecated | text | YES |  | NULL |  |    
-| work | Deprecated | text | YES |  | NULL |  |    
-| education | Deprecated | text | YES |  | NULL |  |    
-| contact | Deprecated | text | YES |  | NULL |  |    
-| homepage |  | varchar(255) | NO |  |  |  |    
-| xmpp |  | varchar(255) | NO |  |  |  |    
-| photo |  | varchar(255) | NO |  |  |  |    
-| thumb |  | varchar(255) | NO |  |  |  |    
-| publish | publish default profile in local directory | boolean | NO |  | 0 |  |    
-| net-publish | publish profile in global directory | boolean | NO |  | 0 |  |    
+| id           | sequential ID                                 | int unsigned       | NO  | PRI | NULL       | auto_increment |    
+| uid          | Owner User id                                 | mediumint unsigned | NO  |     | 0          |                |    
+| profile-name | Deprecated                                    | varchar(255)       | YES |     | NULL       |                |    
+| is-default   | Deprecated                                    | boolean            | YES |     | NULL       |                |    
+| hide-friends | Hide friend list from viewers of this profile | boolean            | NO  |     | 0          |                |    
+| name         |                                               | varchar(255)       | NO  |     |            |                |    
+| pdesc        | Deprecated                                    | varchar(255)       | YES |     | NULL       |                |    
+| dob          | Day of birth                                  | varchar(32)        | NO  |     | 0000-00-00 |                |    
+| address      |                                               | varchar(255)       | NO  |     |            |                |    
+| locality     |                                               | varchar(255)       | NO  |     |            |                |    
+| region       |                                               | varchar(255)       | NO  |     |            |                |    
+| postal-code  |                                               | varchar(32)        | NO  |     |            |                |    
+| country-name |                                               | varchar(255)       | NO  |     |            |                |    
+| hometown     | Deprecated                                    | varchar(255)       | YES |     | NULL       |                |    
+| gender       | Deprecated                                    | varchar(32)        | YES |     | NULL       |                |    
+| marital      | Deprecated                                    | varchar(255)       | YES |     | NULL       |                |    
+| with         | Deprecated                                    | text               | YES |     | NULL       |                |    
+| howlong      | Deprecated                                    | datetime           | YES |     | NULL       |                |    
+| sexual       | Deprecated                                    | varchar(255)       | YES |     | NULL       |                |    
+| politic      | Deprecated                                    | varchar(255)       | YES |     | NULL       |                |    
+| religion     | Deprecated                                    | varchar(255)       | YES |     | NULL       |                |    
+| pub_keywords |                                               | text               | YES |     | NULL       |                |    
+| prv_keywords |                                               | text               | YES |     | NULL       |                |    
+| likes        | Deprecated                                    | text               | YES |     | NULL       |                |    
+| dislikes     | Deprecated                                    | text               | YES |     | NULL       |                |    
+| about        | Profile description                           | text               | YES |     | NULL       |                |    
+| summary      | Deprecated                                    | varchar(255)       | YES |     | NULL       |                |    
+| music        | Deprecated                                    | text               | YES |     | NULL       |                |    
+| book         | Deprecated                                    | text               | YES |     | NULL       |                |    
+| tv           | Deprecated                                    | text               | YES |     | NULL       |                |    
+| film         | Deprecated                                    | text               | YES |     | NULL       |                |    
+| interest     | Deprecated                                    | text               | YES |     | NULL       |                |    
+| romance      | Deprecated                                    | text               | YES |     | NULL       |                |    
+| work         | Deprecated                                    | text               | YES |     | NULL       |                |    
+| education    | Deprecated                                    | text               | YES |     | NULL       |                |    
+| contact      | Deprecated                                    | text               | YES |     | NULL       |                |    
+| homepage     |                                               | varchar(255)       | NO  |     |            |                |    
+| xmpp         |                                               | varchar(255)       | NO  |     |            |                |    
+| photo        |                                               | varchar(255)       | NO  |     |            |                |    
+| thumb        |                                               | varchar(255)       | NO  |     |            |                |    
+| publish      | publish default profile in local directory    | boolean            | NO  |     | 0          |                |    
+| net-publish  | publish profile in global directory           | boolean            | NO  |     | 0          |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_profile_check.md b/doc/database/db_profile_check.md
index b2eea14ae6..a98250742b 100644
--- a/doc/database/db_profile_check.md
+++ b/doc/database/db_profile_check.md
@@ -4,11 +4,11 @@ DFRN remote auth use
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | User id | mediumint unsigned | NO |  | 0 |  |    
-| cid | contact.id | int unsigned | NO |  | 0 |  |    
-| dfrn_id |  | varchar(255) | NO |  |  |  |    
-| sec |  | varchar(255) | NO |  |  |  |    
-| expire |  | int unsigned | NO |  | 0 |  |    
+| id      | sequential ID | int unsigned       | NO | PRI | NULL | auto_increment |    
+| uid     | User id       | mediumint unsigned | NO |     | 0    |                |    
+| cid     | contact.id    | int unsigned       | NO |     | 0    |                |    
+| dfrn_id |               | varchar(255)       | NO |     |      |                |    
+| sec     |               | varchar(255)       | NO |     |      |                |    
+| expire  |               | int unsigned       | NO |     | 0    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_profile_field.md b/doc/database/db_profile_field.md
index 34a683cfba..6b03bde96f 100644
--- a/doc/database/db_profile_field.md
+++ b/doc/database/db_profile_field.md
@@ -4,13 +4,13 @@ Custom profile fields
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | Owner user id | mediumint unsigned | NO |  | 0 |  |    
-| order | Field ordering per user | mediumint unsigned | NO |  | 1 |  |    
-| psid | ID of the permission set of this profile field - 0 = public | int unsigned | YES |  | NULL |  |    
-| label | Label of the field | varchar(255) | NO |  |  |  |    
-| value | Value of the field | text | YES |  | NULL |  |    
-| created | creation time | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| edited | last edit time | datetime | NO |  | 0001-01-01 00:00:00 |  |    
+| id      | sequential ID                                               | int unsigned       | NO  | PRI | NULL                | auto_increment |    
+| uid     | Owner user id                                               | mediumint unsigned | NO  |     | 0                   |                |    
+| order   | Field ordering per user                                     | mediumint unsigned | NO  |     | 1                   |                |    
+| psid    | ID of the permission set of this profile field - 0 = public | int unsigned       | YES |     | NULL                |                |    
+| label   | Label of the field                                          | varchar(255)       | NO  |     |                     |                |    
+| value   | Value of the field                                          | text               | YES |     | NULL                |                |    
+| created | creation time                                               | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| edited  | last edit time                                              | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_push_subscriber.md b/doc/database/db_push_subscriber.md
index 73af99b9ea..df59f03290 100644
--- a/doc/database/db_push_subscriber.md
+++ b/doc/database/db_push_subscriber.md
@@ -4,15 +4,15 @@ Used for OStatus: Contains feed subscribers
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | User id | mediumint unsigned | NO |  | 0 |  |    
-| callback_url |  | varchar(255) | NO |  |  |  |    
-| topic |  | varchar(255) | NO |  |  |  |    
-| nickname |  | varchar(255) | NO |  |  |  |    
-| push | Retrial counter | tinyint | NO |  | 0 |  |    
-| last_update | Date of last successful trial | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| next_try | Next retrial date | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| renewed | Date of last subscription renewal | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| secret |  | varchar(255) | NO |  |  |  |    
+| id           | sequential ID                     | int unsigned       | NO | PRI | NULL                | auto_increment |    
+| uid          | User id                           | mediumint unsigned | NO |     | 0                   |                |    
+| callback_url |                                   | varchar(255)       | NO |     |                     |                |    
+| topic        |                                   | varchar(255)       | NO |     |                     |                |    
+| nickname     |                                   | varchar(255)       | NO |     |                     |                |    
+| push         | Retrial counter                   | tinyint            | NO |     | 0                   |                |    
+| last_update  | Date of last successful trial     | datetime           | NO |     | 0001-01-01 00:00:00 |                |    
+| next_try     | Next retrial date                 | datetime           | NO |     | 0001-01-01 00:00:00 |                |    
+| renewed      | Date of last subscription renewal | datetime           | NO |     | 0001-01-01 00:00:00 |                |    
+| secret       |                                   | varchar(255)       | NO |     |                     |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_register.md b/doc/database/db_register.md
index 6751390112..d0f0c8a031 100644
--- a/doc/database/db_register.md
+++ b/doc/database/db_register.md
@@ -4,12 +4,12 @@ registrations requiring admin approval
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| hash |  | varchar(255) | NO |  |  |  |    
-| created |  | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| uid | User id | mediumint unsigned | NO |  | 0 |  |    
-| password |  | varchar(255) | NO |  |  |  |    
-| language |  | varchar(16) | NO |  |  |  |    
-| note |  | text | YES |  | NULL |  |    
+| id       | sequential ID | int unsigned       | NO  | PRI | NULL                | auto_increment |    
+| hash     |               | varchar(255)       | NO  |     |                     |                |    
+| created  |               | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| uid      | User id       | mediumint unsigned | NO  |     | 0                   |                |    
+| password |               | varchar(255)       | NO  |     |                     |                |    
+| language |               | varchar(16)        | NO  |     |                     |                |    
+| note     |               | text               | YES |     | NULL                |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_search.md b/doc/database/db_search.md
index 10deb6c187..d37c48b5e0 100644
--- a/doc/database/db_search.md
+++ b/doc/database/db_search.md
@@ -4,8 +4,8 @@ Table search
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| uid | User id | mediumint unsigned | NO |  | 0 |  |    
-| term |  | varchar(255) | NO |  |  |  |    
+| id   | sequential ID | int unsigned       | NO | PRI | NULL | auto_increment |    
+| uid  | User id       | mediumint unsigned | NO |     | 0    |                |    
+| term |               | varchar(255)       | NO |     |      |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_session.md b/doc/database/db_session.md
index d607f74e7c..ca7f523f02 100644
--- a/doc/database/db_session.md
+++ b/doc/database/db_session.md
@@ -4,9 +4,9 @@ web session storage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | bigint unsigned | NO | PRI | NULL | auto_increment |    
-| sid |  | varbinary(255) | NO |  |  |  |    
-| data |  | text | YES |  | NULL |  |    
-| expire |  | int unsigned | NO |  | 0 |  |    
+| id     | sequential ID | bigint unsigned | NO  | PRI | NULL | auto_increment |    
+| sid    |               | varbinary(255)  | NO  |     |      |                |    
+| data   |               | text            | YES |     | NULL |                |    
+| expire |               | int unsigned    | NO  |     | 0    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_storage.md b/doc/database/db_storage.md
index 1984436265..cbed7df2c0 100644
--- a/doc/database/db_storage.md
+++ b/doc/database/db_storage.md
@@ -4,7 +4,7 @@ Data stored by Database storage backend
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | Auto incremented image data id | int unsigned | NO | PRI | NULL | auto_increment |    
-| data | file data | longblob | NO |  | NULL |  |    
+| id   | Auto incremented image data id | int unsigned | NO | PRI | NULL | auto_increment |    
+| data | file data                      | longblob     | NO |     | NULL |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_tag.md b/doc/database/db_tag.md
index 8d7ae354f1..e2d3cc07de 100644
--- a/doc/database/db_tag.md
+++ b/doc/database/db_tag.md
@@ -4,8 +4,8 @@ tags and mentions
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | int unsigned | NO | PRI | NULL | auto_increment |    
-| name |  | varchar(96) | NO |  |  |  |    
-| url |  | varbinary(255) | NO |  |  |  |    
+| id   |  | int unsigned   | NO | PRI | NULL | auto_increment |    
+| name |  | varchar(96)    | NO |     |      |                |    
+| url  |  | varbinary(255) | NO |     |      |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_tokens.md b/doc/database/db_tokens.md
index 712bb05fdd..3fe965fa6b 100644
--- a/doc/database/db_tokens.md
+++ b/doc/database/db_tokens.md
@@ -4,11 +4,11 @@ OAuth usage
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | varchar(40) | NO | PRI | NULL |  |    
-| secret |  | text | YES |  | NULL |  |    
-| client_id |  | varchar(20) | NO |  |  |  |    
-| expires |  | int | NO |  | 0 |  |    
-| scope |  | varchar(200) | NO |  |  |  |    
-| uid | User id | mediumint unsigned | NO |  | 0 |  |    
+| id        |         | varchar(40)        | NO  | PRI | NULL |  |    
+| secret    |         | text               | YES |     | NULL |  |    
+| client_id |         | varchar(20)        | NO  |     |      |  |    
+| expires   |         | int                | NO  |     | 0    |  |    
+| scope     |         | varchar(200)       | NO  |     |      |  |    
+| uid       | User id | mediumint unsigned | NO  |     | 0    |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_user-contact.md b/doc/database/db_user-contact.md
index 762c350395..108a568e08 100644
--- a/doc/database/db_user-contact.md
+++ b/doc/database/db_user-contact.md
@@ -4,10 +4,10 @@ User specific public contact data
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| cid | Contact id of the linked public contact | int unsigned | NO | PRI | 0 |  |    
-| uid | User id | mediumint unsigned | NO | PRI | 0 |  |    
-| blocked | Contact is completely blocked for this user | boolean | YES |  | NULL |  |    
-| ignored | Posts from this contact are ignored | boolean | YES |  | NULL |  |    
-| collapsed | Posts from this contact are collapsed | boolean | YES |  | NULL |  |    
+| cid       | Contact id of the linked public contact     | int unsigned       | NO  | PRI | 0    |  |    
+| uid       | User id                                     | mediumint unsigned | NO  | PRI | 0    |  |    
+| blocked   | Contact is completely blocked for this user | boolean            | YES |     | NULL |  |    
+| ignored   | Posts from this contact are ignored         | boolean            | YES |     | NULL |  |    
+| collapsed | Posts from this contact are collapsed       | boolean            | YES |     | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_user.md b/doc/database/db_user.md
index 0794b7bcb1..a56ab90486 100644
--- a/doc/database/db_user.md
+++ b/doc/database/db_user.md
@@ -4,50 +4,50 @@ The local users
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uid | sequential ID | mediumint unsigned | NO | PRI | NULL | auto_increment |    
-| parent-uid | The parent user that has full control about this user | mediumint unsigned | YES |  | NULL |  |    
-| guid | A unique identifier for this user | varchar(64) | NO |  |  |  |    
-| username | Name that this user is known by | varchar(255) | NO |  |  |  |    
-| password | encrypted password | varchar(255) | NO |  |  |  |    
-| legacy_password | Is the password hash double-hashed? | boolean | NO |  | 0 |  |    
-| nickname | nick- and user name | varchar(255) | NO |  |  |  |    
-| email | the users email address | varchar(255) | NO |  |  |  |    
-| openid |  | varchar(255) | NO |  |  |  |    
-| timezone | PHP-legal timezone | varchar(128) | NO |  |  |  |    
-| language | default language | varchar(32) | NO |  | en |  |    
-| register_date | timestamp of registration | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| login_date | timestamp of last login | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| default-location | Default for item.location | varchar(255) | NO |  |  |  |    
-| allow_location | 1 allows to display the location | boolean | NO |  | 0 |  |    
-| theme | user theme preference | varchar(255) | NO |  |  |  |    
-| pubkey | RSA public key 4096 bit | text | YES |  | NULL |  |    
-| prvkey | RSA private key 4096 bit | text | YES |  | NULL |  |    
-| spubkey |  | text | YES |  | NULL |  |    
-| sprvkey |  | text | YES |  | NULL |  |    
-| verified | user is verified through email | boolean | NO |  | 0 |  |    
-| blocked | 1 for user is blocked | boolean | NO |  | 0 |  |    
-| blockwall | Prohibit contacts to post to the profile page of the user | boolean | NO |  | 0 |  |    
-| hidewall | Hide profile details from unkown viewers | boolean | NO |  | 0 |  |    
-| blocktags | Prohibit contacts to tag the post of this user | boolean | NO |  | 0 |  |    
-| unkmail | Permit unknown people to send private mails to this user | boolean | NO |  | 0 |  |    
-| cntunkmail |  | int unsigned | NO |  | 10 |  |    
-| notify-flags | email notification options | smallint unsigned | NO |  | 65535 |  |    
-| page-flags | page/profile type | tinyint unsigned | NO |  | 0 |  |    
-| account-type |  | tinyint unsigned | NO |  | 0 |  |    
-| prvnets |  | boolean | NO |  | 0 |  |    
-| pwdreset | Password reset request token | varchar(255) | YES |  | NULL |  |    
-| pwdreset_time | Timestamp of the last password reset request | datetime | YES |  | NULL |  |    
-| maxreq |  | int unsigned | NO |  | 10 |  |    
-| expire |  | int unsigned | NO |  | 0 |  |    
-| account_removed | if 1 the account is removed | boolean | NO |  | 0 |  |    
-| account_expired |  | boolean | NO |  | 0 |  |    
-| account_expires_on | timestamp when account expires and will be deleted | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| expire_notification_sent | timestamp of last warning of account expiration | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| def_gid |  | int unsigned | NO |  | 0 |  |    
-| allow_cid | default permission for this user | mediumtext | YES |  | NULL |  |    
-| allow_gid | default permission for this user | mediumtext | YES |  | NULL |  |    
-| deny_cid | default permission for this user | mediumtext | YES |  | NULL |  |    
-| deny_gid | default permission for this user | mediumtext | YES |  | NULL |  |    
-| openidserver |  | text | YES |  | NULL |  |    
+| uid                      | sequential ID                                             | mediumint unsigned | NO  | PRI | NULL                | auto_increment |    
+| parent-uid               | The parent user that has full control about this user     | mediumint unsigned | YES |     | NULL                |                |    
+| guid                     | A unique identifier for this user                         | varchar(64)        | NO  |     |                     |                |    
+| username                 | Name that this user is known by                           | varchar(255)       | NO  |     |                     |                |    
+| password                 | encrypted password                                        | varchar(255)       | NO  |     |                     |                |    
+| legacy_password          | Is the password hash double-hashed?                       | boolean            | NO  |     | 0                   |                |    
+| nickname                 | nick- and user name                                       | varchar(255)       | NO  |     |                     |                |    
+| email                    | the users email address                                   | varchar(255)       | NO  |     |                     |                |    
+| openid                   |                                                           | varchar(255)       | NO  |     |                     |                |    
+| timezone                 | PHP-legal timezone                                        | varchar(128)       | NO  |     |                     |                |    
+| language                 | default language                                          | varchar(32)        | NO  |     | en                  |                |    
+| register_date            | timestamp of registration                                 | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| login_date               | timestamp of last login                                   | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| default-location         | Default for item.location                                 | varchar(255)       | NO  |     |                     |                |    
+| allow_location           | 1 allows to display the location                          | boolean            | NO  |     | 0                   |                |    
+| theme                    | user theme preference                                     | varchar(255)       | NO  |     |                     |                |    
+| pubkey                   | RSA public key 4096 bit                                   | text               | YES |     | NULL                |                |    
+| prvkey                   | RSA private key 4096 bit                                  | text               | YES |     | NULL                |                |    
+| spubkey                  |                                                           | text               | YES |     | NULL                |                |    
+| sprvkey                  |                                                           | text               | YES |     | NULL                |                |    
+| verified                 | user is verified through email                            | boolean            | NO  |     | 0                   |                |    
+| blocked                  | 1 for user is blocked                                     | boolean            | NO  |     | 0                   |                |    
+| blockwall                | Prohibit contacts to post to the profile page of the user | boolean            | NO  |     | 0                   |                |    
+| hidewall                 | Hide profile details from unkown viewers                  | boolean            | NO  |     | 0                   |                |    
+| blocktags                | Prohibit contacts to tag the post of this user            | boolean            | NO  |     | 0                   |                |    
+| unkmail                  | Permit unknown people to send private mails to this user  | boolean            | NO  |     | 0                   |                |    
+| cntunkmail               |                                                           | int unsigned       | NO  |     | 10                  |                |    
+| notify-flags             | email notification options                                | smallint unsigned  | NO  |     | 65535               |                |    
+| page-flags               | page/profile type                                         | tinyint unsigned   | NO  |     | 0                   |                |    
+| account-type             |                                                           | tinyint unsigned   | NO  |     | 0                   |                |    
+| prvnets                  |                                                           | boolean            | NO  |     | 0                   |                |    
+| pwdreset                 | Password reset request token                              | varchar(255)       | YES |     | NULL                |                |    
+| pwdreset_time            | Timestamp of the last password reset request              | datetime           | YES |     | NULL                |                |    
+| maxreq                   |                                                           | int unsigned       | NO  |     | 10                  |                |    
+| expire                   |                                                           | int unsigned       | NO  |     | 0                   |                |    
+| account_removed          | if 1 the account is removed                               | boolean            | NO  |     | 0                   |                |    
+| account_expired          |                                                           | boolean            | NO  |     | 0                   |                |    
+| account_expires_on       | timestamp when account expires and will be deleted        | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| expire_notification_sent | timestamp of last warning of account expiration           | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| def_gid                  |                                                           | int unsigned       | NO  |     | 0                   |                |    
+| allow_cid                | default permission for this user                          | mediumtext         | YES |     | NULL                |                |    
+| allow_gid                | default permission for this user                          | mediumtext         | YES |     | NULL                |                |    
+| deny_cid                 | default permission for this user                          | mediumtext         | YES |     | NULL                |                |    
+| deny_gid                 | default permission for this user                          | mediumtext         | YES |     | NULL                |                |    
+| openidserver             |                                                           | text               | YES |     | NULL                |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_userd.md b/doc/database/db_userd.md
index 5006033e96..ff924dfa78 100644
--- a/doc/database/db_userd.md
+++ b/doc/database/db_userd.md
@@ -4,7 +4,7 @@ Deleted usernames
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| username |  | varchar(255) | NO |  | NULL |  |    
+| id       | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
+| username |               | varchar(255) | NO |     | NULL |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_verb.md b/doc/database/db_verb.md
index 4aa171f301..4469acff06 100644
--- a/doc/database/db_verb.md
+++ b/doc/database/db_verb.md
@@ -4,7 +4,7 @@ Activity Verbs
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id |  | smallint unsigned | NO | PRI | NULL | auto_increment |    
-| name |  | varchar(100) | NO |  |  |  |    
+| id   |  | smallint unsigned | NO | PRI | NULL | auto_increment |    
+| name |  | varchar(100)      | NO |     |      |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_worker-ipc.md b/doc/database/db_worker-ipc.md
index 2da8021e44..d278be3b43 100644
--- a/doc/database/db_worker-ipc.md
+++ b/doc/database/db_worker-ipc.md
@@ -4,7 +4,7 @@ Inter process communication between the frontend and the worker
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| key |  | int | NO | PRI | NULL |  |    
-| jobs | Flag for outstanding jobs | boolean | YES |  | NULL |  |    
+| key  |                           | int     | NO  | PRI | NULL |  |    
+| jobs | Flag for outstanding jobs | boolean | YES |     | NULL |  |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_workerqueue.md b/doc/database/db_workerqueue.md
index 00768c3b55..b104f7a5f6 100644
--- a/doc/database/db_workerqueue.md
+++ b/doc/database/db_workerqueue.md
@@ -4,15 +4,15 @@ Background tasks queue entries
 
 | Field | Description | Type | Null | Key | Default | Extra |
 | ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id | Auto incremented worker task id | int unsigned | NO | PRI | NULL | auto_increment |    
-| command | Task command | varchar(100) | YES |  | NULL |  |    
-| parameter | Task parameter | mediumtext | YES |  | NULL |  |    
-| priority | Task priority | tinyint unsigned | NO |  | 0 |  |    
-| created | Creation date | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| pid | Process id of the worker | int unsigned | NO |  | 0 |  |    
-| executed | Execution date | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| next_try | Next retrial date | datetime | NO |  | 0001-01-01 00:00:00 |  |    
-| retrial | Retrial counter | tinyint | NO |  | 0 |  |    
-| done | Marked 1 when the task was done - will be deleted later | boolean | NO |  | 0 |  |    
+| id        | Auto incremented worker task id                         | int unsigned     | NO  | PRI | NULL                | auto_increment |    
+| command   | Task command                                            | varchar(100)     | YES |     | NULL                |                |    
+| parameter | Task parameter                                          | mediumtext       | YES |     | NULL                |                |    
+| priority  | Task priority                                           | tinyint unsigned | NO  |     | 0                   |                |    
+| created   | Creation date                                           | datetime         | NO  |     | 0001-01-01 00:00:00 |                |    
+| pid       | Process id of the worker                                | int unsigned     | NO  |     | 0                   |                |    
+| executed  | Execution date                                          | datetime         | NO  |     | 0001-01-01 00:00:00 |                |    
+| next_try  | Next retrial date                                       | datetime         | NO  |     | 0001-01-01 00:00:00 |                |    
+| retrial   | Retrial counter                                         | tinyint          | NO  |     | 0                   |                |    
+| done      | Marked 1 when the task was done - will be deleted later | boolean          | NO  |     | 0                   |                |    
 
 Return to [database documentation](help/database)
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index bb66bcb3fd..1cf1bc12bc 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -166,7 +166,8 @@ class DBStructure
 
 		$tables = [];
 		foreach (self::definition(null) as $name => $definition) {
-			$fields = [];
+			$fields  = [];
+			$lengths = [];
 			foreach ($definition['fields'] as $key => $value) {
 				$field = [];
 				$field['name']    = $key;
@@ -177,8 +178,17 @@ class DBStructure
 				$field['default'] = $value['default'] ?? 'NULL';
 				$field['extra']   = $value['extra'] ?? '';
 		
+				foreach ($field as $fieldname => $fieldvalue) {
+					$lengths[$fieldname] = max($lengths[$fieldname] ?? 0, strlen($fieldvalue));
+				}
 				$fields[] = $field;
 			}
+
+			array_walk_recursive($fields, function(&$value, $key) use ($lengths)
+			{
+				$value = str_pad($value, $lengths[$key]);
+			});
+
 			$tables[] = ['name' => $name, 'comment' => $definition['comment']];
 			$content = Renderer::replaceMacros(Renderer::getMarkupTemplate('structure.tpl'), [
 				'$name'    => $name,

From fd30df7300d9de5b2316b86ccc38053cec69dfe1 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 14 Jun 2021 05:58:51 +0000
Subject: [PATCH 07/14] Pad the header

---
 doc/database/db_2fa_app_specific_password.md |  16 +-
 doc/database/db_2fa_recovery_codes.md        |  12 +-
 doc/database/db_2fa_trusted_browser.md       |  14 +-
 doc/database/db_addon.md                     |  18 +-
 doc/database/db_apcontact.md                 |  52 +++---
 doc/database/db_application-token.md         |  24 +--
 doc/database/db_application.md               |  26 +--
 doc/database/db_attach.md                    |  34 ++--
 doc/database/db_auth_codes.md                |  14 +-
 doc/database/db_cache.md                     |  12 +-
 doc/database/db_challenge.md                 |  16 +-
 doc/database/db_clients.md                   |  16 +-
 doc/database/db_config.md                    |  12 +-
 doc/database/db_contact-relation.md          |  14 +-
 doc/database/db_contact.md                   | 164 +++++++++----------
 doc/database/db_conv.md                      |  20 +--
 doc/database/db_conversation.md              |  20 +--
 doc/database/db_delayed-post.md              |  12 +-
 doc/database/db_diaspora-interaction.md      |   8 +-
 doc/database/db_event.md                     |  44 ++---
 doc/database/db_fcontact.md                  |  38 ++---
 doc/database/db_fsuggest.md                  |  22 +--
 doc/database/db_group.md                     |  14 +-
 doc/database/db_group_member.md              |  10 +-
 doc/database/db_gserver-tag.md               |   8 +-
 doc/database/db_gserver.md                   |  50 +++---
 doc/database/db_hook.md                      |  14 +-
 doc/database/db_host.md                      |   8 +-
 doc/database/db_inbox-status.md              |  18 +-
 doc/database/db_intro.md                     |  26 +--
 doc/database/db_item-uri.md                  |  10 +-
 doc/database/db_locks.md                     |  14 +-
 doc/database/db_mail.md                      |  48 +++---
 doc/database/db_mailacct.md                  |  30 ++--
 doc/database/db_manage.md                    |  10 +-
 doc/database/db_notification.md              |  22 +--
 doc/database/db_notify-threads.md            |  16 +-
 doc/database/db_notify.md                    |  40 ++---
 doc/database/db_oembed.md                    |  12 +-
 doc/database/db_openwebauth-token.md         |  16 +-
 doc/database/db_parsed_url.md                |  18 +-
 doc/database/db_pconfig.md                   |  14 +-
 doc/database/db_permissionset.md             |  16 +-
 doc/database/db_photo.md                     |  58 +++----
 doc/database/db_post-category.md             |  12 +-
 doc/database/db_post-content.md              |  38 ++---
 doc/database/db_post-delivery-data.md        |  26 +--
 doc/database/db_post-media.md                |  42 ++---
 doc/database/db_post-tag.md                  |  12 +-
 doc/database/db_post-thread-user.md          |  50 +++---
 doc/database/db_post-thread.md               |  22 +--
 doc/database/db_post-user-notification.md    |  10 +-
 doc/database/db_post-user.md                 |  64 ++++----
 doc/database/db_post.md                      |  40 ++---
 doc/database/db_process.md                   |  10 +-
 doc/database/db_profile.md                   |  88 +++++-----
 doc/database/db_profile_check.md             |  16 +-
 doc/database/db_profile_field.md             |  20 +--
 doc/database/db_push_subscriber.md           |  24 +--
 doc/database/db_register.md                  |  18 +-
 doc/database/db_search.md                    |  10 +-
 doc/database/db_session.md                   |  12 +-
 doc/database/db_storage.md                   |   8 +-
 doc/database/db_tag.md                       |  10 +-
 doc/database/db_tokens.md                    |  16 +-
 doc/database/db_user-contact.md              |  14 +-
 doc/database/db_user.md                      |  94 +++++------
 doc/database/db_userd.md                     |   8 +-
 doc/database/db_verb.md                      |   8 +-
 doc/database/db_worker-ipc.md                |   8 +-
 doc/database/db_workerqueue.md               |  24 +--
 src/Database/DBStructure.php                 |  33 +++-
 view/templates/structure.tpl                 |   2 -
 73 files changed, 921 insertions(+), 898 deletions(-)

diff --git a/doc/database/db_2fa_app_specific_password.md b/doc/database/db_2fa_app_specific_password.md
index f34716329e..28ec292c6e 100644
--- a/doc/database/db_2fa_app_specific_password.md
+++ b/doc/database/db_2fa_app_specific_password.md
@@ -2,13 +2,13 @@ Table 2fa_app_specific_password
 ===========
 Two-factor app-specific _password
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id              | Password ID for revocation               | mediumint unsigned | NO  | PRI | NULL | auto_increment |    
-| uid             | User ID                                  | mediumint unsigned | NO  |     | NULL |                |    
-| description     | Description of the usage of the password | varchar(255)       | YES |     | NULL |                |    
-| hashed_password | Hashed password                          | varchar(255)       | NO  |     | NULL |                |    
-| generated       | Datetime the password was generated      | datetime           | NO  |     | NULL |                |    
-| last_used       | Datetime the password was last used      | datetime           | YES |     | NULL |                |    
+| Field           | Description                              | Type               | Null | Key | Default | Extra          |    
+| --------------- | ---------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |    
+| id              | Password ID for revocation               | mediumint unsigned | NO   | PRI | NULL    | auto_increment |    
+| uid             | User ID                                  | mediumint unsigned | NO   |     | NULL    |                |    
+| description     | Description of the usage of the password | varchar(255)       | YES  |     | NULL    |                |    
+| hashed_password | Hashed password                          | varchar(255)       | NO   |     | NULL    |                |    
+| generated       | Datetime the password was generated      | datetime           | NO   |     | NULL    |                |    
+| last_used       | Datetime the password was last used      | datetime           | YES  |     | NULL    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_2fa_recovery_codes.md b/doc/database/db_2fa_recovery_codes.md
index 22c4d85e3d..4263763693 100644
--- a/doc/database/db_2fa_recovery_codes.md
+++ b/doc/database/db_2fa_recovery_codes.md
@@ -2,11 +2,11 @@ Table 2fa_recovery_codes
 ===========
 Two-factor authentication recovery codes
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uid       | User ID                         | mediumint unsigned | NO  | PRI | NULL |  |    
-| code      | Recovery code string            | varchar(50)        | NO  | PRI | NULL |  |    
-| generated | Datetime the code was generated | datetime           | NO  |     | NULL |  |    
-| used      | Datetime the code was used      | datetime           | YES |     | NULL |  |    
+| Field     | Description                     | Type               | Null | Key | Default | Extra |    
+| --------- | ------------------------------- | ------------------ | ---- | --- | ------- | ----- |    
+| uid       | User ID                         | mediumint unsigned | NO   | PRI | NULL    |       |    
+| code      | Recovery code string            | varchar(50)        | NO   | PRI | NULL    |       |    
+| generated | Datetime the code was generated | datetime           | NO   |     | NULL    |       |    
+| used      | Datetime the code was used      | datetime           | YES  |     | NULL    |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_2fa_trusted_browser.md b/doc/database/db_2fa_trusted_browser.md
index 0067ce41cf..b412c104b9 100644
--- a/doc/database/db_2fa_trusted_browser.md
+++ b/doc/database/db_2fa_trusted_browser.md
@@ -2,12 +2,12 @@ Table 2fa_trusted_browser
 ===========
 Two-factor authentication trusted browsers
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| cookie_hash | Trusted cookie hash                        | varchar(80)        | NO  | PRI | NULL |  |    
-| uid         | User ID                                    | mediumint unsigned | NO  |     | NULL |  |    
-| user_agent  | User agent string                          | text               | YES |     | NULL |  |    
-| created     | Datetime the trusted browser was recorded  | datetime           | NO  |     | NULL |  |    
-| last_used   | Datetime the trusted browser was last used | datetime           | YES |     | NULL |  |    
+| Field       | Description                                | Type               | Null | Key | Default | Extra |    
+| ----------- | ------------------------------------------ | ------------------ | ---- | --- | ------- | ----- |    
+| cookie_hash | Trusted cookie hash                        | varchar(80)        | NO   | PRI | NULL    |       |    
+| uid         | User ID                                    | mediumint unsigned | NO   |     | NULL    |       |    
+| user_agent  | User agent string                          | text               | YES  |     | NULL    |       |    
+| created     | Datetime the trusted browser was recorded  | datetime           | NO   |     | NULL    |       |    
+| last_used   | Datetime the trusted browser was last used | datetime           | YES  |     | NULL    |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_addon.md b/doc/database/db_addon.md
index 14853cd446..716ee9a1c5 100644
--- a/doc/database/db_addon.md
+++ b/doc/database/db_addon.md
@@ -2,14 +2,14 @@ Table addon
 ===========
 registered addons
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id           |                                               | int unsigned | NO | PRI | NULL | auto_increment |    
-| name         | addon base (file)name                         | varchar(50)  | NO |     |      |                |    
-| version      | currently unused                              | varchar(50)  | NO |     |      |                |    
-| installed    | currently always 1                            | boolean      | NO |     | 0    |                |    
-| hidden       | currently unused                              | boolean      | NO |     | 0    |                |    
-| timestamp    | file timestamp to check for reloads           | int unsigned | NO |     | 0    |                |    
-| plugin_admin | 1 = has admin config, 0 = has no admin config | boolean      | NO |     | 0    |                |    
+| Field        | Description                                   | Type         | Null | Key | Default | Extra          |    
+| ------------ | --------------------------------------------- | ------------ | ---- | --- | ------- | -------------- |    
+| id           |                                               | int unsigned | NO   | PRI | NULL    | auto_increment |    
+| name         | addon base (file)name                         | varchar(50)  | NO   |     |         |                |    
+| version      | currently unused                              | varchar(50)  | NO   |     |         |                |    
+| installed    | currently always 1                            | boolean      | NO   |     | 0       |                |    
+| hidden       | currently unused                              | boolean      | NO   |     | 0       |                |    
+| timestamp    | file timestamp to check for reloads           | int unsigned | NO   |     | 0       |                |    
+| plugin_admin | 1 = has admin config, 0 = has no admin config | boolean      | NO   |     | 0       |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_apcontact.md b/doc/database/db_apcontact.md
index b22a15f8bd..a32cc2a9ad 100644
--- a/doc/database/db_apcontact.md
+++ b/doc/database/db_apcontact.md
@@ -2,31 +2,31 @@ Table apcontact
 ===========
 ActivityPub compatible contacts - used in the ActivityPub implementation
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| url              | URL of the contact           | varbinary(255) | NO  | PRI | NULL                |  |    
-| uuid             |                              | varchar(255)   | YES |     | NULL                |  |    
-| type             |                              | varchar(20)    | NO  |     | NULL                |  |    
-| following        |                              | varchar(255)   | YES |     | NULL                |  |    
-| followers        |                              | varchar(255)   | YES |     | NULL                |  |    
-| inbox            |                              | varchar(255)   | NO  |     | NULL                |  |    
-| outbox           |                              | varchar(255)   | YES |     | NULL                |  |    
-| sharedinbox      |                              | varchar(255)   | YES |     | NULL                |  |    
-| manually-approve |                              | boolean        | YES |     | NULL                |  |    
-| nick             |                              | varchar(255)   | NO  |     |                     |  |    
-| name             |                              | varchar(255)   | YES |     | NULL                |  |    
-| about            |                              | text           | YES |     | NULL                |  |    
-| photo            |                              | varchar(255)   | YES |     | NULL                |  |    
-| addr             |                              | varchar(255)   | YES |     | NULL                |  |    
-| alias            |                              | varchar(255)   | YES |     | NULL                |  |    
-| pubkey           |                              | text           | YES |     | NULL                |  |    
-| subscribe        |                              | varchar(255)   | YES |     | NULL                |  |    
-| baseurl          | baseurl of the ap contact    | varchar(255)   | YES |     | NULL                |  |    
-| gsid             | Global Server ID             | int unsigned   | YES |     | NULL                |  |    
-| generator        | Name of the contact&#039;s system | varchar(255)   | YES |     | NULL                |  |    
-| following_count  | Number of following contacts | int unsigned   | YES |     | 0                   |  |    
-| followers_count  | Number of followers          | int unsigned   | YES |     | 0                   |  |    
-| statuses_count   | Number of posts              | int unsigned   | YES |     | 0                   |  |    
-| updated          |                              | datetime       | NO  |     | 0001-01-01 00:00:00 |  |    
+| Field            | Description                  | Type           | Null | Key | Default             | Extra |    
+| ---------------- | ---------------------------- | -------------- | ---- | --- | ------------------- | ----- |    
+| url              | URL of the contact           | varbinary(255) | NO   | PRI | NULL                |       |    
+| uuid             |                              | varchar(255)   | YES  |     | NULL                |       |    
+| type             |                              | varchar(20)    | NO   |     | NULL                |       |    
+| following        |                              | varchar(255)   | YES  |     | NULL                |       |    
+| followers        |                              | varchar(255)   | YES  |     | NULL                |       |    
+| inbox            |                              | varchar(255)   | NO   |     | NULL                |       |    
+| outbox           |                              | varchar(255)   | YES  |     | NULL                |       |    
+| sharedinbox      |                              | varchar(255)   | YES  |     | NULL                |       |    
+| manually-approve |                              | boolean        | YES  |     | NULL                |       |    
+| nick             |                              | varchar(255)   | NO   |     |                     |       |    
+| name             |                              | varchar(255)   | YES  |     | NULL                |       |    
+| about            |                              | text           | YES  |     | NULL                |       |    
+| photo            |                              | varchar(255)   | YES  |     | NULL                |       |    
+| addr             |                              | varchar(255)   | YES  |     | NULL                |       |    
+| alias            |                              | varchar(255)   | YES  |     | NULL                |       |    
+| pubkey           |                              | text           | YES  |     | NULL                |       |    
+| subscribe        |                              | varchar(255)   | YES  |     | NULL                |       |    
+| baseurl          | baseurl of the ap contact    | varchar(255)   | YES  |     | NULL                |       |    
+| gsid             | Global Server ID             | int unsigned   | YES  |     | NULL                |       |    
+| generator        | Name of the contact&#039;s system | varchar(255)   | YES  |     | NULL                |       |    
+| following_count  | Number of following contacts | int unsigned   | YES  |     | 0                   |       |    
+| followers_count  | Number of followers          | int unsigned   | YES  |     | 0                   |       |    
+| statuses_count   | Number of posts              | int unsigned   | YES  |     | 0                   |       |    
+| updated          |                              | datetime       | NO   |     | 0001-01-01 00:00:00 |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_application-token.md b/doc/database/db_application-token.md
index ed9fb6d26e..fd273989f0 100644
--- a/doc/database/db_application-token.md
+++ b/doc/database/db_application-token.md
@@ -2,17 +2,17 @@ Table application-token
 ===========
 OAuth user token
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| application-id |               | int unsigned       | NO  | PRI | NULL |  |    
-| uid            | Owner User id | mediumint unsigned | NO  | PRI | NULL |  |    
-| code           |               | varchar(64)        | NO  |     | NULL |  |    
-| access_token   |               | varchar(64)        | NO  |     | NULL |  |    
-| created_at     | creation time | datetime           | NO  |     | NULL |  |    
-| scopes         |               | varchar(255)       | YES |     | NULL |  |    
-| read           | Read scope    | boolean            | YES |     | NULL |  |    
-| write          | Write scope   | boolean            | YES |     | NULL |  |    
-| follow         | Follow scope  | boolean            | YES |     | NULL |  |    
-| push           | Push scope    | boolean            | YES |     | NULL |  |    
+| Field          | Description   | Type               | Null | Key | Default | Extra |    
+| -------------- | ------------- | ------------------ | ---- | --- | ------- | ----- |    
+| application-id |               | int unsigned       | NO   | PRI | NULL    |       |    
+| uid            | Owner User id | mediumint unsigned | NO   | PRI | NULL    |       |    
+| code           |               | varchar(64)        | NO   |     | NULL    |       |    
+| access_token   |               | varchar(64)        | NO   |     | NULL    |       |    
+| created_at     | creation time | datetime           | NO   |     | NULL    |       |    
+| scopes         |               | varchar(255)       | YES  |     | NULL    |       |    
+| read           | Read scope    | boolean            | YES  |     | NULL    |       |    
+| write          | Write scope   | boolean            | YES  |     | NULL    |       |    
+| follow         | Follow scope  | boolean            | YES  |     | NULL    |       |    
+| push           | Push scope    | boolean            | YES  |     | NULL    |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_application.md b/doc/database/db_application.md
index 65281f394f..3206d03be3 100644
--- a/doc/database/db_application.md
+++ b/doc/database/db_application.md
@@ -2,18 +2,18 @@ Table application
 ===========
 OAuth application
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id            | generated index | int unsigned | NO  | PRI | NULL | auto_increment |    
-| client_id     |                 | varchar(64)  | NO  |     | NULL |                |    
-| client_secret |                 | varchar(64)  | NO  |     | NULL |                |    
-| name          |                 | varchar(255) | NO  |     | NULL |                |    
-| redirect_uri  |                 | varchar(255) | NO  |     | NULL |                |    
-| website       |                 | varchar(255) | YES |     | NULL |                |    
-| scopes        |                 | varchar(255) | YES |     | NULL |                |    
-| read          | Read scope      | boolean      | YES |     | NULL |                |    
-| write         | Write scope     | boolean      | YES |     | NULL |                |    
-| follow        | Follow scope    | boolean      | YES |     | NULL |                |    
-| push          | Push scope      | boolean      | YES |     | NULL |                |    
+| Field         | Description     | Type         | Null | Key | Default | Extra          |    
+| ------------- | --------------- | ------------ | ---- | --- | ------- | -------------- |    
+| id            | generated index | int unsigned | NO   | PRI | NULL    | auto_increment |    
+| client_id     |                 | varchar(64)  | NO   |     | NULL    |                |    
+| client_secret |                 | varchar(64)  | NO   |     | NULL    |                |    
+| name          |                 | varchar(255) | NO   |     | NULL    |                |    
+| redirect_uri  |                 | varchar(255) | NO   |     | NULL    |                |    
+| website       |                 | varchar(255) | YES  |     | NULL    |                |    
+| scopes        |                 | varchar(255) | YES  |     | NULL    |                |    
+| read          | Read scope      | boolean      | YES  |     | NULL    |                |    
+| write         | Write scope     | boolean      | YES  |     | NULL    |                |    
+| follow        | Follow scope    | boolean      | YES  |     | NULL    |                |    
+| push          | Push scope      | boolean      | YES  |     | NULL    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_attach.md b/doc/database/db_attach.md
index 4e02b599ed..95f736def6 100644
--- a/doc/database/db_attach.md
+++ b/doc/database/db_attach.md
@@ -2,22 +2,22 @@ Table attach
 ===========
 file attachments
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id            | generated index                                       | int unsigned       | NO  | PRI | NULL                | auto_increment |    
-| uid           | Owner User id                                         | mediumint unsigned | NO  |     | 0                   |                |    
-| hash          | hash                                                  | varchar(64)        | NO  |     |                     |                |    
-| filename      | filename of original                                  | varchar(255)       | NO  |     |                     |                |    
-| filetype      | mimetype                                              | varchar(64)        | NO  |     |                     |                |    
-| filesize      | size in bytes                                         | int unsigned       | NO  |     | 0                   |                |    
-| data          | file data                                             | longblob           | NO  |     | NULL                |                |    
-| created       | creation time                                         | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| edited        | last edit time                                        | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| allow_cid     | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt; | mediumtext         | YES |     | NULL                |                |    
-| allow_gid     | Access Control - list of allowed groups               | mediumtext         | YES |     | NULL                |                |    
-| deny_cid      | Access Control - list of denied contact.id            | mediumtext         | YES |     | NULL                |                |    
-| deny_gid      | Access Control - list of denied groups                | mediumtext         | YES |     | NULL                |                |    
-| backend-class | Storage backend class                                 | tinytext           | YES |     | NULL                |                |    
-| backend-ref   | Storage backend data reference                        | text               | YES |     | NULL                |                |    
+| Field         | Description                                           | Type               | Null | Key | Default             | Extra          |    
+| ------------- | ----------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
+| id            | generated index                                       | int unsigned       | NO   | PRI | NULL                | auto_increment |    
+| uid           | Owner User id                                         | mediumint unsigned | NO   |     | 0                   |                |    
+| hash          | hash                                                  | varchar(64)        | NO   |     |                     |                |    
+| filename      | filename of original                                  | varchar(255)       | NO   |     |                     |                |    
+| filetype      | mimetype                                              | varchar(64)        | NO   |     |                     |                |    
+| filesize      | size in bytes                                         | int unsigned       | NO   |     | 0                   |                |    
+| data          | file data                                             | longblob           | NO   |     | NULL                |                |    
+| created       | creation time                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| edited        | last edit time                                        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| allow_cid     | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt; | mediumtext         | YES  |     | NULL                |                |    
+| allow_gid     | Access Control - list of allowed groups               | mediumtext         | YES  |     | NULL                |                |    
+| deny_cid      | Access Control - list of denied contact.id            | mediumtext         | YES  |     | NULL                |                |    
+| deny_gid      | Access Control - list of denied groups                | mediumtext         | YES  |     | NULL                |                |    
+| backend-class | Storage backend class                                 | tinytext           | YES  |     | NULL                |                |    
+| backend-ref   | Storage backend data reference                        | text               | YES  |     | NULL                |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_auth_codes.md b/doc/database/db_auth_codes.md
index d7ab8640b7..91d611069f 100644
--- a/doc/database/db_auth_codes.md
+++ b/doc/database/db_auth_codes.md
@@ -2,12 +2,12 @@ Table auth_codes
 ===========
 OAuth usage
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id           |  | varchar(40)  | NO | PRI | NULL |  |    
-| client_id    |  | varchar(20)  | NO |     |      |  |    
-| redirect_uri |  | varchar(200) | NO |     |      |  |    
-| expires      |  | int          | NO |     | 0    |  |    
-| scope        |  | varchar(250) | NO |     |      |  |    
+| Field        | Description | Type         | Null | Key | Default | Extra |    
+| ------------ | ----------- | ------------ | ---- | --- | ------- | ----- |    
+| id           |             | varchar(40)  | NO   | PRI | NULL    |       |    
+| client_id    |             | varchar(20)  | NO   |     |         |       |    
+| redirect_uri |             | varchar(200) | NO   |     |         |       |    
+| expires      |             | int          | NO   |     | 0       |       |    
+| scope        |             | varchar(250) | NO   |     |         |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_cache.md b/doc/database/db_cache.md
index 08ef1479b9..42a2045e11 100644
--- a/doc/database/db_cache.md
+++ b/doc/database/db_cache.md
@@ -2,11 +2,11 @@ Table cache
 ===========
 Stores temporary data
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| k       | cache key                    | varbinary(255) | NO  | PRI | NULL                |  |    
-| v       | cached serialized value      | mediumtext     | YES |     | NULL                |  |    
-| expires | datetime of cache expiration | datetime       | NO  |     | 0001-01-01 00:00:00 |  |    
-| updated | datetime of cache insertion  | datetime       | NO  |     | 0001-01-01 00:00:00 |  |    
+| Field   | Description                  | Type           | Null | Key | Default             | Extra |    
+| ------- | ---------------------------- | -------------- | ---- | --- | ------------------- | ----- |    
+| k       | cache key                    | varbinary(255) | NO   | PRI | NULL                |       |    
+| v       | cached serialized value      | mediumtext     | YES  |     | NULL                |       |    
+| expires | datetime of cache expiration | datetime       | NO   |     | 0001-01-01 00:00:00 |       |    
+| updated | datetime of cache insertion  | datetime       | NO   |     | 0001-01-01 00:00:00 |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_challenge.md b/doc/database/db_challenge.md
index 12746056e5..0b7653e694 100644
--- a/doc/database/db_challenge.md
+++ b/doc/database/db_challenge.md
@@ -2,13 +2,13 @@ Table challenge
 ===========
 
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id          | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| challenge   |               | varchar(255) | NO |     |      |                |    
-| dfrn-id     |               | varchar(255) | NO |     |      |                |    
-| expire      |               | int unsigned | NO |     | 0    |                |    
-| type        |               | varchar(255) | NO |     |      |                |    
-| last_update |               | varchar(255) | NO |     |      |                |    
+| Field       | Description   | Type         | Null | Key | Default | Extra          |    
+| ----------- | ------------- | ------------ | ---- | --- | ------- | -------------- |    
+| id          | sequential ID | int unsigned | NO   | PRI | NULL    | auto_increment |    
+| challenge   |               | varchar(255) | NO   |     |         |                |    
+| dfrn-id     |               | varchar(255) | NO   |     |         |                |    
+| expire      |               | int unsigned | NO   |     | 0       |                |    
+| type        |               | varchar(255) | NO   |     |         |                |    
+| last_update |               | varchar(255) | NO   |     |         |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_clients.md b/doc/database/db_clients.md
index 631cb65392..b354e2b58c 100644
--- a/doc/database/db_clients.md
+++ b/doc/database/db_clients.md
@@ -2,13 +2,13 @@ Table clients
 ===========
 OAuth usage
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| client_id    |         | varchar(20)        | NO  | PRI | NULL |  |    
-| pw           |         | varchar(20)        | NO  |     |      |  |    
-| redirect_uri |         | varchar(200)       | NO  |     |      |  |    
-| name         |         | text               | YES |     | NULL |  |    
-| icon         |         | text               | YES |     | NULL |  |    
-| uid          | User id | mediumint unsigned | NO  |     | 0    |  |    
+| Field        | Description | Type               | Null | Key | Default | Extra |    
+| ------------ | ----------- | ------------------ | ---- | --- | ------- | ----- |    
+| client_id    |             | varchar(20)        | NO   | PRI | NULL    |       |    
+| pw           |             | varchar(20)        | NO   |     |         |       |    
+| redirect_uri |             | varchar(200)       | NO   |     |         |       |    
+| name         |             | text               | YES  |     | NULL    |       |    
+| icon         |             | text               | YES  |     | NULL    |       |    
+| uid          | User id     | mediumint unsigned | NO   |     | 0       |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_config.md b/doc/database/db_config.md
index ce4fe46249..fcd1c93bf0 100644
--- a/doc/database/db_config.md
+++ b/doc/database/db_config.md
@@ -2,11 +2,11 @@ Table config
 ===========
 main configuration storage
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id  |  | int unsigned  | NO  | PRI | NULL | auto_increment |    
-| cat |  | varbinary(50) | NO  |     |      |                |    
-| k   |  | varbinary(50) | NO  |     |      |                |    
-| v   |  | mediumtext    | YES |     | NULL |                |    
+| Field | Description | Type          | Null | Key | Default | Extra          |    
+| ----- | ----------- | ------------- | ---- | --- | ------- | -------------- |    
+| id    |             | int unsigned  | NO   | PRI | NULL    | auto_increment |    
+| cat   |             | varbinary(50) | NO   |     |         |                |    
+| k     |             | varbinary(50) | NO   |     |         |                |    
+| v     |             | mediumtext    | YES  |     | NULL    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_contact-relation.md b/doc/database/db_contact-relation.md
index 80cd9db1fb..82b90f79e2 100644
--- a/doc/database/db_contact-relation.md
+++ b/doc/database/db_contact-relation.md
@@ -2,12 +2,12 @@ Table contact-relation
 ===========
 Contact relations
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| cid              | contact the related contact had interacted with     | int unsigned | NO | PRI | 0                   |  |    
-| relation-cid     | related contact who had interacted with the contact | int unsigned | NO | PRI | 0                   |  |    
-| last-interaction | Date of the last interaction                        | datetime     | NO |     | 0001-01-01 00:00:00 |  |    
-| follow-updated   | Date of the last update of the contact relationship | datetime     | NO |     | 0001-01-01 00:00:00 |  |    
-| follows          |                                                     | boolean      | NO |     | 0                   |  |    
+| Field            | Description                                         | Type         | Null | Key | Default             | Extra |    
+| ---------------- | --------------------------------------------------- | ------------ | ---- | --- | ------------------- | ----- |    
+| cid              | contact the related contact had interacted with     | int unsigned | NO   | PRI | 0                   |       |    
+| relation-cid     | related contact who had interacted with the contact | int unsigned | NO   | PRI | 0                   |       |    
+| last-interaction | Date of the last interaction                        | datetime     | NO   |     | 0001-01-01 00:00:00 |       |    
+| follow-updated   | Date of the last update of the contact relationship | datetime     | NO   |     | 0001-01-01 00:00:00 |       |    
+| follows          |                                                     | boolean      | NO   |     | 0                   |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_contact.md b/doc/database/db_contact.md
index 1343488799..2d89f5172d 100644
--- a/doc/database/db_contact.md
+++ b/doc/database/db_contact.md
@@ -2,87 +2,87 @@ Table contact
 ===========
 contact table
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id                        | sequential ID                                             | int unsigned       | NO  | PRI | NULL                | auto_increment |    
-| uid                       | Owner User id                                             | mediumint unsigned | NO  |     | 0                   |                |    
-| created                   |                                                           | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| updated                   | Date of last contact update                               | datetime           | YES |     | 0001-01-01 00:00:00 |                |    
-| self                      | 1 if the contact is the user him/her self                 | boolean            | NO  |     | 0                   |                |    
-| remote_self               |                                                           | boolean            | NO  |     | 0                   |                |    
-| rel                       | The kind of the relation between the user and the contact | tinyint unsigned   | NO  |     | 0                   |                |    
-| duplex                    |                                                           | boolean            | NO  |     | 0                   |                |    
-| network                   | Network of the contact                                    | char(4)            | NO  |     |                     |                |    
-| protocol                  | Protocol of the contact                                   | char(4)            | NO  |     |                     |                |    
-| name                      | Name that this contact is known by                        | varchar(255)       | NO  |     |                     |                |    
-| nick                      | Nick- and user name of the contact                        | varchar(255)       | NO  |     |                     |                |    
-| location                  |                                                           | varchar(255)       | YES |     |                     |                |    
-| about                     |                                                           | text               | YES |     | NULL                |                |    
-| keywords                  | public keywords (interests) of the contact                | text               | YES |     | NULL                |                |    
-| gender                    | Deprecated                                                | varchar(32)        | NO  |     |                     |                |    
-| xmpp                      |                                                           | varchar(255)       | NO  |     |                     |                |    
-| attag                     |                                                           | varchar(255)       | NO  |     |                     |                |    
-| avatar                    |                                                           | varchar(255)       | NO  |     |                     |                |    
-| photo                     | Link to the profile photo of the contact                  | varchar(255)       | YES |     |                     |                |    
-| thumb                     | Link to the profile photo (thumb size)                    | varchar(255)       | YES |     |                     |                |    
-| micro                     | Link to the profile photo (micro size)                    | varchar(255)       | YES |     |                     |                |    
-| site-pubkey               |                                                           | text               | YES |     | NULL                |                |    
-| issued-id                 |                                                           | varchar(255)       | NO  |     |                     |                |    
-| dfrn-id                   |                                                           | varchar(255)       | NO  |     |                     |                |    
-| url                       |                                                           | varchar(255)       | NO  |     |                     |                |    
-| nurl                      |                                                           | varchar(255)       | NO  |     |                     |                |    
-| addr                      |                                                           | varchar(255)       | NO  |     |                     |                |    
-| alias                     |                                                           | varchar(255)       | NO  |     |                     |                |    
-| pubkey                    | RSA public key 4096 bit                                   | text               | YES |     | NULL                |                |    
-| prvkey                    | RSA private key 4096 bit                                  | text               | YES |     | NULL                |                |    
-| batch                     |                                                           | varchar(255)       | NO  |     |                     |                |    
-| request                   |                                                           | varchar(255)       | YES |     | NULL                |                |    
-| notify                    |                                                           | varchar(255)       | YES |     | NULL                |                |    
-| poll                      |                                                           | varchar(255)       | YES |     | NULL                |                |    
-| confirm                   |                                                           | varchar(255)       | YES |     | NULL                |                |    
-| subscribe                 |                                                           | varchar(255)       | YES |     | NULL                |                |    
-| poco                      |                                                           | varchar(255)       | YES |     | NULL                |                |    
-| aes_allow                 |                                                           | boolean            | NO  |     | 0                   |                |    
-| ret-aes                   |                                                           | boolean            | NO  |     | 0                   |                |    
-| usehub                    |                                                           | boolean            | NO  |     | 0                   |                |    
-| subhub                    |                                                           | boolean            | NO  |     | 0                   |                |    
-| hub-verify                |                                                           | varchar(255)       | NO  |     |                     |                |    
-| last-update               | Date of the last try to update the contact info           | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| success_update            | Date of the last successful contact update                | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| failure_update            | Date of the last failed update                            | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| failed                    | Connection failed                                         | boolean            | YES |     | NULL                |                |    
-| name-date                 |                                                           | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| uri-date                  |                                                           | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| avatar-date               |                                                           | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| term-date                 |                                                           | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| last-item                 | date of the last post                                     | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| last-discovery            | date of the last follower discovery                       | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| priority                  |                                                           | tinyint unsigned   | NO  |     | 0                   |                |    
-| blocked                   | Node-wide block status                                    | boolean            | NO  |     | 1                   |                |    
-| block_reason              | Node-wide block reason                                    | text               | YES |     | NULL                |                |    
-| readonly                  | posts of the contact are readonly                         | boolean            | NO  |     | 0                   |                |    
-| writable                  |                                                           | boolean            | NO  |     | 0                   |                |    
-| forum                     | contact is a forum                                        | boolean            | NO  |     | 0                   |                |    
-| prv                       | contact is a private group                                | boolean            | NO  |     | 0                   |                |    
-| contact-type              |                                                           | tinyint            | NO  |     | 0                   |                |    
-| manually-approve          |                                                           | boolean            | YES |     | NULL                |                |    
-| hidden                    |                                                           | boolean            | NO  |     | 0                   |                |    
-| archive                   |                                                           | boolean            | NO  |     | 0                   |                |    
-| pending                   |                                                           | boolean            | NO  |     | 1                   |                |    
-| deleted                   | Contact has been deleted                                  | boolean            | NO  |     | 0                   |                |    
-| rating                    |                                                           | tinyint            | NO  |     | 0                   |                |    
-| unsearchable              | Contact prefers to not be searchable                      | boolean            | NO  |     | 0                   |                |    
-| sensitive                 | Contact posts sensitive content                           | boolean            | NO  |     | 0                   |                |    
-| baseurl                   | baseurl of the contact                                    | varchar(255)       | YES |     |                     |                |    
-| gsid                      | Global Server ID                                          | int unsigned       | YES |     | NULL                |                |    
-| reason                    |                                                           | text               | YES |     | NULL                |                |    
-| closeness                 |                                                           | tinyint unsigned   | NO  |     | 99                  |                |    
-| info                      |                                                           | mediumtext         | YES |     | NULL                |                |    
-| profile-id                | Deprecated                                                | int unsigned       | YES |     | NULL                |                |    
-| bdyear                    |                                                           | varchar(4)         | NO  |     |                     |                |    
-| bd                        |                                                           | date               | NO  |     | 0001-01-01          |                |    
-| notify_new_posts          |                                                           | boolean            | NO  |     | 0                   |                |    
-| fetch_further_information |                                                           | tinyint unsigned   | NO  |     | 0                   |                |    
-| ffi_keyword_denylist      |                                                           | text               | YES |     | NULL                |                |    
+| Field                     | Description                                               | Type               | Null | Key | Default             | Extra          |    
+| ------------------------- | --------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
+| id                        | sequential ID                                             | int unsigned       | NO   | PRI | NULL                | auto_increment |    
+| uid                       | Owner User id                                             | mediumint unsigned | NO   |     | 0                   |                |    
+| created                   |                                                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| updated                   | Date of last contact update                               | datetime           | YES  |     | 0001-01-01 00:00:00 |                |    
+| self                      | 1 if the contact is the user him/her self                 | boolean            | NO   |     | 0                   |                |    
+| remote_self               |                                                           | boolean            | NO   |     | 0                   |                |    
+| rel                       | The kind of the relation between the user and the contact | tinyint unsigned   | NO   |     | 0                   |                |    
+| duplex                    |                                                           | boolean            | NO   |     | 0                   |                |    
+| network                   | Network of the contact                                    | char(4)            | NO   |     |                     |                |    
+| protocol                  | Protocol of the contact                                   | char(4)            | NO   |     |                     |                |    
+| name                      | Name that this contact is known by                        | varchar(255)       | NO   |     |                     |                |    
+| nick                      | Nick- and user name of the contact                        | varchar(255)       | NO   |     |                     |                |    
+| location                  |                                                           | varchar(255)       | YES  |     |                     |                |    
+| about                     |                                                           | text               | YES  |     | NULL                |                |    
+| keywords                  | public keywords (interests) of the contact                | text               | YES  |     | NULL                |                |    
+| gender                    | Deprecated                                                | varchar(32)        | NO   |     |                     |                |    
+| xmpp                      |                                                           | varchar(255)       | NO   |     |                     |                |    
+| attag                     |                                                           | varchar(255)       | NO   |     |                     |                |    
+| avatar                    |                                                           | varchar(255)       | NO   |     |                     |                |    
+| photo                     | Link to the profile photo of the contact                  | varchar(255)       | YES  |     |                     |                |    
+| thumb                     | Link to the profile photo (thumb size)                    | varchar(255)       | YES  |     |                     |                |    
+| micro                     | Link to the profile photo (micro size)                    | varchar(255)       | YES  |     |                     |                |    
+| site-pubkey               |                                                           | text               | YES  |     | NULL                |                |    
+| issued-id                 |                                                           | varchar(255)       | NO   |     |                     |                |    
+| dfrn-id                   |                                                           | varchar(255)       | NO   |     |                     |                |    
+| url                       |                                                           | varchar(255)       | NO   |     |                     |                |    
+| nurl                      |                                                           | varchar(255)       | NO   |     |                     |                |    
+| addr                      |                                                           | varchar(255)       | NO   |     |                     |                |    
+| alias                     |                                                           | varchar(255)       | NO   |     |                     |                |    
+| pubkey                    | RSA public key 4096 bit                                   | text               | YES  |     | NULL                |                |    
+| prvkey                    | RSA private key 4096 bit                                  | text               | YES  |     | NULL                |                |    
+| batch                     |                                                           | varchar(255)       | NO   |     |                     |                |    
+| request                   |                                                           | varchar(255)       | YES  |     | NULL                |                |    
+| notify                    |                                                           | varchar(255)       | YES  |     | NULL                |                |    
+| poll                      |                                                           | varchar(255)       | YES  |     | NULL                |                |    
+| confirm                   |                                                           | varchar(255)       | YES  |     | NULL                |                |    
+| subscribe                 |                                                           | varchar(255)       | YES  |     | NULL                |                |    
+| poco                      |                                                           | varchar(255)       | YES  |     | NULL                |                |    
+| aes_allow                 |                                                           | boolean            | NO   |     | 0                   |                |    
+| ret-aes                   |                                                           | boolean            | NO   |     | 0                   |                |    
+| usehub                    |                                                           | boolean            | NO   |     | 0                   |                |    
+| subhub                    |                                                           | boolean            | NO   |     | 0                   |                |    
+| hub-verify                |                                                           | varchar(255)       | NO   |     |                     |                |    
+| last-update               | Date of the last try to update the contact info           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| success_update            | Date of the last successful contact update                | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| failure_update            | Date of the last failed update                            | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| failed                    | Connection failed                                         | boolean            | YES  |     | NULL                |                |    
+| name-date                 |                                                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| uri-date                  |                                                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| avatar-date               |                                                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| term-date                 |                                                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| last-item                 | date of the last post                                     | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| last-discovery            | date of the last follower discovery                       | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| priority                  |                                                           | tinyint unsigned   | NO   |     | 0                   |                |    
+| blocked                   | Node-wide block status                                    | boolean            | NO   |     | 1                   |                |    
+| block_reason              | Node-wide block reason                                    | text               | YES  |     | NULL                |                |    
+| readonly                  | posts of the contact are readonly                         | boolean            | NO   |     | 0                   |                |    
+| writable                  |                                                           | boolean            | NO   |     | 0                   |                |    
+| forum                     | contact is a forum                                        | boolean            | NO   |     | 0                   |                |    
+| prv                       | contact is a private group                                | boolean            | NO   |     | 0                   |                |    
+| contact-type              |                                                           | tinyint            | NO   |     | 0                   |                |    
+| manually-approve          |                                                           | boolean            | YES  |     | NULL                |                |    
+| hidden                    |                                                           | boolean            | NO   |     | 0                   |                |    
+| archive                   |                                                           | boolean            | NO   |     | 0                   |                |    
+| pending                   |                                                           | boolean            | NO   |     | 1                   |                |    
+| deleted                   | Contact has been deleted                                  | boolean            | NO   |     | 0                   |                |    
+| rating                    |                                                           | tinyint            | NO   |     | 0                   |                |    
+| unsearchable              | Contact prefers to not be searchable                      | boolean            | NO   |     | 0                   |                |    
+| sensitive                 | Contact posts sensitive content                           | boolean            | NO   |     | 0                   |                |    
+| baseurl                   | baseurl of the contact                                    | varchar(255)       | YES  |     |                     |                |    
+| gsid                      | Global Server ID                                          | int unsigned       | YES  |     | NULL                |                |    
+| reason                    |                                                           | text               | YES  |     | NULL                |                |    
+| closeness                 |                                                           | tinyint unsigned   | NO   |     | 99                  |                |    
+| info                      |                                                           | mediumtext         | YES  |     | NULL                |                |    
+| profile-id                | Deprecated                                                | int unsigned       | YES  |     | NULL                |                |    
+| bdyear                    |                                                           | varchar(4)         | NO   |     |                     |                |    
+| bd                        |                                                           | date               | NO   |     | 0001-01-01          |                |    
+| notify_new_posts          |                                                           | boolean            | NO   |     | 0                   |                |    
+| fetch_further_information |                                                           | tinyint unsigned   | NO   |     | 0                   |                |    
+| ffi_keyword_denylist      |                                                           | text               | YES  |     | NULL                |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_conv.md b/doc/database/db_conv.md
index 72ea495901..8cf835b7e3 100644
--- a/doc/database/db_conv.md
+++ b/doc/database/db_conv.md
@@ -2,15 +2,15 @@ Table conv
 ===========
 private messages
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id      | sequential ID                             | int unsigned       | NO  | PRI | NULL                | auto_increment |    
-| guid    | A unique identifier for this conversation | varchar(255)       | NO  |     |                     |                |    
-| recips  | sender_handle;recipient_handle            | text               | YES |     | NULL                |                |    
-| uid     | Owner User id                             | mediumint unsigned | NO  |     | 0                   |                |    
-| creator | handle of creator                         | varchar(255)       | NO  |     |                     |                |    
-| created | creation timestamp                        | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| updated | edited timestamp                          | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| subject | subject of initial message                | text               | YES |     | NULL                |                |    
+| Field   | Description                               | Type               | Null | Key | Default             | Extra          |    
+| ------- | ----------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
+| id      | sequential ID                             | int unsigned       | NO   | PRI | NULL                | auto_increment |    
+| guid    | A unique identifier for this conversation | varchar(255)       | NO   |     |                     |                |    
+| recips  | sender_handle;recipient_handle            | text               | YES  |     | NULL                |                |    
+| uid     | Owner User id                             | mediumint unsigned | NO   |     | 0                   |                |    
+| creator | handle of creator                         | varchar(255)       | NO   |     |                     |                |    
+| created | creation timestamp                        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| updated | edited timestamp                          | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| subject | subject of initial message                | text               | YES  |     | NULL                |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_conversation.md b/doc/database/db_conversation.md
index 212d2a76e3..5e62f21b11 100644
--- a/doc/database/db_conversation.md
+++ b/doc/database/db_conversation.md
@@ -2,15 +2,15 @@ Table conversation
 ===========
 Raw data and structure information for messages
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| item-uri          | Original URI of the item - unrelated to the table with the same name | varbinary(255)   | NO  | PRI | NULL                |  |    
-| reply-to-uri      | URI to which this item is a reply                                    | varbinary(255)   | NO  |     |                     |  |    
-| conversation-uri  | GNU Social conversation URI                                          | varbinary(255)   | NO  |     |                     |  |    
-| conversation-href | GNU Social conversation link                                         | varbinary(255)   | NO  |     |                     |  |    
-| protocol          | The protocol of the item                                             | tinyint unsigned | NO  |     | 255                 |  |    
-| direction         | How the message arrived here: 1=push, 2=pull                         | tinyint unsigned | NO  |     | 0                   |  |    
-| source            | Original source                                                      | mediumtext       | YES |     | NULL                |  |    
-| received          | Receiving date                                                       | datetime         | NO  |     | 0001-01-01 00:00:00 |  |    
+| Field             | Description                                                          | Type             | Null | Key | Default             | Extra |    
+| ----------------- | -------------------------------------------------------------------- | ---------------- | ---- | --- | ------------------- | ----- |    
+| item-uri          | Original URI of the item - unrelated to the table with the same name | varbinary(255)   | NO   | PRI | NULL                |       |    
+| reply-to-uri      | URI to which this item is a reply                                    | varbinary(255)   | NO   |     |                     |       |    
+| conversation-uri  | GNU Social conversation URI                                          | varbinary(255)   | NO   |     |                     |       |    
+| conversation-href | GNU Social conversation link                                         | varbinary(255)   | NO   |     |                     |       |    
+| protocol          | The protocol of the item                                             | tinyint unsigned | NO   |     | 255                 |       |    
+| direction         | How the message arrived here: 1=push, 2=pull                         | tinyint unsigned | NO   |     | 0                   |       |    
+| source            | Original source                                                      | mediumtext       | YES  |     | NULL                |       |    
+| received          | Receiving date                                                       | datetime         | NO   |     | 0001-01-01 00:00:00 |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_delayed-post.md b/doc/database/db_delayed-post.md
index ab79f557a4..cdf9b7d571 100644
--- a/doc/database/db_delayed-post.md
+++ b/doc/database/db_delayed-post.md
@@ -2,11 +2,11 @@ Table delayed-post
 ===========
 Posts that are about to be distributed at a later time
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id      |                                                | int unsigned       | NO  | PRI | NULL | auto_increment |    
-| uri     | URI of the post that will be distributed later | varchar(255)       | YES |     | NULL |                |    
-| uid     | Owner User id                                  | mediumint unsigned | YES |     | NULL |                |    
-| delayed | delay time                                     | datetime           | YES |     | NULL |                |    
+| Field   | Description                                    | Type               | Null | Key | Default | Extra          |    
+| ------- | ---------------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |    
+| id      |                                                | int unsigned       | NO   | PRI | NULL    | auto_increment |    
+| uri     | URI of the post that will be distributed later | varchar(255)       | YES  |     | NULL    |                |    
+| uid     | Owner User id                                  | mediumint unsigned | YES  |     | NULL    |                |    
+| delayed | delay time                                     | datetime           | YES  |     | NULL    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_diaspora-interaction.md b/doc/database/db_diaspora-interaction.md
index 80bd5f196b..0300be72a4 100644
--- a/doc/database/db_diaspora-interaction.md
+++ b/doc/database/db_diaspora-interaction.md
@@ -2,9 +2,9 @@ Table diaspora-interaction
 ===========
 Signed Diaspora Interaction
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id      | Id of the item-uri table entry that contains the item uri | int unsigned | NO  | PRI | NULL |  |    
-| interaction | The Diaspora interaction                                  | mediumtext   | YES |     | NULL |  |    
+| Field       | Description                                               | Type         | Null | Key | Default | Extra |    
+| ----------- | --------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |    
+| uri-id      | Id of the item-uri table entry that contains the item uri | int unsigned | NO   | PRI | NULL    |       |    
+| interaction | The Diaspora interaction                                  | mediumtext   | YES  |     | NULL    |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_event.md b/doc/database/db_event.md
index a227b78dbc..69c4d76b9e 100644
--- a/doc/database/db_event.md
+++ b/doc/database/db_event.md
@@ -2,27 +2,27 @@ Table event
 ===========
 Events
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id        | sequential ID                                          | int unsigned       | NO  | PRI | NULL                | auto_increment |    
-| guid      |                                                        | varchar(255)       | NO  |     |                     |                |    
-| uid       | Owner User id                                          | mediumint unsigned | NO  |     | 0                   |                |    
-| cid       | contact_id (ID of the contact in contact table)        | int unsigned       | NO  |     | 0                   |                |    
-| uri       |                                                        | varchar(255)       | NO  |     |                     |                |    
-| created   | creation time                                          | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| edited    | last edit time                                         | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| start     | event start time                                       | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| finish    | event end time                                         | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| summary   | short description or title of the event                | text               | YES |     | NULL                |                |    
-| desc      | event description                                      | text               | YES |     | NULL                |                |    
-| location  | event location                                         | text               | YES |     | NULL                |                |    
-| type      | event or birthday                                      | varchar(20)        | NO  |     |                     |                |    
-| nofinish  | if event does have no end this is 1                    | boolean            | NO  |     | 0                   |                |    
-| adjust    | adjust to timezone of the recipient (0 or 1)           | boolean            | NO  |     | 1                   |                |    
-| ignore    | 0 or 1                                                 | boolean            | NO  |     | 0                   |                |    
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES |     | NULL                |                |    
-| allow_gid | Access Control - list of allowed groups                | mediumtext         | YES |     | NULL                |                |    
-| deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES |     | NULL                |                |    
-| deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES |     | NULL                |                |    
+| Field     | Description                                            | Type               | Null | Key | Default             | Extra          |    
+| --------- | ------------------------------------------------------ | ------------------ | ---- | --- | ------------------- | -------------- |    
+| id        | sequential ID                                          | int unsigned       | NO   | PRI | NULL                | auto_increment |    
+| guid      |                                                        | varchar(255)       | NO   |     |                     |                |    
+| uid       | Owner User id                                          | mediumint unsigned | NO   |     | 0                   |                |    
+| cid       | contact_id (ID of the contact in contact table)        | int unsigned       | NO   |     | 0                   |                |    
+| uri       |                                                        | varchar(255)       | NO   |     |                     |                |    
+| created   | creation time                                          | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| edited    | last edit time                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| start     | event start time                                       | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| finish    | event end time                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| summary   | short description or title of the event                | text               | YES  |     | NULL                |                |    
+| desc      | event description                                      | text               | YES  |     | NULL                |                |    
+| location  | event location                                         | text               | YES  |     | NULL                |                |    
+| type      | event or birthday                                      | varchar(20)        | NO   |     |                     |                |    
+| nofinish  | if event does have no end this is 1                    | boolean            | NO   |     | 0                   |                |    
+| adjust    | adjust to timezone of the recipient (0 or 1)           | boolean            | NO   |     | 1                   |                |    
+| ignore    | 0 or 1                                                 | boolean            | NO   |     | 0                   |                |    
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES  |     | NULL                |                |    
+| allow_gid | Access Control - list of allowed groups                | mediumtext         | YES  |     | NULL                |                |    
+| deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL                |                |    
+| deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL                |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_fcontact.md b/doc/database/db_fcontact.md
index b1b622a215..84db712f3d 100644
--- a/doc/database/db_fcontact.md
+++ b/doc/database/db_fcontact.md
@@ -2,24 +2,24 @@ Table fcontact
 ===========
 Diaspora compatible contacts - used in the Diaspora implementation
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id       | sequential ID | int unsigned     | NO  | PRI | NULL                | auto_increment |    
-| guid     | unique id     | varchar(255)     | NO  |     |                     |                |    
-| url      |               | varchar(255)     | NO  |     |                     |                |    
-| name     |               | varchar(255)     | NO  |     |                     |                |    
-| photo    |               | varchar(255)     | NO  |     |                     |                |    
-| request  |               | varchar(255)     | NO  |     |                     |                |    
-| nick     |               | varchar(255)     | NO  |     |                     |                |    
-| addr     |               | varchar(255)     | NO  |     |                     |                |    
-| batch    |               | varchar(255)     | NO  |     |                     |                |    
-| notify   |               | varchar(255)     | NO  |     |                     |                |    
-| poll     |               | varchar(255)     | NO  |     |                     |                |    
-| confirm  |               | varchar(255)     | NO  |     |                     |                |    
-| priority |               | tinyint unsigned | NO  |     | 0                   |                |    
-| network  |               | char(4)          | NO  |     |                     |                |    
-| alias    |               | varchar(255)     | NO  |     |                     |                |    
-| pubkey   |               | text             | YES |     | NULL                |                |    
-| updated  |               | datetime         | NO  |     | 0001-01-01 00:00:00 |                |    
+| Field    | Description   | Type             | Null | Key | Default             | Extra          |    
+| -------- | ------------- | ---------------- | ---- | --- | ------------------- | -------------- |    
+| id       | sequential ID | int unsigned     | NO   | PRI | NULL                | auto_increment |    
+| guid     | unique id     | varchar(255)     | NO   |     |                     |                |    
+| url      |               | varchar(255)     | NO   |     |                     |                |    
+| name     |               | varchar(255)     | NO   |     |                     |                |    
+| photo    |               | varchar(255)     | NO   |     |                     |                |    
+| request  |               | varchar(255)     | NO   |     |                     |                |    
+| nick     |               | varchar(255)     | NO   |     |                     |                |    
+| addr     |               | varchar(255)     | NO   |     |                     |                |    
+| batch    |               | varchar(255)     | NO   |     |                     |                |    
+| notify   |               | varchar(255)     | NO   |     |                     |                |    
+| poll     |               | varchar(255)     | NO   |     |                     |                |    
+| confirm  |               | varchar(255)     | NO   |     |                     |                |    
+| priority |               | tinyint unsigned | NO   |     | 0                   |                |    
+| network  |               | char(4)          | NO   |     |                     |                |    
+| alias    |               | varchar(255)     | NO   |     |                     |                |    
+| pubkey   |               | text             | YES  |     | NULL                |                |    
+| updated  |               | datetime         | NO   |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_fsuggest.md b/doc/database/db_fsuggest.md
index 206410ad94..20955acc91 100644
--- a/doc/database/db_fsuggest.md
+++ b/doc/database/db_fsuggest.md
@@ -2,16 +2,16 @@ Table fsuggest
 ===========
 friend suggestion stuff
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id      |         | int unsigned       | NO  | PRI | NULL                | auto_increment |    
-| uid     | User id | mediumint unsigned | NO  |     | 0                   |                |    
-| cid     |         | int unsigned       | NO  |     | 0                   |                |    
-| name    |         | varchar(255)       | NO  |     |                     |                |    
-| url     |         | varchar(255)       | NO  |     |                     |                |    
-| request |         | varchar(255)       | NO  |     |                     |                |    
-| photo   |         | varchar(255)       | NO  |     |                     |                |    
-| note    |         | text               | YES |     | NULL                |                |    
-| created |         | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| Field   | Description | Type               | Null | Key | Default             | Extra          |    
+| ------- | ----------- | ------------------ | ---- | --- | ------------------- | -------------- |    
+| id      |             | int unsigned       | NO   | PRI | NULL                | auto_increment |    
+| uid     | User id     | mediumint unsigned | NO   |     | 0                   |                |    
+| cid     |             | int unsigned       | NO   |     | 0                   |                |    
+| name    |             | varchar(255)       | NO   |     |                     |                |    
+| url     |             | varchar(255)       | NO   |     |                     |                |    
+| request |             | varchar(255)       | NO   |     |                     |                |    
+| photo   |             | varchar(255)       | NO   |     |                     |                |    
+| note    |             | text               | YES  |     | NULL                |                |    
+| created |             | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_group.md b/doc/database/db_group.md
index 11e6d667c7..d81148bd64 100644
--- a/doc/database/db_group.md
+++ b/doc/database/db_group.md
@@ -2,12 +2,12 @@ Table group
 ===========
 privacy groups, group info
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id      | sequential ID                              | int unsigned       | NO | PRI | NULL | auto_increment |    
-| uid     | Owner User id                              | mediumint unsigned | NO |     | 0    |                |    
-| visible | 1 indicates the member list is not private | boolean            | NO |     | 0    |                |    
-| deleted | 1 indicates the group has been deleted     | boolean            | NO |     | 0    |                |    
-| name    | human readable name of group               | varchar(255)       | NO |     |      |                |    
+| Field   | Description                                | Type               | Null | Key | Default | Extra          |    
+| ------- | ------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |    
+| id      | sequential ID                              | int unsigned       | NO   | PRI | NULL    | auto_increment |    
+| uid     | Owner User id                              | mediumint unsigned | NO   |     | 0       |                |    
+| visible | 1 indicates the member list is not private | boolean            | NO   |     | 0       |                |    
+| deleted | 1 indicates the group has been deleted     | boolean            | NO   |     | 0       |                |    
+| name    | human readable name of group               | varchar(255)       | NO   |     |         |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_group_member.md b/doc/database/db_group_member.md
index 0169d276b1..6057c15b42 100644
--- a/doc/database/db_group_member.md
+++ b/doc/database/db_group_member.md
@@ -2,10 +2,10 @@ Table group_member
 ===========
 privacy groups, member info
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id         | sequential ID                                             | int unsigned | NO | PRI | NULL | auto_increment |    
-| gid        | groups.id of the associated group                         | int unsigned | NO |     | 0    |                |    
-| contact-id | contact.id of the member assigned to the associated group | int unsigned | NO |     | 0    |                |    
+| Field      | Description                                               | Type         | Null | Key | Default | Extra          |    
+| ---------- | --------------------------------------------------------- | ------------ | ---- | --- | ------- | -------------- |    
+| id         | sequential ID                                             | int unsigned | NO   | PRI | NULL    | auto_increment |    
+| gid        | groups.id of the associated group                         | int unsigned | NO   |     | 0       |                |    
+| contact-id | contact.id of the member assigned to the associated group | int unsigned | NO   |     | 0       |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_gserver-tag.md b/doc/database/db_gserver-tag.md
index 9631f293ec..47dedeb540 100644
--- a/doc/database/db_gserver-tag.md
+++ b/doc/database/db_gserver-tag.md
@@ -2,9 +2,9 @@ Table gserver-tag
 ===========
 Tags that the server has subscribed
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| gserver-id | The id of the gserver              | int unsigned | NO | PRI | 0 |  |    
-| tag        | Tag that the server has subscribed | varchar(100) | NO | PRI |   |  |    
+| Field      | Description                        | Type         | Null | Key | Default | Extra |    
+| ---------- | ---------------------------------- | ------------ | ---- | --- | ------- | ----- |    
+| gserver-id | The id of the gserver              | int unsigned | NO   | PRI | 0       |       |    
+| tag        | Tag that the server has subscribed | varchar(100) | NO   | PRI |         |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_gserver.md b/doc/database/db_gserver.md
index 220a8a17c8..8be46ba673 100644
--- a/doc/database/db_gserver.md
+++ b/doc/database/db_gserver.md
@@ -2,30 +2,30 @@ Table gserver
 ===========
 Global servers
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id               | sequential ID                                      | int unsigned     | NO  | PRI | NULL                | auto_increment |    
-| url              |                                                    | varchar(255)     | NO  |     |                     |                |    
-| nurl             |                                                    | varchar(255)     | NO  |     |                     |                |    
-| version          |                                                    | varchar(255)     | NO  |     |                     |                |    
-| site_name        |                                                    | varchar(255)     | NO  |     |                     |                |    
-| info             |                                                    | text             | YES |     | NULL                |                |    
-| register_policy  |                                                    | tinyint          | NO  |     | 0                   |                |    
-| registered-users | Number of registered users                         | int unsigned     | NO  |     | 0                   |                |    
-| directory-type   | Type of directory service (Poco, Mastodon)         | tinyint          | YES |     | 0                   |                |    
-| poco             |                                                    | varchar(255)     | NO  |     |                     |                |    
-| noscrape         |                                                    | varchar(255)     | NO  |     |                     |                |    
-| network          |                                                    | char(4)          | NO  |     |                     |                |    
-| protocol         | The protocol of the server                         | tinyint unsigned | YES |     | NULL                |                |    
-| platform         |                                                    | varchar(255)     | NO  |     |                     |                |    
-| relay-subscribe  | Has the server subscribed to the relay system      | boolean          | NO  |     | 0                   |                |    
-| relay-scope      | The scope of messages that the server wants to get | varchar(10)      | NO  |     |                     |                |    
-| detection-method | Method that had been used to detect that server    | tinyint unsigned | YES |     | NULL                |                |    
-| created          |                                                    | datetime         | NO  |     | 0001-01-01 00:00:00 |                |    
-| last_poco_query  |                                                    | datetime         | YES |     | 0001-01-01 00:00:00 |                |    
-| last_contact     | Last successful connection request                 | datetime         | YES |     | 0001-01-01 00:00:00 |                |    
-| last_failure     | Last failed connection request                     | datetime         | YES |     | 0001-01-01 00:00:00 |                |    
-| failed           | Connection failed                                  | boolean          | YES |     | NULL                |                |    
-| next_contact     | Next connection request                            | datetime         | YES |     | 0001-01-01 00:00:00 |                |    
+| Field            | Description                                        | Type             | Null | Key | Default             | Extra          |    
+| ---------------- | -------------------------------------------------- | ---------------- | ---- | --- | ------------------- | -------------- |    
+| id               | sequential ID                                      | int unsigned     | NO   | PRI | NULL                | auto_increment |    
+| url              |                                                    | varchar(255)     | NO   |     |                     |                |    
+| nurl             |                                                    | varchar(255)     | NO   |     |                     |                |    
+| version          |                                                    | varchar(255)     | NO   |     |                     |                |    
+| site_name        |                                                    | varchar(255)     | NO   |     |                     |                |    
+| info             |                                                    | text             | YES  |     | NULL                |                |    
+| register_policy  |                                                    | tinyint          | NO   |     | 0                   |                |    
+| registered-users | Number of registered users                         | int unsigned     | NO   |     | 0                   |                |    
+| directory-type   | Type of directory service (Poco, Mastodon)         | tinyint          | YES  |     | 0                   |                |    
+| poco             |                                                    | varchar(255)     | NO   |     |                     |                |    
+| noscrape         |                                                    | varchar(255)     | NO   |     |                     |                |    
+| network          |                                                    | char(4)          | NO   |     |                     |                |    
+| protocol         | The protocol of the server                         | tinyint unsigned | YES  |     | NULL                |                |    
+| platform         |                                                    | varchar(255)     | NO   |     |                     |                |    
+| relay-subscribe  | Has the server subscribed to the relay system      | boolean          | NO   |     | 0                   |                |    
+| relay-scope      | The scope of messages that the server wants to get | varchar(10)      | NO   |     |                     |                |    
+| detection-method | Method that had been used to detect that server    | tinyint unsigned | YES  |     | NULL                |                |    
+| created          |                                                    | datetime         | NO   |     | 0001-01-01 00:00:00 |                |    
+| last_poco_query  |                                                    | datetime         | YES  |     | 0001-01-01 00:00:00 |                |    
+| last_contact     | Last successful connection request                 | datetime         | YES  |     | 0001-01-01 00:00:00 |                |    
+| last_failure     | Last failed connection request                     | datetime         | YES  |     | 0001-01-01 00:00:00 |                |    
+| failed           | Connection failed                                  | boolean          | YES  |     | NULL                |                |    
+| next_contact     | Next connection request                            | datetime         | YES  |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_hook.md b/doc/database/db_hook.md
index c6b6cf9d0e..75235b31cd 100644
--- a/doc/database/db_hook.md
+++ b/doc/database/db_hook.md
@@ -2,12 +2,12 @@ Table hook
 ===========
 addon hook registry
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id       | sequential ID                                                                                              | int unsigned      | NO | PRI | NULL | auto_increment |    
-| hook     | name of hook                                                                                               | varbinary(100)    | NO |     |      |                |    
-| file     | relative filename of hook handler                                                                          | varbinary(200)    | NO |     |      |                |    
-| function | function name of hook handler                                                                              | varbinary(200)    | NO |     |      |                |    
-| priority | not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order | smallint unsigned | NO |     | 0    |                |    
+| Field    | Description                                                                                                | Type              | Null | Key | Default | Extra          |    
+| -------- | ---------------------------------------------------------------------------------------------------------- | ----------------- | ---- | --- | ------- | -------------- |    
+| id       | sequential ID                                                                                              | int unsigned      | NO   | PRI | NULL    | auto_increment |    
+| hook     | name of hook                                                                                               | varbinary(100)    | NO   |     |         |                |    
+| file     | relative filename of hook handler                                                                          | varbinary(200)    | NO   |     |         |                |    
+| function | function name of hook handler                                                                              | varbinary(200)    | NO   |     |         |                |    
+| priority | not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order | smallint unsigned | NO   |     | 0       |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_host.md b/doc/database/db_host.md
index 97c3bb5fe3..bb07a5b87a 100644
--- a/doc/database/db_host.md
+++ b/doc/database/db_host.md
@@ -2,9 +2,9 @@ Table host
 ===========
 Hostname
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id   | sequential ID | tinyint unsigned | NO | PRI | NULL | auto_increment |    
-| name | The hostname  | varchar(128)     | NO |     |      |                |    
+| Field | Description   | Type             | Null | Key | Default | Extra          |    
+| ----- | ------------- | ---------------- | ---- | --- | ------- | -------------- |    
+| id    | sequential ID | tinyint unsigned | NO   | PRI | NULL    | auto_increment |    
+| name  | The hostname  | varchar(128)     | NO   |     |         |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_inbox-status.md b/doc/database/db_inbox-status.md
index 882f601b2a..53fa009e2b 100644
--- a/doc/database/db_inbox-status.md
+++ b/doc/database/db_inbox-status.md
@@ -2,14 +2,14 @@ Table inbox-status
 ===========
 Status of ActivityPub inboxes
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| url      | URL of the inbox                     | varbinary(255) | NO | PRI | NULL                |  |    
-| created  | Creation date of this entry          | datetime       | NO |     | 0001-01-01 00:00:00 |  |    
-| success  | Date of the last successful delivery | datetime       | NO |     | 0001-01-01 00:00:00 |  |    
-| failure  | Date of the last failed delivery     | datetime       | NO |     | 0001-01-01 00:00:00 |  |    
-| previous | Previous delivery date               | datetime       | NO |     | 0001-01-01 00:00:00 |  |    
-| archive  | Is the inbox archived?               | boolean        | NO |     | 0                   |  |    
-| shared   | Is it a shared inbox?                | boolean        | NO |     | 0                   |  |    
+| Field    | Description                          | Type           | Null | Key | Default             | Extra |    
+| -------- | ------------------------------------ | -------------- | ---- | --- | ------------------- | ----- |    
+| url      | URL of the inbox                     | varbinary(255) | NO   | PRI | NULL                |       |    
+| created  | Creation date of this entry          | datetime       | NO   |     | 0001-01-01 00:00:00 |       |    
+| success  | Date of the last successful delivery | datetime       | NO   |     | 0001-01-01 00:00:00 |       |    
+| failure  | Date of the last failed delivery     | datetime       | NO   |     | 0001-01-01 00:00:00 |       |    
+| previous | Previous delivery date               | datetime       | NO   |     | 0001-01-01 00:00:00 |       |    
+| archive  | Is the inbox archived?               | boolean        | NO   |     | 0                   |       |    
+| shared   | Is it a shared inbox?                | boolean        | NO   |     | 0                   |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_intro.md b/doc/database/db_intro.md
index 698fbe9189..df1deac2bb 100644
--- a/doc/database/db_intro.md
+++ b/doc/database/db_intro.md
@@ -2,18 +2,18 @@ Table intro
 ===========
 
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id         | sequential ID | int unsigned       | NO  | PRI | NULL                | auto_increment |    
-| uid        | User id       | mediumint unsigned | NO  |     | 0                   |                |    
-| fid        |               | int unsigned       | YES |     | NULL                |                |    
-| contact-id |               | int unsigned       | NO  |     | 0                   |                |    
-| knowyou    |               | boolean            | NO  |     | 0                   |                |    
-| duplex     |               | boolean            | NO  |     | 0                   |                |    
-| note       |               | text               | YES |     | NULL                |                |    
-| hash       |               | varchar(255)       | NO  |     |                     |                |    
-| datetime   |               | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| blocked    |               | boolean            | NO  |     | 1                   |                |    
-| ignore     |               | boolean            | NO  |     | 0                   |                |    
+| Field      | Description   | Type               | Null | Key | Default             | Extra          |    
+| ---------- | ------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
+| id         | sequential ID | int unsigned       | NO   | PRI | NULL                | auto_increment |    
+| uid        | User id       | mediumint unsigned | NO   |     | 0                   |                |    
+| fid        |               | int unsigned       | YES  |     | NULL                |                |    
+| contact-id |               | int unsigned       | NO   |     | 0                   |                |    
+| knowyou    |               | boolean            | NO   |     | 0                   |                |    
+| duplex     |               | boolean            | NO   |     | 0                   |                |    
+| note       |               | text               | YES  |     | NULL                |                |    
+| hash       |               | varchar(255)       | NO   |     |                     |                |    
+| datetime   |               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| blocked    |               | boolean            | NO   |     | 1                   |                |    
+| ignore     |               | boolean            | NO   |     | 0                   |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_item-uri.md b/doc/database/db_item-uri.md
index cc7a28e3ab..8e4be669af 100644
--- a/doc/database/db_item-uri.md
+++ b/doc/database/db_item-uri.md
@@ -2,10 +2,10 @@ Table item-uri
 ===========
 URI and GUID for items
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id   |                                 | int unsigned   | NO  | PRI | NULL | auto_increment |    
-| uri  | URI of an item                  | varbinary(255) | NO  |     | NULL |                |    
-| guid | A unique identifier for an item | varbinary(255) | YES |     | NULL |                |    
+| Field | Description                     | Type           | Null | Key | Default | Extra          |    
+| ----- | ------------------------------- | -------------- | ---- | --- | ------- | -------------- |    
+| id    |                                 | int unsigned   | NO   | PRI | NULL    | auto_increment |    
+| uri   | URI of an item                  | varbinary(255) | NO   |     | NULL    |                |    
+| guid  | A unique identifier for an item | varbinary(255) | YES  |     | NULL    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_locks.md b/doc/database/db_locks.md
index 94e39dee78..0da4d8845c 100644
--- a/doc/database/db_locks.md
+++ b/doc/database/db_locks.md
@@ -2,12 +2,12 @@ Table locks
 ===========
 
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id      | sequential ID                | int unsigned | NO | PRI | NULL                | auto_increment |    
-| name    |                              | varchar(128) | NO |     |                     |                |    
-| locked  |                              | boolean      | NO |     | 0                   |                |    
-| pid     | Process ID                   | int unsigned | NO |     | 0                   |                |    
-| expires | datetime of cache expiration | datetime     | NO |     | 0001-01-01 00:00:00 |                |    
+| Field   | Description                  | Type         | Null | Key | Default             | Extra          |    
+| ------- | ---------------------------- | ------------ | ---- | --- | ------------------- | -------------- |    
+| id      | sequential ID                | int unsigned | NO   | PRI | NULL                | auto_increment |    
+| name    |                              | varchar(128) | NO   |     |                     |                |    
+| locked  |                              | boolean      | NO   |     | 0                   |                |    
+| pid     | Process ID                   | int unsigned | NO   |     | 0                   |                |    
+| expires | datetime of cache expiration | datetime     | NO   |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_mail.md b/doc/database/db_mail.md
index 7ee8022559..44f435d006 100644
--- a/doc/database/db_mail.md
+++ b/doc/database/db_mail.md
@@ -2,29 +2,29 @@ Table mail
 ===========
 private messages
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id            | sequential ID                                                  | int unsigned       | NO  | PRI | NULL                | auto_increment |    
-| uid           | Owner User id                                                  | mediumint unsigned | NO  |     | 0                   |                |    
-| guid          | A unique identifier for this private message                   | varchar(255)       | NO  |     |                     |                |    
-| from-name     | name of the sender                                             | varchar(255)       | NO  |     |                     |                |    
-| from-photo    | contact photo link of the sender                               | varchar(255)       | NO  |     |                     |                |    
-| from-url      | profile linke of the sender                                    | varchar(255)       | NO  |     |                     |                |    
-| contact-id    | contact.id                                                     | varchar(255)       | YES |     | NULL                |                |    
-| author-id     | Link to the contact table with uid=0 of the author of the mail | int unsigned       | YES |     | NULL                |                |    
-| convid        | conv.id                                                        | int unsigned       | YES |     | NULL                |                |    
-| title         |                                                                | varchar(255)       | NO  |     |                     |                |    
-| body          |                                                                | mediumtext         | YES |     | NULL                |                |    
-| seen          | if message visited it is 1                                     | boolean            | NO  |     | 0                   |                |    
-| reply         |                                                                | boolean            | NO  |     | 0                   |                |    
-| replied       |                                                                | boolean            | NO  |     | 0                   |                |    
-| unknown       | if sender not in the contact table this is 1                   | boolean            | NO  |     | 0                   |                |    
-| uri           |                                                                | varchar(255)       | NO  |     |                     |                |    
-| uri-id        | Item-uri id of the related mail                                | int unsigned       | YES |     | NULL                |                |    
-| parent-uri    |                                                                | varchar(255)       | NO  |     |                     |                |    
-| parent-uri-id | Item-uri id of the parent of the related mail                  | int unsigned       | YES |     | NULL                |                |    
-| thr-parent    |                                                                | varchar(255)       | YES |     | NULL                |                |    
-| thr-parent-id | Id of the item-uri table that contains the thread parent uri   | int unsigned       | YES |     | NULL                |                |    
-| created       | creation time of the private message                           | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| Field         | Description                                                    | Type               | Null | Key | Default             | Extra          |    
+| ------------- | -------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
+| id            | sequential ID                                                  | int unsigned       | NO   | PRI | NULL                | auto_increment |    
+| uid           | Owner User id                                                  | mediumint unsigned | NO   |     | 0                   |                |    
+| guid          | A unique identifier for this private message                   | varchar(255)       | NO   |     |                     |                |    
+| from-name     | name of the sender                                             | varchar(255)       | NO   |     |                     |                |    
+| from-photo    | contact photo link of the sender                               | varchar(255)       | NO   |     |                     |                |    
+| from-url      | profile linke of the sender                                    | varchar(255)       | NO   |     |                     |                |    
+| contact-id    | contact.id                                                     | varchar(255)       | YES  |     | NULL                |                |    
+| author-id     | Link to the contact table with uid=0 of the author of the mail | int unsigned       | YES  |     | NULL                |                |    
+| convid        | conv.id                                                        | int unsigned       | YES  |     | NULL                |                |    
+| title         |                                                                | varchar(255)       | NO   |     |                     |                |    
+| body          |                                                                | mediumtext         | YES  |     | NULL                |                |    
+| seen          | if message visited it is 1                                     | boolean            | NO   |     | 0                   |                |    
+| reply         |                                                                | boolean            | NO   |     | 0                   |                |    
+| replied       |                                                                | boolean            | NO   |     | 0                   |                |    
+| unknown       | if sender not in the contact table this is 1                   | boolean            | NO   |     | 0                   |                |    
+| uri           |                                                                | varchar(255)       | NO   |     |                     |                |    
+| uri-id        | Item-uri id of the related mail                                | int unsigned       | YES  |     | NULL                |                |    
+| parent-uri    |                                                                | varchar(255)       | NO   |     |                     |                |    
+| parent-uri-id | Item-uri id of the parent of the related mail                  | int unsigned       | YES  |     | NULL                |                |    
+| thr-parent    |                                                                | varchar(255)       | YES  |     | NULL                |                |    
+| thr-parent-id | Id of the item-uri table that contains the thread parent uri   | int unsigned       | YES  |     | NULL                |                |    
+| created       | creation time of the private message                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_mailacct.md b/doc/database/db_mailacct.md
index cd3808d845..0fb9a43f6e 100644
--- a/doc/database/db_mailacct.md
+++ b/doc/database/db_mailacct.md
@@ -2,20 +2,20 @@ Table mailacct
 ===========
 Mail account data for fetching mails
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id           | sequential ID | int unsigned       | NO  | PRI | NULL                | auto_increment |    
-| uid          | User id       | mediumint unsigned | NO  |     | 0                   |                |    
-| server       |               | varchar(255)       | NO  |     |                     |                |    
-| port         |               | smallint unsigned  | NO  |     | 0                   |                |    
-| ssltype      |               | varchar(16)        | NO  |     |                     |                |    
-| mailbox      |               | varchar(255)       | NO  |     |                     |                |    
-| user         |               | varchar(255)       | NO  |     |                     |                |    
-| pass         |               | text               | YES |     | NULL                |                |    
-| reply_to     |               | varchar(255)       | NO  |     |                     |                |    
-| action       |               | tinyint unsigned   | NO  |     | 0                   |                |    
-| movetofolder |               | varchar(255)       | NO  |     |                     |                |    
-| pubmail      |               | boolean            | NO  |     | 0                   |                |    
-| last_check   |               | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| Field        | Description   | Type               | Null | Key | Default             | Extra          |    
+| ------------ | ------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
+| id           | sequential ID | int unsigned       | NO   | PRI | NULL                | auto_increment |    
+| uid          | User id       | mediumint unsigned | NO   |     | 0                   |                |    
+| server       |               | varchar(255)       | NO   |     |                     |                |    
+| port         |               | smallint unsigned  | NO   |     | 0                   |                |    
+| ssltype      |               | varchar(16)        | NO   |     |                     |                |    
+| mailbox      |               | varchar(255)       | NO   |     |                     |                |    
+| user         |               | varchar(255)       | NO   |     |                     |                |    
+| pass         |               | text               | YES  |     | NULL                |                |    
+| reply_to     |               | varchar(255)       | NO   |     |                     |                |    
+| action       |               | tinyint unsigned   | NO   |     | 0                   |                |    
+| movetofolder |               | varchar(255)       | NO   |     |                     |                |    
+| pubmail      |               | boolean            | NO   |     | 0                   |                |    
+| last_check   |               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_manage.md b/doc/database/db_manage.md
index 42b255354c..96f7703707 100644
--- a/doc/database/db_manage.md
+++ b/doc/database/db_manage.md
@@ -2,10 +2,10 @@ Table manage
 ===========
 table of accounts that can manage each other
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id  | sequential ID | int unsigned       | NO | PRI | NULL | auto_increment |    
-| uid | User id       | mediumint unsigned | NO |     | 0    |                |    
-| mid | User id       | mediumint unsigned | NO |     | 0    |                |    
+| Field | Description   | Type               | Null | Key | Default | Extra          |    
+| ----- | ------------- | ------------------ | ---- | --- | ------- | -------------- |    
+| id    | sequential ID | int unsigned       | NO   | PRI | NULL    | auto_increment |    
+| uid   | User id       | mediumint unsigned | NO   |     | 0       |                |    
+| mid   | User id       | mediumint unsigned | NO   |     | 0       |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notification.md b/doc/database/db_notification.md
index 5858151a3e..866d775274 100644
--- a/doc/database/db_notification.md
+++ b/doc/database/db_notification.md
@@ -2,16 +2,16 @@ Table notification
 ===========
 notifications
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id            | sequential ID                                                                  | int unsigned       | NO  | PRI | NULL | auto_increment |    
-| uid           | Owner User id                                                                  | mediumint unsigned | YES |     | NULL |                |    
-| vid           | Id of the verb table entry that contains the activity verbs                    | smallint unsigned  | YES |     | NULL |                |    
-| type          |                                                                                | tinyint unsigned   | YES |     | NULL |                |    
-| actor-id      | Link to the contact table with uid=0 of the actor that caused the notification | int unsigned       | YES |     | NULL |                |    
-| target-uri-id | Item-uri id of the related post                                                | int unsigned       | YES |     | NULL |                |    
-| parent-uri-id | Item-uri id of the parent of the related post                                  | int unsigned       | YES |     | NULL |                |    
-| created       |                                                                                | datetime           | YES |     | NULL |                |    
-| seen          |                                                                                | boolean            | YES |     | 0    |                |    
+| Field         | Description                                                                    | Type               | Null | Key | Default | Extra          |    
+| ------------- | ------------------------------------------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |    
+| id            | sequential ID                                                                  | int unsigned       | NO   | PRI | NULL    | auto_increment |    
+| uid           | Owner User id                                                                  | mediumint unsigned | YES  |     | NULL    |                |    
+| vid           | Id of the verb table entry that contains the activity verbs                    | smallint unsigned  | YES  |     | NULL    |                |    
+| type          |                                                                                | tinyint unsigned   | YES  |     | NULL    |                |    
+| actor-id      | Link to the contact table with uid=0 of the actor that caused the notification | int unsigned       | YES  |     | NULL    |                |    
+| target-uri-id | Item-uri id of the related post                                                | int unsigned       | YES  |     | NULL    |                |    
+| parent-uri-id | Item-uri id of the parent of the related post                                  | int unsigned       | YES  |     | NULL    |                |    
+| created       |                                                                                | datetime           | YES  |     | NULL    |                |    
+| seen          |                                                                                | boolean            | YES  |     | 0       |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notify-threads.md b/doc/database/db_notify-threads.md
index 24aba8093b..3461e502d5 100644
--- a/doc/database/db_notify-threads.md
+++ b/doc/database/db_notify-threads.md
@@ -2,13 +2,13 @@ Table notify-threads
 ===========
 
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id                   | sequential ID                                 | int unsigned       | NO  | PRI | NULL | auto_increment |    
-| notify-id            |                                               | int unsigned       | NO  |     | 0    |                |    
-| master-parent-item   | Deprecated                                    | int unsigned       | YES |     | NULL |                |    
-| master-parent-uri-id | Item-uri id of the parent of the related post | int unsigned       | YES |     | NULL |                |    
-| parent-item          |                                               | int unsigned       | NO  |     | 0    |                |    
-| receiver-uid         | User id                                       | mediumint unsigned | NO  |     | 0    |                |    
+| Field                | Description                                   | Type               | Null | Key | Default | Extra          |    
+| -------------------- | --------------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |    
+| id                   | sequential ID                                 | int unsigned       | NO   | PRI | NULL    | auto_increment |    
+| notify-id            |                                               | int unsigned       | NO   |     | 0       |                |    
+| master-parent-item   | Deprecated                                    | int unsigned       | YES  |     | NULL    |                |    
+| master-parent-uri-id | Item-uri id of the parent of the related post | int unsigned       | YES  |     | NULL    |                |    
+| parent-item          |                                               | int unsigned       | NO   |     | 0       |                |    
+| receiver-uid         | User id                                       | mediumint unsigned | NO   |     | 0       |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notify.md b/doc/database/db_notify.md
index 79c1c73593..fef88a971a 100644
--- a/doc/database/db_notify.md
+++ b/doc/database/db_notify.md
@@ -2,25 +2,25 @@ Table notify
 ===========
 notifications
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id            | sequential ID                                 | int unsigned       | NO  | PRI | NULL                | auto_increment |    
-| type          |                                               | smallint unsigned  | NO  |     | 0                   |                |    
-| name          |                                               | varchar(255)       | NO  |     |                     |                |    
-| url           |                                               | varchar(255)       | NO  |     |                     |                |    
-| photo         |                                               | varchar(255)       | NO  |     |                     |                |    
-| date          |                                               | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| msg           |                                               | mediumtext         | YES |     | NULL                |                |    
-| uid           | Owner User id                                 | mediumint unsigned | NO  |     | 0                   |                |    
-| link          |                                               | varchar(255)       | NO  |     |                     |                |    
-| iid           |                                               | int unsigned       | YES |     | NULL                |                |    
-| parent        |                                               | int unsigned       | YES |     | NULL                |                |    
-| uri-id        | Item-uri id of the related post               | int unsigned       | YES |     | NULL                |                |    
-| parent-uri-id | Item-uri id of the parent of the related post | int unsigned       | YES |     | NULL                |                |    
-| seen          |                                               | boolean            | NO  |     | 0                   |                |    
-| verb          |                                               | varchar(100)       | NO  |     |                     |                |    
-| otype         |                                               | varchar(10)        | NO  |     |                     |                |    
-| name_cache    | Cached bbcode parsing of name                 | tinytext           | YES |     | NULL                |                |    
-| msg_cache     | Cached bbcode parsing of msg                  | mediumtext         | YES |     | NULL                |                |    
+| Field         | Description                                   | Type               | Null | Key | Default             | Extra          |    
+| ------------- | --------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
+| id            | sequential ID                                 | int unsigned       | NO   | PRI | NULL                | auto_increment |    
+| type          |                                               | smallint unsigned  | NO   |     | 0                   |                |    
+| name          |                                               | varchar(255)       | NO   |     |                     |                |    
+| url           |                                               | varchar(255)       | NO   |     |                     |                |    
+| photo         |                                               | varchar(255)       | NO   |     |                     |                |    
+| date          |                                               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| msg           |                                               | mediumtext         | YES  |     | NULL                |                |    
+| uid           | Owner User id                                 | mediumint unsigned | NO   |     | 0                   |                |    
+| link          |                                               | varchar(255)       | NO   |     |                     |                |    
+| iid           |                                               | int unsigned       | YES  |     | NULL                |                |    
+| parent        |                                               | int unsigned       | YES  |     | NULL                |                |    
+| uri-id        | Item-uri id of the related post               | int unsigned       | YES  |     | NULL                |                |    
+| parent-uri-id | Item-uri id of the parent of the related post | int unsigned       | YES  |     | NULL                |                |    
+| seen          |                                               | boolean            | NO   |     | 0                   |                |    
+| verb          |                                               | varchar(100)       | NO   |     |                     |                |    
+| otype         |                                               | varchar(10)        | NO   |     |                     |                |    
+| name_cache    | Cached bbcode parsing of name                 | tinytext           | YES  |     | NULL                |                |    
+| msg_cache     | Cached bbcode parsing of msg                  | mediumtext         | YES  |     | NULL                |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_oembed.md b/doc/database/db_oembed.md
index 3a264d7da0..bff9ebd9c5 100644
--- a/doc/database/db_oembed.md
+++ b/doc/database/db_oembed.md
@@ -2,11 +2,11 @@ Table oembed
 ===========
 cache for OEmbed queries
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| url      | page url                       | varbinary(255)     | NO  | PRI | NULL                |  |    
-| maxwidth | Maximum width passed to Oembed | mediumint unsigned | NO  | PRI | NULL                |  |    
-| content  | OEmbed data of the page        | mediumtext         | YES |     | NULL                |  |    
-| created  | datetime of creation           | datetime           | NO  |     | 0001-01-01 00:00:00 |  |    
+| Field    | Description                    | Type               | Null | Key | Default             | Extra |    
+| -------- | ------------------------------ | ------------------ | ---- | --- | ------------------- | ----- |    
+| url      | page url                       | varbinary(255)     | NO   | PRI | NULL                |       |    
+| maxwidth | Maximum width passed to Oembed | mediumint unsigned | NO   | PRI | NULL                |       |    
+| content  | OEmbed data of the page        | mediumtext         | YES  |     | NULL                |       |    
+| created  | datetime of creation           | datetime           | NO   |     | 0001-01-01 00:00:00 |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_openwebauth-token.md b/doc/database/db_openwebauth-token.md
index ce30bbacff..0ae0a85ba0 100644
--- a/doc/database/db_openwebauth-token.md
+++ b/doc/database/db_openwebauth-token.md
@@ -2,13 +2,13 @@ Table openwebauth-token
 ===========
 Store OpenWebAuth token to verify contacts
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id      | sequential ID              | int unsigned       | NO | PRI | NULL                | auto_increment |    
-| uid     | User id - currently unused | mediumint unsigned | NO |     | 0                   |                |    
-| type    | Verify type                | varchar(32)        | NO |     |                     |                |    
-| token   | A generated token          | varchar(255)       | NO |     |                     |                |    
-| meta    |                            | varchar(255)       | NO |     |                     |                |    
-| created | datetime of creation       | datetime           | NO |     | 0001-01-01 00:00:00 |                |    
+| Field   | Description                | Type               | Null | Key | Default             | Extra          |    
+| ------- | -------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
+| id      | sequential ID              | int unsigned       | NO   | PRI | NULL                | auto_increment |    
+| uid     | User id - currently unused | mediumint unsigned | NO   |     | 0                   |                |    
+| type    | Verify type                | varchar(32)        | NO   |     |                     |                |    
+| token   | A generated token          | varchar(255)       | NO   |     |                     |                |    
+| meta    |                            | varchar(255)       | NO   |     |                     |                |    
+| created | datetime of creation       | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_parsed_url.md b/doc/database/db_parsed_url.md
index 757b8c0ab4..a264c86e3e 100644
--- a/doc/database/db_parsed_url.md
+++ b/doc/database/db_parsed_url.md
@@ -2,14 +2,14 @@ Table parsed_url
 ===========
 cache for &#039;parse_url&#039; queries
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| url_hash | page url hash                     | binary(64) | NO  | PRI | NULL                |  |    
-| guessing | is the &#039;guessing&#039; mode active?    | boolean    | NO  | PRI | 0                   |  |    
-| oembed   | is the data the result of oembed? | boolean    | NO  | PRI | 0                   |  |    
-| url      | page url                          | text       | NO  |     | NULL                |  |    
-| content  | page data                         | mediumtext | YES |     | NULL                |  |    
-| created  | datetime of creation              | datetime   | NO  |     | 0001-01-01 00:00:00 |  |    
-| expires  | datetime of expiration            | datetime   | NO  |     | 0001-01-01 00:00:00 |  |    
+| Field    | Description                       | Type       | Null | Key | Default             | Extra |    
+| -------- | --------------------------------- | ---------- | ---- | --- | ------------------- | ----- |    
+| url_hash | page url hash                     | binary(64) | NO   | PRI | NULL                |       |    
+| guessing | is the &#039;guessing&#039; mode active?    | boolean    | NO   | PRI | 0                   |       |    
+| oembed   | is the data the result of oembed? | boolean    | NO   | PRI | 0                   |       |    
+| url      | page url                          | text       | NO   |     | NULL                |       |    
+| content  | page data                         | mediumtext | YES  |     | NULL                |       |    
+| created  | datetime of creation              | datetime   | NO   |     | 0001-01-01 00:00:00 |       |    
+| expires  | datetime of expiration            | datetime   | NO   |     | 0001-01-01 00:00:00 |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_pconfig.md b/doc/database/db_pconfig.md
index 99f9058777..819dfbfbf6 100644
--- a/doc/database/db_pconfig.md
+++ b/doc/database/db_pconfig.md
@@ -2,12 +2,12 @@ Table pconfig
 ===========
 personal (per user) configuration storage
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id  | Primary key | int unsigned       | NO  | PRI | NULL | auto_increment |    
-| uid | User id     | mediumint unsigned | NO  |     | 0    |                |    
-| cat | Category    | varchar(50)        | NO  |     |      |                |    
-| k   | Key         | varchar(100)       | NO  |     |      |                |    
-| v   | Value       | mediumtext         | YES |     | NULL |                |    
+| Field | Description | Type               | Null | Key | Default | Extra          |    
+| ----- | ----------- | ------------------ | ---- | --- | ------- | -------------- |    
+| id    | Primary key | int unsigned       | NO   | PRI | NULL    | auto_increment |    
+| uid   | User id     | mediumint unsigned | NO   |     | 0       |                |    
+| cat   | Category    | varchar(50)        | NO   |     |         |                |    
+| k     | Key         | varchar(100)       | NO   |     |         |                |    
+| v     | Value       | mediumtext         | YES  |     | NULL    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_permissionset.md b/doc/database/db_permissionset.md
index e492455242..39b3d93b3c 100644
--- a/doc/database/db_permissionset.md
+++ b/doc/database/db_permissionset.md
@@ -2,13 +2,13 @@ Table permissionset
 ===========
 
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id        | sequential ID                                          | int unsigned       | NO  | PRI | NULL | auto_increment |    
-| uid       | Owner id of this permission set                        | mediumint unsigned | NO  |     | 0    |                |    
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES |     | NULL |                |    
-| allow_gid | Access Control - list of allowed groups                | mediumtext         | YES |     | NULL |                |    
-| deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES |     | NULL |                |    
-| deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES |     | NULL |                |    
+| Field     | Description                                            | Type               | Null | Key | Default | Extra          |    
+| --------- | ------------------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |    
+| id        | sequential ID                                          | int unsigned       | NO   | PRI | NULL    | auto_increment |    
+| uid       | Owner id of this permission set                        | mediumint unsigned | NO   |     | 0       |                |    
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES  |     | NULL    |                |    
+| allow_gid | Access Control - list of allowed groups                | mediumtext         | YES  |     | NULL    |                |    
+| deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL    |                |    
+| deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_photo.md b/doc/database/db_photo.md
index 10ae06f09e..1574d61818 100644
--- a/doc/database/db_photo.md
+++ b/doc/database/db_photo.md
@@ -2,34 +2,34 @@ Table photo
 ===========
 photo storage
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id            | sequential ID                                          | int unsigned       | NO  | PRI | NULL                | auto_increment |    
-| uid           | Owner User id                                          | mediumint unsigned | NO  |     | 0                   |                |    
-| contact-id    | contact.id                                             | int unsigned       | NO  |     | 0                   |                |    
-| guid          | A unique identifier for this photo                     | char(16)           | NO  |     |                     |                |    
-| resource-id   |                                                        | char(32)           | NO  |     |                     |                |    
-| hash          | hash value of the photo                                | char(32)           | YES |     | NULL                |                |    
-| created       | creation date                                          | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| edited        | last edited date                                       | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| title         |                                                        | varchar(255)       | NO  |     |                     |                |    
-| desc          |                                                        | text               | YES |     | NULL                |                |    
-| album         | The name of the album to which the photo belongs       | varchar(255)       | NO  |     |                     |                |    
-| filename      |                                                        | varchar(255)       | NO  |     |                     |                |    
-| type          |                                                        | varchar(30)        | NO  |     | image/jpeg          |                |    
-| height        |                                                        | smallint unsigned  | NO  |     | 0                   |                |    
-| width         |                                                        | smallint unsigned  | NO  |     | 0                   |                |    
-| datasize      |                                                        | int unsigned       | NO  |     | 0                   |                |    
-| data          |                                                        | mediumblob         | NO  |     | NULL                |                |    
-| scale         |                                                        | tinyint unsigned   | NO  |     | 0                   |                |    
-| profile       |                                                        | boolean            | NO  |     | 0                   |                |    
-| allow_cid     | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES |     | NULL                |                |    
-| allow_gid     | Access Control - list of allowed groups                | mediumtext         | YES |     | NULL                |                |    
-| deny_cid      | Access Control - list of denied contact.id             | mediumtext         | YES |     | NULL                |                |    
-| deny_gid      | Access Control - list of denied groups                 | mediumtext         | YES |     | NULL                |                |    
-| accessible    | Make photo publicly accessible, ignoring permissions   | boolean            | NO  |     | 0                   |                |    
-| backend-class | Storage backend class                                  | tinytext           | YES |     | NULL                |                |    
-| backend-ref   | Storage backend data reference                         | text               | YES |     | NULL                |                |    
-| updated       |                                                        | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| Field         | Description                                            | Type               | Null | Key | Default             | Extra          |    
+| ------------- | ------------------------------------------------------ | ------------------ | ---- | --- | ------------------- | -------------- |    
+| id            | sequential ID                                          | int unsigned       | NO   | PRI | NULL                | auto_increment |    
+| uid           | Owner User id                                          | mediumint unsigned | NO   |     | 0                   |                |    
+| contact-id    | contact.id                                             | int unsigned       | NO   |     | 0                   |                |    
+| guid          | A unique identifier for this photo                     | char(16)           | NO   |     |                     |                |    
+| resource-id   |                                                        | char(32)           | NO   |     |                     |                |    
+| hash          | hash value of the photo                                | char(32)           | YES  |     | NULL                |                |    
+| created       | creation date                                          | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| edited        | last edited date                                       | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| title         |                                                        | varchar(255)       | NO   |     |                     |                |    
+| desc          |                                                        | text               | YES  |     | NULL                |                |    
+| album         | The name of the album to which the photo belongs       | varchar(255)       | NO   |     |                     |                |    
+| filename      |                                                        | varchar(255)       | NO   |     |                     |                |    
+| type          |                                                        | varchar(30)        | NO   |     | image/jpeg          |                |    
+| height        |                                                        | smallint unsigned  | NO   |     | 0                   |                |    
+| width         |                                                        | smallint unsigned  | NO   |     | 0                   |                |    
+| datasize      |                                                        | int unsigned       | NO   |     | 0                   |                |    
+| data          |                                                        | mediumblob         | NO   |     | NULL                |                |    
+| scale         |                                                        | tinyint unsigned   | NO   |     | 0                   |                |    
+| profile       |                                                        | boolean            | NO   |     | 0                   |                |    
+| allow_cid     | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES  |     | NULL                |                |    
+| allow_gid     | Access Control - list of allowed groups                | mediumtext         | YES  |     | NULL                |                |    
+| deny_cid      | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL                |                |    
+| deny_gid      | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL                |                |    
+| accessible    | Make photo publicly accessible, ignoring permissions   | boolean            | NO   |     | 0                   |                |    
+| backend-class | Storage backend class                                  | tinytext           | YES  |     | NULL                |                |    
+| backend-ref   | Storage backend data reference                         | text               | YES  |     | NULL                |                |    
+| updated       |                                                        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-category.md b/doc/database/db_post-category.md
index a4b847493d..c5bf26e8fc 100644
--- a/doc/database/db_post-category.md
+++ b/doc/database/db_post-category.md
@@ -2,11 +2,11 @@ Table post-category
 ===========
 post relation to categories
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned       | NO | PRI | NULL |  |    
-| uid    | User id                                                   | mediumint unsigned | NO | PRI | 0    |  |    
-| type   |                                                           | tinyint unsigned   | NO | PRI | 0    |  |    
-| tid    |                                                           | int unsigned       | NO | PRI | 0    |  |    
+| Field  | Description                                               | Type               | Null | Key | Default | Extra |    
+| ------ | --------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned       | NO   | PRI | NULL    |       |    
+| uid    | User id                                                   | mediumint unsigned | NO   | PRI | 0       |       |    
+| type   |                                                           | tinyint unsigned   | NO   | PRI | 0       |       |    
+| tid    |                                                           | int unsigned       | NO   | PRI | 0       |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-content.md b/doc/database/db_post-content.md
index 232753223f..cee72373ba 100644
--- a/doc/database/db_post-content.md
+++ b/doc/database/db_post-content.md
@@ -2,24 +2,24 @@ Table post-content
 ===========
 Content for all posts
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id          | Id of the item-uri table entry that contains the item uri                                                                 | int unsigned | NO  | PRI | NULL |  |    
-| title           | item title                                                                                                                | varchar(255) | NO  |     |      |  |    
-| content-warning |                                                                                                                           | varchar(255) | NO  |     |      |  |    
-| body            | item body content                                                                                                         | mediumtext   | YES |     | NULL |  |    
-| raw-body        | Body without embedded media links                                                                                         | mediumtext   | YES |     | NULL |  |    
-| location        | text location where this item originated                                                                                  | varchar(255) | NO  |     |      |  |    
-| coord           | longitude/latitude pair representing location where this item originated                                                  | varchar(255) | NO  |     |      |  |    
-| language        | Language information about this post                                                                                      | text         | YES |     | NULL |  |    
-| app             | application which generated this item                                                                                     | varchar(255) | NO  |     |      |  |    
-| rendered-hash   |                                                                                                                           | varchar(32)  | NO  |     |      |  |    
-| rendered-html   | item.body converted to html                                                                                               | mediumtext   | YES |     | NULL |  |    
-| object-type     | ActivityStreams object type                                                                                               | varchar(100) | NO  |     |      |  |    
-| object          | JSON encoded object structure unless it is an implied object (normal post)                                                | text         | YES |     | NULL |  |    
-| target-type     | ActivityStreams target type if applicable (URI)                                                                           | varchar(100) | NO  |     |      |  |    
-| target          | JSON encoded target structure if used                                                                                     | text         | YES |     | NULL |  |    
-| resource-id     | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32)  | NO  |     |      |  |    
-| plink           | permalink or URL to a displayable copy of the message at its source                                                       | varchar(255) | NO  |     |      |  |    
+| Field           | Description                                                                                                               | Type         | Null | Key | Default | Extra |    
+| --------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |    
+| uri-id          | Id of the item-uri table entry that contains the item uri                                                                 | int unsigned | NO   | PRI | NULL    |       |    
+| title           | item title                                                                                                                | varchar(255) | NO   |     |         |       |    
+| content-warning |                                                                                                                           | varchar(255) | NO   |     |         |       |    
+| body            | item body content                                                                                                         | mediumtext   | YES  |     | NULL    |       |    
+| raw-body        | Body without embedded media links                                                                                         | mediumtext   | YES  |     | NULL    |       |    
+| location        | text location where this item originated                                                                                  | varchar(255) | NO   |     |         |       |    
+| coord           | longitude/latitude pair representing location where this item originated                                                  | varchar(255) | NO   |     |         |       |    
+| language        | Language information about this post                                                                                      | text         | YES  |     | NULL    |       |    
+| app             | application which generated this item                                                                                     | varchar(255) | NO   |     |         |       |    
+| rendered-hash   |                                                                                                                           | varchar(32)  | NO   |     |         |       |    
+| rendered-html   | item.body converted to html                                                                                               | mediumtext   | YES  |     | NULL    |       |    
+| object-type     | ActivityStreams object type                                                                                               | varchar(100) | NO   |     |         |       |    
+| object          | JSON encoded object structure unless it is an implied object (normal post)                                                | text         | YES  |     | NULL    |       |    
+| target-type     | ActivityStreams target type if applicable (URI)                                                                           | varchar(100) | NO   |     |         |       |    
+| target          | JSON encoded target structure if used                                                                                     | text         | YES  |     | NULL    |       |    
+| resource-id     | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32)  | NO   |     |         |       |    
+| plink           | permalink or URL to a displayable copy of the message at its source                                                       | varchar(255) | NO   |     |         |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-delivery-data.md b/doc/database/db_post-delivery-data.md
index 30a91193ae..95e9dc1904 100644
--- a/doc/database/db_post-delivery-data.md
+++ b/doc/database/db_post-delivery-data.md
@@ -2,18 +2,18 @@ Table post-delivery-data
 ===========
 Delivery data for items
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id       | Id of the item-uri table entry that contains the item uri                                                                                                  | int unsigned | NO  | PRI | NULL |  |    
-| postopts     | External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery | text         | YES |     | NULL |  |    
-| inform       | Additional receivers of the linked item                                                                                                                    | mediumtext   | YES |     | NULL |  |    
-| queue_count  | Initial number of delivery recipients, used as item.delivery_queue_count                                                                                   | mediumint    | NO  |     | 0    |  |    
-| queue_done   | Number of successful deliveries, used as item.delivery_queue_done                                                                                          | mediumint    | NO  |     | 0    |  |    
-| queue_failed | Number of unsuccessful deliveries, used as item.delivery_queue_failed                                                                                      | mediumint    | NO  |     | 0    |  |    
-| activitypub  | Number of successful deliveries via ActivityPub                                                                                                            | mediumint    | NO  |     | 0    |  |    
-| dfrn         | Number of successful deliveries via DFRN                                                                                                                   | mediumint    | NO  |     | 0    |  |    
-| legacy_dfrn  | Number of successful deliveries via legacy DFRN                                                                                                            | mediumint    | NO  |     | 0    |  |    
-| diaspora     | Number of successful deliveries via Diaspora                                                                                                               | mediumint    | NO  |     | 0    |  |    
-| ostatus      | Number of successful deliveries via OStatus                                                                                                                | mediumint    | NO  |     | 0    |  |    
+| Field        | Description                                                                                                                                                | Type         | Null | Key | Default | Extra |    
+| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |    
+| uri-id       | Id of the item-uri table entry that contains the item uri                                                                                                  | int unsigned | NO   | PRI | NULL    |       |    
+| postopts     | External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery | text         | YES  |     | NULL    |       |    
+| inform       | Additional receivers of the linked item                                                                                                                    | mediumtext   | YES  |     | NULL    |       |    
+| queue_count  | Initial number of delivery recipients, used as item.delivery_queue_count                                                                                   | mediumint    | NO   |     | 0       |       |    
+| queue_done   | Number of successful deliveries, used as item.delivery_queue_done                                                                                          | mediumint    | NO   |     | 0       |       |    
+| queue_failed | Number of unsuccessful deliveries, used as item.delivery_queue_failed                                                                                      | mediumint    | NO   |     | 0       |       |    
+| activitypub  | Number of successful deliveries via ActivityPub                                                                                                            | mediumint    | NO   |     | 0       |       |    
+| dfrn         | Number of successful deliveries via DFRN                                                                                                                   | mediumint    | NO   |     | 0       |       |    
+| legacy_dfrn  | Number of successful deliveries via legacy DFRN                                                                                                            | mediumint    | NO   |     | 0       |       |    
+| diaspora     | Number of successful deliveries via Diaspora                                                                                                               | mediumint    | NO   |     | 0       |       |    
+| ostatus      | Number of successful deliveries via OStatus                                                                                                                | mediumint    | NO   |     | 0       |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-media.md b/doc/database/db_post-media.md
index de3b0e43cd..b78f2d4099 100644
--- a/doc/database/db_post-media.md
+++ b/doc/database/db_post-media.md
@@ -2,26 +2,26 @@ Table post-media
 ===========
 Attached media
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id              | sequential ID                                             | int unsigned      | NO  | PRI | NULL | auto_increment |    
-| uri-id          | Id of the item-uri table entry that contains the item uri | int unsigned      | NO  |     | NULL |                |    
-| url             | Media URL                                                 | varbinary(511)    | NO  |     | NULL |                |    
-| type            | Media type                                                | tinyint unsigned  | NO  |     | 0    |                |    
-| mimetype        |                                                           | varchar(60)       | YES |     | NULL |                |    
-| height          | Height of the media                                       | smallint unsigned | YES |     | NULL |                |    
-| width           | Width of the media                                        | smallint unsigned | YES |     | NULL |                |    
-| size            | Media size                                                | int unsigned      | YES |     | NULL |                |    
-| preview         | Preview URL                                               | varbinary(255)    | YES |     | NULL |                |    
-| preview-height  | Height of the preview picture                             | smallint unsigned | YES |     | NULL |                |    
-| preview-width   | Width of the preview picture                              | smallint unsigned | YES |     | NULL |                |    
-| description     |                                                           | text              | YES |     | NULL |                |    
-| name            | Name of the media                                         | varchar(255)      | YES |     | NULL |                |    
-| author-url      | URL of the author of the media                            | varbinary(255)    | YES |     | NULL |                |    
-| author-name     | Name of the author of the media                           | varchar(255)      | YES |     | NULL |                |    
-| author-image    | Image of the author of the media                          | varbinary(255)    | YES |     | NULL |                |    
-| publisher-url   | URL of the publisher of the media                         | varbinary(255)    | YES |     | NULL |                |    
-| publisher-name  | Name of the publisher of the media                        | varchar(255)      | YES |     | NULL |                |    
-| publisher-image | Image of the publisher of the media                       | varbinary(255)    | YES |     | NULL |                |    
+| Field           | Description                                               | Type              | Null | Key | Default | Extra          |    
+| --------------- | --------------------------------------------------------- | ----------------- | ---- | --- | ------- | -------------- |    
+| id              | sequential ID                                             | int unsigned      | NO   | PRI | NULL    | auto_increment |    
+| uri-id          | Id of the item-uri table entry that contains the item uri | int unsigned      | NO   |     | NULL    |                |    
+| url             | Media URL                                                 | varbinary(511)    | NO   |     | NULL    |                |    
+| type            | Media type                                                | tinyint unsigned  | NO   |     | 0       |                |    
+| mimetype        |                                                           | varchar(60)       | YES  |     | NULL    |                |    
+| height          | Height of the media                                       | smallint unsigned | YES  |     | NULL    |                |    
+| width           | Width of the media                                        | smallint unsigned | YES  |     | NULL    |                |    
+| size            | Media size                                                | int unsigned      | YES  |     | NULL    |                |    
+| preview         | Preview URL                                               | varbinary(255)    | YES  |     | NULL    |                |    
+| preview-height  | Height of the preview picture                             | smallint unsigned | YES  |     | NULL    |                |    
+| preview-width   | Width of the preview picture                              | smallint unsigned | YES  |     | NULL    |                |    
+| description     |                                                           | text              | YES  |     | NULL    |                |    
+| name            | Name of the media                                         | varchar(255)      | YES  |     | NULL    |                |    
+| author-url      | URL of the author of the media                            | varbinary(255)    | YES  |     | NULL    |                |    
+| author-name     | Name of the author of the media                           | varchar(255)      | YES  |     | NULL    |                |    
+| author-image    | Image of the author of the media                          | varbinary(255)    | YES  |     | NULL    |                |    
+| publisher-url   | URL of the publisher of the media                         | varbinary(255)    | YES  |     | NULL    |                |    
+| publisher-name  | Name of the publisher of the media                        | varchar(255)      | YES  |     | NULL    |                |    
+| publisher-image | Image of the publisher of the media                       | varbinary(255)    | YES  |     | NULL    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-tag.md b/doc/database/db_post-tag.md
index ae65cf9832..53df02cbe0 100644
--- a/doc/database/db_post-tag.md
+++ b/doc/database/db_post-tag.md
@@ -2,11 +2,11 @@ Table post-tag
 ===========
 post relation to tags
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned     | NO | PRI | NULL |  |    
-| type   |                                                           | tinyint unsigned | NO | PRI | 0    |  |    
-| tid    |                                                           | int unsigned     | NO | PRI | 0    |  |    
-| cid    | Contact id of the mentioned public contact                | int unsigned     | NO | PRI | 0    |  |    
+| Field  | Description                                               | Type             | Null | Key | Default | Extra |    
+| ------ | --------------------------------------------------------- | ---------------- | ---- | --- | ------- | ----- |    
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned     | NO   | PRI | NULL    |       |    
+| type   |                                                           | tinyint unsigned | NO   | PRI | 0       |       |    
+| tid    |                                                           | int unsigned     | NO   | PRI | 0       |       |    
+| cid    | Contact id of the mentioned public contact                | int unsigned     | NO   | PRI | 0       |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-thread-user.md b/doc/database/db_post-thread-user.md
index abb1ed8bda..1db1ffe266 100644
--- a/doc/database/db_post-thread-user.md
+++ b/doc/database/db_post-thread-user.md
@@ -2,30 +2,30 @@ Table post-thread-user
 ===========
 Thread related data per user
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id       | Id of the item-uri table entry that contains the item uri                                               | int unsigned       | NO  | PRI | NULL                |  |    
-| owner-id     | Item owner                                                                                              | int unsigned       | NO  |     | 0                   |  |    
-| author-id    | Item author                                                                                             | int unsigned       | NO  |     | 0                   |  |    
-| causer-id    | Link to the contact table with uid=0 of the contact that caused the item creation                       | int unsigned       | YES |     | NULL                |  |    
-| network      |                                                                                                         | char(4)            | NO  |     |                     |  |    
-| created      |                                                                                                         | datetime           | NO  |     | 0001-01-01 00:00:00 |  |    
-| received     |                                                                                                         | datetime           | NO  |     | 0001-01-01 00:00:00 |  |    
-| changed      | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime           | NO  |     | 0001-01-01 00:00:00 |  |    
-| commented    |                                                                                                         | datetime           | NO  |     | 0001-01-01 00:00:00 |  |    
-| uid          | Owner id which owns this copy of the item                                                               | mediumint unsigned | NO  | PRI | 0                   |  |    
-| pinned       | The thread is pinned on the profile page                                                                | boolean            | NO  |     | 0                   |  |    
-| starred      |                                                                                                         | boolean            | NO  |     | 0                   |  |    
-| ignored      | Ignore updates for this thread                                                                          | boolean            | NO  |     | 0                   |  |    
-| wall         | This item was posted to the wall of uid                                                                 | boolean            | NO  |     | 0                   |  |    
-| mention      |                                                                                                         | boolean            | NO  |     | 0                   |  |    
-| pubmail      |                                                                                                         | boolean            | NO  |     | 0                   |  |    
-| forum_mode   |                                                                                                         | tinyint unsigned   | NO  |     | 0                   |  |    
-| contact-id   | contact.id                                                                                              | int unsigned       | NO  |     | 0                   |  |    
-| unseen       | post has not been seen                                                                                  | boolean            | NO  |     | 1                   |  |    
-| hidden       | Marker to hide the post from the user                                                                   | boolean            | NO  |     | 0                   |  |    
-| origin       | item originated at this site                                                                            | boolean            | NO  |     | 0                   |  |    
-| psid         | ID of the permission set of this post                                                                   | int unsigned       | YES |     | NULL                |  |    
-| post-user-id | Id of the post-user table                                                                               | int unsigned       | YES |     | NULL                |  |    
+| Field        | Description                                                                                             | Type               | Null | Key | Default             | Extra |    
+| ------------ | ------------------------------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | ----- |    
+| uri-id       | Id of the item-uri table entry that contains the item uri                                               | int unsigned       | NO   | PRI | NULL                |       |    
+| owner-id     | Item owner                                                                                              | int unsigned       | NO   |     | 0                   |       |    
+| author-id    | Item author                                                                                             | int unsigned       | NO   |     | 0                   |       |    
+| causer-id    | Link to the contact table with uid=0 of the contact that caused the item creation                       | int unsigned       | YES  |     | NULL                |       |    
+| network      |                                                                                                         | char(4)            | NO   |     |                     |       |    
+| created      |                                                                                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |       |    
+| received     |                                                                                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |       |    
+| changed      | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime           | NO   |     | 0001-01-01 00:00:00 |       |    
+| commented    |                                                                                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |       |    
+| uid          | Owner id which owns this copy of the item                                                               | mediumint unsigned | NO   | PRI | 0                   |       |    
+| pinned       | The thread is pinned on the profile page                                                                | boolean            | NO   |     | 0                   |       |    
+| starred      |                                                                                                         | boolean            | NO   |     | 0                   |       |    
+| ignored      | Ignore updates for this thread                                                                          | boolean            | NO   |     | 0                   |       |    
+| wall         | This item was posted to the wall of uid                                                                 | boolean            | NO   |     | 0                   |       |    
+| mention      |                                                                                                         | boolean            | NO   |     | 0                   |       |    
+| pubmail      |                                                                                                         | boolean            | NO   |     | 0                   |       |    
+| forum_mode   |                                                                                                         | tinyint unsigned   | NO   |     | 0                   |       |    
+| contact-id   | contact.id                                                                                              | int unsigned       | NO   |     | 0                   |       |    
+| unseen       | post has not been seen                                                                                  | boolean            | NO   |     | 1                   |       |    
+| hidden       | Marker to hide the post from the user                                                                   | boolean            | NO   |     | 0                   |       |    
+| origin       | item originated at this site                                                                            | boolean            | NO   |     | 0                   |       |    
+| psid         | ID of the permission set of this post                                                                   | int unsigned       | YES  |     | NULL                |       |    
+| post-user-id | Id of the post-user table                                                                               | int unsigned       | YES  |     | NULL                |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-thread.md b/doc/database/db_post-thread.md
index aca05c1e2a..57a28d199c 100644
--- a/doc/database/db_post-thread.md
+++ b/doc/database/db_post-thread.md
@@ -2,16 +2,16 @@ Table post-thread
 ===========
 Thread related data
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id    | Id of the item-uri table entry that contains the item uri                                               | int unsigned | NO  | PRI | NULL                |  |    
-| owner-id  | Item owner                                                                                              | int unsigned | NO  |     | 0                   |  |    
-| author-id | Item author                                                                                             | int unsigned | NO  |     | 0                   |  |    
-| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation                       | int unsigned | YES |     | NULL                |  |    
-| network   |                                                                                                         | char(4)      | NO  |     |                     |  |    
-| created   |                                                                                                         | datetime     | NO  |     | 0001-01-01 00:00:00 |  |    
-| received  |                                                                                                         | datetime     | NO  |     | 0001-01-01 00:00:00 |  |    
-| changed   | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime     | NO  |     | 0001-01-01 00:00:00 |  |    
-| commented |                                                                                                         | datetime     | NO  |     | 0001-01-01 00:00:00 |  |    
+| Field     | Description                                                                                             | Type         | Null | Key | Default             | Extra |    
+| --------- | ------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------------------- | ----- |    
+| uri-id    | Id of the item-uri table entry that contains the item uri                                               | int unsigned | NO   | PRI | NULL                |       |    
+| owner-id  | Item owner                                                                                              | int unsigned | NO   |     | 0                   |       |    
+| author-id | Item author                                                                                             | int unsigned | NO   |     | 0                   |       |    
+| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation                       | int unsigned | YES  |     | NULL                |       |    
+| network   |                                                                                                         | char(4)      | NO   |     |                     |       |    
+| created   |                                                                                                         | datetime     | NO   |     | 0001-01-01 00:00:00 |       |    
+| received  |                                                                                                         | datetime     | NO   |     | 0001-01-01 00:00:00 |       |    
+| changed   | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime     | NO   |     | 0001-01-01 00:00:00 |       |    
+| commented |                                                                                                         | datetime     | NO   |     | 0001-01-01 00:00:00 |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-user-notification.md b/doc/database/db_post-user-notification.md
index 8a93d7a566..fc367ca750 100644
--- a/doc/database/db_post-user-notification.md
+++ b/doc/database/db_post-user-notification.md
@@ -2,10 +2,10 @@ Table post-user-notification
 ===========
 User post notifications
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id            | Id of the item-uri table entry that contains the item uri | int unsigned       | NO | PRI | NULL |  |    
-| uid               | Owner id which owns this copy of the item                 | mediumint unsigned | NO | PRI | NULL |  |    
-| notification-type |                                                           | tinyint unsigned   | NO |     | 0    |  |    
+| Field             | Description                                               | Type               | Null | Key | Default | Extra |    
+| ----------------- | --------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |    
+| uri-id            | Id of the item-uri table entry that contains the item uri | int unsigned       | NO   | PRI | NULL    |       |    
+| uid               | Owner id which owns this copy of the item                 | mediumint unsigned | NO   | PRI | NULL    |       |    
+| notification-type |                                                           | tinyint unsigned   | NO   |     | 0       |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-user.md b/doc/database/db_post-user.md
index 247787f58e..91c101200c 100644
--- a/doc/database/db_post-user.md
+++ b/doc/database/db_post-user.md
@@ -2,37 +2,37 @@ Table post-user
 ===========
 User specific post data
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id                |                                                                                   | int unsigned       | NO  | PRI | NULL                | auto_increment |    
-| uri-id            | Id of the item-uri table entry that contains the item uri                         | int unsigned       | NO  |     | NULL                |                |    
-| parent-uri-id     | Id of the item-uri table that contains the parent uri                             | int unsigned       | YES |     | NULL                |                |    
-| thr-parent-id     | Id of the item-uri table that contains the thread parent uri                      | int unsigned       | YES |     | NULL                |                |    
-| external-id       | Id of the item-uri table entry that contains the external uri                     | int unsigned       | YES |     | NULL                |                |    
-| created           | Creation timestamp.                                                               | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| edited            | Date of last edit (default is created)                                            | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| received          | datetime                                                                          | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| gravity           |                                                                                   | tinyint unsigned   | NO  |     | 0                   |                |    
-| network           | Network from where the item comes from                                            | char(4)            | NO  |     |                     |                |    
-| owner-id          | Link to the contact table with uid=0 of the owner of this item                    | int unsigned       | NO  |     | 0                   |                |    
-| author-id         | Link to the contact table with uid=0 of the author of this item                   | int unsigned       | NO  |     | 0                   |                |    
-| causer-id         | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned       | YES |     | NULL                |                |    
-| post-type         | Post type (personal note, image, article, ...)                                    | tinyint unsigned   | NO  |     | 0                   |                |    
-| post-reason       | Reason why the post arrived at the user                                           | tinyint unsigned   | NO  |     | 0                   |                |    
-| vid               | Id of the verb table entry that contains the activity verbs                       | smallint unsigned  | YES |     | NULL                |                |    
-| private           | 0=public, 1=private, 2=unlisted                                                   | tinyint unsigned   | NO  |     | 0                   |                |    
-| global            |                                                                                   | boolean            | NO  |     | 0                   |                |    
-| visible           |                                                                                   | boolean            | NO  |     | 0                   |                |    
-| deleted           | item has been marked for deletion                                                 | boolean            | NO  |     | 0                   |                |    
-| uid               | Owner id which owns this copy of the item                                         | mediumint unsigned | NO  |     | NULL                |                |    
-| protocol          | Protocol used to deliver the item for this user                                   | tinyint unsigned   | YES |     | NULL                |                |    
-| contact-id        | contact.id                                                                        | int unsigned       | NO  |     | 0                   |                |    
-| event-id          | Used to link to the event.id                                                      | int unsigned       | YES |     | NULL                |                |    
-| unseen            | post has not been seen                                                            | boolean            | NO  |     | 1                   |                |    
-| hidden            | Marker to hide the post from the user                                             | boolean            | NO  |     | 0                   |                |    
-| notification-type |                                                                                   | tinyint unsigned   | NO  |     | 0                   |                |    
-| wall              | This item was posted to the wall of uid                                           | boolean            | NO  |     | 0                   |                |    
-| origin            | item originated at this site                                                      | boolean            | NO  |     | 0                   |                |    
-| psid              | ID of the permission set of this post                                             | int unsigned       | YES |     | NULL                |                |    
+| Field             | Description                                                                       | Type               | Null | Key | Default             | Extra          |    
+| ----------------- | --------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
+| id                |                                                                                   | int unsigned       | NO   | PRI | NULL                | auto_increment |    
+| uri-id            | Id of the item-uri table entry that contains the item uri                         | int unsigned       | NO   |     | NULL                |                |    
+| parent-uri-id     | Id of the item-uri table that contains the parent uri                             | int unsigned       | YES  |     | NULL                |                |    
+| thr-parent-id     | Id of the item-uri table that contains the thread parent uri                      | int unsigned       | YES  |     | NULL                |                |    
+| external-id       | Id of the item-uri table entry that contains the external uri                     | int unsigned       | YES  |     | NULL                |                |    
+| created           | Creation timestamp.                                                               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| edited            | Date of last edit (default is created)                                            | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| received          | datetime                                                                          | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| gravity           |                                                                                   | tinyint unsigned   | NO   |     | 0                   |                |    
+| network           | Network from where the item comes from                                            | char(4)            | NO   |     |                     |                |    
+| owner-id          | Link to the contact table with uid=0 of the owner of this item                    | int unsigned       | NO   |     | 0                   |                |    
+| author-id         | Link to the contact table with uid=0 of the author of this item                   | int unsigned       | NO   |     | 0                   |                |    
+| causer-id         | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned       | YES  |     | NULL                |                |    
+| post-type         | Post type (personal note, image, article, ...)                                    | tinyint unsigned   | NO   |     | 0                   |                |    
+| post-reason       | Reason why the post arrived at the user                                           | tinyint unsigned   | NO   |     | 0                   |                |    
+| vid               | Id of the verb table entry that contains the activity verbs                       | smallint unsigned  | YES  |     | NULL                |                |    
+| private           | 0=public, 1=private, 2=unlisted                                                   | tinyint unsigned   | NO   |     | 0                   |                |    
+| global            |                                                                                   | boolean            | NO   |     | 0                   |                |    
+| visible           |                                                                                   | boolean            | NO   |     | 0                   |                |    
+| deleted           | item has been marked for deletion                                                 | boolean            | NO   |     | 0                   |                |    
+| uid               | Owner id which owns this copy of the item                                         | mediumint unsigned | NO   |     | NULL                |                |    
+| protocol          | Protocol used to deliver the item for this user                                   | tinyint unsigned   | YES  |     | NULL                |                |    
+| contact-id        | contact.id                                                                        | int unsigned       | NO   |     | 0                   |                |    
+| event-id          | Used to link to the event.id                                                      | int unsigned       | YES  |     | NULL                |                |    
+| unseen            | post has not been seen                                                            | boolean            | NO   |     | 1                   |                |    
+| hidden            | Marker to hide the post from the user                                             | boolean            | NO   |     | 0                   |                |    
+| notification-type |                                                                                   | tinyint unsigned   | NO   |     | 0                   |                |    
+| wall              | This item was posted to the wall of uid                                           | boolean            | NO   |     | 0                   |                |    
+| origin            | item originated at this site                                                      | boolean            | NO   |     | 0                   |                |    
+| psid              | ID of the permission set of this post                                             | int unsigned       | YES  |     | NULL                |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post.md b/doc/database/db_post.md
index ac3cdf34d7..5d97020371 100644
--- a/doc/database/db_post.md
+++ b/doc/database/db_post.md
@@ -2,25 +2,25 @@ Table post
 ===========
 Structure for all posts
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uri-id        | Id of the item-uri table entry that contains the item uri                         | int unsigned      | NO  | PRI | NULL                |  |    
-| parent-uri-id | Id of the item-uri table that contains the parent uri                             | int unsigned      | YES |     | NULL                |  |    
-| thr-parent-id | Id of the item-uri table that contains the thread parent uri                      | int unsigned      | YES |     | NULL                |  |    
-| external-id   | Id of the item-uri table entry that contains the external uri                     | int unsigned      | YES |     | NULL                |  |    
-| created       | Creation timestamp.                                                               | datetime          | NO  |     | 0001-01-01 00:00:00 |  |    
-| edited        | Date of last edit (default is created)                                            | datetime          | NO  |     | 0001-01-01 00:00:00 |  |    
-| received      | datetime                                                                          | datetime          | NO  |     | 0001-01-01 00:00:00 |  |    
-| gravity       |                                                                                   | tinyint unsigned  | NO  |     | 0                   |  |    
-| network       | Network from where the item comes from                                            | char(4)           | NO  |     |                     |  |    
-| owner-id      | Link to the contact table with uid=0 of the owner of this item                    | int unsigned      | NO  |     | 0                   |  |    
-| author-id     | Link to the contact table with uid=0 of the author of this item                   | int unsigned      | NO  |     | 0                   |  |    
-| causer-id     | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned      | YES |     | NULL                |  |    
-| post-type     | Post type (personal note, image, article, ...)                                    | tinyint unsigned  | NO  |     | 0                   |  |    
-| vid           | Id of the verb table entry that contains the activity verbs                       | smallint unsigned | YES |     | NULL                |  |    
-| private       | 0=public, 1=private, 2=unlisted                                                   | tinyint unsigned  | NO  |     | 0                   |  |    
-| global        |                                                                                   | boolean           | NO  |     | 0                   |  |    
-| visible       |                                                                                   | boolean           | NO  |     | 0                   |  |    
-| deleted       | item has been marked for deletion                                                 | boolean           | NO  |     | 0                   |  |    
+| Field         | Description                                                                       | Type              | Null | Key | Default             | Extra |    
+| ------------- | --------------------------------------------------------------------------------- | ----------------- | ---- | --- | ------------------- | ----- |    
+| uri-id        | Id of the item-uri table entry that contains the item uri                         | int unsigned      | NO   | PRI | NULL                |       |    
+| parent-uri-id | Id of the item-uri table that contains the parent uri                             | int unsigned      | YES  |     | NULL                |       |    
+| thr-parent-id | Id of the item-uri table that contains the thread parent uri                      | int unsigned      | YES  |     | NULL                |       |    
+| external-id   | Id of the item-uri table entry that contains the external uri                     | int unsigned      | YES  |     | NULL                |       |    
+| created       | Creation timestamp.                                                               | datetime          | NO   |     | 0001-01-01 00:00:00 |       |    
+| edited        | Date of last edit (default is created)                                            | datetime          | NO   |     | 0001-01-01 00:00:00 |       |    
+| received      | datetime                                                                          | datetime          | NO   |     | 0001-01-01 00:00:00 |       |    
+| gravity       |                                                                                   | tinyint unsigned  | NO   |     | 0                   |       |    
+| network       | Network from where the item comes from                                            | char(4)           | NO   |     |                     |       |    
+| owner-id      | Link to the contact table with uid=0 of the owner of this item                    | int unsigned      | NO   |     | 0                   |       |    
+| author-id     | Link to the contact table with uid=0 of the author of this item                   | int unsigned      | NO   |     | 0                   |       |    
+| causer-id     | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned      | YES  |     | NULL                |       |    
+| post-type     | Post type (personal note, image, article, ...)                                    | tinyint unsigned  | NO   |     | 0                   |       |    
+| vid           | Id of the verb table entry that contains the activity verbs                       | smallint unsigned | YES  |     | NULL                |       |    
+| private       | 0=public, 1=private, 2=unlisted                                                   | tinyint unsigned  | NO   |     | 0                   |       |    
+| global        |                                                                                   | boolean           | NO   |     | 0                   |       |    
+| visible       |                                                                                   | boolean           | NO   |     | 0                   |       |    
+| deleted       | item has been marked for deletion                                                 | boolean           | NO   |     | 0                   |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_process.md b/doc/database/db_process.md
index 732aa001b2..6e823ce968 100644
--- a/doc/database/db_process.md
+++ b/doc/database/db_process.md
@@ -2,10 +2,10 @@ Table process
 ===========
 Currently running system processes
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| pid     |  | int unsigned  | NO | PRI | NULL                |  |    
-| command |  | varbinary(32) | NO |     |                     |  |    
-| created |  | datetime      | NO |     | 0001-01-01 00:00:00 |  |    
+| Field   | Description | Type          | Null | Key | Default             | Extra |    
+| ------- | ----------- | ------------- | ---- | --- | ------------------- | ----- |    
+| pid     |             | int unsigned  | NO   | PRI | NULL                |       |    
+| command |             | varbinary(32) | NO   |     |                     |       |    
+| created |             | datetime      | NO   |     | 0001-01-01 00:00:00 |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_profile.md b/doc/database/db_profile.md
index c8e27ddc0c..debc093caf 100644
--- a/doc/database/db_profile.md
+++ b/doc/database/db_profile.md
@@ -2,49 +2,49 @@ Table profile
 ===========
 user profiles data
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id           | sequential ID                                 | int unsigned       | NO  | PRI | NULL       | auto_increment |    
-| uid          | Owner User id                                 | mediumint unsigned | NO  |     | 0          |                |    
-| profile-name | Deprecated                                    | varchar(255)       | YES |     | NULL       |                |    
-| is-default   | Deprecated                                    | boolean            | YES |     | NULL       |                |    
-| hide-friends | Hide friend list from viewers of this profile | boolean            | NO  |     | 0          |                |    
-| name         |                                               | varchar(255)       | NO  |     |            |                |    
-| pdesc        | Deprecated                                    | varchar(255)       | YES |     | NULL       |                |    
-| dob          | Day of birth                                  | varchar(32)        | NO  |     | 0000-00-00 |                |    
-| address      |                                               | varchar(255)       | NO  |     |            |                |    
-| locality     |                                               | varchar(255)       | NO  |     |            |                |    
-| region       |                                               | varchar(255)       | NO  |     |            |                |    
-| postal-code  |                                               | varchar(32)        | NO  |     |            |                |    
-| country-name |                                               | varchar(255)       | NO  |     |            |                |    
-| hometown     | Deprecated                                    | varchar(255)       | YES |     | NULL       |                |    
-| gender       | Deprecated                                    | varchar(32)        | YES |     | NULL       |                |    
-| marital      | Deprecated                                    | varchar(255)       | YES |     | NULL       |                |    
-| with         | Deprecated                                    | text               | YES |     | NULL       |                |    
-| howlong      | Deprecated                                    | datetime           | YES |     | NULL       |                |    
-| sexual       | Deprecated                                    | varchar(255)       | YES |     | NULL       |                |    
-| politic      | Deprecated                                    | varchar(255)       | YES |     | NULL       |                |    
-| religion     | Deprecated                                    | varchar(255)       | YES |     | NULL       |                |    
-| pub_keywords |                                               | text               | YES |     | NULL       |                |    
-| prv_keywords |                                               | text               | YES |     | NULL       |                |    
-| likes        | Deprecated                                    | text               | YES |     | NULL       |                |    
-| dislikes     | Deprecated                                    | text               | YES |     | NULL       |                |    
-| about        | Profile description                           | text               | YES |     | NULL       |                |    
-| summary      | Deprecated                                    | varchar(255)       | YES |     | NULL       |                |    
-| music        | Deprecated                                    | text               | YES |     | NULL       |                |    
-| book         | Deprecated                                    | text               | YES |     | NULL       |                |    
-| tv           | Deprecated                                    | text               | YES |     | NULL       |                |    
-| film         | Deprecated                                    | text               | YES |     | NULL       |                |    
-| interest     | Deprecated                                    | text               | YES |     | NULL       |                |    
-| romance      | Deprecated                                    | text               | YES |     | NULL       |                |    
-| work         | Deprecated                                    | text               | YES |     | NULL       |                |    
-| education    | Deprecated                                    | text               | YES |     | NULL       |                |    
-| contact      | Deprecated                                    | text               | YES |     | NULL       |                |    
-| homepage     |                                               | varchar(255)       | NO  |     |            |                |    
-| xmpp         |                                               | varchar(255)       | NO  |     |            |                |    
-| photo        |                                               | varchar(255)       | NO  |     |            |                |    
-| thumb        |                                               | varchar(255)       | NO  |     |            |                |    
-| publish      | publish default profile in local directory    | boolean            | NO  |     | 0          |                |    
-| net-publish  | publish profile in global directory           | boolean            | NO  |     | 0          |                |    
+| Field        | Description                                   | Type               | Null | Key | Default    | Extra          |    
+| ------------ | --------------------------------------------- | ------------------ | ---- | --- | ---------- | -------------- |    
+| id           | sequential ID                                 | int unsigned       | NO   | PRI | NULL       | auto_increment |    
+| uid          | Owner User id                                 | mediumint unsigned | NO   |     | 0          |                |    
+| profile-name | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |    
+| is-default   | Deprecated                                    | boolean            | YES  |     | NULL       |                |    
+| hide-friends | Hide friend list from viewers of this profile | boolean            | NO   |     | 0          |                |    
+| name         |                                               | varchar(255)       | NO   |     |            |                |    
+| pdesc        | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |    
+| dob          | Day of birth                                  | varchar(32)        | NO   |     | 0000-00-00 |                |    
+| address      |                                               | varchar(255)       | NO   |     |            |                |    
+| locality     |                                               | varchar(255)       | NO   |     |            |                |    
+| region       |                                               | varchar(255)       | NO   |     |            |                |    
+| postal-code  |                                               | varchar(32)        | NO   |     |            |                |    
+| country-name |                                               | varchar(255)       | NO   |     |            |                |    
+| hometown     | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |    
+| gender       | Deprecated                                    | varchar(32)        | YES  |     | NULL       |                |    
+| marital      | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |    
+| with         | Deprecated                                    | text               | YES  |     | NULL       |                |    
+| howlong      | Deprecated                                    | datetime           | YES  |     | NULL       |                |    
+| sexual       | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |    
+| politic      | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |    
+| religion     | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |    
+| pub_keywords |                                               | text               | YES  |     | NULL       |                |    
+| prv_keywords |                                               | text               | YES  |     | NULL       |                |    
+| likes        | Deprecated                                    | text               | YES  |     | NULL       |                |    
+| dislikes     | Deprecated                                    | text               | YES  |     | NULL       |                |    
+| about        | Profile description                           | text               | YES  |     | NULL       |                |    
+| summary      | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |    
+| music        | Deprecated                                    | text               | YES  |     | NULL       |                |    
+| book         | Deprecated                                    | text               | YES  |     | NULL       |                |    
+| tv           | Deprecated                                    | text               | YES  |     | NULL       |                |    
+| film         | Deprecated                                    | text               | YES  |     | NULL       |                |    
+| interest     | Deprecated                                    | text               | YES  |     | NULL       |                |    
+| romance      | Deprecated                                    | text               | YES  |     | NULL       |                |    
+| work         | Deprecated                                    | text               | YES  |     | NULL       |                |    
+| education    | Deprecated                                    | text               | YES  |     | NULL       |                |    
+| contact      | Deprecated                                    | text               | YES  |     | NULL       |                |    
+| homepage     |                                               | varchar(255)       | NO   |     |            |                |    
+| xmpp         |                                               | varchar(255)       | NO   |     |            |                |    
+| photo        |                                               | varchar(255)       | NO   |     |            |                |    
+| thumb        |                                               | varchar(255)       | NO   |     |            |                |    
+| publish      | publish default profile in local directory    | boolean            | NO   |     | 0          |                |    
+| net-publish  | publish profile in global directory           | boolean            | NO   |     | 0          |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_profile_check.md b/doc/database/db_profile_check.md
index a98250742b..b35ded56a2 100644
--- a/doc/database/db_profile_check.md
+++ b/doc/database/db_profile_check.md
@@ -2,13 +2,13 @@ Table profile_check
 ===========
 DFRN remote auth use
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id      | sequential ID | int unsigned       | NO | PRI | NULL | auto_increment |    
-| uid     | User id       | mediumint unsigned | NO |     | 0    |                |    
-| cid     | contact.id    | int unsigned       | NO |     | 0    |                |    
-| dfrn_id |               | varchar(255)       | NO |     |      |                |    
-| sec     |               | varchar(255)       | NO |     |      |                |    
-| expire  |               | int unsigned       | NO |     | 0    |                |    
+| Field   | Description   | Type               | Null | Key | Default | Extra          |    
+| ------- | ------------- | ------------------ | ---- | --- | ------- | -------------- |    
+| id      | sequential ID | int unsigned       | NO   | PRI | NULL    | auto_increment |    
+| uid     | User id       | mediumint unsigned | NO   |     | 0       |                |    
+| cid     | contact.id    | int unsigned       | NO   |     | 0       |                |    
+| dfrn_id |               | varchar(255)       | NO   |     |         |                |    
+| sec     |               | varchar(255)       | NO   |     |         |                |    
+| expire  |               | int unsigned       | NO   |     | 0       |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_profile_field.md b/doc/database/db_profile_field.md
index 6b03bde96f..c213bf113d 100644
--- a/doc/database/db_profile_field.md
+++ b/doc/database/db_profile_field.md
@@ -2,15 +2,15 @@ Table profile_field
 ===========
 Custom profile fields
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id      | sequential ID                                               | int unsigned       | NO  | PRI | NULL                | auto_increment |    
-| uid     | Owner user id                                               | mediumint unsigned | NO  |     | 0                   |                |    
-| order   | Field ordering per user                                     | mediumint unsigned | NO  |     | 1                   |                |    
-| psid    | ID of the permission set of this profile field - 0 = public | int unsigned       | YES |     | NULL                |                |    
-| label   | Label of the field                                          | varchar(255)       | NO  |     |                     |                |    
-| value   | Value of the field                                          | text               | YES |     | NULL                |                |    
-| created | creation time                                               | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| edited  | last edit time                                              | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
+| Field   | Description                                                 | Type               | Null | Key | Default             | Extra          |    
+| ------- | ----------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
+| id      | sequential ID                                               | int unsigned       | NO   | PRI | NULL                | auto_increment |    
+| uid     | Owner user id                                               | mediumint unsigned | NO   |     | 0                   |                |    
+| order   | Field ordering per user                                     | mediumint unsigned | NO   |     | 1                   |                |    
+| psid    | ID of the permission set of this profile field - 0 = public | int unsigned       | YES  |     | NULL                |                |    
+| label   | Label of the field                                          | varchar(255)       | NO   |     |                     |                |    
+| value   | Value of the field                                          | text               | YES  |     | NULL                |                |    
+| created | creation time                                               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| edited  | last edit time                                              | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_push_subscriber.md b/doc/database/db_push_subscriber.md
index df59f03290..6098a4fd8d 100644
--- a/doc/database/db_push_subscriber.md
+++ b/doc/database/db_push_subscriber.md
@@ -2,17 +2,17 @@ Table push_subscriber
 ===========
 Used for OStatus: Contains feed subscribers
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id           | sequential ID                     | int unsigned       | NO | PRI | NULL                | auto_increment |    
-| uid          | User id                           | mediumint unsigned | NO |     | 0                   |                |    
-| callback_url |                                   | varchar(255)       | NO |     |                     |                |    
-| topic        |                                   | varchar(255)       | NO |     |                     |                |    
-| nickname     |                                   | varchar(255)       | NO |     |                     |                |    
-| push         | Retrial counter                   | tinyint            | NO |     | 0                   |                |    
-| last_update  | Date of last successful trial     | datetime           | NO |     | 0001-01-01 00:00:00 |                |    
-| next_try     | Next retrial date                 | datetime           | NO |     | 0001-01-01 00:00:00 |                |    
-| renewed      | Date of last subscription renewal | datetime           | NO |     | 0001-01-01 00:00:00 |                |    
-| secret       |                                   | varchar(255)       | NO |     |                     |                |    
+| Field        | Description                       | Type               | Null | Key | Default             | Extra          |    
+| ------------ | --------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
+| id           | sequential ID                     | int unsigned       | NO   | PRI | NULL                | auto_increment |    
+| uid          | User id                           | mediumint unsigned | NO   |     | 0                   |                |    
+| callback_url |                                   | varchar(255)       | NO   |     |                     |                |    
+| topic        |                                   | varchar(255)       | NO   |     |                     |                |    
+| nickname     |                                   | varchar(255)       | NO   |     |                     |                |    
+| push         | Retrial counter                   | tinyint            | NO   |     | 0                   |                |    
+| last_update  | Date of last successful trial     | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| next_try     | Next retrial date                 | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| renewed      | Date of last subscription renewal | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| secret       |                                   | varchar(255)       | NO   |     |                     |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_register.md b/doc/database/db_register.md
index d0f0c8a031..630d7b4a6e 100644
--- a/doc/database/db_register.md
+++ b/doc/database/db_register.md
@@ -2,14 +2,14 @@ Table register
 ===========
 registrations requiring admin approval
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id       | sequential ID | int unsigned       | NO  | PRI | NULL                | auto_increment |    
-| hash     |               | varchar(255)       | NO  |     |                     |                |    
-| created  |               | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| uid      | User id       | mediumint unsigned | NO  |     | 0                   |                |    
-| password |               | varchar(255)       | NO  |     |                     |                |    
-| language |               | varchar(16)        | NO  |     |                     |                |    
-| note     |               | text               | YES |     | NULL                |                |    
+| Field    | Description   | Type               | Null | Key | Default             | Extra          |    
+| -------- | ------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
+| id       | sequential ID | int unsigned       | NO   | PRI | NULL                | auto_increment |    
+| hash     |               | varchar(255)       | NO   |     |                     |                |    
+| created  |               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| uid      | User id       | mediumint unsigned | NO   |     | 0                   |                |    
+| password |               | varchar(255)       | NO   |     |                     |                |    
+| language |               | varchar(16)        | NO   |     |                     |                |    
+| note     |               | text               | YES  |     | NULL                |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_search.md b/doc/database/db_search.md
index d37c48b5e0..0297545a0e 100644
--- a/doc/database/db_search.md
+++ b/doc/database/db_search.md
@@ -2,10 +2,10 @@ Table search
 ===========
 
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id   | sequential ID | int unsigned       | NO | PRI | NULL | auto_increment |    
-| uid  | User id       | mediumint unsigned | NO |     | 0    |                |    
-| term |               | varchar(255)       | NO |     |      |                |    
+| Field | Description   | Type               | Null | Key | Default | Extra          |    
+| ----- | ------------- | ------------------ | ---- | --- | ------- | -------------- |    
+| id    | sequential ID | int unsigned       | NO   | PRI | NULL    | auto_increment |    
+| uid   | User id       | mediumint unsigned | NO   |     | 0       |                |    
+| term  |               | varchar(255)       | NO   |     |         |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_session.md b/doc/database/db_session.md
index ca7f523f02..04c85487f3 100644
--- a/doc/database/db_session.md
+++ b/doc/database/db_session.md
@@ -2,11 +2,11 @@ Table session
 ===========
 web session storage
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id     | sequential ID | bigint unsigned | NO  | PRI | NULL | auto_increment |    
-| sid    |               | varbinary(255)  | NO  |     |      |                |    
-| data   |               | text            | YES |     | NULL |                |    
-| expire |               | int unsigned    | NO  |     | 0    |                |    
+| Field  | Description   | Type            | Null | Key | Default | Extra          |    
+| ------ | ------------- | --------------- | ---- | --- | ------- | -------------- |    
+| id     | sequential ID | bigint unsigned | NO   | PRI | NULL    | auto_increment |    
+| sid    |               | varbinary(255)  | NO   |     |         |                |    
+| data   |               | text            | YES  |     | NULL    |                |    
+| expire |               | int unsigned    | NO   |     | 0       |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_storage.md b/doc/database/db_storage.md
index cbed7df2c0..00807760c5 100644
--- a/doc/database/db_storage.md
+++ b/doc/database/db_storage.md
@@ -2,9 +2,9 @@ Table storage
 ===========
 Data stored by Database storage backend
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id   | Auto incremented image data id | int unsigned | NO | PRI | NULL | auto_increment |    
-| data | file data                      | longblob     | NO |     | NULL |                |    
+| Field | Description                    | Type         | Null | Key | Default | Extra          |    
+| ----- | ------------------------------ | ------------ | ---- | --- | ------- | -------------- |    
+| id    | Auto incremented image data id | int unsigned | NO   | PRI | NULL    | auto_increment |    
+| data  | file data                      | longblob     | NO   |     | NULL    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_tag.md b/doc/database/db_tag.md
index e2d3cc07de..1d1ed72b09 100644
--- a/doc/database/db_tag.md
+++ b/doc/database/db_tag.md
@@ -2,10 +2,10 @@ Table tag
 ===========
 tags and mentions
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id   |  | int unsigned   | NO | PRI | NULL | auto_increment |    
-| name |  | varchar(96)    | NO |     |      |                |    
-| url  |  | varbinary(255) | NO |     |      |                |    
+| Field | Description | Type           | Null | Key | Default | Extra          |    
+| ----- | ----------- | -------------- | ---- | --- | ------- | -------------- |    
+| id    |             | int unsigned   | NO   | PRI | NULL    | auto_increment |    
+| name  |             | varchar(96)    | NO   |     |         |                |    
+| url   |             | varbinary(255) | NO   |     |         |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_tokens.md b/doc/database/db_tokens.md
index 3fe965fa6b..d3f45bb796 100644
--- a/doc/database/db_tokens.md
+++ b/doc/database/db_tokens.md
@@ -2,13 +2,13 @@ Table tokens
 ===========
 OAuth usage
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id        |         | varchar(40)        | NO  | PRI | NULL |  |    
-| secret    |         | text               | YES |     | NULL |  |    
-| client_id |         | varchar(20)        | NO  |     |      |  |    
-| expires   |         | int                | NO  |     | 0    |  |    
-| scope     |         | varchar(200)       | NO  |     |      |  |    
-| uid       | User id | mediumint unsigned | NO  |     | 0    |  |    
+| Field     | Description | Type               | Null | Key | Default | Extra |    
+| --------- | ----------- | ------------------ | ---- | --- | ------- | ----- |    
+| id        |             | varchar(40)        | NO   | PRI | NULL    |       |    
+| secret    |             | text               | YES  |     | NULL    |       |    
+| client_id |             | varchar(20)        | NO   |     |         |       |    
+| expires   |             | int                | NO   |     | 0       |       |    
+| scope     |             | varchar(200)       | NO   |     |         |       |    
+| uid       | User id     | mediumint unsigned | NO   |     | 0       |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_user-contact.md b/doc/database/db_user-contact.md
index 108a568e08..ba529fd0a8 100644
--- a/doc/database/db_user-contact.md
+++ b/doc/database/db_user-contact.md
@@ -2,12 +2,12 @@ Table user-contact
 ===========
 User specific public contact data
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| cid       | Contact id of the linked public contact     | int unsigned       | NO  | PRI | 0    |  |    
-| uid       | User id                                     | mediumint unsigned | NO  | PRI | 0    |  |    
-| blocked   | Contact is completely blocked for this user | boolean            | YES |     | NULL |  |    
-| ignored   | Posts from this contact are ignored         | boolean            | YES |     | NULL |  |    
-| collapsed | Posts from this contact are collapsed       | boolean            | YES |     | NULL |  |    
+| Field     | Description                                 | Type               | Null | Key | Default | Extra |    
+| --------- | ------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |    
+| cid       | Contact id of the linked public contact     | int unsigned       | NO   | PRI | 0       |       |    
+| uid       | User id                                     | mediumint unsigned | NO   | PRI | 0       |       |    
+| blocked   | Contact is completely blocked for this user | boolean            | YES  |     | NULL    |       |    
+| ignored   | Posts from this contact are ignored         | boolean            | YES  |     | NULL    |       |    
+| collapsed | Posts from this contact are collapsed       | boolean            | YES  |     | NULL    |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_user.md b/doc/database/db_user.md
index a56ab90486..6e63c6a3a3 100644
--- a/doc/database/db_user.md
+++ b/doc/database/db_user.md
@@ -2,52 +2,52 @@ Table user
 ===========
 The local users
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| uid                      | sequential ID                                             | mediumint unsigned | NO  | PRI | NULL                | auto_increment |    
-| parent-uid               | The parent user that has full control about this user     | mediumint unsigned | YES |     | NULL                |                |    
-| guid                     | A unique identifier for this user                         | varchar(64)        | NO  |     |                     |                |    
-| username                 | Name that this user is known by                           | varchar(255)       | NO  |     |                     |                |    
-| password                 | encrypted password                                        | varchar(255)       | NO  |     |                     |                |    
-| legacy_password          | Is the password hash double-hashed?                       | boolean            | NO  |     | 0                   |                |    
-| nickname                 | nick- and user name                                       | varchar(255)       | NO  |     |                     |                |    
-| email                    | the users email address                                   | varchar(255)       | NO  |     |                     |                |    
-| openid                   |                                                           | varchar(255)       | NO  |     |                     |                |    
-| timezone                 | PHP-legal timezone                                        | varchar(128)       | NO  |     |                     |                |    
-| language                 | default language                                          | varchar(32)        | NO  |     | en                  |                |    
-| register_date            | timestamp of registration                                 | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| login_date               | timestamp of last login                                   | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| default-location         | Default for item.location                                 | varchar(255)       | NO  |     |                     |                |    
-| allow_location           | 1 allows to display the location                          | boolean            | NO  |     | 0                   |                |    
-| theme                    | user theme preference                                     | varchar(255)       | NO  |     |                     |                |    
-| pubkey                   | RSA public key 4096 bit                                   | text               | YES |     | NULL                |                |    
-| prvkey                   | RSA private key 4096 bit                                  | text               | YES |     | NULL                |                |    
-| spubkey                  |                                                           | text               | YES |     | NULL                |                |    
-| sprvkey                  |                                                           | text               | YES |     | NULL                |                |    
-| verified                 | user is verified through email                            | boolean            | NO  |     | 0                   |                |    
-| blocked                  | 1 for user is blocked                                     | boolean            | NO  |     | 0                   |                |    
-| blockwall                | Prohibit contacts to post to the profile page of the user | boolean            | NO  |     | 0                   |                |    
-| hidewall                 | Hide profile details from unkown viewers                  | boolean            | NO  |     | 0                   |                |    
-| blocktags                | Prohibit contacts to tag the post of this user            | boolean            | NO  |     | 0                   |                |    
-| unkmail                  | Permit unknown people to send private mails to this user  | boolean            | NO  |     | 0                   |                |    
-| cntunkmail               |                                                           | int unsigned       | NO  |     | 10                  |                |    
-| notify-flags             | email notification options                                | smallint unsigned  | NO  |     | 65535               |                |    
-| page-flags               | page/profile type                                         | tinyint unsigned   | NO  |     | 0                   |                |    
-| account-type             |                                                           | tinyint unsigned   | NO  |     | 0                   |                |    
-| prvnets                  |                                                           | boolean            | NO  |     | 0                   |                |    
-| pwdreset                 | Password reset request token                              | varchar(255)       | YES |     | NULL                |                |    
-| pwdreset_time            | Timestamp of the last password reset request              | datetime           | YES |     | NULL                |                |    
-| maxreq                   |                                                           | int unsigned       | NO  |     | 10                  |                |    
-| expire                   |                                                           | int unsigned       | NO  |     | 0                   |                |    
-| account_removed          | if 1 the account is removed                               | boolean            | NO  |     | 0                   |                |    
-| account_expired          |                                                           | boolean            | NO  |     | 0                   |                |    
-| account_expires_on       | timestamp when account expires and will be deleted        | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| expire_notification_sent | timestamp of last warning of account expiration           | datetime           | NO  |     | 0001-01-01 00:00:00 |                |    
-| def_gid                  |                                                           | int unsigned       | NO  |     | 0                   |                |    
-| allow_cid                | default permission for this user                          | mediumtext         | YES |     | NULL                |                |    
-| allow_gid                | default permission for this user                          | mediumtext         | YES |     | NULL                |                |    
-| deny_cid                 | default permission for this user                          | mediumtext         | YES |     | NULL                |                |    
-| deny_gid                 | default permission for this user                          | mediumtext         | YES |     | NULL                |                |    
-| openidserver             |                                                           | text               | YES |     | NULL                |                |    
+| Field                    | Description                                               | Type               | Null | Key | Default             | Extra          |    
+| ------------------------ | --------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
+| uid                      | sequential ID                                             | mediumint unsigned | NO   | PRI | NULL                | auto_increment |    
+| parent-uid               | The parent user that has full control about this user     | mediumint unsigned | YES  |     | NULL                |                |    
+| guid                     | A unique identifier for this user                         | varchar(64)        | NO   |     |                     |                |    
+| username                 | Name that this user is known by                           | varchar(255)       | NO   |     |                     |                |    
+| password                 | encrypted password                                        | varchar(255)       | NO   |     |                     |                |    
+| legacy_password          | Is the password hash double-hashed?                       | boolean            | NO   |     | 0                   |                |    
+| nickname                 | nick- and user name                                       | varchar(255)       | NO   |     |                     |                |    
+| email                    | the users email address                                   | varchar(255)       | NO   |     |                     |                |    
+| openid                   |                                                           | varchar(255)       | NO   |     |                     |                |    
+| timezone                 | PHP-legal timezone                                        | varchar(128)       | NO   |     |                     |                |    
+| language                 | default language                                          | varchar(32)        | NO   |     | en                  |                |    
+| register_date            | timestamp of registration                                 | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| login_date               | timestamp of last login                                   | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| default-location         | Default for item.location                                 | varchar(255)       | NO   |     |                     |                |    
+| allow_location           | 1 allows to display the location                          | boolean            | NO   |     | 0                   |                |    
+| theme                    | user theme preference                                     | varchar(255)       | NO   |     |                     |                |    
+| pubkey                   | RSA public key 4096 bit                                   | text               | YES  |     | NULL                |                |    
+| prvkey                   | RSA private key 4096 bit                                  | text               | YES  |     | NULL                |                |    
+| spubkey                  |                                                           | text               | YES  |     | NULL                |                |    
+| sprvkey                  |                                                           | text               | YES  |     | NULL                |                |    
+| verified                 | user is verified through email                            | boolean            | NO   |     | 0                   |                |    
+| blocked                  | 1 for user is blocked                                     | boolean            | NO   |     | 0                   |                |    
+| blockwall                | Prohibit contacts to post to the profile page of the user | boolean            | NO   |     | 0                   |                |    
+| hidewall                 | Hide profile details from unkown viewers                  | boolean            | NO   |     | 0                   |                |    
+| blocktags                | Prohibit contacts to tag the post of this user            | boolean            | NO   |     | 0                   |                |    
+| unkmail                  | Permit unknown people to send private mails to this user  | boolean            | NO   |     | 0                   |                |    
+| cntunkmail               |                                                           | int unsigned       | NO   |     | 10                  |                |    
+| notify-flags             | email notification options                                | smallint unsigned  | NO   |     | 65535               |                |    
+| page-flags               | page/profile type                                         | tinyint unsigned   | NO   |     | 0                   |                |    
+| account-type             |                                                           | tinyint unsigned   | NO   |     | 0                   |                |    
+| prvnets                  |                                                           | boolean            | NO   |     | 0                   |                |    
+| pwdreset                 | Password reset request token                              | varchar(255)       | YES  |     | NULL                |                |    
+| pwdreset_time            | Timestamp of the last password reset request              | datetime           | YES  |     | NULL                |                |    
+| maxreq                   |                                                           | int unsigned       | NO   |     | 10                  |                |    
+| expire                   |                                                           | int unsigned       | NO   |     | 0                   |                |    
+| account_removed          | if 1 the account is removed                               | boolean            | NO   |     | 0                   |                |    
+| account_expired          |                                                           | boolean            | NO   |     | 0                   |                |    
+| account_expires_on       | timestamp when account expires and will be deleted        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| expire_notification_sent | timestamp of last warning of account expiration           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| def_gid                  |                                                           | int unsigned       | NO   |     | 0                   |                |    
+| allow_cid                | default permission for this user                          | mediumtext         | YES  |     | NULL                |                |    
+| allow_gid                | default permission for this user                          | mediumtext         | YES  |     | NULL                |                |    
+| deny_cid                 | default permission for this user                          | mediumtext         | YES  |     | NULL                |                |    
+| deny_gid                 | default permission for this user                          | mediumtext         | YES  |     | NULL                |                |    
+| openidserver             |                                                           | text               | YES  |     | NULL                |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_userd.md b/doc/database/db_userd.md
index ff924dfa78..df2c20c33b 100644
--- a/doc/database/db_userd.md
+++ b/doc/database/db_userd.md
@@ -2,9 +2,9 @@ Table userd
 ===========
 Deleted usernames
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id       | sequential ID | int unsigned | NO | PRI | NULL | auto_increment |    
-| username |               | varchar(255) | NO |     | NULL |                |    
+| Field    | Description   | Type         | Null | Key | Default | Extra          |    
+| -------- | ------------- | ------------ | ---- | --- | ------- | -------------- |    
+| id       | sequential ID | int unsigned | NO   | PRI | NULL    | auto_increment |    
+| username |               | varchar(255) | NO   |     | NULL    |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_verb.md b/doc/database/db_verb.md
index 4469acff06..f5451104c9 100644
--- a/doc/database/db_verb.md
+++ b/doc/database/db_verb.md
@@ -2,9 +2,9 @@ Table verb
 ===========
 Activity Verbs
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id   |  | smallint unsigned | NO | PRI | NULL | auto_increment |    
-| name |  | varchar(100)      | NO |     |      |                |    
+| Field | Description | Type              | Null | Key | Default | Extra          |    
+| ----- | ----------- | ----------------- | ---- | --- | ------- | -------------- |    
+| id    |             | smallint unsigned | NO   | PRI | NULL    | auto_increment |    
+| name  |             | varchar(100)      | NO   |     |         |                |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_worker-ipc.md b/doc/database/db_worker-ipc.md
index d278be3b43..266efc576c 100644
--- a/doc/database/db_worker-ipc.md
+++ b/doc/database/db_worker-ipc.md
@@ -2,9 +2,9 @@ Table worker-ipc
 ===========
 Inter process communication between the frontend and the worker
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| key  |                           | int     | NO  | PRI | NULL |  |    
-| jobs | Flag for outstanding jobs | boolean | YES |     | NULL |  |    
+| Field | Description               | Type    | Null | Key | Default | Extra |    
+| ----- | ------------------------- | ------- | ---- | --- | ------- | ----- |    
+| key   |                           | int     | NO   | PRI | NULL    |       |    
+| jobs  | Flag for outstanding jobs | boolean | YES  |     | NULL    |       |    
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_workerqueue.md b/doc/database/db_workerqueue.md
index b104f7a5f6..fac65b0197 100644
--- a/doc/database/db_workerqueue.md
+++ b/doc/database/db_workerqueue.md
@@ -2,17 +2,17 @@ Table workerqueue
 ===========
 Background tasks queue entries
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
-| id        | Auto incremented worker task id                         | int unsigned     | NO  | PRI | NULL                | auto_increment |    
-| command   | Task command                                            | varchar(100)     | YES |     | NULL                |                |    
-| parameter | Task parameter                                          | mediumtext       | YES |     | NULL                |                |    
-| priority  | Task priority                                           | tinyint unsigned | NO  |     | 0                   |                |    
-| created   | Creation date                                           | datetime         | NO  |     | 0001-01-01 00:00:00 |                |    
-| pid       | Process id of the worker                                | int unsigned     | NO  |     | 0                   |                |    
-| executed  | Execution date                                          | datetime         | NO  |     | 0001-01-01 00:00:00 |                |    
-| next_try  | Next retrial date                                       | datetime         | NO  |     | 0001-01-01 00:00:00 |                |    
-| retrial   | Retrial counter                                         | tinyint          | NO  |     | 0                   |                |    
-| done      | Marked 1 when the task was done - will be deleted later | boolean          | NO  |     | 0                   |                |    
+| Field     | Description                                             | Type             | Null | Key | Default             | Extra          |    
+| --------- | ------------------------------------------------------- | ---------------- | ---- | --- | ------------------- | -------------- |    
+| id        | Auto incremented worker task id                         | int unsigned     | NO   | PRI | NULL                | auto_increment |    
+| command   | Task command                                            | varchar(100)     | YES  |     | NULL                |                |    
+| parameter | Task parameter                                          | mediumtext       | YES  |     | NULL                |                |    
+| priority  | Task priority                                           | tinyint unsigned | NO   |     | 0                   |                |    
+| created   | Creation date                                           | datetime         | NO   |     | 0001-01-01 00:00:00 |                |    
+| pid       | Process id of the worker                                | int unsigned     | NO   |     | 0                   |                |    
+| executed  | Execution date                                          | datetime         | NO   |     | 0001-01-01 00:00:00 |                |    
+| next_try  | Next retrial date                                       | datetime         | NO   |     | 0001-01-01 00:00:00 |                |    
+| retrial   | Retrial counter                                         | tinyint          | NO   |     | 0                   |                |    
+| done      | Marked 1 when the task was done - will be deleted later | boolean          | NO   |     | 0                   |                |    
 
 Return to [database documentation](help/database)
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 1cf1bc12bc..4451b09ab6 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -166,8 +166,33 @@ class DBStructure
 
 		$tables = [];
 		foreach (self::definition(null) as $name => $definition) {
-			$fields  = [];
-			$lengths = [];
+			$fields  = [[
+				'name'    => 'Field',
+				'comment' => 'Description',
+				'type'    => 'Type',
+				'null'    => 'Null',
+				'primary' => 'Key',
+				'default' => 'Default',
+				'extra'   => 'Extra',
+			], 
+			[
+				'name'    => '-',
+				'comment' => '-',
+				'type'    => '-',
+				'null'    => '-',
+				'primary' => '-',
+				'default' => '-',
+				'extra'   => '-',
+			]];
+			$lengths = [
+				'name'    => 5,
+				'comment' => 11,
+				'type'    => 4,
+				'null'    => 4,
+				'primary' => 3,
+				'default' => 7,
+				'extra'   => 5,
+			];
 			foreach ($definition['fields'] as $key => $value) {
 				$field = [];
 				$field['name']    = $key;
@@ -186,9 +211,9 @@ class DBStructure
 
 			array_walk_recursive($fields, function(&$value, $key) use ($lengths)
 			{
-				$value = str_pad($value, $lengths[$key]);
+				$value = str_pad($value, $lengths[$key], $value === '-' ? '-' : ' ');
 			});
-
+			
 			$tables[] = ['name' => $name, 'comment' => $definition['comment']];
 			$content = Renderer::replaceMacros(Renderer::getMarkupTemplate('structure.tpl'), [
 				'$name'    => $name,
diff --git a/view/templates/structure.tpl b/view/templates/structure.tpl
index 15049ab575..7b1569e37d 100644
--- a/view/templates/structure.tpl
+++ b/view/templates/structure.tpl
@@ -2,8 +2,6 @@ Table {{$name}}
 ===========
 {{$comment}}
 
-| Field | Description | Type | Null | Key | Default | Extra |
-| ----- | ----------- | ---- | ---- | --- | ------- | ----- |
 {{foreach $fields as $field}}
 | {{$field.name}} | {{$field.comment}} | {{$field.type}} | {{$field.null}} | {{$field.primary}} | {{$field.default}} | {{$field.extra}} |    
 {{/foreach}}

From 2cd0c1d30d237806e9c3853aa0645f786e31855c Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 14 Jun 2021 06:10:11 +0000
Subject: [PATCH 08/14] Trailing whitespace removed

---
 doc/database/db_2fa_app_specific_password.md |  17 +-
 doc/database/db_2fa_recovery_codes.md        |  13 +-
 doc/database/db_2fa_trusted_browser.md       |  15 +-
 doc/database/db_addon.md                     |  19 ++-
 doc/database/db_apcontact.md                 |  53 +++---
 doc/database/db_application-token.md         |  25 +--
 doc/database/db_application.md               |  27 +--
 doc/database/db_attach.md                    |  35 ++--
 doc/database/db_auth_codes.md                |  15 +-
 doc/database/db_cache.md                     |  13 +-
 doc/database/db_challenge.md                 |  17 +-
 doc/database/db_clients.md                   |  17 +-
 doc/database/db_config.md                    |  13 +-
 doc/database/db_contact-relation.md          |  15 +-
 doc/database/db_contact.md                   | 165 ++++++++++---------
 doc/database/db_conv.md                      |  21 +--
 doc/database/db_conversation.md              |  21 +--
 doc/database/db_delayed-post.md              |  13 +-
 doc/database/db_diaspora-interaction.md      |   9 +-
 doc/database/db_event.md                     |  45 ++---
 doc/database/db_fcontact.md                  |  39 ++---
 doc/database/db_fsuggest.md                  |  23 +--
 doc/database/db_group.md                     |  15 +-
 doc/database/db_group_member.md              |  11 +-
 doc/database/db_gserver-tag.md               |   9 +-
 doc/database/db_gserver.md                   |  51 +++---
 doc/database/db_hook.md                      |  15 +-
 doc/database/db_host.md                      |   9 +-
 doc/database/db_inbox-status.md              |  19 ++-
 doc/database/db_intro.md                     |  27 +--
 doc/database/db_item-uri.md                  |  11 +-
 doc/database/db_locks.md                     |  15 +-
 doc/database/db_mail.md                      |  49 +++---
 doc/database/db_mailacct.md                  |  31 ++--
 doc/database/db_manage.md                    |  11 +-
 doc/database/db_notification.md              |  23 +--
 doc/database/db_notify-threads.md            |  17 +-
 doc/database/db_notify.md                    |  41 ++---
 doc/database/db_oembed.md                    |  13 +-
 doc/database/db_openwebauth-token.md         |  17 +-
 doc/database/db_parsed_url.md                |  19 ++-
 doc/database/db_pconfig.md                   |  15 +-
 doc/database/db_permissionset.md             |  17 +-
 doc/database/db_photo.md                     |  59 +++----
 doc/database/db_post-category.md             |  13 +-
 doc/database/db_post-content.md              |  39 ++---
 doc/database/db_post-delivery-data.md        |  27 +--
 doc/database/db_post-media.md                |  43 ++---
 doc/database/db_post-tag.md                  |  13 +-
 doc/database/db_post-thread-user.md          |  51 +++---
 doc/database/db_post-thread.md               |  23 +--
 doc/database/db_post-user-notification.md    |  11 +-
 doc/database/db_post-user.md                 |  65 ++++----
 doc/database/db_post.md                      |  41 ++---
 doc/database/db_process.md                   |  11 +-
 doc/database/db_profile.md                   |  89 +++++-----
 doc/database/db_profile_check.md             |  17 +-
 doc/database/db_profile_field.md             |  21 +--
 doc/database/db_push_subscriber.md           |  25 +--
 doc/database/db_register.md                  |  19 ++-
 doc/database/db_search.md                    |  11 +-
 doc/database/db_session.md                   |  13 +-
 doc/database/db_storage.md                   |   9 +-
 doc/database/db_tag.md                       |  11 +-
 doc/database/db_tokens.md                    |  17 +-
 doc/database/db_user-contact.md              |  15 +-
 doc/database/db_user.md                      |  95 +++++------
 doc/database/db_userd.md                     |   9 +-
 doc/database/db_verb.md                      |   9 +-
 doc/database/db_worker-ipc.md                |   9 +-
 doc/database/db_workerqueue.md               |  25 +--
 view/templates/structure.tpl                 |   3 +-
 72 files changed, 965 insertions(+), 893 deletions(-)

diff --git a/doc/database/db_2fa_app_specific_password.md b/doc/database/db_2fa_app_specific_password.md
index 28ec292c6e..6dba89bf41 100644
--- a/doc/database/db_2fa_app_specific_password.md
+++ b/doc/database/db_2fa_app_specific_password.md
@@ -1,14 +1,15 @@
 Table 2fa_app_specific_password
 ===========
+
 Two-factor app-specific _password
 
-| Field           | Description                              | Type               | Null | Key | Default | Extra          |    
-| --------------- | ---------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |    
-| id              | Password ID for revocation               | mediumint unsigned | NO   | PRI | NULL    | auto_increment |    
-| uid             | User ID                                  | mediumint unsigned | NO   |     | NULL    |                |    
-| description     | Description of the usage of the password | varchar(255)       | YES  |     | NULL    |                |    
-| hashed_password | Hashed password                          | varchar(255)       | NO   |     | NULL    |                |    
-| generated       | Datetime the password was generated      | datetime           | NO   |     | NULL    |                |    
-| last_used       | Datetime the password was last used      | datetime           | YES  |     | NULL    |                |    
+| Field           | Description                              | Type               | Null | Key | Default | Extra          |
+| --------------- | ---------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |
+| id              | Password ID for revocation               | mediumint unsigned | NO   | PRI | NULL    | auto_increment |
+| uid             | User ID                                  | mediumint unsigned | NO   |     | NULL    |                |
+| description     | Description of the usage of the password | varchar(255)       | YES  |     | NULL    |                |
+| hashed_password | Hashed password                          | varchar(255)       | NO   |     | NULL    |                |
+| generated       | Datetime the password was generated      | datetime           | NO   |     | NULL    |                |
+| last_used       | Datetime the password was last used      | datetime           | YES  |     | NULL    |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_2fa_recovery_codes.md b/doc/database/db_2fa_recovery_codes.md
index 4263763693..30e00ef658 100644
--- a/doc/database/db_2fa_recovery_codes.md
+++ b/doc/database/db_2fa_recovery_codes.md
@@ -1,12 +1,13 @@
 Table 2fa_recovery_codes
 ===========
+
 Two-factor authentication recovery codes
 
-| Field     | Description                     | Type               | Null | Key | Default | Extra |    
-| --------- | ------------------------------- | ------------------ | ---- | --- | ------- | ----- |    
-| uid       | User ID                         | mediumint unsigned | NO   | PRI | NULL    |       |    
-| code      | Recovery code string            | varchar(50)        | NO   | PRI | NULL    |       |    
-| generated | Datetime the code was generated | datetime           | NO   |     | NULL    |       |    
-| used      | Datetime the code was used      | datetime           | YES  |     | NULL    |       |    
+| Field     | Description                     | Type               | Null | Key | Default | Extra |
+| --------- | ------------------------------- | ------------------ | ---- | --- | ------- | ----- |
+| uid       | User ID                         | mediumint unsigned | NO   | PRI | NULL    |       |
+| code      | Recovery code string            | varchar(50)        | NO   | PRI | NULL    |       |
+| generated | Datetime the code was generated | datetime           | NO   |     | NULL    |       |
+| used      | Datetime the code was used      | datetime           | YES  |     | NULL    |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_2fa_trusted_browser.md b/doc/database/db_2fa_trusted_browser.md
index b412c104b9..34845ba579 100644
--- a/doc/database/db_2fa_trusted_browser.md
+++ b/doc/database/db_2fa_trusted_browser.md
@@ -1,13 +1,14 @@
 Table 2fa_trusted_browser
 ===========
+
 Two-factor authentication trusted browsers
 
-| Field       | Description                                | Type               | Null | Key | Default | Extra |    
-| ----------- | ------------------------------------------ | ------------------ | ---- | --- | ------- | ----- |    
-| cookie_hash | Trusted cookie hash                        | varchar(80)        | NO   | PRI | NULL    |       |    
-| uid         | User ID                                    | mediumint unsigned | NO   |     | NULL    |       |    
-| user_agent  | User agent string                          | text               | YES  |     | NULL    |       |    
-| created     | Datetime the trusted browser was recorded  | datetime           | NO   |     | NULL    |       |    
-| last_used   | Datetime the trusted browser was last used | datetime           | YES  |     | NULL    |       |    
+| Field       | Description                                | Type               | Null | Key | Default | Extra |
+| ----------- | ------------------------------------------ | ------------------ | ---- | --- | ------- | ----- |
+| cookie_hash | Trusted cookie hash                        | varchar(80)        | NO   | PRI | NULL    |       |
+| uid         | User ID                                    | mediumint unsigned | NO   |     | NULL    |       |
+| user_agent  | User agent string                          | text               | YES  |     | NULL    |       |
+| created     | Datetime the trusted browser was recorded  | datetime           | NO   |     | NULL    |       |
+| last_used   | Datetime the trusted browser was last used | datetime           | YES  |     | NULL    |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_addon.md b/doc/database/db_addon.md
index 716ee9a1c5..568e64a5a6 100644
--- a/doc/database/db_addon.md
+++ b/doc/database/db_addon.md
@@ -1,15 +1,16 @@
 Table addon
 ===========
+
 registered addons
 
-| Field        | Description                                   | Type         | Null | Key | Default | Extra          |    
-| ------------ | --------------------------------------------- | ------------ | ---- | --- | ------- | -------------- |    
-| id           |                                               | int unsigned | NO   | PRI | NULL    | auto_increment |    
-| name         | addon base (file)name                         | varchar(50)  | NO   |     |         |                |    
-| version      | currently unused                              | varchar(50)  | NO   |     |         |                |    
-| installed    | currently always 1                            | boolean      | NO   |     | 0       |                |    
-| hidden       | currently unused                              | boolean      | NO   |     | 0       |                |    
-| timestamp    | file timestamp to check for reloads           | int unsigned | NO   |     | 0       |                |    
-| plugin_admin | 1 = has admin config, 0 = has no admin config | boolean      | NO   |     | 0       |                |    
+| Field        | Description                                   | Type         | Null | Key | Default | Extra          |
+| ------------ | --------------------------------------------- | ------------ | ---- | --- | ------- | -------------- |
+| id           |                                               | int unsigned | NO   | PRI | NULL    | auto_increment |
+| name         | addon base (file)name                         | varchar(50)  | NO   |     |         |                |
+| version      | currently unused                              | varchar(50)  | NO   |     |         |                |
+| installed    | currently always 1                            | boolean      | NO   |     | 0       |                |
+| hidden       | currently unused                              | boolean      | NO   |     | 0       |                |
+| timestamp    | file timestamp to check for reloads           | int unsigned | NO   |     | 0       |                |
+| plugin_admin | 1 = has admin config, 0 = has no admin config | boolean      | NO   |     | 0       |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_apcontact.md b/doc/database/db_apcontact.md
index a32cc2a9ad..c76c99b8b3 100644
--- a/doc/database/db_apcontact.md
+++ b/doc/database/db_apcontact.md
@@ -1,32 +1,33 @@
 Table apcontact
 ===========
+
 ActivityPub compatible contacts - used in the ActivityPub implementation
 
-| Field            | Description                  | Type           | Null | Key | Default             | Extra |    
-| ---------------- | ---------------------------- | -------------- | ---- | --- | ------------------- | ----- |    
-| url              | URL of the contact           | varbinary(255) | NO   | PRI | NULL                |       |    
-| uuid             |                              | varchar(255)   | YES  |     | NULL                |       |    
-| type             |                              | varchar(20)    | NO   |     | NULL                |       |    
-| following        |                              | varchar(255)   | YES  |     | NULL                |       |    
-| followers        |                              | varchar(255)   | YES  |     | NULL                |       |    
-| inbox            |                              | varchar(255)   | NO   |     | NULL                |       |    
-| outbox           |                              | varchar(255)   | YES  |     | NULL                |       |    
-| sharedinbox      |                              | varchar(255)   | YES  |     | NULL                |       |    
-| manually-approve |                              | boolean        | YES  |     | NULL                |       |    
-| nick             |                              | varchar(255)   | NO   |     |                     |       |    
-| name             |                              | varchar(255)   | YES  |     | NULL                |       |    
-| about            |                              | text           | YES  |     | NULL                |       |    
-| photo            |                              | varchar(255)   | YES  |     | NULL                |       |    
-| addr             |                              | varchar(255)   | YES  |     | NULL                |       |    
-| alias            |                              | varchar(255)   | YES  |     | NULL                |       |    
-| pubkey           |                              | text           | YES  |     | NULL                |       |    
-| subscribe        |                              | varchar(255)   | YES  |     | NULL                |       |    
-| baseurl          | baseurl of the ap contact    | varchar(255)   | YES  |     | NULL                |       |    
-| gsid             | Global Server ID             | int unsigned   | YES  |     | NULL                |       |    
-| generator        | Name of the contact&#039;s system | varchar(255)   | YES  |     | NULL                |       |    
-| following_count  | Number of following contacts | int unsigned   | YES  |     | 0                   |       |    
-| followers_count  | Number of followers          | int unsigned   | YES  |     | 0                   |       |    
-| statuses_count   | Number of posts              | int unsigned   | YES  |     | 0                   |       |    
-| updated          |                              | datetime       | NO   |     | 0001-01-01 00:00:00 |       |    
+| Field            | Description                  | Type           | Null | Key | Default             | Extra |
+| ---------------- | ---------------------------- | -------------- | ---- | --- | ------------------- | ----- |
+| url              | URL of the contact           | varbinary(255) | NO   | PRI | NULL                |       |
+| uuid             |                              | varchar(255)   | YES  |     | NULL                |       |
+| type             |                              | varchar(20)    | NO   |     | NULL                |       |
+| following        |                              | varchar(255)   | YES  |     | NULL                |       |
+| followers        |                              | varchar(255)   | YES  |     | NULL                |       |
+| inbox            |                              | varchar(255)   | NO   |     | NULL                |       |
+| outbox           |                              | varchar(255)   | YES  |     | NULL                |       |
+| sharedinbox      |                              | varchar(255)   | YES  |     | NULL                |       |
+| manually-approve |                              | boolean        | YES  |     | NULL                |       |
+| nick             |                              | varchar(255)   | NO   |     |                     |       |
+| name             |                              | varchar(255)   | YES  |     | NULL                |       |
+| about            |                              | text           | YES  |     | NULL                |       |
+| photo            |                              | varchar(255)   | YES  |     | NULL                |       |
+| addr             |                              | varchar(255)   | YES  |     | NULL                |       |
+| alias            |                              | varchar(255)   | YES  |     | NULL                |       |
+| pubkey           |                              | text           | YES  |     | NULL                |       |
+| subscribe        |                              | varchar(255)   | YES  |     | NULL                |       |
+| baseurl          | baseurl of the ap contact    | varchar(255)   | YES  |     | NULL                |       |
+| gsid             | Global Server ID             | int unsigned   | YES  |     | NULL                |       |
+| generator        | Name of the contact&#039;s system | varchar(255)   | YES  |     | NULL                |       |
+| following_count  | Number of following contacts | int unsigned   | YES  |     | 0                   |       |
+| followers_count  | Number of followers          | int unsigned   | YES  |     | 0                   |       |
+| statuses_count   | Number of posts              | int unsigned   | YES  |     | 0                   |       |
+| updated          |                              | datetime       | NO   |     | 0001-01-01 00:00:00 |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_application-token.md b/doc/database/db_application-token.md
index fd273989f0..e37bce6c9f 100644
--- a/doc/database/db_application-token.md
+++ b/doc/database/db_application-token.md
@@ -1,18 +1,19 @@
 Table application-token
 ===========
+
 OAuth user token
 
-| Field          | Description   | Type               | Null | Key | Default | Extra |    
-| -------------- | ------------- | ------------------ | ---- | --- | ------- | ----- |    
-| application-id |               | int unsigned       | NO   | PRI | NULL    |       |    
-| uid            | Owner User id | mediumint unsigned | NO   | PRI | NULL    |       |    
-| code           |               | varchar(64)        | NO   |     | NULL    |       |    
-| access_token   |               | varchar(64)        | NO   |     | NULL    |       |    
-| created_at     | creation time | datetime           | NO   |     | NULL    |       |    
-| scopes         |               | varchar(255)       | YES  |     | NULL    |       |    
-| read           | Read scope    | boolean            | YES  |     | NULL    |       |    
-| write          | Write scope   | boolean            | YES  |     | NULL    |       |    
-| follow         | Follow scope  | boolean            | YES  |     | NULL    |       |    
-| push           | Push scope    | boolean            | YES  |     | NULL    |       |    
+| Field          | Description   | Type               | Null | Key | Default | Extra |
+| -------------- | ------------- | ------------------ | ---- | --- | ------- | ----- |
+| application-id |               | int unsigned       | NO   | PRI | NULL    |       |
+| uid            | Owner User id | mediumint unsigned | NO   | PRI | NULL    |       |
+| code           |               | varchar(64)        | NO   |     | NULL    |       |
+| access_token   |               | varchar(64)        | NO   |     | NULL    |       |
+| created_at     | creation time | datetime           | NO   |     | NULL    |       |
+| scopes         |               | varchar(255)       | YES  |     | NULL    |       |
+| read           | Read scope    | boolean            | YES  |     | NULL    |       |
+| write          | Write scope   | boolean            | YES  |     | NULL    |       |
+| follow         | Follow scope  | boolean            | YES  |     | NULL    |       |
+| push           | Push scope    | boolean            | YES  |     | NULL    |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_application.md b/doc/database/db_application.md
index 3206d03be3..461cc11881 100644
--- a/doc/database/db_application.md
+++ b/doc/database/db_application.md
@@ -1,19 +1,20 @@
 Table application
 ===========
+
 OAuth application
 
-| Field         | Description     | Type         | Null | Key | Default | Extra          |    
-| ------------- | --------------- | ------------ | ---- | --- | ------- | -------------- |    
-| id            | generated index | int unsigned | NO   | PRI | NULL    | auto_increment |    
-| client_id     |                 | varchar(64)  | NO   |     | NULL    |                |    
-| client_secret |                 | varchar(64)  | NO   |     | NULL    |                |    
-| name          |                 | varchar(255) | NO   |     | NULL    |                |    
-| redirect_uri  |                 | varchar(255) | NO   |     | NULL    |                |    
-| website       |                 | varchar(255) | YES  |     | NULL    |                |    
-| scopes        |                 | varchar(255) | YES  |     | NULL    |                |    
-| read          | Read scope      | boolean      | YES  |     | NULL    |                |    
-| write         | Write scope     | boolean      | YES  |     | NULL    |                |    
-| follow        | Follow scope    | boolean      | YES  |     | NULL    |                |    
-| push          | Push scope      | boolean      | YES  |     | NULL    |                |    
+| Field         | Description     | Type         | Null | Key | Default | Extra          |
+| ------------- | --------------- | ------------ | ---- | --- | ------- | -------------- |
+| id            | generated index | int unsigned | NO   | PRI | NULL    | auto_increment |
+| client_id     |                 | varchar(64)  | NO   |     | NULL    |                |
+| client_secret |                 | varchar(64)  | NO   |     | NULL    |                |
+| name          |                 | varchar(255) | NO   |     | NULL    |                |
+| redirect_uri  |                 | varchar(255) | NO   |     | NULL    |                |
+| website       |                 | varchar(255) | YES  |     | NULL    |                |
+| scopes        |                 | varchar(255) | YES  |     | NULL    |                |
+| read          | Read scope      | boolean      | YES  |     | NULL    |                |
+| write         | Write scope     | boolean      | YES  |     | NULL    |                |
+| follow        | Follow scope    | boolean      | YES  |     | NULL    |                |
+| push          | Push scope      | boolean      | YES  |     | NULL    |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_attach.md b/doc/database/db_attach.md
index 95f736def6..4cbda2a17b 100644
--- a/doc/database/db_attach.md
+++ b/doc/database/db_attach.md
@@ -1,23 +1,24 @@
 Table attach
 ===========
+
 file attachments
 
-| Field         | Description                                           | Type               | Null | Key | Default             | Extra          |    
-| ------------- | ----------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
-| id            | generated index                                       | int unsigned       | NO   | PRI | NULL                | auto_increment |    
-| uid           | Owner User id                                         | mediumint unsigned | NO   |     | 0                   |                |    
-| hash          | hash                                                  | varchar(64)        | NO   |     |                     |                |    
-| filename      | filename of original                                  | varchar(255)       | NO   |     |                     |                |    
-| filetype      | mimetype                                              | varchar(64)        | NO   |     |                     |                |    
-| filesize      | size in bytes                                         | int unsigned       | NO   |     | 0                   |                |    
-| data          | file data                                             | longblob           | NO   |     | NULL                |                |    
-| created       | creation time                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| edited        | last edit time                                        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| allow_cid     | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt; | mediumtext         | YES  |     | NULL                |                |    
-| allow_gid     | Access Control - list of allowed groups               | mediumtext         | YES  |     | NULL                |                |    
-| deny_cid      | Access Control - list of denied contact.id            | mediumtext         | YES  |     | NULL                |                |    
-| deny_gid      | Access Control - list of denied groups                | mediumtext         | YES  |     | NULL                |                |    
-| backend-class | Storage backend class                                 | tinytext           | YES  |     | NULL                |                |    
-| backend-ref   | Storage backend data reference                        | text               | YES  |     | NULL                |                |    
+| Field         | Description                                           | Type               | Null | Key | Default             | Extra          |
+| ------------- | ----------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
+| id            | generated index                                       | int unsigned       | NO   | PRI | NULL                | auto_increment |
+| uid           | Owner User id                                         | mediumint unsigned | NO   |     | 0                   |                |
+| hash          | hash                                                  | varchar(64)        | NO   |     |                     |                |
+| filename      | filename of original                                  | varchar(255)       | NO   |     |                     |                |
+| filetype      | mimetype                                              | varchar(64)        | NO   |     |                     |                |
+| filesize      | size in bytes                                         | int unsigned       | NO   |     | 0                   |                |
+| data          | file data                                             | longblob           | NO   |     | NULL                |                |
+| created       | creation time                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| edited        | last edit time                                        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| allow_cid     | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt; | mediumtext         | YES  |     | NULL                |                |
+| allow_gid     | Access Control - list of allowed groups               | mediumtext         | YES  |     | NULL                |                |
+| deny_cid      | Access Control - list of denied contact.id            | mediumtext         | YES  |     | NULL                |                |
+| deny_gid      | Access Control - list of denied groups                | mediumtext         | YES  |     | NULL                |                |
+| backend-class | Storage backend class                                 | tinytext           | YES  |     | NULL                |                |
+| backend-ref   | Storage backend data reference                        | text               | YES  |     | NULL                |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_auth_codes.md b/doc/database/db_auth_codes.md
index 91d611069f..fef3f987c1 100644
--- a/doc/database/db_auth_codes.md
+++ b/doc/database/db_auth_codes.md
@@ -1,13 +1,14 @@
 Table auth_codes
 ===========
+
 OAuth usage
 
-| Field        | Description | Type         | Null | Key | Default | Extra |    
-| ------------ | ----------- | ------------ | ---- | --- | ------- | ----- |    
-| id           |             | varchar(40)  | NO   | PRI | NULL    |       |    
-| client_id    |             | varchar(20)  | NO   |     |         |       |    
-| redirect_uri |             | varchar(200) | NO   |     |         |       |    
-| expires      |             | int          | NO   |     | 0       |       |    
-| scope        |             | varchar(250) | NO   |     |         |       |    
+| Field        | Description | Type         | Null | Key | Default | Extra |
+| ------------ | ----------- | ------------ | ---- | --- | ------- | ----- |
+| id           |             | varchar(40)  | NO   | PRI | NULL    |       |
+| client_id    |             | varchar(20)  | NO   |     |         |       |
+| redirect_uri |             | varchar(200) | NO   |     |         |       |
+| expires      |             | int          | NO   |     | 0       |       |
+| scope        |             | varchar(250) | NO   |     |         |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_cache.md b/doc/database/db_cache.md
index 42a2045e11..300959ef38 100644
--- a/doc/database/db_cache.md
+++ b/doc/database/db_cache.md
@@ -1,12 +1,13 @@
 Table cache
 ===========
+
 Stores temporary data
 
-| Field   | Description                  | Type           | Null | Key | Default             | Extra |    
-| ------- | ---------------------------- | -------------- | ---- | --- | ------------------- | ----- |    
-| k       | cache key                    | varbinary(255) | NO   | PRI | NULL                |       |    
-| v       | cached serialized value      | mediumtext     | YES  |     | NULL                |       |    
-| expires | datetime of cache expiration | datetime       | NO   |     | 0001-01-01 00:00:00 |       |    
-| updated | datetime of cache insertion  | datetime       | NO   |     | 0001-01-01 00:00:00 |       |    
+| Field   | Description                  | Type           | Null | Key | Default             | Extra |
+| ------- | ---------------------------- | -------------- | ---- | --- | ------------------- | ----- |
+| k       | cache key                    | varbinary(255) | NO   | PRI | NULL                |       |
+| v       | cached serialized value      | mediumtext     | YES  |     | NULL                |       |
+| expires | datetime of cache expiration | datetime       | NO   |     | 0001-01-01 00:00:00 |       |
+| updated | datetime of cache insertion  | datetime       | NO   |     | 0001-01-01 00:00:00 |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_challenge.md b/doc/database/db_challenge.md
index 0b7653e694..5988954ab8 100644
--- a/doc/database/db_challenge.md
+++ b/doc/database/db_challenge.md
@@ -2,13 +2,14 @@ Table challenge
 ===========
 
 
-| Field       | Description   | Type         | Null | Key | Default | Extra          |    
-| ----------- | ------------- | ------------ | ---- | --- | ------- | -------------- |    
-| id          | sequential ID | int unsigned | NO   | PRI | NULL    | auto_increment |    
-| challenge   |               | varchar(255) | NO   |     |         |                |    
-| dfrn-id     |               | varchar(255) | NO   |     |         |                |    
-| expire      |               | int unsigned | NO   |     | 0       |                |    
-| type        |               | varchar(255) | NO   |     |         |                |    
-| last_update |               | varchar(255) | NO   |     |         |                |    
+
+| Field       | Description   | Type         | Null | Key | Default | Extra          |
+| ----------- | ------------- | ------------ | ---- | --- | ------- | -------------- |
+| id          | sequential ID | int unsigned | NO   | PRI | NULL    | auto_increment |
+| challenge   |               | varchar(255) | NO   |     |         |                |
+| dfrn-id     |               | varchar(255) | NO   |     |         |                |
+| expire      |               | int unsigned | NO   |     | 0       |                |
+| type        |               | varchar(255) | NO   |     |         |                |
+| last_update |               | varchar(255) | NO   |     |         |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_clients.md b/doc/database/db_clients.md
index b354e2b58c..f907e0d969 100644
--- a/doc/database/db_clients.md
+++ b/doc/database/db_clients.md
@@ -1,14 +1,15 @@
 Table clients
 ===========
+
 OAuth usage
 
-| Field        | Description | Type               | Null | Key | Default | Extra |    
-| ------------ | ----------- | ------------------ | ---- | --- | ------- | ----- |    
-| client_id    |             | varchar(20)        | NO   | PRI | NULL    |       |    
-| pw           |             | varchar(20)        | NO   |     |         |       |    
-| redirect_uri |             | varchar(200)       | NO   |     |         |       |    
-| name         |             | text               | YES  |     | NULL    |       |    
-| icon         |             | text               | YES  |     | NULL    |       |    
-| uid          | User id     | mediumint unsigned | NO   |     | 0       |       |    
+| Field        | Description | Type               | Null | Key | Default | Extra |
+| ------------ | ----------- | ------------------ | ---- | --- | ------- | ----- |
+| client_id    |             | varchar(20)        | NO   | PRI | NULL    |       |
+| pw           |             | varchar(20)        | NO   |     |         |       |
+| redirect_uri |             | varchar(200)       | NO   |     |         |       |
+| name         |             | text               | YES  |     | NULL    |       |
+| icon         |             | text               | YES  |     | NULL    |       |
+| uid          | User id     | mediumint unsigned | NO   |     | 0       |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_config.md b/doc/database/db_config.md
index fcd1c93bf0..029723510d 100644
--- a/doc/database/db_config.md
+++ b/doc/database/db_config.md
@@ -1,12 +1,13 @@
 Table config
 ===========
+
 main configuration storage
 
-| Field | Description | Type          | Null | Key | Default | Extra          |    
-| ----- | ----------- | ------------- | ---- | --- | ------- | -------------- |    
-| id    |             | int unsigned  | NO   | PRI | NULL    | auto_increment |    
-| cat   |             | varbinary(50) | NO   |     |         |                |    
-| k     |             | varbinary(50) | NO   |     |         |                |    
-| v     |             | mediumtext    | YES  |     | NULL    |                |    
+| Field | Description | Type          | Null | Key | Default | Extra          |
+| ----- | ----------- | ------------- | ---- | --- | ------- | -------------- |
+| id    |             | int unsigned  | NO   | PRI | NULL    | auto_increment |
+| cat   |             | varbinary(50) | NO   |     |         |                |
+| k     |             | varbinary(50) | NO   |     |         |                |
+| v     |             | mediumtext    | YES  |     | NULL    |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_contact-relation.md b/doc/database/db_contact-relation.md
index 82b90f79e2..9a86b8daf7 100644
--- a/doc/database/db_contact-relation.md
+++ b/doc/database/db_contact-relation.md
@@ -1,13 +1,14 @@
 Table contact-relation
 ===========
+
 Contact relations
 
-| Field            | Description                                         | Type         | Null | Key | Default             | Extra |    
-| ---------------- | --------------------------------------------------- | ------------ | ---- | --- | ------------------- | ----- |    
-| cid              | contact the related contact had interacted with     | int unsigned | NO   | PRI | 0                   |       |    
-| relation-cid     | related contact who had interacted with the contact | int unsigned | NO   | PRI | 0                   |       |    
-| last-interaction | Date of the last interaction                        | datetime     | NO   |     | 0001-01-01 00:00:00 |       |    
-| follow-updated   | Date of the last update of the contact relationship | datetime     | NO   |     | 0001-01-01 00:00:00 |       |    
-| follows          |                                                     | boolean      | NO   |     | 0                   |       |    
+| Field            | Description                                         | Type         | Null | Key | Default             | Extra |
+| ---------------- | --------------------------------------------------- | ------------ | ---- | --- | ------------------- | ----- |
+| cid              | contact the related contact had interacted with     | int unsigned | NO   | PRI | 0                   |       |
+| relation-cid     | related contact who had interacted with the contact | int unsigned | NO   | PRI | 0                   |       |
+| last-interaction | Date of the last interaction                        | datetime     | NO   |     | 0001-01-01 00:00:00 |       |
+| follow-updated   | Date of the last update of the contact relationship | datetime     | NO   |     | 0001-01-01 00:00:00 |       |
+| follows          |                                                     | boolean      | NO   |     | 0                   |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_contact.md b/doc/database/db_contact.md
index 2d89f5172d..340f95e067 100644
--- a/doc/database/db_contact.md
+++ b/doc/database/db_contact.md
@@ -1,88 +1,89 @@
 Table contact
 ===========
+
 contact table
 
-| Field                     | Description                                               | Type               | Null | Key | Default             | Extra          |    
-| ------------------------- | --------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
-| id                        | sequential ID                                             | int unsigned       | NO   | PRI | NULL                | auto_increment |    
-| uid                       | Owner User id                                             | mediumint unsigned | NO   |     | 0                   |                |    
-| created                   |                                                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| updated                   | Date of last contact update                               | datetime           | YES  |     | 0001-01-01 00:00:00 |                |    
-| self                      | 1 if the contact is the user him/her self                 | boolean            | NO   |     | 0                   |                |    
-| remote_self               |                                                           | boolean            | NO   |     | 0                   |                |    
-| rel                       | The kind of the relation between the user and the contact | tinyint unsigned   | NO   |     | 0                   |                |    
-| duplex                    |                                                           | boolean            | NO   |     | 0                   |                |    
-| network                   | Network of the contact                                    | char(4)            | NO   |     |                     |                |    
-| protocol                  | Protocol of the contact                                   | char(4)            | NO   |     |                     |                |    
-| name                      | Name that this contact is known by                        | varchar(255)       | NO   |     |                     |                |    
-| nick                      | Nick- and user name of the contact                        | varchar(255)       | NO   |     |                     |                |    
-| location                  |                                                           | varchar(255)       | YES  |     |                     |                |    
-| about                     |                                                           | text               | YES  |     | NULL                |                |    
-| keywords                  | public keywords (interests) of the contact                | text               | YES  |     | NULL                |                |    
-| gender                    | Deprecated                                                | varchar(32)        | NO   |     |                     |                |    
-| xmpp                      |                                                           | varchar(255)       | NO   |     |                     |                |    
-| attag                     |                                                           | varchar(255)       | NO   |     |                     |                |    
-| avatar                    |                                                           | varchar(255)       | NO   |     |                     |                |    
-| photo                     | Link to the profile photo of the contact                  | varchar(255)       | YES  |     |                     |                |    
-| thumb                     | Link to the profile photo (thumb size)                    | varchar(255)       | YES  |     |                     |                |    
-| micro                     | Link to the profile photo (micro size)                    | varchar(255)       | YES  |     |                     |                |    
-| site-pubkey               |                                                           | text               | YES  |     | NULL                |                |    
-| issued-id                 |                                                           | varchar(255)       | NO   |     |                     |                |    
-| dfrn-id                   |                                                           | varchar(255)       | NO   |     |                     |                |    
-| url                       |                                                           | varchar(255)       | NO   |     |                     |                |    
-| nurl                      |                                                           | varchar(255)       | NO   |     |                     |                |    
-| addr                      |                                                           | varchar(255)       | NO   |     |                     |                |    
-| alias                     |                                                           | varchar(255)       | NO   |     |                     |                |    
-| pubkey                    | RSA public key 4096 bit                                   | text               | YES  |     | NULL                |                |    
-| prvkey                    | RSA private key 4096 bit                                  | text               | YES  |     | NULL                |                |    
-| batch                     |                                                           | varchar(255)       | NO   |     |                     |                |    
-| request                   |                                                           | varchar(255)       | YES  |     | NULL                |                |    
-| notify                    |                                                           | varchar(255)       | YES  |     | NULL                |                |    
-| poll                      |                                                           | varchar(255)       | YES  |     | NULL                |                |    
-| confirm                   |                                                           | varchar(255)       | YES  |     | NULL                |                |    
-| subscribe                 |                                                           | varchar(255)       | YES  |     | NULL                |                |    
-| poco                      |                                                           | varchar(255)       | YES  |     | NULL                |                |    
-| aes_allow                 |                                                           | boolean            | NO   |     | 0                   |                |    
-| ret-aes                   |                                                           | boolean            | NO   |     | 0                   |                |    
-| usehub                    |                                                           | boolean            | NO   |     | 0                   |                |    
-| subhub                    |                                                           | boolean            | NO   |     | 0                   |                |    
-| hub-verify                |                                                           | varchar(255)       | NO   |     |                     |                |    
-| last-update               | Date of the last try to update the contact info           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| success_update            | Date of the last successful contact update                | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| failure_update            | Date of the last failed update                            | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| failed                    | Connection failed                                         | boolean            | YES  |     | NULL                |                |    
-| name-date                 |                                                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| uri-date                  |                                                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| avatar-date               |                                                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| term-date                 |                                                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| last-item                 | date of the last post                                     | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| last-discovery            | date of the last follower discovery                       | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| priority                  |                                                           | tinyint unsigned   | NO   |     | 0                   |                |    
-| blocked                   | Node-wide block status                                    | boolean            | NO   |     | 1                   |                |    
-| block_reason              | Node-wide block reason                                    | text               | YES  |     | NULL                |                |    
-| readonly                  | posts of the contact are readonly                         | boolean            | NO   |     | 0                   |                |    
-| writable                  |                                                           | boolean            | NO   |     | 0                   |                |    
-| forum                     | contact is a forum                                        | boolean            | NO   |     | 0                   |                |    
-| prv                       | contact is a private group                                | boolean            | NO   |     | 0                   |                |    
-| contact-type              |                                                           | tinyint            | NO   |     | 0                   |                |    
-| manually-approve          |                                                           | boolean            | YES  |     | NULL                |                |    
-| hidden                    |                                                           | boolean            | NO   |     | 0                   |                |    
-| archive                   |                                                           | boolean            | NO   |     | 0                   |                |    
-| pending                   |                                                           | boolean            | NO   |     | 1                   |                |    
-| deleted                   | Contact has been deleted                                  | boolean            | NO   |     | 0                   |                |    
-| rating                    |                                                           | tinyint            | NO   |     | 0                   |                |    
-| unsearchable              | Contact prefers to not be searchable                      | boolean            | NO   |     | 0                   |                |    
-| sensitive                 | Contact posts sensitive content                           | boolean            | NO   |     | 0                   |                |    
-| baseurl                   | baseurl of the contact                                    | varchar(255)       | YES  |     |                     |                |    
-| gsid                      | Global Server ID                                          | int unsigned       | YES  |     | NULL                |                |    
-| reason                    |                                                           | text               | YES  |     | NULL                |                |    
-| closeness                 |                                                           | tinyint unsigned   | NO   |     | 99                  |                |    
-| info                      |                                                           | mediumtext         | YES  |     | NULL                |                |    
-| profile-id                | Deprecated                                                | int unsigned       | YES  |     | NULL                |                |    
-| bdyear                    |                                                           | varchar(4)         | NO   |     |                     |                |    
-| bd                        |                                                           | date               | NO   |     | 0001-01-01          |                |    
-| notify_new_posts          |                                                           | boolean            | NO   |     | 0                   |                |    
-| fetch_further_information |                                                           | tinyint unsigned   | NO   |     | 0                   |                |    
-| ffi_keyword_denylist      |                                                           | text               | YES  |     | NULL                |                |    
+| Field                     | Description                                               | Type               | Null | Key | Default             | Extra          |
+| ------------------------- | --------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
+| id                        | sequential ID                                             | int unsigned       | NO   | PRI | NULL                | auto_increment |
+| uid                       | Owner User id                                             | mediumint unsigned | NO   |     | 0                   |                |
+| created                   |                                                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| updated                   | Date of last contact update                               | datetime           | YES  |     | 0001-01-01 00:00:00 |                |
+| self                      | 1 if the contact is the user him/her self                 | boolean            | NO   |     | 0                   |                |
+| remote_self               |                                                           | boolean            | NO   |     | 0                   |                |
+| rel                       | The kind of the relation between the user and the contact | tinyint unsigned   | NO   |     | 0                   |                |
+| duplex                    |                                                           | boolean            | NO   |     | 0                   |                |
+| network                   | Network of the contact                                    | char(4)            | NO   |     |                     |                |
+| protocol                  | Protocol of the contact                                   | char(4)            | NO   |     |                     |                |
+| name                      | Name that this contact is known by                        | varchar(255)       | NO   |     |                     |                |
+| nick                      | Nick- and user name of the contact                        | varchar(255)       | NO   |     |                     |                |
+| location                  |                                                           | varchar(255)       | YES  |     |                     |                |
+| about                     |                                                           | text               | YES  |     | NULL                |                |
+| keywords                  | public keywords (interests) of the contact                | text               | YES  |     | NULL                |                |
+| gender                    | Deprecated                                                | varchar(32)        | NO   |     |                     |                |
+| xmpp                      |                                                           | varchar(255)       | NO   |     |                     |                |
+| attag                     |                                                           | varchar(255)       | NO   |     |                     |                |
+| avatar                    |                                                           | varchar(255)       | NO   |     |                     |                |
+| photo                     | Link to the profile photo of the contact                  | varchar(255)       | YES  |     |                     |                |
+| thumb                     | Link to the profile photo (thumb size)                    | varchar(255)       | YES  |     |                     |                |
+| micro                     | Link to the profile photo (micro size)                    | varchar(255)       | YES  |     |                     |                |
+| site-pubkey               |                                                           | text               | YES  |     | NULL                |                |
+| issued-id                 |                                                           | varchar(255)       | NO   |     |                     |                |
+| dfrn-id                   |                                                           | varchar(255)       | NO   |     |                     |                |
+| url                       |                                                           | varchar(255)       | NO   |     |                     |                |
+| nurl                      |                                                           | varchar(255)       | NO   |     |                     |                |
+| addr                      |                                                           | varchar(255)       | NO   |     |                     |                |
+| alias                     |                                                           | varchar(255)       | NO   |     |                     |                |
+| pubkey                    | RSA public key 4096 bit                                   | text               | YES  |     | NULL                |                |
+| prvkey                    | RSA private key 4096 bit                                  | text               | YES  |     | NULL                |                |
+| batch                     |                                                           | varchar(255)       | NO   |     |                     |                |
+| request                   |                                                           | varchar(255)       | YES  |     | NULL                |                |
+| notify                    |                                                           | varchar(255)       | YES  |     | NULL                |                |
+| poll                      |                                                           | varchar(255)       | YES  |     | NULL                |                |
+| confirm                   |                                                           | varchar(255)       | YES  |     | NULL                |                |
+| subscribe                 |                                                           | varchar(255)       | YES  |     | NULL                |                |
+| poco                      |                                                           | varchar(255)       | YES  |     | NULL                |                |
+| aes_allow                 |                                                           | boolean            | NO   |     | 0                   |                |
+| ret-aes                   |                                                           | boolean            | NO   |     | 0                   |                |
+| usehub                    |                                                           | boolean            | NO   |     | 0                   |                |
+| subhub                    |                                                           | boolean            | NO   |     | 0                   |                |
+| hub-verify                |                                                           | varchar(255)       | NO   |     |                     |                |
+| last-update               | Date of the last try to update the contact info           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| success_update            | Date of the last successful contact update                | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| failure_update            | Date of the last failed update                            | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| failed                    | Connection failed                                         | boolean            | YES  |     | NULL                |                |
+| name-date                 |                                                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| uri-date                  |                                                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| avatar-date               |                                                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| term-date                 |                                                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| last-item                 | date of the last post                                     | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| last-discovery            | date of the last follower discovery                       | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| priority                  |                                                           | tinyint unsigned   | NO   |     | 0                   |                |
+| blocked                   | Node-wide block status                                    | boolean            | NO   |     | 1                   |                |
+| block_reason              | Node-wide block reason                                    | text               | YES  |     | NULL                |                |
+| readonly                  | posts of the contact are readonly                         | boolean            | NO   |     | 0                   |                |
+| writable                  |                                                           | boolean            | NO   |     | 0                   |                |
+| forum                     | contact is a forum                                        | boolean            | NO   |     | 0                   |                |
+| prv                       | contact is a private group                                | boolean            | NO   |     | 0                   |                |
+| contact-type              |                                                           | tinyint            | NO   |     | 0                   |                |
+| manually-approve          |                                                           | boolean            | YES  |     | NULL                |                |
+| hidden                    |                                                           | boolean            | NO   |     | 0                   |                |
+| archive                   |                                                           | boolean            | NO   |     | 0                   |                |
+| pending                   |                                                           | boolean            | NO   |     | 1                   |                |
+| deleted                   | Contact has been deleted                                  | boolean            | NO   |     | 0                   |                |
+| rating                    |                                                           | tinyint            | NO   |     | 0                   |                |
+| unsearchable              | Contact prefers to not be searchable                      | boolean            | NO   |     | 0                   |                |
+| sensitive                 | Contact posts sensitive content                           | boolean            | NO   |     | 0                   |                |
+| baseurl                   | baseurl of the contact                                    | varchar(255)       | YES  |     |                     |                |
+| gsid                      | Global Server ID                                          | int unsigned       | YES  |     | NULL                |                |
+| reason                    |                                                           | text               | YES  |     | NULL                |                |
+| closeness                 |                                                           | tinyint unsigned   | NO   |     | 99                  |                |
+| info                      |                                                           | mediumtext         | YES  |     | NULL                |                |
+| profile-id                | Deprecated                                                | int unsigned       | YES  |     | NULL                |                |
+| bdyear                    |                                                           | varchar(4)         | NO   |     |                     |                |
+| bd                        |                                                           | date               | NO   |     | 0001-01-01          |                |
+| notify_new_posts          |                                                           | boolean            | NO   |     | 0                   |                |
+| fetch_further_information |                                                           | tinyint unsigned   | NO   |     | 0                   |                |
+| ffi_keyword_denylist      |                                                           | text               | YES  |     | NULL                |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_conv.md b/doc/database/db_conv.md
index 8cf835b7e3..11bd7ac13d 100644
--- a/doc/database/db_conv.md
+++ b/doc/database/db_conv.md
@@ -1,16 +1,17 @@
 Table conv
 ===========
+
 private messages
 
-| Field   | Description                               | Type               | Null | Key | Default             | Extra          |    
-| ------- | ----------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
-| id      | sequential ID                             | int unsigned       | NO   | PRI | NULL                | auto_increment |    
-| guid    | A unique identifier for this conversation | varchar(255)       | NO   |     |                     |                |    
-| recips  | sender_handle;recipient_handle            | text               | YES  |     | NULL                |                |    
-| uid     | Owner User id                             | mediumint unsigned | NO   |     | 0                   |                |    
-| creator | handle of creator                         | varchar(255)       | NO   |     |                     |                |    
-| created | creation timestamp                        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| updated | edited timestamp                          | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| subject | subject of initial message                | text               | YES  |     | NULL                |                |    
+| Field   | Description                               | Type               | Null | Key | Default             | Extra          |
+| ------- | ----------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
+| id      | sequential ID                             | int unsigned       | NO   | PRI | NULL                | auto_increment |
+| guid    | A unique identifier for this conversation | varchar(255)       | NO   |     |                     |                |
+| recips  | sender_handle;recipient_handle            | text               | YES  |     | NULL                |                |
+| uid     | Owner User id                             | mediumint unsigned | NO   |     | 0                   |                |
+| creator | handle of creator                         | varchar(255)       | NO   |     |                     |                |
+| created | creation timestamp                        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| updated | edited timestamp                          | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| subject | subject of initial message                | text               | YES  |     | NULL                |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_conversation.md b/doc/database/db_conversation.md
index 5e62f21b11..964a98d610 100644
--- a/doc/database/db_conversation.md
+++ b/doc/database/db_conversation.md
@@ -1,16 +1,17 @@
 Table conversation
 ===========
+
 Raw data and structure information for messages
 
-| Field             | Description                                                          | Type             | Null | Key | Default             | Extra |    
-| ----------------- | -------------------------------------------------------------------- | ---------------- | ---- | --- | ------------------- | ----- |    
-| item-uri          | Original URI of the item - unrelated to the table with the same name | varbinary(255)   | NO   | PRI | NULL                |       |    
-| reply-to-uri      | URI to which this item is a reply                                    | varbinary(255)   | NO   |     |                     |       |    
-| conversation-uri  | GNU Social conversation URI                                          | varbinary(255)   | NO   |     |                     |       |    
-| conversation-href | GNU Social conversation link                                         | varbinary(255)   | NO   |     |                     |       |    
-| protocol          | The protocol of the item                                             | tinyint unsigned | NO   |     | 255                 |       |    
-| direction         | How the message arrived here: 1=push, 2=pull                         | tinyint unsigned | NO   |     | 0                   |       |    
-| source            | Original source                                                      | mediumtext       | YES  |     | NULL                |       |    
-| received          | Receiving date                                                       | datetime         | NO   |     | 0001-01-01 00:00:00 |       |    
+| Field             | Description                                                          | Type             | Null | Key | Default             | Extra |
+| ----------------- | -------------------------------------------------------------------- | ---------------- | ---- | --- | ------------------- | ----- |
+| item-uri          | Original URI of the item - unrelated to the table with the same name | varbinary(255)   | NO   | PRI | NULL                |       |
+| reply-to-uri      | URI to which this item is a reply                                    | varbinary(255)   | NO   |     |                     |       |
+| conversation-uri  | GNU Social conversation URI                                          | varbinary(255)   | NO   |     |                     |       |
+| conversation-href | GNU Social conversation link                                         | varbinary(255)   | NO   |     |                     |       |
+| protocol          | The protocol of the item                                             | tinyint unsigned | NO   |     | 255                 |       |
+| direction         | How the message arrived here: 1=push, 2=pull                         | tinyint unsigned | NO   |     | 0                   |       |
+| source            | Original source                                                      | mediumtext       | YES  |     | NULL                |       |
+| received          | Receiving date                                                       | datetime         | NO   |     | 0001-01-01 00:00:00 |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_delayed-post.md b/doc/database/db_delayed-post.md
index cdf9b7d571..0f1c2f5cf1 100644
--- a/doc/database/db_delayed-post.md
+++ b/doc/database/db_delayed-post.md
@@ -1,12 +1,13 @@
 Table delayed-post
 ===========
+
 Posts that are about to be distributed at a later time
 
-| Field   | Description                                    | Type               | Null | Key | Default | Extra          |    
-| ------- | ---------------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |    
-| id      |                                                | int unsigned       | NO   | PRI | NULL    | auto_increment |    
-| uri     | URI of the post that will be distributed later | varchar(255)       | YES  |     | NULL    |                |    
-| uid     | Owner User id                                  | mediumint unsigned | YES  |     | NULL    |                |    
-| delayed | delay time                                     | datetime           | YES  |     | NULL    |                |    
+| Field   | Description                                    | Type               | Null | Key | Default | Extra          |
+| ------- | ---------------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |
+| id      |                                                | int unsigned       | NO   | PRI | NULL    | auto_increment |
+| uri     | URI of the post that will be distributed later | varchar(255)       | YES  |     | NULL    |                |
+| uid     | Owner User id                                  | mediumint unsigned | YES  |     | NULL    |                |
+| delayed | delay time                                     | datetime           | YES  |     | NULL    |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_diaspora-interaction.md b/doc/database/db_diaspora-interaction.md
index 0300be72a4..503c846fd9 100644
--- a/doc/database/db_diaspora-interaction.md
+++ b/doc/database/db_diaspora-interaction.md
@@ -1,10 +1,11 @@
 Table diaspora-interaction
 ===========
+
 Signed Diaspora Interaction
 
-| Field       | Description                                               | Type         | Null | Key | Default | Extra |    
-| ----------- | --------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |    
-| uri-id      | Id of the item-uri table entry that contains the item uri | int unsigned | NO   | PRI | NULL    |       |    
-| interaction | The Diaspora interaction                                  | mediumtext   | YES  |     | NULL    |       |    
+| Field       | Description                                               | Type         | Null | Key | Default | Extra |
+| ----------- | --------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |
+| uri-id      | Id of the item-uri table entry that contains the item uri | int unsigned | NO   | PRI | NULL    |       |
+| interaction | The Diaspora interaction                                  | mediumtext   | YES  |     | NULL    |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_event.md b/doc/database/db_event.md
index 69c4d76b9e..72cec00128 100644
--- a/doc/database/db_event.md
+++ b/doc/database/db_event.md
@@ -1,28 +1,29 @@
 Table event
 ===========
+
 Events
 
-| Field     | Description                                            | Type               | Null | Key | Default             | Extra          |    
-| --------- | ------------------------------------------------------ | ------------------ | ---- | --- | ------------------- | -------------- |    
-| id        | sequential ID                                          | int unsigned       | NO   | PRI | NULL                | auto_increment |    
-| guid      |                                                        | varchar(255)       | NO   |     |                     |                |    
-| uid       | Owner User id                                          | mediumint unsigned | NO   |     | 0                   |                |    
-| cid       | contact_id (ID of the contact in contact table)        | int unsigned       | NO   |     | 0                   |                |    
-| uri       |                                                        | varchar(255)       | NO   |     |                     |                |    
-| created   | creation time                                          | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| edited    | last edit time                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| start     | event start time                                       | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| finish    | event end time                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| summary   | short description or title of the event                | text               | YES  |     | NULL                |                |    
-| desc      | event description                                      | text               | YES  |     | NULL                |                |    
-| location  | event location                                         | text               | YES  |     | NULL                |                |    
-| type      | event or birthday                                      | varchar(20)        | NO   |     |                     |                |    
-| nofinish  | if event does have no end this is 1                    | boolean            | NO   |     | 0                   |                |    
-| adjust    | adjust to timezone of the recipient (0 or 1)           | boolean            | NO   |     | 1                   |                |    
-| ignore    | 0 or 1                                                 | boolean            | NO   |     | 0                   |                |    
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES  |     | NULL                |                |    
-| allow_gid | Access Control - list of allowed groups                | mediumtext         | YES  |     | NULL                |                |    
-| deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL                |                |    
-| deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL                |                |    
+| Field     | Description                                            | Type               | Null | Key | Default             | Extra          |
+| --------- | ------------------------------------------------------ | ------------------ | ---- | --- | ------------------- | -------------- |
+| id        | sequential ID                                          | int unsigned       | NO   | PRI | NULL                | auto_increment |
+| guid      |                                                        | varchar(255)       | NO   |     |                     |                |
+| uid       | Owner User id                                          | mediumint unsigned | NO   |     | 0                   |                |
+| cid       | contact_id (ID of the contact in contact table)        | int unsigned       | NO   |     | 0                   |                |
+| uri       |                                                        | varchar(255)       | NO   |     |                     |                |
+| created   | creation time                                          | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| edited    | last edit time                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| start     | event start time                                       | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| finish    | event end time                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| summary   | short description or title of the event                | text               | YES  |     | NULL                |                |
+| desc      | event description                                      | text               | YES  |     | NULL                |                |
+| location  | event location                                         | text               | YES  |     | NULL                |                |
+| type      | event or birthday                                      | varchar(20)        | NO   |     |                     |                |
+| nofinish  | if event does have no end this is 1                    | boolean            | NO   |     | 0                   |                |
+| adjust    | adjust to timezone of the recipient (0 or 1)           | boolean            | NO   |     | 1                   |                |
+| ignore    | 0 or 1                                                 | boolean            | NO   |     | 0                   |                |
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES  |     | NULL                |                |
+| allow_gid | Access Control - list of allowed groups                | mediumtext         | YES  |     | NULL                |                |
+| deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL                |                |
+| deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL                |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_fcontact.md b/doc/database/db_fcontact.md
index 84db712f3d..f20ca6cd05 100644
--- a/doc/database/db_fcontact.md
+++ b/doc/database/db_fcontact.md
@@ -1,25 +1,26 @@
 Table fcontact
 ===========
+
 Diaspora compatible contacts - used in the Diaspora implementation
 
-| Field    | Description   | Type             | Null | Key | Default             | Extra          |    
-| -------- | ------------- | ---------------- | ---- | --- | ------------------- | -------------- |    
-| id       | sequential ID | int unsigned     | NO   | PRI | NULL                | auto_increment |    
-| guid     | unique id     | varchar(255)     | NO   |     |                     |                |    
-| url      |               | varchar(255)     | NO   |     |                     |                |    
-| name     |               | varchar(255)     | NO   |     |                     |                |    
-| photo    |               | varchar(255)     | NO   |     |                     |                |    
-| request  |               | varchar(255)     | NO   |     |                     |                |    
-| nick     |               | varchar(255)     | NO   |     |                     |                |    
-| addr     |               | varchar(255)     | NO   |     |                     |                |    
-| batch    |               | varchar(255)     | NO   |     |                     |                |    
-| notify   |               | varchar(255)     | NO   |     |                     |                |    
-| poll     |               | varchar(255)     | NO   |     |                     |                |    
-| confirm  |               | varchar(255)     | NO   |     |                     |                |    
-| priority |               | tinyint unsigned | NO   |     | 0                   |                |    
-| network  |               | char(4)          | NO   |     |                     |                |    
-| alias    |               | varchar(255)     | NO   |     |                     |                |    
-| pubkey   |               | text             | YES  |     | NULL                |                |    
-| updated  |               | datetime         | NO   |     | 0001-01-01 00:00:00 |                |    
+| Field    | Description   | Type             | Null | Key | Default             | Extra          |
+| -------- | ------------- | ---------------- | ---- | --- | ------------------- | -------------- |
+| id       | sequential ID | int unsigned     | NO   | PRI | NULL                | auto_increment |
+| guid     | unique id     | varchar(255)     | NO   |     |                     |                |
+| url      |               | varchar(255)     | NO   |     |                     |                |
+| name     |               | varchar(255)     | NO   |     |                     |                |
+| photo    |               | varchar(255)     | NO   |     |                     |                |
+| request  |               | varchar(255)     | NO   |     |                     |                |
+| nick     |               | varchar(255)     | NO   |     |                     |                |
+| addr     |               | varchar(255)     | NO   |     |                     |                |
+| batch    |               | varchar(255)     | NO   |     |                     |                |
+| notify   |               | varchar(255)     | NO   |     |                     |                |
+| poll     |               | varchar(255)     | NO   |     |                     |                |
+| confirm  |               | varchar(255)     | NO   |     |                     |                |
+| priority |               | tinyint unsigned | NO   |     | 0                   |                |
+| network  |               | char(4)          | NO   |     |                     |                |
+| alias    |               | varchar(255)     | NO   |     |                     |                |
+| pubkey   |               | text             | YES  |     | NULL                |                |
+| updated  |               | datetime         | NO   |     | 0001-01-01 00:00:00 |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_fsuggest.md b/doc/database/db_fsuggest.md
index 20955acc91..d3a8e21ab5 100644
--- a/doc/database/db_fsuggest.md
+++ b/doc/database/db_fsuggest.md
@@ -1,17 +1,18 @@
 Table fsuggest
 ===========
+
 friend suggestion stuff
 
-| Field   | Description | Type               | Null | Key | Default             | Extra          |    
-| ------- | ----------- | ------------------ | ---- | --- | ------------------- | -------------- |    
-| id      |             | int unsigned       | NO   | PRI | NULL                | auto_increment |    
-| uid     | User id     | mediumint unsigned | NO   |     | 0                   |                |    
-| cid     |             | int unsigned       | NO   |     | 0                   |                |    
-| name    |             | varchar(255)       | NO   |     |                     |                |    
-| url     |             | varchar(255)       | NO   |     |                     |                |    
-| request |             | varchar(255)       | NO   |     |                     |                |    
-| photo   |             | varchar(255)       | NO   |     |                     |                |    
-| note    |             | text               | YES  |     | NULL                |                |    
-| created |             | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| Field   | Description | Type               | Null | Key | Default             | Extra          |
+| ------- | ----------- | ------------------ | ---- | --- | ------------------- | -------------- |
+| id      |             | int unsigned       | NO   | PRI | NULL                | auto_increment |
+| uid     | User id     | mediumint unsigned | NO   |     | 0                   |                |
+| cid     |             | int unsigned       | NO   |     | 0                   |                |
+| name    |             | varchar(255)       | NO   |     |                     |                |
+| url     |             | varchar(255)       | NO   |     |                     |                |
+| request |             | varchar(255)       | NO   |     |                     |                |
+| photo   |             | varchar(255)       | NO   |     |                     |                |
+| note    |             | text               | YES  |     | NULL                |                |
+| created |             | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_group.md b/doc/database/db_group.md
index d81148bd64..7ea3a0d2ff 100644
--- a/doc/database/db_group.md
+++ b/doc/database/db_group.md
@@ -1,13 +1,14 @@
 Table group
 ===========
+
 privacy groups, group info
 
-| Field   | Description                                | Type               | Null | Key | Default | Extra          |    
-| ------- | ------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |    
-| id      | sequential ID                              | int unsigned       | NO   | PRI | NULL    | auto_increment |    
-| uid     | Owner User id                              | mediumint unsigned | NO   |     | 0       |                |    
-| visible | 1 indicates the member list is not private | boolean            | NO   |     | 0       |                |    
-| deleted | 1 indicates the group has been deleted     | boolean            | NO   |     | 0       |                |    
-| name    | human readable name of group               | varchar(255)       | NO   |     |         |                |    
+| Field   | Description                                | Type               | Null | Key | Default | Extra          |
+| ------- | ------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |
+| id      | sequential ID                              | int unsigned       | NO   | PRI | NULL    | auto_increment |
+| uid     | Owner User id                              | mediumint unsigned | NO   |     | 0       |                |
+| visible | 1 indicates the member list is not private | boolean            | NO   |     | 0       |                |
+| deleted | 1 indicates the group has been deleted     | boolean            | NO   |     | 0       |                |
+| name    | human readable name of group               | varchar(255)       | NO   |     |         |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_group_member.md b/doc/database/db_group_member.md
index 6057c15b42..ba0960df44 100644
--- a/doc/database/db_group_member.md
+++ b/doc/database/db_group_member.md
@@ -1,11 +1,12 @@
 Table group_member
 ===========
+
 privacy groups, member info
 
-| Field      | Description                                               | Type         | Null | Key | Default | Extra          |    
-| ---------- | --------------------------------------------------------- | ------------ | ---- | --- | ------- | -------------- |    
-| id         | sequential ID                                             | int unsigned | NO   | PRI | NULL    | auto_increment |    
-| gid        | groups.id of the associated group                         | int unsigned | NO   |     | 0       |                |    
-| contact-id | contact.id of the member assigned to the associated group | int unsigned | NO   |     | 0       |                |    
+| Field      | Description                                               | Type         | Null | Key | Default | Extra          |
+| ---------- | --------------------------------------------------------- | ------------ | ---- | --- | ------- | -------------- |
+| id         | sequential ID                                             | int unsigned | NO   | PRI | NULL    | auto_increment |
+| gid        | groups.id of the associated group                         | int unsigned | NO   |     | 0       |                |
+| contact-id | contact.id of the member assigned to the associated group | int unsigned | NO   |     | 0       |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_gserver-tag.md b/doc/database/db_gserver-tag.md
index 47dedeb540..dba65c45ab 100644
--- a/doc/database/db_gserver-tag.md
+++ b/doc/database/db_gserver-tag.md
@@ -1,10 +1,11 @@
 Table gserver-tag
 ===========
+
 Tags that the server has subscribed
 
-| Field      | Description                        | Type         | Null | Key | Default | Extra |    
-| ---------- | ---------------------------------- | ------------ | ---- | --- | ------- | ----- |    
-| gserver-id | The id of the gserver              | int unsigned | NO   | PRI | 0       |       |    
-| tag        | Tag that the server has subscribed | varchar(100) | NO   | PRI |         |       |    
+| Field      | Description                        | Type         | Null | Key | Default | Extra |
+| ---------- | ---------------------------------- | ------------ | ---- | --- | ------- | ----- |
+| gserver-id | The id of the gserver              | int unsigned | NO   | PRI | 0       |       |
+| tag        | Tag that the server has subscribed | varchar(100) | NO   | PRI |         |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_gserver.md b/doc/database/db_gserver.md
index 8be46ba673..341f71eff5 100644
--- a/doc/database/db_gserver.md
+++ b/doc/database/db_gserver.md
@@ -1,31 +1,32 @@
 Table gserver
 ===========
+
 Global servers
 
-| Field            | Description                                        | Type             | Null | Key | Default             | Extra          |    
-| ---------------- | -------------------------------------------------- | ---------------- | ---- | --- | ------------------- | -------------- |    
-| id               | sequential ID                                      | int unsigned     | NO   | PRI | NULL                | auto_increment |    
-| url              |                                                    | varchar(255)     | NO   |     |                     |                |    
-| nurl             |                                                    | varchar(255)     | NO   |     |                     |                |    
-| version          |                                                    | varchar(255)     | NO   |     |                     |                |    
-| site_name        |                                                    | varchar(255)     | NO   |     |                     |                |    
-| info             |                                                    | text             | YES  |     | NULL                |                |    
-| register_policy  |                                                    | tinyint          | NO   |     | 0                   |                |    
-| registered-users | Number of registered users                         | int unsigned     | NO   |     | 0                   |                |    
-| directory-type   | Type of directory service (Poco, Mastodon)         | tinyint          | YES  |     | 0                   |                |    
-| poco             |                                                    | varchar(255)     | NO   |     |                     |                |    
-| noscrape         |                                                    | varchar(255)     | NO   |     |                     |                |    
-| network          |                                                    | char(4)          | NO   |     |                     |                |    
-| protocol         | The protocol of the server                         | tinyint unsigned | YES  |     | NULL                |                |    
-| platform         |                                                    | varchar(255)     | NO   |     |                     |                |    
-| relay-subscribe  | Has the server subscribed to the relay system      | boolean          | NO   |     | 0                   |                |    
-| relay-scope      | The scope of messages that the server wants to get | varchar(10)      | NO   |     |                     |                |    
-| detection-method | Method that had been used to detect that server    | tinyint unsigned | YES  |     | NULL                |                |    
-| created          |                                                    | datetime         | NO   |     | 0001-01-01 00:00:00 |                |    
-| last_poco_query  |                                                    | datetime         | YES  |     | 0001-01-01 00:00:00 |                |    
-| last_contact     | Last successful connection request                 | datetime         | YES  |     | 0001-01-01 00:00:00 |                |    
-| last_failure     | Last failed connection request                     | datetime         | YES  |     | 0001-01-01 00:00:00 |                |    
-| failed           | Connection failed                                  | boolean          | YES  |     | NULL                |                |    
-| next_contact     | Next connection request                            | datetime         | YES  |     | 0001-01-01 00:00:00 |                |    
+| Field            | Description                                        | Type             | Null | Key | Default             | Extra          |
+| ---------------- | -------------------------------------------------- | ---------------- | ---- | --- | ------------------- | -------------- |
+| id               | sequential ID                                      | int unsigned     | NO   | PRI | NULL                | auto_increment |
+| url              |                                                    | varchar(255)     | NO   |     |                     |                |
+| nurl             |                                                    | varchar(255)     | NO   |     |                     |                |
+| version          |                                                    | varchar(255)     | NO   |     |                     |                |
+| site_name        |                                                    | varchar(255)     | NO   |     |                     |                |
+| info             |                                                    | text             | YES  |     | NULL                |                |
+| register_policy  |                                                    | tinyint          | NO   |     | 0                   |                |
+| registered-users | Number of registered users                         | int unsigned     | NO   |     | 0                   |                |
+| directory-type   | Type of directory service (Poco, Mastodon)         | tinyint          | YES  |     | 0                   |                |
+| poco             |                                                    | varchar(255)     | NO   |     |                     |                |
+| noscrape         |                                                    | varchar(255)     | NO   |     |                     |                |
+| network          |                                                    | char(4)          | NO   |     |                     |                |
+| protocol         | The protocol of the server                         | tinyint unsigned | YES  |     | NULL                |                |
+| platform         |                                                    | varchar(255)     | NO   |     |                     |                |
+| relay-subscribe  | Has the server subscribed to the relay system      | boolean          | NO   |     | 0                   |                |
+| relay-scope      | The scope of messages that the server wants to get | varchar(10)      | NO   |     |                     |                |
+| detection-method | Method that had been used to detect that server    | tinyint unsigned | YES  |     | NULL                |                |
+| created          |                                                    | datetime         | NO   |     | 0001-01-01 00:00:00 |                |
+| last_poco_query  |                                                    | datetime         | YES  |     | 0001-01-01 00:00:00 |                |
+| last_contact     | Last successful connection request                 | datetime         | YES  |     | 0001-01-01 00:00:00 |                |
+| last_failure     | Last failed connection request                     | datetime         | YES  |     | 0001-01-01 00:00:00 |                |
+| failed           | Connection failed                                  | boolean          | YES  |     | NULL                |                |
+| next_contact     | Next connection request                            | datetime         | YES  |     | 0001-01-01 00:00:00 |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_hook.md b/doc/database/db_hook.md
index 75235b31cd..c25f674cc9 100644
--- a/doc/database/db_hook.md
+++ b/doc/database/db_hook.md
@@ -1,13 +1,14 @@
 Table hook
 ===========
+
 addon hook registry
 
-| Field    | Description                                                                                                | Type              | Null | Key | Default | Extra          |    
-| -------- | ---------------------------------------------------------------------------------------------------------- | ----------------- | ---- | --- | ------- | -------------- |    
-| id       | sequential ID                                                                                              | int unsigned      | NO   | PRI | NULL    | auto_increment |    
-| hook     | name of hook                                                                                               | varbinary(100)    | NO   |     |         |                |    
-| file     | relative filename of hook handler                                                                          | varbinary(200)    | NO   |     |         |                |    
-| function | function name of hook handler                                                                              | varbinary(200)    | NO   |     |         |                |    
-| priority | not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order | smallint unsigned | NO   |     | 0       |                |    
+| Field    | Description                                                                                                | Type              | Null | Key | Default | Extra          |
+| -------- | ---------------------------------------------------------------------------------------------------------- | ----------------- | ---- | --- | ------- | -------------- |
+| id       | sequential ID                                                                                              | int unsigned      | NO   | PRI | NULL    | auto_increment |
+| hook     | name of hook                                                                                               | varbinary(100)    | NO   |     |         |                |
+| file     | relative filename of hook handler                                                                          | varbinary(200)    | NO   |     |         |                |
+| function | function name of hook handler                                                                              | varbinary(200)    | NO   |     |         |                |
+| priority | not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order | smallint unsigned | NO   |     | 0       |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_host.md b/doc/database/db_host.md
index bb07a5b87a..97fda6fa6f 100644
--- a/doc/database/db_host.md
+++ b/doc/database/db_host.md
@@ -1,10 +1,11 @@
 Table host
 ===========
+
 Hostname
 
-| Field | Description   | Type             | Null | Key | Default | Extra          |    
-| ----- | ------------- | ---------------- | ---- | --- | ------- | -------------- |    
-| id    | sequential ID | tinyint unsigned | NO   | PRI | NULL    | auto_increment |    
-| name  | The hostname  | varchar(128)     | NO   |     |         |                |    
+| Field | Description   | Type             | Null | Key | Default | Extra          |
+| ----- | ------------- | ---------------- | ---- | --- | ------- | -------------- |
+| id    | sequential ID | tinyint unsigned | NO   | PRI | NULL    | auto_increment |
+| name  | The hostname  | varchar(128)     | NO   |     |         |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_inbox-status.md b/doc/database/db_inbox-status.md
index 53fa009e2b..fb6a408506 100644
--- a/doc/database/db_inbox-status.md
+++ b/doc/database/db_inbox-status.md
@@ -1,15 +1,16 @@
 Table inbox-status
 ===========
+
 Status of ActivityPub inboxes
 
-| Field    | Description                          | Type           | Null | Key | Default             | Extra |    
-| -------- | ------------------------------------ | -------------- | ---- | --- | ------------------- | ----- |    
-| url      | URL of the inbox                     | varbinary(255) | NO   | PRI | NULL                |       |    
-| created  | Creation date of this entry          | datetime       | NO   |     | 0001-01-01 00:00:00 |       |    
-| success  | Date of the last successful delivery | datetime       | NO   |     | 0001-01-01 00:00:00 |       |    
-| failure  | Date of the last failed delivery     | datetime       | NO   |     | 0001-01-01 00:00:00 |       |    
-| previous | Previous delivery date               | datetime       | NO   |     | 0001-01-01 00:00:00 |       |    
-| archive  | Is the inbox archived?               | boolean        | NO   |     | 0                   |       |    
-| shared   | Is it a shared inbox?                | boolean        | NO   |     | 0                   |       |    
+| Field    | Description                          | Type           | Null | Key | Default             | Extra |
+| -------- | ------------------------------------ | -------------- | ---- | --- | ------------------- | ----- |
+| url      | URL of the inbox                     | varbinary(255) | NO   | PRI | NULL                |       |
+| created  | Creation date of this entry          | datetime       | NO   |     | 0001-01-01 00:00:00 |       |
+| success  | Date of the last successful delivery | datetime       | NO   |     | 0001-01-01 00:00:00 |       |
+| failure  | Date of the last failed delivery     | datetime       | NO   |     | 0001-01-01 00:00:00 |       |
+| previous | Previous delivery date               | datetime       | NO   |     | 0001-01-01 00:00:00 |       |
+| archive  | Is the inbox archived?               | boolean        | NO   |     | 0                   |       |
+| shared   | Is it a shared inbox?                | boolean        | NO   |     | 0                   |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_intro.md b/doc/database/db_intro.md
index df1deac2bb..3e3731b55a 100644
--- a/doc/database/db_intro.md
+++ b/doc/database/db_intro.md
@@ -2,18 +2,19 @@ Table intro
 ===========
 
 
-| Field      | Description   | Type               | Null | Key | Default             | Extra          |    
-| ---------- | ------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
-| id         | sequential ID | int unsigned       | NO   | PRI | NULL                | auto_increment |    
-| uid        | User id       | mediumint unsigned | NO   |     | 0                   |                |    
-| fid        |               | int unsigned       | YES  |     | NULL                |                |    
-| contact-id |               | int unsigned       | NO   |     | 0                   |                |    
-| knowyou    |               | boolean            | NO   |     | 0                   |                |    
-| duplex     |               | boolean            | NO   |     | 0                   |                |    
-| note       |               | text               | YES  |     | NULL                |                |    
-| hash       |               | varchar(255)       | NO   |     |                     |                |    
-| datetime   |               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| blocked    |               | boolean            | NO   |     | 1                   |                |    
-| ignore     |               | boolean            | NO   |     | 0                   |                |    
+
+| Field      | Description   | Type               | Null | Key | Default             | Extra          |
+| ---------- | ------------- | ------------------ | ---- | --- | ------------------- | -------------- |
+| id         | sequential ID | int unsigned       | NO   | PRI | NULL                | auto_increment |
+| uid        | User id       | mediumint unsigned | NO   |     | 0                   |                |
+| fid        |               | int unsigned       | YES  |     | NULL                |                |
+| contact-id |               | int unsigned       | NO   |     | 0                   |                |
+| knowyou    |               | boolean            | NO   |     | 0                   |                |
+| duplex     |               | boolean            | NO   |     | 0                   |                |
+| note       |               | text               | YES  |     | NULL                |                |
+| hash       |               | varchar(255)       | NO   |     |                     |                |
+| datetime   |               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| blocked    |               | boolean            | NO   |     | 1                   |                |
+| ignore     |               | boolean            | NO   |     | 0                   |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_item-uri.md b/doc/database/db_item-uri.md
index 8e4be669af..4b3dda5ced 100644
--- a/doc/database/db_item-uri.md
+++ b/doc/database/db_item-uri.md
@@ -1,11 +1,12 @@
 Table item-uri
 ===========
+
 URI and GUID for items
 
-| Field | Description                     | Type           | Null | Key | Default | Extra          |    
-| ----- | ------------------------------- | -------------- | ---- | --- | ------- | -------------- |    
-| id    |                                 | int unsigned   | NO   | PRI | NULL    | auto_increment |    
-| uri   | URI of an item                  | varbinary(255) | NO   |     | NULL    |                |    
-| guid  | A unique identifier for an item | varbinary(255) | YES  |     | NULL    |                |    
+| Field | Description                     | Type           | Null | Key | Default | Extra          |
+| ----- | ------------------------------- | -------------- | ---- | --- | ------- | -------------- |
+| id    |                                 | int unsigned   | NO   | PRI | NULL    | auto_increment |
+| uri   | URI of an item                  | varbinary(255) | NO   |     | NULL    |                |
+| guid  | A unique identifier for an item | varbinary(255) | YES  |     | NULL    |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_locks.md b/doc/database/db_locks.md
index 0da4d8845c..3379990174 100644
--- a/doc/database/db_locks.md
+++ b/doc/database/db_locks.md
@@ -2,12 +2,13 @@ Table locks
 ===========
 
 
-| Field   | Description                  | Type         | Null | Key | Default             | Extra          |    
-| ------- | ---------------------------- | ------------ | ---- | --- | ------------------- | -------------- |    
-| id      | sequential ID                | int unsigned | NO   | PRI | NULL                | auto_increment |    
-| name    |                              | varchar(128) | NO   |     |                     |                |    
-| locked  |                              | boolean      | NO   |     | 0                   |                |    
-| pid     | Process ID                   | int unsigned | NO   |     | 0                   |                |    
-| expires | datetime of cache expiration | datetime     | NO   |     | 0001-01-01 00:00:00 |                |    
+
+| Field   | Description                  | Type         | Null | Key | Default             | Extra          |
+| ------- | ---------------------------- | ------------ | ---- | --- | ------------------- | -------------- |
+| id      | sequential ID                | int unsigned | NO   | PRI | NULL                | auto_increment |
+| name    |                              | varchar(128) | NO   |     |                     |                |
+| locked  |                              | boolean      | NO   |     | 0                   |                |
+| pid     | Process ID                   | int unsigned | NO   |     | 0                   |                |
+| expires | datetime of cache expiration | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_mail.md b/doc/database/db_mail.md
index 44f435d006..dbdacb6d31 100644
--- a/doc/database/db_mail.md
+++ b/doc/database/db_mail.md
@@ -1,30 +1,31 @@
 Table mail
 ===========
+
 private messages
 
-| Field         | Description                                                    | Type               | Null | Key | Default             | Extra          |    
-| ------------- | -------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
-| id            | sequential ID                                                  | int unsigned       | NO   | PRI | NULL                | auto_increment |    
-| uid           | Owner User id                                                  | mediumint unsigned | NO   |     | 0                   |                |    
-| guid          | A unique identifier for this private message                   | varchar(255)       | NO   |     |                     |                |    
-| from-name     | name of the sender                                             | varchar(255)       | NO   |     |                     |                |    
-| from-photo    | contact photo link of the sender                               | varchar(255)       | NO   |     |                     |                |    
-| from-url      | profile linke of the sender                                    | varchar(255)       | NO   |     |                     |                |    
-| contact-id    | contact.id                                                     | varchar(255)       | YES  |     | NULL                |                |    
-| author-id     | Link to the contact table with uid=0 of the author of the mail | int unsigned       | YES  |     | NULL                |                |    
-| convid        | conv.id                                                        | int unsigned       | YES  |     | NULL                |                |    
-| title         |                                                                | varchar(255)       | NO   |     |                     |                |    
-| body          |                                                                | mediumtext         | YES  |     | NULL                |                |    
-| seen          | if message visited it is 1                                     | boolean            | NO   |     | 0                   |                |    
-| reply         |                                                                | boolean            | NO   |     | 0                   |                |    
-| replied       |                                                                | boolean            | NO   |     | 0                   |                |    
-| unknown       | if sender not in the contact table this is 1                   | boolean            | NO   |     | 0                   |                |    
-| uri           |                                                                | varchar(255)       | NO   |     |                     |                |    
-| uri-id        | Item-uri id of the related mail                                | int unsigned       | YES  |     | NULL                |                |    
-| parent-uri    |                                                                | varchar(255)       | NO   |     |                     |                |    
-| parent-uri-id | Item-uri id of the parent of the related mail                  | int unsigned       | YES  |     | NULL                |                |    
-| thr-parent    |                                                                | varchar(255)       | YES  |     | NULL                |                |    
-| thr-parent-id | Id of the item-uri table that contains the thread parent uri   | int unsigned       | YES  |     | NULL                |                |    
-| created       | creation time of the private message                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| Field         | Description                                                    | Type               | Null | Key | Default             | Extra          |
+| ------------- | -------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
+| id            | sequential ID                                                  | int unsigned       | NO   | PRI | NULL                | auto_increment |
+| uid           | Owner User id                                                  | mediumint unsigned | NO   |     | 0                   |                |
+| guid          | A unique identifier for this private message                   | varchar(255)       | NO   |     |                     |                |
+| from-name     | name of the sender                                             | varchar(255)       | NO   |     |                     |                |
+| from-photo    | contact photo link of the sender                               | varchar(255)       | NO   |     |                     |                |
+| from-url      | profile linke of the sender                                    | varchar(255)       | NO   |     |                     |                |
+| contact-id    | contact.id                                                     | varchar(255)       | YES  |     | NULL                |                |
+| author-id     | Link to the contact table with uid=0 of the author of the mail | int unsigned       | YES  |     | NULL                |                |
+| convid        | conv.id                                                        | int unsigned       | YES  |     | NULL                |                |
+| title         |                                                                | varchar(255)       | NO   |     |                     |                |
+| body          |                                                                | mediumtext         | YES  |     | NULL                |                |
+| seen          | if message visited it is 1                                     | boolean            | NO   |     | 0                   |                |
+| reply         |                                                                | boolean            | NO   |     | 0                   |                |
+| replied       |                                                                | boolean            | NO   |     | 0                   |                |
+| unknown       | if sender not in the contact table this is 1                   | boolean            | NO   |     | 0                   |                |
+| uri           |                                                                | varchar(255)       | NO   |     |                     |                |
+| uri-id        | Item-uri id of the related mail                                | int unsigned       | YES  |     | NULL                |                |
+| parent-uri    |                                                                | varchar(255)       | NO   |     |                     |                |
+| parent-uri-id | Item-uri id of the parent of the related mail                  | int unsigned       | YES  |     | NULL                |                |
+| thr-parent    |                                                                | varchar(255)       | YES  |     | NULL                |                |
+| thr-parent-id | Id of the item-uri table that contains the thread parent uri   | int unsigned       | YES  |     | NULL                |                |
+| created       | creation time of the private message                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_mailacct.md b/doc/database/db_mailacct.md
index 0fb9a43f6e..8a1f380788 100644
--- a/doc/database/db_mailacct.md
+++ b/doc/database/db_mailacct.md
@@ -1,21 +1,22 @@
 Table mailacct
 ===========
+
 Mail account data for fetching mails
 
-| Field        | Description   | Type               | Null | Key | Default             | Extra          |    
-| ------------ | ------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
-| id           | sequential ID | int unsigned       | NO   | PRI | NULL                | auto_increment |    
-| uid          | User id       | mediumint unsigned | NO   |     | 0                   |                |    
-| server       |               | varchar(255)       | NO   |     |                     |                |    
-| port         |               | smallint unsigned  | NO   |     | 0                   |                |    
-| ssltype      |               | varchar(16)        | NO   |     |                     |                |    
-| mailbox      |               | varchar(255)       | NO   |     |                     |                |    
-| user         |               | varchar(255)       | NO   |     |                     |                |    
-| pass         |               | text               | YES  |     | NULL                |                |    
-| reply_to     |               | varchar(255)       | NO   |     |                     |                |    
-| action       |               | tinyint unsigned   | NO   |     | 0                   |                |    
-| movetofolder |               | varchar(255)       | NO   |     |                     |                |    
-| pubmail      |               | boolean            | NO   |     | 0                   |                |    
-| last_check   |               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| Field        | Description   | Type               | Null | Key | Default             | Extra          |
+| ------------ | ------------- | ------------------ | ---- | --- | ------------------- | -------------- |
+| id           | sequential ID | int unsigned       | NO   | PRI | NULL                | auto_increment |
+| uid          | User id       | mediumint unsigned | NO   |     | 0                   |                |
+| server       |               | varchar(255)       | NO   |     |                     |                |
+| port         |               | smallint unsigned  | NO   |     | 0                   |                |
+| ssltype      |               | varchar(16)        | NO   |     |                     |                |
+| mailbox      |               | varchar(255)       | NO   |     |                     |                |
+| user         |               | varchar(255)       | NO   |     |                     |                |
+| pass         |               | text               | YES  |     | NULL                |                |
+| reply_to     |               | varchar(255)       | NO   |     |                     |                |
+| action       |               | tinyint unsigned   | NO   |     | 0                   |                |
+| movetofolder |               | varchar(255)       | NO   |     |                     |                |
+| pubmail      |               | boolean            | NO   |     | 0                   |                |
+| last_check   |               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_manage.md b/doc/database/db_manage.md
index 96f7703707..c2dadfca4d 100644
--- a/doc/database/db_manage.md
+++ b/doc/database/db_manage.md
@@ -1,11 +1,12 @@
 Table manage
 ===========
+
 table of accounts that can manage each other
 
-| Field | Description   | Type               | Null | Key | Default | Extra          |    
-| ----- | ------------- | ------------------ | ---- | --- | ------- | -------------- |    
-| id    | sequential ID | int unsigned       | NO   | PRI | NULL    | auto_increment |    
-| uid   | User id       | mediumint unsigned | NO   |     | 0       |                |    
-| mid   | User id       | mediumint unsigned | NO   |     | 0       |                |    
+| Field | Description   | Type               | Null | Key | Default | Extra          |
+| ----- | ------------- | ------------------ | ---- | --- | ------- | -------------- |
+| id    | sequential ID | int unsigned       | NO   | PRI | NULL    | auto_increment |
+| uid   | User id       | mediumint unsigned | NO   |     | 0       |                |
+| mid   | User id       | mediumint unsigned | NO   |     | 0       |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notification.md b/doc/database/db_notification.md
index 866d775274..0941ff1d36 100644
--- a/doc/database/db_notification.md
+++ b/doc/database/db_notification.md
@@ -1,17 +1,18 @@
 Table notification
 ===========
+
 notifications
 
-| Field         | Description                                                                    | Type               | Null | Key | Default | Extra          |    
-| ------------- | ------------------------------------------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |    
-| id            | sequential ID                                                                  | int unsigned       | NO   | PRI | NULL    | auto_increment |    
-| uid           | Owner User id                                                                  | mediumint unsigned | YES  |     | NULL    |                |    
-| vid           | Id of the verb table entry that contains the activity verbs                    | smallint unsigned  | YES  |     | NULL    |                |    
-| type          |                                                                                | tinyint unsigned   | YES  |     | NULL    |                |    
-| actor-id      | Link to the contact table with uid=0 of the actor that caused the notification | int unsigned       | YES  |     | NULL    |                |    
-| target-uri-id | Item-uri id of the related post                                                | int unsigned       | YES  |     | NULL    |                |    
-| parent-uri-id | Item-uri id of the parent of the related post                                  | int unsigned       | YES  |     | NULL    |                |    
-| created       |                                                                                | datetime           | YES  |     | NULL    |                |    
-| seen          |                                                                                | boolean            | YES  |     | 0       |                |    
+| Field         | Description                                                                    | Type               | Null | Key | Default | Extra          |
+| ------------- | ------------------------------------------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |
+| id            | sequential ID                                                                  | int unsigned       | NO   | PRI | NULL    | auto_increment |
+| uid           | Owner User id                                                                  | mediumint unsigned | YES  |     | NULL    |                |
+| vid           | Id of the verb table entry that contains the activity verbs                    | smallint unsigned  | YES  |     | NULL    |                |
+| type          |                                                                                | tinyint unsigned   | YES  |     | NULL    |                |
+| actor-id      | Link to the contact table with uid=0 of the actor that caused the notification | int unsigned       | YES  |     | NULL    |                |
+| target-uri-id | Item-uri id of the related post                                                | int unsigned       | YES  |     | NULL    |                |
+| parent-uri-id | Item-uri id of the parent of the related post                                  | int unsigned       | YES  |     | NULL    |                |
+| created       |                                                                                | datetime           | YES  |     | NULL    |                |
+| seen          |                                                                                | boolean            | YES  |     | 0       |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notify-threads.md b/doc/database/db_notify-threads.md
index 3461e502d5..0dd493975b 100644
--- a/doc/database/db_notify-threads.md
+++ b/doc/database/db_notify-threads.md
@@ -2,13 +2,14 @@ Table notify-threads
 ===========
 
 
-| Field                | Description                                   | Type               | Null | Key | Default | Extra          |    
-| -------------------- | --------------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |    
-| id                   | sequential ID                                 | int unsigned       | NO   | PRI | NULL    | auto_increment |    
-| notify-id            |                                               | int unsigned       | NO   |     | 0       |                |    
-| master-parent-item   | Deprecated                                    | int unsigned       | YES  |     | NULL    |                |    
-| master-parent-uri-id | Item-uri id of the parent of the related post | int unsigned       | YES  |     | NULL    |                |    
-| parent-item          |                                               | int unsigned       | NO   |     | 0       |                |    
-| receiver-uid         | User id                                       | mediumint unsigned | NO   |     | 0       |                |    
+
+| Field                | Description                                   | Type               | Null | Key | Default | Extra          |
+| -------------------- | --------------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |
+| id                   | sequential ID                                 | int unsigned       | NO   | PRI | NULL    | auto_increment |
+| notify-id            |                                               | int unsigned       | NO   |     | 0       |                |
+| master-parent-item   | Deprecated                                    | int unsigned       | YES  |     | NULL    |                |
+| master-parent-uri-id | Item-uri id of the parent of the related post | int unsigned       | YES  |     | NULL    |                |
+| parent-item          |                                               | int unsigned       | NO   |     | 0       |                |
+| receiver-uid         | User id                                       | mediumint unsigned | NO   |     | 0       |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notify.md b/doc/database/db_notify.md
index fef88a971a..a9eac5a3c8 100644
--- a/doc/database/db_notify.md
+++ b/doc/database/db_notify.md
@@ -1,26 +1,27 @@
 Table notify
 ===========
+
 notifications
 
-| Field         | Description                                   | Type               | Null | Key | Default             | Extra          |    
-| ------------- | --------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
-| id            | sequential ID                                 | int unsigned       | NO   | PRI | NULL                | auto_increment |    
-| type          |                                               | smallint unsigned  | NO   |     | 0                   |                |    
-| name          |                                               | varchar(255)       | NO   |     |                     |                |    
-| url           |                                               | varchar(255)       | NO   |     |                     |                |    
-| photo         |                                               | varchar(255)       | NO   |     |                     |                |    
-| date          |                                               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| msg           |                                               | mediumtext         | YES  |     | NULL                |                |    
-| uid           | Owner User id                                 | mediumint unsigned | NO   |     | 0                   |                |    
-| link          |                                               | varchar(255)       | NO   |     |                     |                |    
-| iid           |                                               | int unsigned       | YES  |     | NULL                |                |    
-| parent        |                                               | int unsigned       | YES  |     | NULL                |                |    
-| uri-id        | Item-uri id of the related post               | int unsigned       | YES  |     | NULL                |                |    
-| parent-uri-id | Item-uri id of the parent of the related post | int unsigned       | YES  |     | NULL                |                |    
-| seen          |                                               | boolean            | NO   |     | 0                   |                |    
-| verb          |                                               | varchar(100)       | NO   |     |                     |                |    
-| otype         |                                               | varchar(10)        | NO   |     |                     |                |    
-| name_cache    | Cached bbcode parsing of name                 | tinytext           | YES  |     | NULL                |                |    
-| msg_cache     | Cached bbcode parsing of msg                  | mediumtext         | YES  |     | NULL                |                |    
+| Field         | Description                                   | Type               | Null | Key | Default             | Extra          |
+| ------------- | --------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
+| id            | sequential ID                                 | int unsigned       | NO   | PRI | NULL                | auto_increment |
+| type          |                                               | smallint unsigned  | NO   |     | 0                   |                |
+| name          |                                               | varchar(255)       | NO   |     |                     |                |
+| url           |                                               | varchar(255)       | NO   |     |                     |                |
+| photo         |                                               | varchar(255)       | NO   |     |                     |                |
+| date          |                                               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| msg           |                                               | mediumtext         | YES  |     | NULL                |                |
+| uid           | Owner User id                                 | mediumint unsigned | NO   |     | 0                   |                |
+| link          |                                               | varchar(255)       | NO   |     |                     |                |
+| iid           |                                               | int unsigned       | YES  |     | NULL                |                |
+| parent        |                                               | int unsigned       | YES  |     | NULL                |                |
+| uri-id        | Item-uri id of the related post               | int unsigned       | YES  |     | NULL                |                |
+| parent-uri-id | Item-uri id of the parent of the related post | int unsigned       | YES  |     | NULL                |                |
+| seen          |                                               | boolean            | NO   |     | 0                   |                |
+| verb          |                                               | varchar(100)       | NO   |     |                     |                |
+| otype         |                                               | varchar(10)        | NO   |     |                     |                |
+| name_cache    | Cached bbcode parsing of name                 | tinytext           | YES  |     | NULL                |                |
+| msg_cache     | Cached bbcode parsing of msg                  | mediumtext         | YES  |     | NULL                |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_oembed.md b/doc/database/db_oembed.md
index bff9ebd9c5..3edee64c68 100644
--- a/doc/database/db_oembed.md
+++ b/doc/database/db_oembed.md
@@ -1,12 +1,13 @@
 Table oembed
 ===========
+
 cache for OEmbed queries
 
-| Field    | Description                    | Type               | Null | Key | Default             | Extra |    
-| -------- | ------------------------------ | ------------------ | ---- | --- | ------------------- | ----- |    
-| url      | page url                       | varbinary(255)     | NO   | PRI | NULL                |       |    
-| maxwidth | Maximum width passed to Oembed | mediumint unsigned | NO   | PRI | NULL                |       |    
-| content  | OEmbed data of the page        | mediumtext         | YES  |     | NULL                |       |    
-| created  | datetime of creation           | datetime           | NO   |     | 0001-01-01 00:00:00 |       |    
+| Field    | Description                    | Type               | Null | Key | Default             | Extra |
+| -------- | ------------------------------ | ------------------ | ---- | --- | ------------------- | ----- |
+| url      | page url                       | varbinary(255)     | NO   | PRI | NULL                |       |
+| maxwidth | Maximum width passed to Oembed | mediumint unsigned | NO   | PRI | NULL                |       |
+| content  | OEmbed data of the page        | mediumtext         | YES  |     | NULL                |       |
+| created  | datetime of creation           | datetime           | NO   |     | 0001-01-01 00:00:00 |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_openwebauth-token.md b/doc/database/db_openwebauth-token.md
index 0ae0a85ba0..1c3060f0f4 100644
--- a/doc/database/db_openwebauth-token.md
+++ b/doc/database/db_openwebauth-token.md
@@ -1,14 +1,15 @@
 Table openwebauth-token
 ===========
+
 Store OpenWebAuth token to verify contacts
 
-| Field   | Description                | Type               | Null | Key | Default             | Extra          |    
-| ------- | -------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
-| id      | sequential ID              | int unsigned       | NO   | PRI | NULL                | auto_increment |    
-| uid     | User id - currently unused | mediumint unsigned | NO   |     | 0                   |                |    
-| type    | Verify type                | varchar(32)        | NO   |     |                     |                |    
-| token   | A generated token          | varchar(255)       | NO   |     |                     |                |    
-| meta    |                            | varchar(255)       | NO   |     |                     |                |    
-| created | datetime of creation       | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| Field   | Description                | Type               | Null | Key | Default             | Extra          |
+| ------- | -------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
+| id      | sequential ID              | int unsigned       | NO   | PRI | NULL                | auto_increment |
+| uid     | User id - currently unused | mediumint unsigned | NO   |     | 0                   |                |
+| type    | Verify type                | varchar(32)        | NO   |     |                     |                |
+| token   | A generated token          | varchar(255)       | NO   |     |                     |                |
+| meta    |                            | varchar(255)       | NO   |     |                     |                |
+| created | datetime of creation       | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_parsed_url.md b/doc/database/db_parsed_url.md
index a264c86e3e..29a3ff8521 100644
--- a/doc/database/db_parsed_url.md
+++ b/doc/database/db_parsed_url.md
@@ -1,15 +1,16 @@
 Table parsed_url
 ===========
+
 cache for &#039;parse_url&#039; queries
 
-| Field    | Description                       | Type       | Null | Key | Default             | Extra |    
-| -------- | --------------------------------- | ---------- | ---- | --- | ------------------- | ----- |    
-| url_hash | page url hash                     | binary(64) | NO   | PRI | NULL                |       |    
-| guessing | is the &#039;guessing&#039; mode active?    | boolean    | NO   | PRI | 0                   |       |    
-| oembed   | is the data the result of oembed? | boolean    | NO   | PRI | 0                   |       |    
-| url      | page url                          | text       | NO   |     | NULL                |       |    
-| content  | page data                         | mediumtext | YES  |     | NULL                |       |    
-| created  | datetime of creation              | datetime   | NO   |     | 0001-01-01 00:00:00 |       |    
-| expires  | datetime of expiration            | datetime   | NO   |     | 0001-01-01 00:00:00 |       |    
+| Field    | Description                       | Type       | Null | Key | Default             | Extra |
+| -------- | --------------------------------- | ---------- | ---- | --- | ------------------- | ----- |
+| url_hash | page url hash                     | binary(64) | NO   | PRI | NULL                |       |
+| guessing | is the &#039;guessing&#039; mode active?    | boolean    | NO   | PRI | 0                   |       |
+| oembed   | is the data the result of oembed? | boolean    | NO   | PRI | 0                   |       |
+| url      | page url                          | text       | NO   |     | NULL                |       |
+| content  | page data                         | mediumtext | YES  |     | NULL                |       |
+| created  | datetime of creation              | datetime   | NO   |     | 0001-01-01 00:00:00 |       |
+| expires  | datetime of expiration            | datetime   | NO   |     | 0001-01-01 00:00:00 |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_pconfig.md b/doc/database/db_pconfig.md
index 819dfbfbf6..7449c511d3 100644
--- a/doc/database/db_pconfig.md
+++ b/doc/database/db_pconfig.md
@@ -1,13 +1,14 @@
 Table pconfig
 ===========
+
 personal (per user) configuration storage
 
-| Field | Description | Type               | Null | Key | Default | Extra          |    
-| ----- | ----------- | ------------------ | ---- | --- | ------- | -------------- |    
-| id    | Primary key | int unsigned       | NO   | PRI | NULL    | auto_increment |    
-| uid   | User id     | mediumint unsigned | NO   |     | 0       |                |    
-| cat   | Category    | varchar(50)        | NO   |     |         |                |    
-| k     | Key         | varchar(100)       | NO   |     |         |                |    
-| v     | Value       | mediumtext         | YES  |     | NULL    |                |    
+| Field | Description | Type               | Null | Key | Default | Extra          |
+| ----- | ----------- | ------------------ | ---- | --- | ------- | -------------- |
+| id    | Primary key | int unsigned       | NO   | PRI | NULL    | auto_increment |
+| uid   | User id     | mediumint unsigned | NO   |     | 0       |                |
+| cat   | Category    | varchar(50)        | NO   |     |         |                |
+| k     | Key         | varchar(100)       | NO   |     |         |                |
+| v     | Value       | mediumtext         | YES  |     | NULL    |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_permissionset.md b/doc/database/db_permissionset.md
index 39b3d93b3c..855ed1ea12 100644
--- a/doc/database/db_permissionset.md
+++ b/doc/database/db_permissionset.md
@@ -2,13 +2,14 @@ Table permissionset
 ===========
 
 
-| Field     | Description                                            | Type               | Null | Key | Default | Extra          |    
-| --------- | ------------------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |    
-| id        | sequential ID                                          | int unsigned       | NO   | PRI | NULL    | auto_increment |    
-| uid       | Owner id of this permission set                        | mediumint unsigned | NO   |     | 0       |                |    
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES  |     | NULL    |                |    
-| allow_gid | Access Control - list of allowed groups                | mediumtext         | YES  |     | NULL    |                |    
-| deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL    |                |    
-| deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL    |                |    
+
+| Field     | Description                                            | Type               | Null | Key | Default | Extra          |
+| --------- | ------------------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |
+| id        | sequential ID                                          | int unsigned       | NO   | PRI | NULL    | auto_increment |
+| uid       | Owner id of this permission set                        | mediumint unsigned | NO   |     | 0       |                |
+| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES  |     | NULL    |                |
+| allow_gid | Access Control - list of allowed groups                | mediumtext         | YES  |     | NULL    |                |
+| deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL    |                |
+| deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL    |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_photo.md b/doc/database/db_photo.md
index 1574d61818..168797a1fb 100644
--- a/doc/database/db_photo.md
+++ b/doc/database/db_photo.md
@@ -1,35 +1,36 @@
 Table photo
 ===========
+
 photo storage
 
-| Field         | Description                                            | Type               | Null | Key | Default             | Extra          |    
-| ------------- | ------------------------------------------------------ | ------------------ | ---- | --- | ------------------- | -------------- |    
-| id            | sequential ID                                          | int unsigned       | NO   | PRI | NULL                | auto_increment |    
-| uid           | Owner User id                                          | mediumint unsigned | NO   |     | 0                   |                |    
-| contact-id    | contact.id                                             | int unsigned       | NO   |     | 0                   |                |    
-| guid          | A unique identifier for this photo                     | char(16)           | NO   |     |                     |                |    
-| resource-id   |                                                        | char(32)           | NO   |     |                     |                |    
-| hash          | hash value of the photo                                | char(32)           | YES  |     | NULL                |                |    
-| created       | creation date                                          | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| edited        | last edited date                                       | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| title         |                                                        | varchar(255)       | NO   |     |                     |                |    
-| desc          |                                                        | text               | YES  |     | NULL                |                |    
-| album         | The name of the album to which the photo belongs       | varchar(255)       | NO   |     |                     |                |    
-| filename      |                                                        | varchar(255)       | NO   |     |                     |                |    
-| type          |                                                        | varchar(30)        | NO   |     | image/jpeg          |                |    
-| height        |                                                        | smallint unsigned  | NO   |     | 0                   |                |    
-| width         |                                                        | smallint unsigned  | NO   |     | 0                   |                |    
-| datasize      |                                                        | int unsigned       | NO   |     | 0                   |                |    
-| data          |                                                        | mediumblob         | NO   |     | NULL                |                |    
-| scale         |                                                        | tinyint unsigned   | NO   |     | 0                   |                |    
-| profile       |                                                        | boolean            | NO   |     | 0                   |                |    
-| allow_cid     | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES  |     | NULL                |                |    
-| allow_gid     | Access Control - list of allowed groups                | mediumtext         | YES  |     | NULL                |                |    
-| deny_cid      | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL                |                |    
-| deny_gid      | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL                |                |    
-| accessible    | Make photo publicly accessible, ignoring permissions   | boolean            | NO   |     | 0                   |                |    
-| backend-class | Storage backend class                                  | tinytext           | YES  |     | NULL                |                |    
-| backend-ref   | Storage backend data reference                         | text               | YES  |     | NULL                |                |    
-| updated       |                                                        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| Field         | Description                                            | Type               | Null | Key | Default             | Extra          |
+| ------------- | ------------------------------------------------------ | ------------------ | ---- | --- | ------------------- | -------------- |
+| id            | sequential ID                                          | int unsigned       | NO   | PRI | NULL                | auto_increment |
+| uid           | Owner User id                                          | mediumint unsigned | NO   |     | 0                   |                |
+| contact-id    | contact.id                                             | int unsigned       | NO   |     | 0                   |                |
+| guid          | A unique identifier for this photo                     | char(16)           | NO   |     |                     |                |
+| resource-id   |                                                        | char(32)           | NO   |     |                     |                |
+| hash          | hash value of the photo                                | char(32)           | YES  |     | NULL                |                |
+| created       | creation date                                          | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| edited        | last edited date                                       | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| title         |                                                        | varchar(255)       | NO   |     |                     |                |
+| desc          |                                                        | text               | YES  |     | NULL                |                |
+| album         | The name of the album to which the photo belongs       | varchar(255)       | NO   |     |                     |                |
+| filename      |                                                        | varchar(255)       | NO   |     |                     |                |
+| type          |                                                        | varchar(30)        | NO   |     | image/jpeg          |                |
+| height        |                                                        | smallint unsigned  | NO   |     | 0                   |                |
+| width         |                                                        | smallint unsigned  | NO   |     | 0                   |                |
+| datasize      |                                                        | int unsigned       | NO   |     | 0                   |                |
+| data          |                                                        | mediumblob         | NO   |     | NULL                |                |
+| scale         |                                                        | tinyint unsigned   | NO   |     | 0                   |                |
+| profile       |                                                        | boolean            | NO   |     | 0                   |                |
+| allow_cid     | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES  |     | NULL                |                |
+| allow_gid     | Access Control - list of allowed groups                | mediumtext         | YES  |     | NULL                |                |
+| deny_cid      | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL                |                |
+| deny_gid      | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL                |                |
+| accessible    | Make photo publicly accessible, ignoring permissions   | boolean            | NO   |     | 0                   |                |
+| backend-class | Storage backend class                                  | tinytext           | YES  |     | NULL                |                |
+| backend-ref   | Storage backend data reference                         | text               | YES  |     | NULL                |                |
+| updated       |                                                        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-category.md b/doc/database/db_post-category.md
index c5bf26e8fc..14663cf5bb 100644
--- a/doc/database/db_post-category.md
+++ b/doc/database/db_post-category.md
@@ -1,12 +1,13 @@
 Table post-category
 ===========
+
 post relation to categories
 
-| Field  | Description                                               | Type               | Null | Key | Default | Extra |    
-| ------ | --------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |    
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned       | NO   | PRI | NULL    |       |    
-| uid    | User id                                                   | mediumint unsigned | NO   | PRI | 0       |       |    
-| type   |                                                           | tinyint unsigned   | NO   | PRI | 0       |       |    
-| tid    |                                                           | int unsigned       | NO   | PRI | 0       |       |    
+| Field  | Description                                               | Type               | Null | Key | Default | Extra |
+| ------ | --------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned       | NO   | PRI | NULL    |       |
+| uid    | User id                                                   | mediumint unsigned | NO   | PRI | 0       |       |
+| type   |                                                           | tinyint unsigned   | NO   | PRI | 0       |       |
+| tid    |                                                           | int unsigned       | NO   | PRI | 0       |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-content.md b/doc/database/db_post-content.md
index cee72373ba..4596a04a56 100644
--- a/doc/database/db_post-content.md
+++ b/doc/database/db_post-content.md
@@ -1,25 +1,26 @@
 Table post-content
 ===========
+
 Content for all posts
 
-| Field           | Description                                                                                                               | Type         | Null | Key | Default | Extra |    
-| --------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |    
-| uri-id          | Id of the item-uri table entry that contains the item uri                                                                 | int unsigned | NO   | PRI | NULL    |       |    
-| title           | item title                                                                                                                | varchar(255) | NO   |     |         |       |    
-| content-warning |                                                                                                                           | varchar(255) | NO   |     |         |       |    
-| body            | item body content                                                                                                         | mediumtext   | YES  |     | NULL    |       |    
-| raw-body        | Body without embedded media links                                                                                         | mediumtext   | YES  |     | NULL    |       |    
-| location        | text location where this item originated                                                                                  | varchar(255) | NO   |     |         |       |    
-| coord           | longitude/latitude pair representing location where this item originated                                                  | varchar(255) | NO   |     |         |       |    
-| language        | Language information about this post                                                                                      | text         | YES  |     | NULL    |       |    
-| app             | application which generated this item                                                                                     | varchar(255) | NO   |     |         |       |    
-| rendered-hash   |                                                                                                                           | varchar(32)  | NO   |     |         |       |    
-| rendered-html   | item.body converted to html                                                                                               | mediumtext   | YES  |     | NULL    |       |    
-| object-type     | ActivityStreams object type                                                                                               | varchar(100) | NO   |     |         |       |    
-| object          | JSON encoded object structure unless it is an implied object (normal post)                                                | text         | YES  |     | NULL    |       |    
-| target-type     | ActivityStreams target type if applicable (URI)                                                                           | varchar(100) | NO   |     |         |       |    
-| target          | JSON encoded target structure if used                                                                                     | text         | YES  |     | NULL    |       |    
-| resource-id     | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32)  | NO   |     |         |       |    
-| plink           | permalink or URL to a displayable copy of the message at its source                                                       | varchar(255) | NO   |     |         |       |    
+| Field           | Description                                                                                                               | Type         | Null | Key | Default | Extra |
+| --------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |
+| uri-id          | Id of the item-uri table entry that contains the item uri                                                                 | int unsigned | NO   | PRI | NULL    |       |
+| title           | item title                                                                                                                | varchar(255) | NO   |     |         |       |
+| content-warning |                                                                                                                           | varchar(255) | NO   |     |         |       |
+| body            | item body content                                                                                                         | mediumtext   | YES  |     | NULL    |       |
+| raw-body        | Body without embedded media links                                                                                         | mediumtext   | YES  |     | NULL    |       |
+| location        | text location where this item originated                                                                                  | varchar(255) | NO   |     |         |       |
+| coord           | longitude/latitude pair representing location where this item originated                                                  | varchar(255) | NO   |     |         |       |
+| language        | Language information about this post                                                                                      | text         | YES  |     | NULL    |       |
+| app             | application which generated this item                                                                                     | varchar(255) | NO   |     |         |       |
+| rendered-hash   |                                                                                                                           | varchar(32)  | NO   |     |         |       |
+| rendered-html   | item.body converted to html                                                                                               | mediumtext   | YES  |     | NULL    |       |
+| object-type     | ActivityStreams object type                                                                                               | varchar(100) | NO   |     |         |       |
+| object          | JSON encoded object structure unless it is an implied object (normal post)                                                | text         | YES  |     | NULL    |       |
+| target-type     | ActivityStreams target type if applicable (URI)                                                                           | varchar(100) | NO   |     |         |       |
+| target          | JSON encoded target structure if used                                                                                     | text         | YES  |     | NULL    |       |
+| resource-id     | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32)  | NO   |     |         |       |
+| plink           | permalink or URL to a displayable copy of the message at its source                                                       | varchar(255) | NO   |     |         |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-delivery-data.md b/doc/database/db_post-delivery-data.md
index 95e9dc1904..1ed912d8bc 100644
--- a/doc/database/db_post-delivery-data.md
+++ b/doc/database/db_post-delivery-data.md
@@ -1,19 +1,20 @@
 Table post-delivery-data
 ===========
+
 Delivery data for items
 
-| Field        | Description                                                                                                                                                | Type         | Null | Key | Default | Extra |    
-| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |    
-| uri-id       | Id of the item-uri table entry that contains the item uri                                                                                                  | int unsigned | NO   | PRI | NULL    |       |    
-| postopts     | External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery | text         | YES  |     | NULL    |       |    
-| inform       | Additional receivers of the linked item                                                                                                                    | mediumtext   | YES  |     | NULL    |       |    
-| queue_count  | Initial number of delivery recipients, used as item.delivery_queue_count                                                                                   | mediumint    | NO   |     | 0       |       |    
-| queue_done   | Number of successful deliveries, used as item.delivery_queue_done                                                                                          | mediumint    | NO   |     | 0       |       |    
-| queue_failed | Number of unsuccessful deliveries, used as item.delivery_queue_failed                                                                                      | mediumint    | NO   |     | 0       |       |    
-| activitypub  | Number of successful deliveries via ActivityPub                                                                                                            | mediumint    | NO   |     | 0       |       |    
-| dfrn         | Number of successful deliveries via DFRN                                                                                                                   | mediumint    | NO   |     | 0       |       |    
-| legacy_dfrn  | Number of successful deliveries via legacy DFRN                                                                                                            | mediumint    | NO   |     | 0       |       |    
-| diaspora     | Number of successful deliveries via Diaspora                                                                                                               | mediumint    | NO   |     | 0       |       |    
-| ostatus      | Number of successful deliveries via OStatus                                                                                                                | mediumint    | NO   |     | 0       |       |    
+| Field        | Description                                                                                                                                                | Type         | Null | Key | Default | Extra |
+| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |
+| uri-id       | Id of the item-uri table entry that contains the item uri                                                                                                  | int unsigned | NO   | PRI | NULL    |       |
+| postopts     | External post connectors add their network name to this comma-separated string to identify that they should be delivered to these networks during delivery | text         | YES  |     | NULL    |       |
+| inform       | Additional receivers of the linked item                                                                                                                    | mediumtext   | YES  |     | NULL    |       |
+| queue_count  | Initial number of delivery recipients, used as item.delivery_queue_count                                                                                   | mediumint    | NO   |     | 0       |       |
+| queue_done   | Number of successful deliveries, used as item.delivery_queue_done                                                                                          | mediumint    | NO   |     | 0       |       |
+| queue_failed | Number of unsuccessful deliveries, used as item.delivery_queue_failed                                                                                      | mediumint    | NO   |     | 0       |       |
+| activitypub  | Number of successful deliveries via ActivityPub                                                                                                            | mediumint    | NO   |     | 0       |       |
+| dfrn         | Number of successful deliveries via DFRN                                                                                                                   | mediumint    | NO   |     | 0       |       |
+| legacy_dfrn  | Number of successful deliveries via legacy DFRN                                                                                                            | mediumint    | NO   |     | 0       |       |
+| diaspora     | Number of successful deliveries via Diaspora                                                                                                               | mediumint    | NO   |     | 0       |       |
+| ostatus      | Number of successful deliveries via OStatus                                                                                                                | mediumint    | NO   |     | 0       |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-media.md b/doc/database/db_post-media.md
index b78f2d4099..e1e299f02e 100644
--- a/doc/database/db_post-media.md
+++ b/doc/database/db_post-media.md
@@ -1,27 +1,28 @@
 Table post-media
 ===========
+
 Attached media
 
-| Field           | Description                                               | Type              | Null | Key | Default | Extra          |    
-| --------------- | --------------------------------------------------------- | ----------------- | ---- | --- | ------- | -------------- |    
-| id              | sequential ID                                             | int unsigned      | NO   | PRI | NULL    | auto_increment |    
-| uri-id          | Id of the item-uri table entry that contains the item uri | int unsigned      | NO   |     | NULL    |                |    
-| url             | Media URL                                                 | varbinary(511)    | NO   |     | NULL    |                |    
-| type            | Media type                                                | tinyint unsigned  | NO   |     | 0       |                |    
-| mimetype        |                                                           | varchar(60)       | YES  |     | NULL    |                |    
-| height          | Height of the media                                       | smallint unsigned | YES  |     | NULL    |                |    
-| width           | Width of the media                                        | smallint unsigned | YES  |     | NULL    |                |    
-| size            | Media size                                                | int unsigned      | YES  |     | NULL    |                |    
-| preview         | Preview URL                                               | varbinary(255)    | YES  |     | NULL    |                |    
-| preview-height  | Height of the preview picture                             | smallint unsigned | YES  |     | NULL    |                |    
-| preview-width   | Width of the preview picture                              | smallint unsigned | YES  |     | NULL    |                |    
-| description     |                                                           | text              | YES  |     | NULL    |                |    
-| name            | Name of the media                                         | varchar(255)      | YES  |     | NULL    |                |    
-| author-url      | URL of the author of the media                            | varbinary(255)    | YES  |     | NULL    |                |    
-| author-name     | Name of the author of the media                           | varchar(255)      | YES  |     | NULL    |                |    
-| author-image    | Image of the author of the media                          | varbinary(255)    | YES  |     | NULL    |                |    
-| publisher-url   | URL of the publisher of the media                         | varbinary(255)    | YES  |     | NULL    |                |    
-| publisher-name  | Name of the publisher of the media                        | varchar(255)      | YES  |     | NULL    |                |    
-| publisher-image | Image of the publisher of the media                       | varbinary(255)    | YES  |     | NULL    |                |    
+| Field           | Description                                               | Type              | Null | Key | Default | Extra          |
+| --------------- | --------------------------------------------------------- | ----------------- | ---- | --- | ------- | -------------- |
+| id              | sequential ID                                             | int unsigned      | NO   | PRI | NULL    | auto_increment |
+| uri-id          | Id of the item-uri table entry that contains the item uri | int unsigned      | NO   |     | NULL    |                |
+| url             | Media URL                                                 | varbinary(511)    | NO   |     | NULL    |                |
+| type            | Media type                                                | tinyint unsigned  | NO   |     | 0       |                |
+| mimetype        |                                                           | varchar(60)       | YES  |     | NULL    |                |
+| height          | Height of the media                                       | smallint unsigned | YES  |     | NULL    |                |
+| width           | Width of the media                                        | smallint unsigned | YES  |     | NULL    |                |
+| size            | Media size                                                | int unsigned      | YES  |     | NULL    |                |
+| preview         | Preview URL                                               | varbinary(255)    | YES  |     | NULL    |                |
+| preview-height  | Height of the preview picture                             | smallint unsigned | YES  |     | NULL    |                |
+| preview-width   | Width of the preview picture                              | smallint unsigned | YES  |     | NULL    |                |
+| description     |                                                           | text              | YES  |     | NULL    |                |
+| name            | Name of the media                                         | varchar(255)      | YES  |     | NULL    |                |
+| author-url      | URL of the author of the media                            | varbinary(255)    | YES  |     | NULL    |                |
+| author-name     | Name of the author of the media                           | varchar(255)      | YES  |     | NULL    |                |
+| author-image    | Image of the author of the media                          | varbinary(255)    | YES  |     | NULL    |                |
+| publisher-url   | URL of the publisher of the media                         | varbinary(255)    | YES  |     | NULL    |                |
+| publisher-name  | Name of the publisher of the media                        | varchar(255)      | YES  |     | NULL    |                |
+| publisher-image | Image of the publisher of the media                       | varbinary(255)    | YES  |     | NULL    |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-tag.md b/doc/database/db_post-tag.md
index 53df02cbe0..228f27708d 100644
--- a/doc/database/db_post-tag.md
+++ b/doc/database/db_post-tag.md
@@ -1,12 +1,13 @@
 Table post-tag
 ===========
+
 post relation to tags
 
-| Field  | Description                                               | Type             | Null | Key | Default | Extra |    
-| ------ | --------------------------------------------------------- | ---------------- | ---- | --- | ------- | ----- |    
-| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned     | NO   | PRI | NULL    |       |    
-| type   |                                                           | tinyint unsigned | NO   | PRI | 0       |       |    
-| tid    |                                                           | int unsigned     | NO   | PRI | 0       |       |    
-| cid    | Contact id of the mentioned public contact                | int unsigned     | NO   | PRI | 0       |       |    
+| Field  | Description                                               | Type             | Null | Key | Default | Extra |
+| ------ | --------------------------------------------------------- | ---------------- | ---- | --- | ------- | ----- |
+| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned     | NO   | PRI | NULL    |       |
+| type   |                                                           | tinyint unsigned | NO   | PRI | 0       |       |
+| tid    |                                                           | int unsigned     | NO   | PRI | 0       |       |
+| cid    | Contact id of the mentioned public contact                | int unsigned     | NO   | PRI | 0       |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-thread-user.md b/doc/database/db_post-thread-user.md
index 1db1ffe266..29e5617d35 100644
--- a/doc/database/db_post-thread-user.md
+++ b/doc/database/db_post-thread-user.md
@@ -1,31 +1,32 @@
 Table post-thread-user
 ===========
+
 Thread related data per user
 
-| Field        | Description                                                                                             | Type               | Null | Key | Default             | Extra |    
-| ------------ | ------------------------------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | ----- |    
-| uri-id       | Id of the item-uri table entry that contains the item uri                                               | int unsigned       | NO   | PRI | NULL                |       |    
-| owner-id     | Item owner                                                                                              | int unsigned       | NO   |     | 0                   |       |    
-| author-id    | Item author                                                                                             | int unsigned       | NO   |     | 0                   |       |    
-| causer-id    | Link to the contact table with uid=0 of the contact that caused the item creation                       | int unsigned       | YES  |     | NULL                |       |    
-| network      |                                                                                                         | char(4)            | NO   |     |                     |       |    
-| created      |                                                                                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |       |    
-| received     |                                                                                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |       |    
-| changed      | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime           | NO   |     | 0001-01-01 00:00:00 |       |    
-| commented    |                                                                                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |       |    
-| uid          | Owner id which owns this copy of the item                                                               | mediumint unsigned | NO   | PRI | 0                   |       |    
-| pinned       | The thread is pinned on the profile page                                                                | boolean            | NO   |     | 0                   |       |    
-| starred      |                                                                                                         | boolean            | NO   |     | 0                   |       |    
-| ignored      | Ignore updates for this thread                                                                          | boolean            | NO   |     | 0                   |       |    
-| wall         | This item was posted to the wall of uid                                                                 | boolean            | NO   |     | 0                   |       |    
-| mention      |                                                                                                         | boolean            | NO   |     | 0                   |       |    
-| pubmail      |                                                                                                         | boolean            | NO   |     | 0                   |       |    
-| forum_mode   |                                                                                                         | tinyint unsigned   | NO   |     | 0                   |       |    
-| contact-id   | contact.id                                                                                              | int unsigned       | NO   |     | 0                   |       |    
-| unseen       | post has not been seen                                                                                  | boolean            | NO   |     | 1                   |       |    
-| hidden       | Marker to hide the post from the user                                                                   | boolean            | NO   |     | 0                   |       |    
-| origin       | item originated at this site                                                                            | boolean            | NO   |     | 0                   |       |    
-| psid         | ID of the permission set of this post                                                                   | int unsigned       | YES  |     | NULL                |       |    
-| post-user-id | Id of the post-user table                                                                               | int unsigned       | YES  |     | NULL                |       |    
+| Field        | Description                                                                                             | Type               | Null | Key | Default             | Extra |
+| ------------ | ------------------------------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | ----- |
+| uri-id       | Id of the item-uri table entry that contains the item uri                                               | int unsigned       | NO   | PRI | NULL                |       |
+| owner-id     | Item owner                                                                                              | int unsigned       | NO   |     | 0                   |       |
+| author-id    | Item author                                                                                             | int unsigned       | NO   |     | 0                   |       |
+| causer-id    | Link to the contact table with uid=0 of the contact that caused the item creation                       | int unsigned       | YES  |     | NULL                |       |
+| network      |                                                                                                         | char(4)            | NO   |     |                     |       |
+| created      |                                                                                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |       |
+| received     |                                                                                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |       |
+| changed      | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime           | NO   |     | 0001-01-01 00:00:00 |       |
+| commented    |                                                                                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |       |
+| uid          | Owner id which owns this copy of the item                                                               | mediumint unsigned | NO   | PRI | 0                   |       |
+| pinned       | The thread is pinned on the profile page                                                                | boolean            | NO   |     | 0                   |       |
+| starred      |                                                                                                         | boolean            | NO   |     | 0                   |       |
+| ignored      | Ignore updates for this thread                                                                          | boolean            | NO   |     | 0                   |       |
+| wall         | This item was posted to the wall of uid                                                                 | boolean            | NO   |     | 0                   |       |
+| mention      |                                                                                                         | boolean            | NO   |     | 0                   |       |
+| pubmail      |                                                                                                         | boolean            | NO   |     | 0                   |       |
+| forum_mode   |                                                                                                         | tinyint unsigned   | NO   |     | 0                   |       |
+| contact-id   | contact.id                                                                                              | int unsigned       | NO   |     | 0                   |       |
+| unseen       | post has not been seen                                                                                  | boolean            | NO   |     | 1                   |       |
+| hidden       | Marker to hide the post from the user                                                                   | boolean            | NO   |     | 0                   |       |
+| origin       | item originated at this site                                                                            | boolean            | NO   |     | 0                   |       |
+| psid         | ID of the permission set of this post                                                                   | int unsigned       | YES  |     | NULL                |       |
+| post-user-id | Id of the post-user table                                                                               | int unsigned       | YES  |     | NULL                |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-thread.md b/doc/database/db_post-thread.md
index 57a28d199c..8b847e6283 100644
--- a/doc/database/db_post-thread.md
+++ b/doc/database/db_post-thread.md
@@ -1,17 +1,18 @@
 Table post-thread
 ===========
+
 Thread related data
 
-| Field     | Description                                                                                             | Type         | Null | Key | Default             | Extra |    
-| --------- | ------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------------------- | ----- |    
-| uri-id    | Id of the item-uri table entry that contains the item uri                                               | int unsigned | NO   | PRI | NULL                |       |    
-| owner-id  | Item owner                                                                                              | int unsigned | NO   |     | 0                   |       |    
-| author-id | Item author                                                                                             | int unsigned | NO   |     | 0                   |       |    
-| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation                       | int unsigned | YES  |     | NULL                |       |    
-| network   |                                                                                                         | char(4)      | NO   |     |                     |       |    
-| created   |                                                                                                         | datetime     | NO   |     | 0001-01-01 00:00:00 |       |    
-| received  |                                                                                                         | datetime     | NO   |     | 0001-01-01 00:00:00 |       |    
-| changed   | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime     | NO   |     | 0001-01-01 00:00:00 |       |    
-| commented |                                                                                                         | datetime     | NO   |     | 0001-01-01 00:00:00 |       |    
+| Field     | Description                                                                                             | Type         | Null | Key | Default             | Extra |
+| --------- | ------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------------------- | ----- |
+| uri-id    | Id of the item-uri table entry that contains the item uri                                               | int unsigned | NO   | PRI | NULL                |       |
+| owner-id  | Item owner                                                                                              | int unsigned | NO   |     | 0                   |       |
+| author-id | Item author                                                                                             | int unsigned | NO   |     | 0                   |       |
+| causer-id | Link to the contact table with uid=0 of the contact that caused the item creation                       | int unsigned | YES  |     | NULL                |       |
+| network   |                                                                                                         | char(4)      | NO   |     |                     |       |
+| created   |                                                                                                         | datetime     | NO   |     | 0001-01-01 00:00:00 |       |
+| received  |                                                                                                         | datetime     | NO   |     | 0001-01-01 00:00:00 |       |
+| changed   | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime     | NO   |     | 0001-01-01 00:00:00 |       |
+| commented |                                                                                                         | datetime     | NO   |     | 0001-01-01 00:00:00 |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-user-notification.md b/doc/database/db_post-user-notification.md
index fc367ca750..1607ce2c23 100644
--- a/doc/database/db_post-user-notification.md
+++ b/doc/database/db_post-user-notification.md
@@ -1,11 +1,12 @@
 Table post-user-notification
 ===========
+
 User post notifications
 
-| Field             | Description                                               | Type               | Null | Key | Default | Extra |    
-| ----------------- | --------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |    
-| uri-id            | Id of the item-uri table entry that contains the item uri | int unsigned       | NO   | PRI | NULL    |       |    
-| uid               | Owner id which owns this copy of the item                 | mediumint unsigned | NO   | PRI | NULL    |       |    
-| notification-type |                                                           | tinyint unsigned   | NO   |     | 0       |       |    
+| Field             | Description                                               | Type               | Null | Key | Default | Extra |
+| ----------------- | --------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
+| uri-id            | Id of the item-uri table entry that contains the item uri | int unsigned       | NO   | PRI | NULL    |       |
+| uid               | Owner id which owns this copy of the item                 | mediumint unsigned | NO   | PRI | NULL    |       |
+| notification-type |                                                           | tinyint unsigned   | NO   |     | 0       |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-user.md b/doc/database/db_post-user.md
index 91c101200c..8fad8056ec 100644
--- a/doc/database/db_post-user.md
+++ b/doc/database/db_post-user.md
@@ -1,38 +1,39 @@
 Table post-user
 ===========
+
 User specific post data
 
-| Field             | Description                                                                       | Type               | Null | Key | Default             | Extra          |    
-| ----------------- | --------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
-| id                |                                                                                   | int unsigned       | NO   | PRI | NULL                | auto_increment |    
-| uri-id            | Id of the item-uri table entry that contains the item uri                         | int unsigned       | NO   |     | NULL                |                |    
-| parent-uri-id     | Id of the item-uri table that contains the parent uri                             | int unsigned       | YES  |     | NULL                |                |    
-| thr-parent-id     | Id of the item-uri table that contains the thread parent uri                      | int unsigned       | YES  |     | NULL                |                |    
-| external-id       | Id of the item-uri table entry that contains the external uri                     | int unsigned       | YES  |     | NULL                |                |    
-| created           | Creation timestamp.                                                               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| edited            | Date of last edit (default is created)                                            | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| received          | datetime                                                                          | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| gravity           |                                                                                   | tinyint unsigned   | NO   |     | 0                   |                |    
-| network           | Network from where the item comes from                                            | char(4)            | NO   |     |                     |                |    
-| owner-id          | Link to the contact table with uid=0 of the owner of this item                    | int unsigned       | NO   |     | 0                   |                |    
-| author-id         | Link to the contact table with uid=0 of the author of this item                   | int unsigned       | NO   |     | 0                   |                |    
-| causer-id         | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned       | YES  |     | NULL                |                |    
-| post-type         | Post type (personal note, image, article, ...)                                    | tinyint unsigned   | NO   |     | 0                   |                |    
-| post-reason       | Reason why the post arrived at the user                                           | tinyint unsigned   | NO   |     | 0                   |                |    
-| vid               | Id of the verb table entry that contains the activity verbs                       | smallint unsigned  | YES  |     | NULL                |                |    
-| private           | 0=public, 1=private, 2=unlisted                                                   | tinyint unsigned   | NO   |     | 0                   |                |    
-| global            |                                                                                   | boolean            | NO   |     | 0                   |                |    
-| visible           |                                                                                   | boolean            | NO   |     | 0                   |                |    
-| deleted           | item has been marked for deletion                                                 | boolean            | NO   |     | 0                   |                |    
-| uid               | Owner id which owns this copy of the item                                         | mediumint unsigned | NO   |     | NULL                |                |    
-| protocol          | Protocol used to deliver the item for this user                                   | tinyint unsigned   | YES  |     | NULL                |                |    
-| contact-id        | contact.id                                                                        | int unsigned       | NO   |     | 0                   |                |    
-| event-id          | Used to link to the event.id                                                      | int unsigned       | YES  |     | NULL                |                |    
-| unseen            | post has not been seen                                                            | boolean            | NO   |     | 1                   |                |    
-| hidden            | Marker to hide the post from the user                                             | boolean            | NO   |     | 0                   |                |    
-| notification-type |                                                                                   | tinyint unsigned   | NO   |     | 0                   |                |    
-| wall              | This item was posted to the wall of uid                                           | boolean            | NO   |     | 0                   |                |    
-| origin            | item originated at this site                                                      | boolean            | NO   |     | 0                   |                |    
-| psid              | ID of the permission set of this post                                             | int unsigned       | YES  |     | NULL                |                |    
+| Field             | Description                                                                       | Type               | Null | Key | Default             | Extra          |
+| ----------------- | --------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
+| id                |                                                                                   | int unsigned       | NO   | PRI | NULL                | auto_increment |
+| uri-id            | Id of the item-uri table entry that contains the item uri                         | int unsigned       | NO   |     | NULL                |                |
+| parent-uri-id     | Id of the item-uri table that contains the parent uri                             | int unsigned       | YES  |     | NULL                |                |
+| thr-parent-id     | Id of the item-uri table that contains the thread parent uri                      | int unsigned       | YES  |     | NULL                |                |
+| external-id       | Id of the item-uri table entry that contains the external uri                     | int unsigned       | YES  |     | NULL                |                |
+| created           | Creation timestamp.                                                               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| edited            | Date of last edit (default is created)                                            | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| received          | datetime                                                                          | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| gravity           |                                                                                   | tinyint unsigned   | NO   |     | 0                   |                |
+| network           | Network from where the item comes from                                            | char(4)            | NO   |     |                     |                |
+| owner-id          | Link to the contact table with uid=0 of the owner of this item                    | int unsigned       | NO   |     | 0                   |                |
+| author-id         | Link to the contact table with uid=0 of the author of this item                   | int unsigned       | NO   |     | 0                   |                |
+| causer-id         | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned       | YES  |     | NULL                |                |
+| post-type         | Post type (personal note, image, article, ...)                                    | tinyint unsigned   | NO   |     | 0                   |                |
+| post-reason       | Reason why the post arrived at the user                                           | tinyint unsigned   | NO   |     | 0                   |                |
+| vid               | Id of the verb table entry that contains the activity verbs                       | smallint unsigned  | YES  |     | NULL                |                |
+| private           | 0=public, 1=private, 2=unlisted                                                   | tinyint unsigned   | NO   |     | 0                   |                |
+| global            |                                                                                   | boolean            | NO   |     | 0                   |                |
+| visible           |                                                                                   | boolean            | NO   |     | 0                   |                |
+| deleted           | item has been marked for deletion                                                 | boolean            | NO   |     | 0                   |                |
+| uid               | Owner id which owns this copy of the item                                         | mediumint unsigned | NO   |     | NULL                |                |
+| protocol          | Protocol used to deliver the item for this user                                   | tinyint unsigned   | YES  |     | NULL                |                |
+| contact-id        | contact.id                                                                        | int unsigned       | NO   |     | 0                   |                |
+| event-id          | Used to link to the event.id                                                      | int unsigned       | YES  |     | NULL                |                |
+| unseen            | post has not been seen                                                            | boolean            | NO   |     | 1                   |                |
+| hidden            | Marker to hide the post from the user                                             | boolean            | NO   |     | 0                   |                |
+| notification-type |                                                                                   | tinyint unsigned   | NO   |     | 0                   |                |
+| wall              | This item was posted to the wall of uid                                           | boolean            | NO   |     | 0                   |                |
+| origin            | item originated at this site                                                      | boolean            | NO   |     | 0                   |                |
+| psid              | ID of the permission set of this post                                             | int unsigned       | YES  |     | NULL                |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post.md b/doc/database/db_post.md
index 5d97020371..afde2ef871 100644
--- a/doc/database/db_post.md
+++ b/doc/database/db_post.md
@@ -1,26 +1,27 @@
 Table post
 ===========
+
 Structure for all posts
 
-| Field         | Description                                                                       | Type              | Null | Key | Default             | Extra |    
-| ------------- | --------------------------------------------------------------------------------- | ----------------- | ---- | --- | ------------------- | ----- |    
-| uri-id        | Id of the item-uri table entry that contains the item uri                         | int unsigned      | NO   | PRI | NULL                |       |    
-| parent-uri-id | Id of the item-uri table that contains the parent uri                             | int unsigned      | YES  |     | NULL                |       |    
-| thr-parent-id | Id of the item-uri table that contains the thread parent uri                      | int unsigned      | YES  |     | NULL                |       |    
-| external-id   | Id of the item-uri table entry that contains the external uri                     | int unsigned      | YES  |     | NULL                |       |    
-| created       | Creation timestamp.                                                               | datetime          | NO   |     | 0001-01-01 00:00:00 |       |    
-| edited        | Date of last edit (default is created)                                            | datetime          | NO   |     | 0001-01-01 00:00:00 |       |    
-| received      | datetime                                                                          | datetime          | NO   |     | 0001-01-01 00:00:00 |       |    
-| gravity       |                                                                                   | tinyint unsigned  | NO   |     | 0                   |       |    
-| network       | Network from where the item comes from                                            | char(4)           | NO   |     |                     |       |    
-| owner-id      | Link to the contact table with uid=0 of the owner of this item                    | int unsigned      | NO   |     | 0                   |       |    
-| author-id     | Link to the contact table with uid=0 of the author of this item                   | int unsigned      | NO   |     | 0                   |       |    
-| causer-id     | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned      | YES  |     | NULL                |       |    
-| post-type     | Post type (personal note, image, article, ...)                                    | tinyint unsigned  | NO   |     | 0                   |       |    
-| vid           | Id of the verb table entry that contains the activity verbs                       | smallint unsigned | YES  |     | NULL                |       |    
-| private       | 0=public, 1=private, 2=unlisted                                                   | tinyint unsigned  | NO   |     | 0                   |       |    
-| global        |                                                                                   | boolean           | NO   |     | 0                   |       |    
-| visible       |                                                                                   | boolean           | NO   |     | 0                   |       |    
-| deleted       | item has been marked for deletion                                                 | boolean           | NO   |     | 0                   |       |    
+| Field         | Description                                                                       | Type              | Null | Key | Default             | Extra |
+| ------------- | --------------------------------------------------------------------------------- | ----------------- | ---- | --- | ------------------- | ----- |
+| uri-id        | Id of the item-uri table entry that contains the item uri                         | int unsigned      | NO   | PRI | NULL                |       |
+| parent-uri-id | Id of the item-uri table that contains the parent uri                             | int unsigned      | YES  |     | NULL                |       |
+| thr-parent-id | Id of the item-uri table that contains the thread parent uri                      | int unsigned      | YES  |     | NULL                |       |
+| external-id   | Id of the item-uri table entry that contains the external uri                     | int unsigned      | YES  |     | NULL                |       |
+| created       | Creation timestamp.                                                               | datetime          | NO   |     | 0001-01-01 00:00:00 |       |
+| edited        | Date of last edit (default is created)                                            | datetime          | NO   |     | 0001-01-01 00:00:00 |       |
+| received      | datetime                                                                          | datetime          | NO   |     | 0001-01-01 00:00:00 |       |
+| gravity       |                                                                                   | tinyint unsigned  | NO   |     | 0                   |       |
+| network       | Network from where the item comes from                                            | char(4)           | NO   |     |                     |       |
+| owner-id      | Link to the contact table with uid=0 of the owner of this item                    | int unsigned      | NO   |     | 0                   |       |
+| author-id     | Link to the contact table with uid=0 of the author of this item                   | int unsigned      | NO   |     | 0                   |       |
+| causer-id     | Link to the contact table with uid=0 of the contact that caused the item creation | int unsigned      | YES  |     | NULL                |       |
+| post-type     | Post type (personal note, image, article, ...)                                    | tinyint unsigned  | NO   |     | 0                   |       |
+| vid           | Id of the verb table entry that contains the activity verbs                       | smallint unsigned | YES  |     | NULL                |       |
+| private       | 0=public, 1=private, 2=unlisted                                                   | tinyint unsigned  | NO   |     | 0                   |       |
+| global        |                                                                                   | boolean           | NO   |     | 0                   |       |
+| visible       |                                                                                   | boolean           | NO   |     | 0                   |       |
+| deleted       | item has been marked for deletion                                                 | boolean           | NO   |     | 0                   |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_process.md b/doc/database/db_process.md
index 6e823ce968..648019e835 100644
--- a/doc/database/db_process.md
+++ b/doc/database/db_process.md
@@ -1,11 +1,12 @@
 Table process
 ===========
+
 Currently running system processes
 
-| Field   | Description | Type          | Null | Key | Default             | Extra |    
-| ------- | ----------- | ------------- | ---- | --- | ------------------- | ----- |    
-| pid     |             | int unsigned  | NO   | PRI | NULL                |       |    
-| command |             | varbinary(32) | NO   |     |                     |       |    
-| created |             | datetime      | NO   |     | 0001-01-01 00:00:00 |       |    
+| Field   | Description | Type          | Null | Key | Default             | Extra |
+| ------- | ----------- | ------------- | ---- | --- | ------------------- | ----- |
+| pid     |             | int unsigned  | NO   | PRI | NULL                |       |
+| command |             | varbinary(32) | NO   |     |                     |       |
+| created |             | datetime      | NO   |     | 0001-01-01 00:00:00 |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_profile.md b/doc/database/db_profile.md
index debc093caf..be97c5d4a8 100644
--- a/doc/database/db_profile.md
+++ b/doc/database/db_profile.md
@@ -1,50 +1,51 @@
 Table profile
 ===========
+
 user profiles data
 
-| Field        | Description                                   | Type               | Null | Key | Default    | Extra          |    
-| ------------ | --------------------------------------------- | ------------------ | ---- | --- | ---------- | -------------- |    
-| id           | sequential ID                                 | int unsigned       | NO   | PRI | NULL       | auto_increment |    
-| uid          | Owner User id                                 | mediumint unsigned | NO   |     | 0          |                |    
-| profile-name | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |    
-| is-default   | Deprecated                                    | boolean            | YES  |     | NULL       |                |    
-| hide-friends | Hide friend list from viewers of this profile | boolean            | NO   |     | 0          |                |    
-| name         |                                               | varchar(255)       | NO   |     |            |                |    
-| pdesc        | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |    
-| dob          | Day of birth                                  | varchar(32)        | NO   |     | 0000-00-00 |                |    
-| address      |                                               | varchar(255)       | NO   |     |            |                |    
-| locality     |                                               | varchar(255)       | NO   |     |            |                |    
-| region       |                                               | varchar(255)       | NO   |     |            |                |    
-| postal-code  |                                               | varchar(32)        | NO   |     |            |                |    
-| country-name |                                               | varchar(255)       | NO   |     |            |                |    
-| hometown     | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |    
-| gender       | Deprecated                                    | varchar(32)        | YES  |     | NULL       |                |    
-| marital      | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |    
-| with         | Deprecated                                    | text               | YES  |     | NULL       |                |    
-| howlong      | Deprecated                                    | datetime           | YES  |     | NULL       |                |    
-| sexual       | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |    
-| politic      | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |    
-| religion     | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |    
-| pub_keywords |                                               | text               | YES  |     | NULL       |                |    
-| prv_keywords |                                               | text               | YES  |     | NULL       |                |    
-| likes        | Deprecated                                    | text               | YES  |     | NULL       |                |    
-| dislikes     | Deprecated                                    | text               | YES  |     | NULL       |                |    
-| about        | Profile description                           | text               | YES  |     | NULL       |                |    
-| summary      | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |    
-| music        | Deprecated                                    | text               | YES  |     | NULL       |                |    
-| book         | Deprecated                                    | text               | YES  |     | NULL       |                |    
-| tv           | Deprecated                                    | text               | YES  |     | NULL       |                |    
-| film         | Deprecated                                    | text               | YES  |     | NULL       |                |    
-| interest     | Deprecated                                    | text               | YES  |     | NULL       |                |    
-| romance      | Deprecated                                    | text               | YES  |     | NULL       |                |    
-| work         | Deprecated                                    | text               | YES  |     | NULL       |                |    
-| education    | Deprecated                                    | text               | YES  |     | NULL       |                |    
-| contact      | Deprecated                                    | text               | YES  |     | NULL       |                |    
-| homepage     |                                               | varchar(255)       | NO   |     |            |                |    
-| xmpp         |                                               | varchar(255)       | NO   |     |            |                |    
-| photo        |                                               | varchar(255)       | NO   |     |            |                |    
-| thumb        |                                               | varchar(255)       | NO   |     |            |                |    
-| publish      | publish default profile in local directory    | boolean            | NO   |     | 0          |                |    
-| net-publish  | publish profile in global directory           | boolean            | NO   |     | 0          |                |    
+| Field        | Description                                   | Type               | Null | Key | Default    | Extra          |
+| ------------ | --------------------------------------------- | ------------------ | ---- | --- | ---------- | -------------- |
+| id           | sequential ID                                 | int unsigned       | NO   | PRI | NULL       | auto_increment |
+| uid          | Owner User id                                 | mediumint unsigned | NO   |     | 0          |                |
+| profile-name | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |
+| is-default   | Deprecated                                    | boolean            | YES  |     | NULL       |                |
+| hide-friends | Hide friend list from viewers of this profile | boolean            | NO   |     | 0          |                |
+| name         |                                               | varchar(255)       | NO   |     |            |                |
+| pdesc        | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |
+| dob          | Day of birth                                  | varchar(32)        | NO   |     | 0000-00-00 |                |
+| address      |                                               | varchar(255)       | NO   |     |            |                |
+| locality     |                                               | varchar(255)       | NO   |     |            |                |
+| region       |                                               | varchar(255)       | NO   |     |            |                |
+| postal-code  |                                               | varchar(32)        | NO   |     |            |                |
+| country-name |                                               | varchar(255)       | NO   |     |            |                |
+| hometown     | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |
+| gender       | Deprecated                                    | varchar(32)        | YES  |     | NULL       |                |
+| marital      | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |
+| with         | Deprecated                                    | text               | YES  |     | NULL       |                |
+| howlong      | Deprecated                                    | datetime           | YES  |     | NULL       |                |
+| sexual       | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |
+| politic      | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |
+| religion     | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |
+| pub_keywords |                                               | text               | YES  |     | NULL       |                |
+| prv_keywords |                                               | text               | YES  |     | NULL       |                |
+| likes        | Deprecated                                    | text               | YES  |     | NULL       |                |
+| dislikes     | Deprecated                                    | text               | YES  |     | NULL       |                |
+| about        | Profile description                           | text               | YES  |     | NULL       |                |
+| summary      | Deprecated                                    | varchar(255)       | YES  |     | NULL       |                |
+| music        | Deprecated                                    | text               | YES  |     | NULL       |                |
+| book         | Deprecated                                    | text               | YES  |     | NULL       |                |
+| tv           | Deprecated                                    | text               | YES  |     | NULL       |                |
+| film         | Deprecated                                    | text               | YES  |     | NULL       |                |
+| interest     | Deprecated                                    | text               | YES  |     | NULL       |                |
+| romance      | Deprecated                                    | text               | YES  |     | NULL       |                |
+| work         | Deprecated                                    | text               | YES  |     | NULL       |                |
+| education    | Deprecated                                    | text               | YES  |     | NULL       |                |
+| contact      | Deprecated                                    | text               | YES  |     | NULL       |                |
+| homepage     |                                               | varchar(255)       | NO   |     |            |                |
+| xmpp         |                                               | varchar(255)       | NO   |     |            |                |
+| photo        |                                               | varchar(255)       | NO   |     |            |                |
+| thumb        |                                               | varchar(255)       | NO   |     |            |                |
+| publish      | publish default profile in local directory    | boolean            | NO   |     | 0          |                |
+| net-publish  | publish profile in global directory           | boolean            | NO   |     | 0          |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_profile_check.md b/doc/database/db_profile_check.md
index b35ded56a2..77f4bb6188 100644
--- a/doc/database/db_profile_check.md
+++ b/doc/database/db_profile_check.md
@@ -1,14 +1,15 @@
 Table profile_check
 ===========
+
 DFRN remote auth use
 
-| Field   | Description   | Type               | Null | Key | Default | Extra          |    
-| ------- | ------------- | ------------------ | ---- | --- | ------- | -------------- |    
-| id      | sequential ID | int unsigned       | NO   | PRI | NULL    | auto_increment |    
-| uid     | User id       | mediumint unsigned | NO   |     | 0       |                |    
-| cid     | contact.id    | int unsigned       | NO   |     | 0       |                |    
-| dfrn_id |               | varchar(255)       | NO   |     |         |                |    
-| sec     |               | varchar(255)       | NO   |     |         |                |    
-| expire  |               | int unsigned       | NO   |     | 0       |                |    
+| Field   | Description   | Type               | Null | Key | Default | Extra          |
+| ------- | ------------- | ------------------ | ---- | --- | ------- | -------------- |
+| id      | sequential ID | int unsigned       | NO   | PRI | NULL    | auto_increment |
+| uid     | User id       | mediumint unsigned | NO   |     | 0       |                |
+| cid     | contact.id    | int unsigned       | NO   |     | 0       |                |
+| dfrn_id |               | varchar(255)       | NO   |     |         |                |
+| sec     |               | varchar(255)       | NO   |     |         |                |
+| expire  |               | int unsigned       | NO   |     | 0       |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_profile_field.md b/doc/database/db_profile_field.md
index c213bf113d..7bf2e9dcd9 100644
--- a/doc/database/db_profile_field.md
+++ b/doc/database/db_profile_field.md
@@ -1,16 +1,17 @@
 Table profile_field
 ===========
+
 Custom profile fields
 
-| Field   | Description                                                 | Type               | Null | Key | Default             | Extra          |    
-| ------- | ----------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
-| id      | sequential ID                                               | int unsigned       | NO   | PRI | NULL                | auto_increment |    
-| uid     | Owner user id                                               | mediumint unsigned | NO   |     | 0                   |                |    
-| order   | Field ordering per user                                     | mediumint unsigned | NO   |     | 1                   |                |    
-| psid    | ID of the permission set of this profile field - 0 = public | int unsigned       | YES  |     | NULL                |                |    
-| label   | Label of the field                                          | varchar(255)       | NO   |     |                     |                |    
-| value   | Value of the field                                          | text               | YES  |     | NULL                |                |    
-| created | creation time                                               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| edited  | last edit time                                              | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
+| Field   | Description                                                 | Type               | Null | Key | Default             | Extra          |
+| ------- | ----------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
+| id      | sequential ID                                               | int unsigned       | NO   | PRI | NULL                | auto_increment |
+| uid     | Owner user id                                               | mediumint unsigned | NO   |     | 0                   |                |
+| order   | Field ordering per user                                     | mediumint unsigned | NO   |     | 1                   |                |
+| psid    | ID of the permission set of this profile field - 0 = public | int unsigned       | YES  |     | NULL                |                |
+| label   | Label of the field                                          | varchar(255)       | NO   |     |                     |                |
+| value   | Value of the field                                          | text               | YES  |     | NULL                |                |
+| created | creation time                                               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| edited  | last edit time                                              | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_push_subscriber.md b/doc/database/db_push_subscriber.md
index 6098a4fd8d..fde15de14a 100644
--- a/doc/database/db_push_subscriber.md
+++ b/doc/database/db_push_subscriber.md
@@ -1,18 +1,19 @@
 Table push_subscriber
 ===========
+
 Used for OStatus: Contains feed subscribers
 
-| Field        | Description                       | Type               | Null | Key | Default             | Extra          |    
-| ------------ | --------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
-| id           | sequential ID                     | int unsigned       | NO   | PRI | NULL                | auto_increment |    
-| uid          | User id                           | mediumint unsigned | NO   |     | 0                   |                |    
-| callback_url |                                   | varchar(255)       | NO   |     |                     |                |    
-| topic        |                                   | varchar(255)       | NO   |     |                     |                |    
-| nickname     |                                   | varchar(255)       | NO   |     |                     |                |    
-| push         | Retrial counter                   | tinyint            | NO   |     | 0                   |                |    
-| last_update  | Date of last successful trial     | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| next_try     | Next retrial date                 | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| renewed      | Date of last subscription renewal | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| secret       |                                   | varchar(255)       | NO   |     |                     |                |    
+| Field        | Description                       | Type               | Null | Key | Default             | Extra          |
+| ------------ | --------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
+| id           | sequential ID                     | int unsigned       | NO   | PRI | NULL                | auto_increment |
+| uid          | User id                           | mediumint unsigned | NO   |     | 0                   |                |
+| callback_url |                                   | varchar(255)       | NO   |     |                     |                |
+| topic        |                                   | varchar(255)       | NO   |     |                     |                |
+| nickname     |                                   | varchar(255)       | NO   |     |                     |                |
+| push         | Retrial counter                   | tinyint            | NO   |     | 0                   |                |
+| last_update  | Date of last successful trial     | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| next_try     | Next retrial date                 | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| renewed      | Date of last subscription renewal | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| secret       |                                   | varchar(255)       | NO   |     |                     |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_register.md b/doc/database/db_register.md
index 630d7b4a6e..fac22811d4 100644
--- a/doc/database/db_register.md
+++ b/doc/database/db_register.md
@@ -1,15 +1,16 @@
 Table register
 ===========
+
 registrations requiring admin approval
 
-| Field    | Description   | Type               | Null | Key | Default             | Extra          |    
-| -------- | ------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
-| id       | sequential ID | int unsigned       | NO   | PRI | NULL                | auto_increment |    
-| hash     |               | varchar(255)       | NO   |     |                     |                |    
-| created  |               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| uid      | User id       | mediumint unsigned | NO   |     | 0                   |                |    
-| password |               | varchar(255)       | NO   |     |                     |                |    
-| language |               | varchar(16)        | NO   |     |                     |                |    
-| note     |               | text               | YES  |     | NULL                |                |    
+| Field    | Description   | Type               | Null | Key | Default             | Extra          |
+| -------- | ------------- | ------------------ | ---- | --- | ------------------- | -------------- |
+| id       | sequential ID | int unsigned       | NO   | PRI | NULL                | auto_increment |
+| hash     |               | varchar(255)       | NO   |     |                     |                |
+| created  |               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| uid      | User id       | mediumint unsigned | NO   |     | 0                   |                |
+| password |               | varchar(255)       | NO   |     |                     |                |
+| language |               | varchar(16)        | NO   |     |                     |                |
+| note     |               | text               | YES  |     | NULL                |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_search.md b/doc/database/db_search.md
index 0297545a0e..dc20ac42a5 100644
--- a/doc/database/db_search.md
+++ b/doc/database/db_search.md
@@ -2,10 +2,11 @@ Table search
 ===========
 
 
-| Field | Description   | Type               | Null | Key | Default | Extra          |    
-| ----- | ------------- | ------------------ | ---- | --- | ------- | -------------- |    
-| id    | sequential ID | int unsigned       | NO   | PRI | NULL    | auto_increment |    
-| uid   | User id       | mediumint unsigned | NO   |     | 0       |                |    
-| term  |               | varchar(255)       | NO   |     |         |                |    
+
+| Field | Description   | Type               | Null | Key | Default | Extra          |
+| ----- | ------------- | ------------------ | ---- | --- | ------- | -------------- |
+| id    | sequential ID | int unsigned       | NO   | PRI | NULL    | auto_increment |
+| uid   | User id       | mediumint unsigned | NO   |     | 0       |                |
+| term  |               | varchar(255)       | NO   |     |         |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_session.md b/doc/database/db_session.md
index 04c85487f3..d01b573647 100644
--- a/doc/database/db_session.md
+++ b/doc/database/db_session.md
@@ -1,12 +1,13 @@
 Table session
 ===========
+
 web session storage
 
-| Field  | Description   | Type            | Null | Key | Default | Extra          |    
-| ------ | ------------- | --------------- | ---- | --- | ------- | -------------- |    
-| id     | sequential ID | bigint unsigned | NO   | PRI | NULL    | auto_increment |    
-| sid    |               | varbinary(255)  | NO   |     |         |                |    
-| data   |               | text            | YES  |     | NULL    |                |    
-| expire |               | int unsigned    | NO   |     | 0       |                |    
+| Field  | Description   | Type            | Null | Key | Default | Extra          |
+| ------ | ------------- | --------------- | ---- | --- | ------- | -------------- |
+| id     | sequential ID | bigint unsigned | NO   | PRI | NULL    | auto_increment |
+| sid    |               | varbinary(255)  | NO   |     |         |                |
+| data   |               | text            | YES  |     | NULL    |                |
+| expire |               | int unsigned    | NO   |     | 0       |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_storage.md b/doc/database/db_storage.md
index 00807760c5..21596ba653 100644
--- a/doc/database/db_storage.md
+++ b/doc/database/db_storage.md
@@ -1,10 +1,11 @@
 Table storage
 ===========
+
 Data stored by Database storage backend
 
-| Field | Description                    | Type         | Null | Key | Default | Extra          |    
-| ----- | ------------------------------ | ------------ | ---- | --- | ------- | -------------- |    
-| id    | Auto incremented image data id | int unsigned | NO   | PRI | NULL    | auto_increment |    
-| data  | file data                      | longblob     | NO   |     | NULL    |                |    
+| Field | Description                    | Type         | Null | Key | Default | Extra          |
+| ----- | ------------------------------ | ------------ | ---- | --- | ------- | -------------- |
+| id    | Auto incremented image data id | int unsigned | NO   | PRI | NULL    | auto_increment |
+| data  | file data                      | longblob     | NO   |     | NULL    |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_tag.md b/doc/database/db_tag.md
index 1d1ed72b09..f52478c855 100644
--- a/doc/database/db_tag.md
+++ b/doc/database/db_tag.md
@@ -1,11 +1,12 @@
 Table tag
 ===========
+
 tags and mentions
 
-| Field | Description | Type           | Null | Key | Default | Extra          |    
-| ----- | ----------- | -------------- | ---- | --- | ------- | -------------- |    
-| id    |             | int unsigned   | NO   | PRI | NULL    | auto_increment |    
-| name  |             | varchar(96)    | NO   |     |         |                |    
-| url   |             | varbinary(255) | NO   |     |         |                |    
+| Field | Description | Type           | Null | Key | Default | Extra          |
+| ----- | ----------- | -------------- | ---- | --- | ------- | -------------- |
+| id    |             | int unsigned   | NO   | PRI | NULL    | auto_increment |
+| name  |             | varchar(96)    | NO   |     |         |                |
+| url   |             | varbinary(255) | NO   |     |         |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_tokens.md b/doc/database/db_tokens.md
index d3f45bb796..bf20f16b82 100644
--- a/doc/database/db_tokens.md
+++ b/doc/database/db_tokens.md
@@ -1,14 +1,15 @@
 Table tokens
 ===========
+
 OAuth usage
 
-| Field     | Description | Type               | Null | Key | Default | Extra |    
-| --------- | ----------- | ------------------ | ---- | --- | ------- | ----- |    
-| id        |             | varchar(40)        | NO   | PRI | NULL    |       |    
-| secret    |             | text               | YES  |     | NULL    |       |    
-| client_id |             | varchar(20)        | NO   |     |         |       |    
-| expires   |             | int                | NO   |     | 0       |       |    
-| scope     |             | varchar(200)       | NO   |     |         |       |    
-| uid       | User id     | mediumint unsigned | NO   |     | 0       |       |    
+| Field     | Description | Type               | Null | Key | Default | Extra |
+| --------- | ----------- | ------------------ | ---- | --- | ------- | ----- |
+| id        |             | varchar(40)        | NO   | PRI | NULL    |       |
+| secret    |             | text               | YES  |     | NULL    |       |
+| client_id |             | varchar(20)        | NO   |     |         |       |
+| expires   |             | int                | NO   |     | 0       |       |
+| scope     |             | varchar(200)       | NO   |     |         |       |
+| uid       | User id     | mediumint unsigned | NO   |     | 0       |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_user-contact.md b/doc/database/db_user-contact.md
index ba529fd0a8..9bcbff7d33 100644
--- a/doc/database/db_user-contact.md
+++ b/doc/database/db_user-contact.md
@@ -1,13 +1,14 @@
 Table user-contact
 ===========
+
 User specific public contact data
 
-| Field     | Description                                 | Type               | Null | Key | Default | Extra |    
-| --------- | ------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |    
-| cid       | Contact id of the linked public contact     | int unsigned       | NO   | PRI | 0       |       |    
-| uid       | User id                                     | mediumint unsigned | NO   | PRI | 0       |       |    
-| blocked   | Contact is completely blocked for this user | boolean            | YES  |     | NULL    |       |    
-| ignored   | Posts from this contact are ignored         | boolean            | YES  |     | NULL    |       |    
-| collapsed | Posts from this contact are collapsed       | boolean            | YES  |     | NULL    |       |    
+| Field     | Description                                 | Type               | Null | Key | Default | Extra |
+| --------- | ------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
+| cid       | Contact id of the linked public contact     | int unsigned       | NO   | PRI | 0       |       |
+| uid       | User id                                     | mediumint unsigned | NO   | PRI | 0       |       |
+| blocked   | Contact is completely blocked for this user | boolean            | YES  |     | NULL    |       |
+| ignored   | Posts from this contact are ignored         | boolean            | YES  |     | NULL    |       |
+| collapsed | Posts from this contact are collapsed       | boolean            | YES  |     | NULL    |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_user.md b/doc/database/db_user.md
index 6e63c6a3a3..8cc762cc22 100644
--- a/doc/database/db_user.md
+++ b/doc/database/db_user.md
@@ -1,53 +1,54 @@
 Table user
 ===========
+
 The local users
 
-| Field                    | Description                                               | Type               | Null | Key | Default             | Extra          |    
-| ------------------------ | --------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |    
-| uid                      | sequential ID                                             | mediumint unsigned | NO   | PRI | NULL                | auto_increment |    
-| parent-uid               | The parent user that has full control about this user     | mediumint unsigned | YES  |     | NULL                |                |    
-| guid                     | A unique identifier for this user                         | varchar(64)        | NO   |     |                     |                |    
-| username                 | Name that this user is known by                           | varchar(255)       | NO   |     |                     |                |    
-| password                 | encrypted password                                        | varchar(255)       | NO   |     |                     |                |    
-| legacy_password          | Is the password hash double-hashed?                       | boolean            | NO   |     | 0                   |                |    
-| nickname                 | nick- and user name                                       | varchar(255)       | NO   |     |                     |                |    
-| email                    | the users email address                                   | varchar(255)       | NO   |     |                     |                |    
-| openid                   |                                                           | varchar(255)       | NO   |     |                     |                |    
-| timezone                 | PHP-legal timezone                                        | varchar(128)       | NO   |     |                     |                |    
-| language                 | default language                                          | varchar(32)        | NO   |     | en                  |                |    
-| register_date            | timestamp of registration                                 | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| login_date               | timestamp of last login                                   | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| default-location         | Default for item.location                                 | varchar(255)       | NO   |     |                     |                |    
-| allow_location           | 1 allows to display the location                          | boolean            | NO   |     | 0                   |                |    
-| theme                    | user theme preference                                     | varchar(255)       | NO   |     |                     |                |    
-| pubkey                   | RSA public key 4096 bit                                   | text               | YES  |     | NULL                |                |    
-| prvkey                   | RSA private key 4096 bit                                  | text               | YES  |     | NULL                |                |    
-| spubkey                  |                                                           | text               | YES  |     | NULL                |                |    
-| sprvkey                  |                                                           | text               | YES  |     | NULL                |                |    
-| verified                 | user is verified through email                            | boolean            | NO   |     | 0                   |                |    
-| blocked                  | 1 for user is blocked                                     | boolean            | NO   |     | 0                   |                |    
-| blockwall                | Prohibit contacts to post to the profile page of the user | boolean            | NO   |     | 0                   |                |    
-| hidewall                 | Hide profile details from unkown viewers                  | boolean            | NO   |     | 0                   |                |    
-| blocktags                | Prohibit contacts to tag the post of this user            | boolean            | NO   |     | 0                   |                |    
-| unkmail                  | Permit unknown people to send private mails to this user  | boolean            | NO   |     | 0                   |                |    
-| cntunkmail               |                                                           | int unsigned       | NO   |     | 10                  |                |    
-| notify-flags             | email notification options                                | smallint unsigned  | NO   |     | 65535               |                |    
-| page-flags               | page/profile type                                         | tinyint unsigned   | NO   |     | 0                   |                |    
-| account-type             |                                                           | tinyint unsigned   | NO   |     | 0                   |                |    
-| prvnets                  |                                                           | boolean            | NO   |     | 0                   |                |    
-| pwdreset                 | Password reset request token                              | varchar(255)       | YES  |     | NULL                |                |    
-| pwdreset_time            | Timestamp of the last password reset request              | datetime           | YES  |     | NULL                |                |    
-| maxreq                   |                                                           | int unsigned       | NO   |     | 10                  |                |    
-| expire                   |                                                           | int unsigned       | NO   |     | 0                   |                |    
-| account_removed          | if 1 the account is removed                               | boolean            | NO   |     | 0                   |                |    
-| account_expired          |                                                           | boolean            | NO   |     | 0                   |                |    
-| account_expires_on       | timestamp when account expires and will be deleted        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| expire_notification_sent | timestamp of last warning of account expiration           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |    
-| def_gid                  |                                                           | int unsigned       | NO   |     | 0                   |                |    
-| allow_cid                | default permission for this user                          | mediumtext         | YES  |     | NULL                |                |    
-| allow_gid                | default permission for this user                          | mediumtext         | YES  |     | NULL                |                |    
-| deny_cid                 | default permission for this user                          | mediumtext         | YES  |     | NULL                |                |    
-| deny_gid                 | default permission for this user                          | mediumtext         | YES  |     | NULL                |                |    
-| openidserver             |                                                           | text               | YES  |     | NULL                |                |    
+| Field                    | Description                                               | Type               | Null | Key | Default             | Extra          |
+| ------------------------ | --------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
+| uid                      | sequential ID                                             | mediumint unsigned | NO   | PRI | NULL                | auto_increment |
+| parent-uid               | The parent user that has full control about this user     | mediumint unsigned | YES  |     | NULL                |                |
+| guid                     | A unique identifier for this user                         | varchar(64)        | NO   |     |                     |                |
+| username                 | Name that this user is known by                           | varchar(255)       | NO   |     |                     |                |
+| password                 | encrypted password                                        | varchar(255)       | NO   |     |                     |                |
+| legacy_password          | Is the password hash double-hashed?                       | boolean            | NO   |     | 0                   |                |
+| nickname                 | nick- and user name                                       | varchar(255)       | NO   |     |                     |                |
+| email                    | the users email address                                   | varchar(255)       | NO   |     |                     |                |
+| openid                   |                                                           | varchar(255)       | NO   |     |                     |                |
+| timezone                 | PHP-legal timezone                                        | varchar(128)       | NO   |     |                     |                |
+| language                 | default language                                          | varchar(32)        | NO   |     | en                  |                |
+| register_date            | timestamp of registration                                 | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| login_date               | timestamp of last login                                   | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| default-location         | Default for item.location                                 | varchar(255)       | NO   |     |                     |                |
+| allow_location           | 1 allows to display the location                          | boolean            | NO   |     | 0                   |                |
+| theme                    | user theme preference                                     | varchar(255)       | NO   |     |                     |                |
+| pubkey                   | RSA public key 4096 bit                                   | text               | YES  |     | NULL                |                |
+| prvkey                   | RSA private key 4096 bit                                  | text               | YES  |     | NULL                |                |
+| spubkey                  |                                                           | text               | YES  |     | NULL                |                |
+| sprvkey                  |                                                           | text               | YES  |     | NULL                |                |
+| verified                 | user is verified through email                            | boolean            | NO   |     | 0                   |                |
+| blocked                  | 1 for user is blocked                                     | boolean            | NO   |     | 0                   |                |
+| blockwall                | Prohibit contacts to post to the profile page of the user | boolean            | NO   |     | 0                   |                |
+| hidewall                 | Hide profile details from unkown viewers                  | boolean            | NO   |     | 0                   |                |
+| blocktags                | Prohibit contacts to tag the post of this user            | boolean            | NO   |     | 0                   |                |
+| unkmail                  | Permit unknown people to send private mails to this user  | boolean            | NO   |     | 0                   |                |
+| cntunkmail               |                                                           | int unsigned       | NO   |     | 10                  |                |
+| notify-flags             | email notification options                                | smallint unsigned  | NO   |     | 65535               |                |
+| page-flags               | page/profile type                                         | tinyint unsigned   | NO   |     | 0                   |                |
+| account-type             |                                                           | tinyint unsigned   | NO   |     | 0                   |                |
+| prvnets                  |                                                           | boolean            | NO   |     | 0                   |                |
+| pwdreset                 | Password reset request token                              | varchar(255)       | YES  |     | NULL                |                |
+| pwdreset_time            | Timestamp of the last password reset request              | datetime           | YES  |     | NULL                |                |
+| maxreq                   |                                                           | int unsigned       | NO   |     | 10                  |                |
+| expire                   |                                                           | int unsigned       | NO   |     | 0                   |                |
+| account_removed          | if 1 the account is removed                               | boolean            | NO   |     | 0                   |                |
+| account_expired          |                                                           | boolean            | NO   |     | 0                   |                |
+| account_expires_on       | timestamp when account expires and will be deleted        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| expire_notification_sent | timestamp of last warning of account expiration           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| def_gid                  |                                                           | int unsigned       | NO   |     | 0                   |                |
+| allow_cid                | default permission for this user                          | mediumtext         | YES  |     | NULL                |                |
+| allow_gid                | default permission for this user                          | mediumtext         | YES  |     | NULL                |                |
+| deny_cid                 | default permission for this user                          | mediumtext         | YES  |     | NULL                |                |
+| deny_gid                 | default permission for this user                          | mediumtext         | YES  |     | NULL                |                |
+| openidserver             |                                                           | text               | YES  |     | NULL                |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_userd.md b/doc/database/db_userd.md
index df2c20c33b..eaef348749 100644
--- a/doc/database/db_userd.md
+++ b/doc/database/db_userd.md
@@ -1,10 +1,11 @@
 Table userd
 ===========
+
 Deleted usernames
 
-| Field    | Description   | Type         | Null | Key | Default | Extra          |    
-| -------- | ------------- | ------------ | ---- | --- | ------- | -------------- |    
-| id       | sequential ID | int unsigned | NO   | PRI | NULL    | auto_increment |    
-| username |               | varchar(255) | NO   |     | NULL    |                |    
+| Field    | Description   | Type         | Null | Key | Default | Extra          |
+| -------- | ------------- | ------------ | ---- | --- | ------- | -------------- |
+| id       | sequential ID | int unsigned | NO   | PRI | NULL    | auto_increment |
+| username |               | varchar(255) | NO   |     | NULL    |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_verb.md b/doc/database/db_verb.md
index f5451104c9..cd5d66f835 100644
--- a/doc/database/db_verb.md
+++ b/doc/database/db_verb.md
@@ -1,10 +1,11 @@
 Table verb
 ===========
+
 Activity Verbs
 
-| Field | Description | Type              | Null | Key | Default | Extra          |    
-| ----- | ----------- | ----------------- | ---- | --- | ------- | -------------- |    
-| id    |             | smallint unsigned | NO   | PRI | NULL    | auto_increment |    
-| name  |             | varchar(100)      | NO   |     |         |                |    
+| Field | Description | Type              | Null | Key | Default | Extra          |
+| ----- | ----------- | ----------------- | ---- | --- | ------- | -------------- |
+| id    |             | smallint unsigned | NO   | PRI | NULL    | auto_increment |
+| name  |             | varchar(100)      | NO   |     |         |                |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_worker-ipc.md b/doc/database/db_worker-ipc.md
index 266efc576c..57ec489352 100644
--- a/doc/database/db_worker-ipc.md
+++ b/doc/database/db_worker-ipc.md
@@ -1,10 +1,11 @@
 Table worker-ipc
 ===========
+
 Inter process communication between the frontend and the worker
 
-| Field | Description               | Type    | Null | Key | Default | Extra |    
-| ----- | ------------------------- | ------- | ---- | --- | ------- | ----- |    
-| key   |                           | int     | NO   | PRI | NULL    |       |    
-| jobs  | Flag for outstanding jobs | boolean | YES  |     | NULL    |       |    
+| Field | Description               | Type    | Null | Key | Default | Extra |
+| ----- | ------------------------- | ------- | ---- | --- | ------- | ----- |
+| key   |                           | int     | NO   | PRI | NULL    |       |
+| jobs  | Flag for outstanding jobs | boolean | YES  |     | NULL    |       |
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_workerqueue.md b/doc/database/db_workerqueue.md
index fac65b0197..16b6a2e0d8 100644
--- a/doc/database/db_workerqueue.md
+++ b/doc/database/db_workerqueue.md
@@ -1,18 +1,19 @@
 Table workerqueue
 ===========
+
 Background tasks queue entries
 
-| Field     | Description                                             | Type             | Null | Key | Default             | Extra          |    
-| --------- | ------------------------------------------------------- | ---------------- | ---- | --- | ------------------- | -------------- |    
-| id        | Auto incremented worker task id                         | int unsigned     | NO   | PRI | NULL                | auto_increment |    
-| command   | Task command                                            | varchar(100)     | YES  |     | NULL                |                |    
-| parameter | Task parameter                                          | mediumtext       | YES  |     | NULL                |                |    
-| priority  | Task priority                                           | tinyint unsigned | NO   |     | 0                   |                |    
-| created   | Creation date                                           | datetime         | NO   |     | 0001-01-01 00:00:00 |                |    
-| pid       | Process id of the worker                                | int unsigned     | NO   |     | 0                   |                |    
-| executed  | Execution date                                          | datetime         | NO   |     | 0001-01-01 00:00:00 |                |    
-| next_try  | Next retrial date                                       | datetime         | NO   |     | 0001-01-01 00:00:00 |                |    
-| retrial   | Retrial counter                                         | tinyint          | NO   |     | 0                   |                |    
-| done      | Marked 1 when the task was done - will be deleted later | boolean          | NO   |     | 0                   |                |    
+| Field     | Description                                             | Type             | Null | Key | Default             | Extra          |
+| --------- | ------------------------------------------------------- | ---------------- | ---- | --- | ------------------- | -------------- |
+| id        | Auto incremented worker task id                         | int unsigned     | NO   | PRI | NULL                | auto_increment |
+| command   | Task command                                            | varchar(100)     | YES  |     | NULL                |                |
+| parameter | Task parameter                                          | mediumtext       | YES  |     | NULL                |                |
+| priority  | Task priority                                           | tinyint unsigned | NO   |     | 0                   |                |
+| created   | Creation date                                           | datetime         | NO   |     | 0001-01-01 00:00:00 |                |
+| pid       | Process id of the worker                                | int unsigned     | NO   |     | 0                   |                |
+| executed  | Execution date                                          | datetime         | NO   |     | 0001-01-01 00:00:00 |                |
+| next_try  | Next retrial date                                       | datetime         | NO   |     | 0001-01-01 00:00:00 |                |
+| retrial   | Retrial counter                                         | tinyint          | NO   |     | 0                   |                |
+| done      | Marked 1 when the task was done - will be deleted later | boolean          | NO   |     | 0                   |                |
 
 Return to [database documentation](help/database)
diff --git a/view/templates/structure.tpl b/view/templates/structure.tpl
index 7b1569e37d..3ec9ba9b2d 100644
--- a/view/templates/structure.tpl
+++ b/view/templates/structure.tpl
@@ -1,9 +1,10 @@
 Table {{$name}}
 ===========
+
 {{$comment}}
 
 {{foreach $fields as $field}}
-| {{$field.name}} | {{$field.comment}} | {{$field.type}} | {{$field.null}} | {{$field.primary}} | {{$field.default}} | {{$field.extra}} |    
+| {{$field.name}} | {{$field.comment}} | {{$field.type}} | {{$field.null}} | {{$field.primary}} | {{$field.default}} | {{$field.extra}} |
 {{/foreach}}
 
 Return to [database documentation](help/database)

From 96f07c7288a0b9a2433ad66ee6cef21612d90264 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 14 Jun 2021 08:53:37 +0000
Subject: [PATCH 09/14] Indexes and foreign keys added

---
 doc/database/db_2fa_app_specific_password.md | 18 ++++++++
 doc/database/db_2fa_recovery_codes.md        | 17 +++++++
 doc/database/db_2fa_trusted_browser.md       | 18 ++++++++
 doc/database/db_addon.md                     | 13 ++++++
 doc/database/db_apcontact.md                 | 23 ++++++++++
 doc/database/db_application-token.md         | 19 ++++++++
 doc/database/db_application.md               | 12 +++++
 doc/database/db_attach.md                    | 18 ++++++++
 doc/database/db_auth_codes.md                | 18 ++++++++
 doc/database/db_cache.md                     | 12 +++++
 doc/database/db_challenge.md                 | 12 +++++
 doc/database/db_clients.md                   | 18 ++++++++
 doc/database/db_config.md                    | 12 +++++
 doc/database/db_contact-relation.md          | 19 ++++++++
 doc/database/db_contact.md                   | 40 +++++++++++++++++
 doc/database/db_conv.md                      | 18 ++++++++
 doc/database/db_conversation.md              | 13 ++++++
 doc/database/db_delayed-post.md              | 18 ++++++++
 doc/database/db_diaspora-interaction.md      | 17 +++++++
 doc/database/db_event.md                     | 20 +++++++++
 doc/database/db_fcontact.md                  | 13 ++++++
 doc/database/db_fsuggest.md                  | 20 +++++++++
 doc/database/db_group.md                     | 18 ++++++++
 doc/database/db_group_member.md              | 20 +++++++++
 doc/database/db_gserver-tag.md               | 18 ++++++++
 doc/database/db_gserver.md                   | 14 ++++++
 doc/database/db_hook.md                      | 13 ++++++
 doc/database/db_host.md                      | 12 +++++
 doc/database/db_inbox-status.md              | 11 +++++
 doc/database/db_intro.md                     | 20 +++++++++
 doc/database/db_item-uri.md                  | 13 ++++++
 doc/database/db_locks.md                     | 12 +++++
 doc/database/db_mail.md                      | 30 +++++++++++++
 doc/database/db_mailacct.md                  | 18 ++++++++
 doc/database/db_manage.md                    | 20 +++++++++
 doc/database/db_notification.md              | 27 +++++++++++
 doc/database/db_notify-threads.md            | 22 +++++++++
 doc/database/db_notify.md                    | 24 ++++++++++
 doc/database/db_oembed.md                    | 12 +++++
 doc/database/db_openwebauth-token.md         | 18 ++++++++
 doc/database/db_parsed_url.md                | 13 ++++++
 doc/database/db_pconfig.md                   | 18 ++++++++
 doc/database/db_permissionset.md             | 18 ++++++++
 doc/database/db_photo.md                     | 24 ++++++++++
 doc/database/db_post-category.md             | 21 +++++++++
 doc/database/db_post-content.md              | 20 +++++++++
 doc/database/db_post-delivery-data.md        | 17 +++++++
 doc/database/db_post-media.md                | 18 ++++++++
 doc/database/db_post-tag.md                  | 21 +++++++++
 doc/database/db_post-thread-user.md          | 38 ++++++++++++++++
 doc/database/db_post-thread.md               | 25 +++++++++++
 doc/database/db_post-user-notification.md    | 19 ++++++++
 doc/database/db_post-user.md                 | 47 ++++++++++++++++++++
 doc/database/db_post.md                      | 31 +++++++++++++
 doc/database/db_process.md                   | 12 +++++
 doc/database/db_profile.md                   | 19 ++++++++
 doc/database/db_profile_check.md             | 20 +++++++++
 doc/database/db_profile_field.md             | 21 +++++++++
 doc/database/db_push_subscriber.md           | 19 ++++++++
 doc/database/db_register.md                  | 18 ++++++++
 doc/database/db_search.md                    | 19 ++++++++
 doc/database/db_session.md                   | 13 ++++++
 doc/database/db_storage.md                   | 11 +++++
 doc/database/db_tag.md                       | 13 ++++++
 doc/database/db_tokens.md                    | 20 +++++++++
 doc/database/db_user-contact.md              | 19 ++++++++
 doc/database/db_user.md                      | 21 +++++++++
 doc/database/db_userd.md                     | 12 +++++
 doc/database/db_verb.md                      | 12 +++++
 doc/database/db_worker-ipc.md                | 11 +++++
 doc/database/db_workerqueue.md               | 19 ++++++++
 src/Database/DBStructure.php                 | 32 +++++++++----
 view/templates/structure.tpl                 | 23 ++++++++++
 73 files changed, 1366 insertions(+), 8 deletions(-)

diff --git a/doc/database/db_2fa_app_specific_password.md b/doc/database/db_2fa_app_specific_password.md
index 6dba89bf41..dd97735035 100644
--- a/doc/database/db_2fa_app_specific_password.md
+++ b/doc/database/db_2fa_app_specific_password.md
@@ -3,6 +3,9 @@ Table 2fa_app_specific_password
 
 Two-factor app-specific _password
 
+Fields
+------
+
 | Field           | Description                              | Type               | Null | Key | Default | Extra          |
 | --------------- | ---------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |
 | id              | Password ID for revocation               | mediumint unsigned | NO   | PRI | NULL    | auto_increment |
@@ -12,4 +15,19 @@ Two-factor app-specific _password
 | generated       | Datetime the password was generated      | datetime           | NO   |     | NULL    |                |
 | last_used       | Datetime the password was last used      | datetime           | YES  |     | NULL    |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid_description | uid, description(190) |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_2fa_recovery_codes.md b/doc/database/db_2fa_recovery_codes.md
index 30e00ef658..53574c7541 100644
--- a/doc/database/db_2fa_recovery_codes.md
+++ b/doc/database/db_2fa_recovery_codes.md
@@ -3,6 +3,9 @@ Table 2fa_recovery_codes
 
 Two-factor authentication recovery codes
 
+Fields
+------
+
 | Field     | Description                     | Type               | Null | Key | Default | Extra |
 | --------- | ------------------------------- | ------------------ | ---- | --- | ------- | ----- |
 | uid       | User ID                         | mediumint unsigned | NO   | PRI | NULL    |       |
@@ -10,4 +13,18 @@ Two-factor authentication recovery codes
 | generated | Datetime the code was generated | datetime           | NO   |     | NULL    |       |
 | used      | Datetime the code was used      | datetime           | YES  |     | NULL    |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | uid, code |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_2fa_trusted_browser.md b/doc/database/db_2fa_trusted_browser.md
index 34845ba579..595d0ef5c7 100644
--- a/doc/database/db_2fa_trusted_browser.md
+++ b/doc/database/db_2fa_trusted_browser.md
@@ -3,6 +3,9 @@ Table 2fa_trusted_browser
 
 Two-factor authentication trusted browsers
 
+Fields
+------
+
 | Field       | Description                                | Type               | Null | Key | Default | Extra |
 | ----------- | ------------------------------------------ | ------------------ | ---- | --- | ------- | ----- |
 | cookie_hash | Trusted cookie hash                        | varchar(80)        | NO   | PRI | NULL    |       |
@@ -11,4 +14,19 @@ Two-factor authentication trusted browsers
 | created     | Datetime the trusted browser was recorded  | datetime           | NO   |     | NULL    |       |
 | last_used   | Datetime the trusted browser was last used | datetime           | YES  |     | NULL    |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | cookie_hash |
+| uid | uid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_addon.md b/doc/database/db_addon.md
index 568e64a5a6..6644ebaa2a 100644
--- a/doc/database/db_addon.md
+++ b/doc/database/db_addon.md
@@ -3,6 +3,9 @@ Table addon
 
 registered addons
 
+Fields
+------
+
 | Field        | Description                                   | Type         | Null | Key | Default | Extra          |
 | ------------ | --------------------------------------------- | ------------ | ---- | --- | ------- | -------------- |
 | id           |                                               | int unsigned | NO   | PRI | NULL    | auto_increment |
@@ -13,4 +16,14 @@ registered addons
 | timestamp    | file timestamp to check for reloads           | int unsigned | NO   |     | 0       |                |
 | plugin_admin | 1 = has admin config, 0 = has no admin config | boolean      | NO   |     | 0       |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| installed_name | installed, name |
+| name | UNIQUE, name |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_apcontact.md b/doc/database/db_apcontact.md
index c76c99b8b3..a7ea4e9d4c 100644
--- a/doc/database/db_apcontact.md
+++ b/doc/database/db_apcontact.md
@@ -3,6 +3,9 @@ Table apcontact
 
 ActivityPub compatible contacts - used in the ActivityPub implementation
 
+Fields
+------
+
 | Field            | Description                  | Type           | Null | Key | Default             | Extra |
 | ---------------- | ---------------------------- | -------------- | ---- | --- | ------------------- | ----- |
 | url              | URL of the contact           | varbinary(255) | NO   | PRI | NULL                |       |
@@ -30,4 +33,24 @@ ActivityPub compatible contacts - used in the ActivityPub implementation
 | statuses_count   | Number of posts              | int unsigned   | YES  |     | 0                   |       |
 | updated          |                              | datetime       | NO   |     | 0001-01-01 00:00:00 |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | url |
+| addr | addr(32) |
+| alias | alias(190) |
+| followers | followers(190) |
+| baseurl | baseurl(190) |
+| sharedinbox | sharedinbox(190) |
+| gsid | gsid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| gsid | [gserver](help/database/db_gserver) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_application-token.md b/doc/database/db_application-token.md
index e37bce6c9f..19230b10b0 100644
--- a/doc/database/db_application-token.md
+++ b/doc/database/db_application-token.md
@@ -3,6 +3,9 @@ Table application-token
 
 OAuth user token
 
+Fields
+------
+
 | Field          | Description   | Type               | Null | Key | Default | Extra |
 | -------------- | ------------- | ------------------ | ---- | --- | ------- | ----- |
 | application-id |               | int unsigned       | NO   | PRI | NULL    |       |
@@ -16,4 +19,20 @@ OAuth user token
 | follow         | Follow scope  | boolean            | YES  |     | NULL    |       |
 | push           | Push scope    | boolean            | YES  |     | NULL    |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | application-id, uid |
+| uid_id | uid, application-id |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| application-id | [application](help/database/db_application) | id |
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_application.md b/doc/database/db_application.md
index 461cc11881..e1743f28c7 100644
--- a/doc/database/db_application.md
+++ b/doc/database/db_application.md
@@ -3,6 +3,9 @@ Table application
 
 OAuth application
 
+Fields
+------
+
 | Field         | Description     | Type         | Null | Key | Default | Extra          |
 | ------------- | --------------- | ------------ | ---- | --- | ------- | -------------- |
 | id            | generated index | int unsigned | NO   | PRI | NULL    | auto_increment |
@@ -17,4 +20,13 @@ OAuth application
 | follow        | Follow scope    | boolean      | YES  |     | NULL    |                |
 | push          | Push scope      | boolean      | YES  |     | NULL    |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| client_id | UNIQUE, client_id |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_attach.md b/doc/database/db_attach.md
index 4cbda2a17b..218ce8b1d7 100644
--- a/doc/database/db_attach.md
+++ b/doc/database/db_attach.md
@@ -3,6 +3,9 @@ Table attach
 
 file attachments
 
+Fields
+------
+
 | Field         | Description                                           | Type               | Null | Key | Default             | Extra          |
 | ------------- | ----------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
 | id            | generated index                                       | int unsigned       | NO   | PRI | NULL                | auto_increment |
@@ -21,4 +24,19 @@ file attachments
 | backend-class | Storage backend class                                 | tinytext           | YES  |     | NULL                |                |
 | backend-ref   | Storage backend data reference                        | text               | YES  |     | NULL                |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid | uid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_auth_codes.md b/doc/database/db_auth_codes.md
index fef3f987c1..9ebd15cbdf 100644
--- a/doc/database/db_auth_codes.md
+++ b/doc/database/db_auth_codes.md
@@ -3,6 +3,9 @@ Table auth_codes
 
 OAuth usage
 
+Fields
+------
+
 | Field        | Description | Type         | Null | Key | Default | Extra |
 | ------------ | ----------- | ------------ | ---- | --- | ------- | ----- |
 | id           |             | varchar(40)  | NO   | PRI | NULL    |       |
@@ -11,4 +14,19 @@ OAuth usage
 | expires      |             | int          | NO   |     | 0       |       |
 | scope        |             | varchar(250) | NO   |     |         |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| client_id | client_id |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| client_id | [clients](help/database/db_clients) | client_id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_cache.md b/doc/database/db_cache.md
index 300959ef38..2428a6f51a 100644
--- a/doc/database/db_cache.md
+++ b/doc/database/db_cache.md
@@ -3,6 +3,9 @@ Table cache
 
 Stores temporary data
 
+Fields
+------
+
 | Field   | Description                  | Type           | Null | Key | Default             | Extra |
 | ------- | ---------------------------- | -------------- | ---- | --- | ------------------- | ----- |
 | k       | cache key                    | varbinary(255) | NO   | PRI | NULL                |       |
@@ -10,4 +13,13 @@ Stores temporary data
 | expires | datetime of cache expiration | datetime       | NO   |     | 0001-01-01 00:00:00 |       |
 | updated | datetime of cache insertion  | datetime       | NO   |     | 0001-01-01 00:00:00 |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | k |
+| k_expires | k, expires |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_challenge.md b/doc/database/db_challenge.md
index 5988954ab8..bfd54c45da 100644
--- a/doc/database/db_challenge.md
+++ b/doc/database/db_challenge.md
@@ -3,6 +3,9 @@ Table challenge
 
 
 
+Fields
+------
+
 | Field       | Description   | Type         | Null | Key | Default | Extra          |
 | ----------- | ------------- | ------------ | ---- | --- | ------- | -------------- |
 | id          | sequential ID | int unsigned | NO   | PRI | NULL    | auto_increment |
@@ -12,4 +15,13 @@ Table challenge
 | type        |               | varchar(255) | NO   |     |         |                |
 | last_update |               | varchar(255) | NO   |     |         |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| expire | expire |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_clients.md b/doc/database/db_clients.md
index f907e0d969..00e5ef6c31 100644
--- a/doc/database/db_clients.md
+++ b/doc/database/db_clients.md
@@ -3,6 +3,9 @@ Table clients
 
 OAuth usage
 
+Fields
+------
+
 | Field        | Description | Type               | Null | Key | Default | Extra |
 | ------------ | ----------- | ------------------ | ---- | --- | ------- | ----- |
 | client_id    |             | varchar(20)        | NO   | PRI | NULL    |       |
@@ -12,4 +15,19 @@ OAuth usage
 | icon         |             | text               | YES  |     | NULL    |       |
 | uid          | User id     | mediumint unsigned | NO   |     | 0       |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | client_id |
+| uid | uid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_config.md b/doc/database/db_config.md
index 029723510d..17c3cfee20 100644
--- a/doc/database/db_config.md
+++ b/doc/database/db_config.md
@@ -3,6 +3,9 @@ Table config
 
 main configuration storage
 
+Fields
+------
+
 | Field | Description | Type          | Null | Key | Default | Extra          |
 | ----- | ----------- | ------------- | ---- | --- | ------- | -------------- |
 | id    |             | int unsigned  | NO   | PRI | NULL    | auto_increment |
@@ -10,4 +13,13 @@ main configuration storage
 | k     |             | varbinary(50) | NO   |     |         |                |
 | v     |             | mediumtext    | YES  |     | NULL    |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| cat_k | UNIQUE, cat, k |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_contact-relation.md b/doc/database/db_contact-relation.md
index 9a86b8daf7..c8dc95a3b7 100644
--- a/doc/database/db_contact-relation.md
+++ b/doc/database/db_contact-relation.md
@@ -3,6 +3,9 @@ Table contact-relation
 
 Contact relations
 
+Fields
+------
+
 | Field            | Description                                         | Type         | Null | Key | Default             | Extra |
 | ---------------- | --------------------------------------------------- | ------------ | ---- | --- | ------------------- | ----- |
 | cid              | contact the related contact had interacted with     | int unsigned | NO   | PRI | 0                   |       |
@@ -11,4 +14,20 @@ Contact relations
 | follow-updated   | Date of the last update of the contact relationship | datetime     | NO   |     | 0001-01-01 00:00:00 |       |
 | follows          |                                                     | boolean      | NO   |     | 0                   |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | cid, relation-cid |
+| relation-cid | relation-cid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| cid | [contact](help/database/db_contact) | id |
+| relation-cid | [contact](help/database/db_contact) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_contact.md b/doc/database/db_contact.md
index 340f95e067..ae49777aa3 100644
--- a/doc/database/db_contact.md
+++ b/doc/database/db_contact.md
@@ -3,6 +3,9 @@ Table contact
 
 contact table
 
+Fields
+------
+
 | Field                     | Description                                               | Type               | Null | Key | Default             | Extra          |
 | ------------------------- | --------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
 | id                        | sequential ID                                             | int unsigned       | NO   | PRI | NULL                | auto_increment |
@@ -86,4 +89,41 @@ contact table
 | fetch_further_information |                                                           | tinyint unsigned   | NO   |     | 0                   |                |
 | ffi_keyword_denylist      |                                                           | text               | YES  |     | NULL                |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid_name | uid, name(190) |
+| self_uid | self, uid |
+| alias_uid | alias(128), uid |
+| pending_uid | pending, uid |
+| blocked_uid | blocked, uid |
+| uid_rel_network_poll | uid, rel, network, poll(64), archive |
+| uid_network_batch | uid, network, batch(64) |
+| batch_contact-type | batch(64), contact-type |
+| addr_uid | addr(128), uid |
+| nurl_uid | nurl(128), uid |
+| nick_uid | nick(128), uid |
+| attag_uid | attag(96), uid |
+| dfrn-id | dfrn-id(64) |
+| issued-id | issued-id(64) |
+| network_uid_lastupdate | network, uid, last-update |
+| uid_network_self_lastupdate | uid, network, self, last-update |
+| uid_lastitem | uid, last-item |
+| baseurl | baseurl(64) |
+| uid_contact-type | uid, contact-type |
+| uid_self_contact-type | uid, self, contact-type |
+| self_network_uid | self, network, uid |
+| gsid | gsid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+| gsid | [gserver](help/database/db_gserver) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_conv.md b/doc/database/db_conv.md
index 11bd7ac13d..a92e154c25 100644
--- a/doc/database/db_conv.md
+++ b/doc/database/db_conv.md
@@ -3,6 +3,9 @@ Table conv
 
 private messages
 
+Fields
+------
+
 | Field   | Description                               | Type               | Null | Key | Default             | Extra          |
 | ------- | ----------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
 | id      | sequential ID                             | int unsigned       | NO   | PRI | NULL                | auto_increment |
@@ -14,4 +17,19 @@ private messages
 | updated | edited timestamp                          | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 | subject | subject of initial message                | text               | YES  |     | NULL                |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid | uid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_conversation.md b/doc/database/db_conversation.md
index 964a98d610..eba69c9904 100644
--- a/doc/database/db_conversation.md
+++ b/doc/database/db_conversation.md
@@ -3,6 +3,9 @@ Table conversation
 
 Raw data and structure information for messages
 
+Fields
+------
+
 | Field             | Description                                                          | Type             | Null | Key | Default             | Extra |
 | ----------------- | -------------------------------------------------------------------- | ---------------- | ---- | --- | ------------------- | ----- |
 | item-uri          | Original URI of the item - unrelated to the table with the same name | varbinary(255)   | NO   | PRI | NULL                |       |
@@ -14,4 +17,14 @@ Raw data and structure information for messages
 | source            | Original source                                                      | mediumtext       | YES  |     | NULL                |       |
 | received          | Receiving date                                                       | datetime         | NO   |     | 0001-01-01 00:00:00 |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | item-uri |
+| conversation-uri | conversation-uri |
+| received | received |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_delayed-post.md b/doc/database/db_delayed-post.md
index 0f1c2f5cf1..16c31e46e2 100644
--- a/doc/database/db_delayed-post.md
+++ b/doc/database/db_delayed-post.md
@@ -3,6 +3,9 @@ Table delayed-post
 
 Posts that are about to be distributed at a later time
 
+Fields
+------
+
 | Field   | Description                                    | Type               | Null | Key | Default | Extra          |
 | ------- | ---------------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |
 | id      |                                                | int unsigned       | NO   | PRI | NULL    | auto_increment |
@@ -10,4 +13,19 @@ Posts that are about to be distributed at a later time
 | uid     | Owner User id                                  | mediumint unsigned | YES  |     | NULL    |                |
 | delayed | delay time                                     | datetime           | YES  |     | NULL    |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid_uri | UNIQUE, uid, uri(190) |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_diaspora-interaction.md b/doc/database/db_diaspora-interaction.md
index 503c846fd9..3a15a5d19c 100644
--- a/doc/database/db_diaspora-interaction.md
+++ b/doc/database/db_diaspora-interaction.md
@@ -3,9 +3,26 @@ Table diaspora-interaction
 
 Signed Diaspora Interaction
 
+Fields
+------
+
 | Field       | Description                                               | Type         | Null | Key | Default | Extra |
 | ----------- | --------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |
 | uri-id      | Id of the item-uri table entry that contains the item uri | int unsigned | NO   | PRI | NULL    |       |
 | interaction | The Diaspora interaction                                  | mediumtext   | YES  |     | NULL    |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | uri-id |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_event.md b/doc/database/db_event.md
index 72cec00128..6b893dafdf 100644
--- a/doc/database/db_event.md
+++ b/doc/database/db_event.md
@@ -3,6 +3,9 @@ Table event
 
 Events
 
+Fields
+------
+
 | Field     | Description                                            | Type               | Null | Key | Default             | Extra          |
 | --------- | ------------------------------------------------------ | ------------------ | ---- | --- | ------------------- | -------------- |
 | id        | sequential ID                                          | int unsigned       | NO   | PRI | NULL                | auto_increment |
@@ -26,4 +29,21 @@ Events
 | deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL                |                |
 | deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL                |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid_start | uid, start |
+| cid | cid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+| cid | [contact](help/database/db_contact) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_fcontact.md b/doc/database/db_fcontact.md
index f20ca6cd05..a30bfb4ee6 100644
--- a/doc/database/db_fcontact.md
+++ b/doc/database/db_fcontact.md
@@ -3,6 +3,9 @@ Table fcontact
 
 Diaspora compatible contacts - used in the Diaspora implementation
 
+Fields
+------
+
 | Field    | Description   | Type             | Null | Key | Default             | Extra          |
 | -------- | ------------- | ---------------- | ---- | --- | ------------------- | -------------- |
 | id       | sequential ID | int unsigned     | NO   | PRI | NULL                | auto_increment |
@@ -23,4 +26,14 @@ Diaspora compatible contacts - used in the Diaspora implementation
 | pubkey   |               | text             | YES  |     | NULL                |                |
 | updated  |               | datetime         | NO   |     | 0001-01-01 00:00:00 |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| addr | addr(32) |
+| url | UNIQUE, url(190) |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_fsuggest.md b/doc/database/db_fsuggest.md
index d3a8e21ab5..55c36e3c1d 100644
--- a/doc/database/db_fsuggest.md
+++ b/doc/database/db_fsuggest.md
@@ -3,6 +3,9 @@ Table fsuggest
 
 friend suggestion stuff
 
+Fields
+------
+
 | Field   | Description | Type               | Null | Key | Default             | Extra          |
 | ------- | ----------- | ------------------ | ---- | --- | ------------------- | -------------- |
 | id      |             | int unsigned       | NO   | PRI | NULL                | auto_increment |
@@ -15,4 +18,21 @@ friend suggestion stuff
 | note    |             | text               | YES  |     | NULL                |                |
 | created |             | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| cid | cid |
+| uid | uid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+| cid | [contact](help/database/db_contact) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_group.md b/doc/database/db_group.md
index 7ea3a0d2ff..48565aaeea 100644
--- a/doc/database/db_group.md
+++ b/doc/database/db_group.md
@@ -3,6 +3,9 @@ Table group
 
 privacy groups, group info
 
+Fields
+------
+
 | Field   | Description                                | Type               | Null | Key | Default | Extra          |
 | ------- | ------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |
 | id      | sequential ID                              | int unsigned       | NO   | PRI | NULL    | auto_increment |
@@ -11,4 +14,19 @@ privacy groups, group info
 | deleted | 1 indicates the group has been deleted     | boolean            | NO   |     | 0       |                |
 | name    | human readable name of group               | varchar(255)       | NO   |     |         |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid | uid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_group_member.md b/doc/database/db_group_member.md
index ba0960df44..adebe933bd 100644
--- a/doc/database/db_group_member.md
+++ b/doc/database/db_group_member.md
@@ -3,10 +3,30 @@ Table group_member
 
 privacy groups, member info
 
+Fields
+------
+
 | Field      | Description                                               | Type         | Null | Key | Default | Extra          |
 | ---------- | --------------------------------------------------------- | ------------ | ---- | --- | ------- | -------------- |
 | id         | sequential ID                                             | int unsigned | NO   | PRI | NULL    | auto_increment |
 | gid        | groups.id of the associated group                         | int unsigned | NO   |     | 0       |                |
 | contact-id | contact.id of the member assigned to the associated group | int unsigned | NO   |     | 0       |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| contactid | contact-id |
+| gid_contactid | UNIQUE, gid, contact-id |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| gid | [group](help/database/db_group) | id |
+| contact-id | [contact](help/database/db_contact) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_gserver-tag.md b/doc/database/db_gserver-tag.md
index dba65c45ab..216bef1d56 100644
--- a/doc/database/db_gserver-tag.md
+++ b/doc/database/db_gserver-tag.md
@@ -3,9 +3,27 @@ Table gserver-tag
 
 Tags that the server has subscribed
 
+Fields
+------
+
 | Field      | Description                        | Type         | Null | Key | Default | Extra |
 | ---------- | ---------------------------------- | ------------ | ---- | --- | ------- | ----- |
 | gserver-id | The id of the gserver              | int unsigned | NO   | PRI | 0       |       |
 | tag        | Tag that the server has subscribed | varchar(100) | NO   | PRI |         |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | gserver-id, tag |
+| tag | tag |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| gserver-id | [gserver](help/database/db_gserver) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_gserver.md b/doc/database/db_gserver.md
index 341f71eff5..5d5f2226b3 100644
--- a/doc/database/db_gserver.md
+++ b/doc/database/db_gserver.md
@@ -3,6 +3,9 @@ Table gserver
 
 Global servers
 
+Fields
+------
+
 | Field            | Description                                        | Type             | Null | Key | Default             | Extra          |
 | ---------------- | -------------------------------------------------- | ---------------- | ---- | --- | ------------------- | -------------- |
 | id               | sequential ID                                      | int unsigned     | NO   | PRI | NULL                | auto_increment |
@@ -29,4 +32,15 @@ Global servers
 | failed           | Connection failed                                  | boolean          | YES  |     | NULL                |                |
 | next_contact     | Next connection request                            | datetime         | YES  |     | 0001-01-01 00:00:00 |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| nurl | UNIQUE, nurl(190) |
+| next_contact | next_contact |
+| network | network |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_hook.md b/doc/database/db_hook.md
index c25f674cc9..500e8f91d0 100644
--- a/doc/database/db_hook.md
+++ b/doc/database/db_hook.md
@@ -3,6 +3,9 @@ Table hook
 
 addon hook registry
 
+Fields
+------
+
 | Field    | Description                                                                                                | Type              | Null | Key | Default | Extra          |
 | -------- | ---------------------------------------------------------------------------------------------------------- | ----------------- | ---- | --- | ------- | -------------- |
 | id       | sequential ID                                                                                              | int unsigned      | NO   | PRI | NULL    | auto_increment |
@@ -11,4 +14,14 @@ addon hook registry
 | function | function name of hook handler                                                                              | varbinary(200)    | NO   |     |         |                |
 | priority | not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order | smallint unsigned | NO   |     | 0       |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| priority | priority |
+| hook_file_function | UNIQUE, hook, file, function |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_host.md b/doc/database/db_host.md
index 97fda6fa6f..802001e1b1 100644
--- a/doc/database/db_host.md
+++ b/doc/database/db_host.md
@@ -3,9 +3,21 @@ Table host
 
 Hostname
 
+Fields
+------
+
 | Field | Description   | Type             | Null | Key | Default | Extra          |
 | ----- | ------------- | ---------------- | ---- | --- | ------- | -------------- |
 | id    | sequential ID | tinyint unsigned | NO   | PRI | NULL    | auto_increment |
 | name  | The hostname  | varchar(128)     | NO   |     |         |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| name | UNIQUE, name |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_inbox-status.md b/doc/database/db_inbox-status.md
index fb6a408506..1f3463ad4b 100644
--- a/doc/database/db_inbox-status.md
+++ b/doc/database/db_inbox-status.md
@@ -3,6 +3,9 @@ Table inbox-status
 
 Status of ActivityPub inboxes
 
+Fields
+------
+
 | Field    | Description                          | Type           | Null | Key | Default             | Extra |
 | -------- | ------------------------------------ | -------------- | ---- | --- | ------------------- | ----- |
 | url      | URL of the inbox                     | varbinary(255) | NO   | PRI | NULL                |       |
@@ -13,4 +16,12 @@ Status of ActivityPub inboxes
 | archive  | Is the inbox archived?               | boolean        | NO   |     | 0                   |       |
 | shared   | Is it a shared inbox?                | boolean        | NO   |     | 0                   |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | url |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_intro.md b/doc/database/db_intro.md
index 3e3731b55a..ed4dd54b69 100644
--- a/doc/database/db_intro.md
+++ b/doc/database/db_intro.md
@@ -3,6 +3,9 @@ Table intro
 
 
 
+Fields
+------
+
 | Field      | Description   | Type               | Null | Key | Default             | Extra          |
 | ---------- | ------------- | ------------------ | ---- | --- | ------------------- | -------------- |
 | id         | sequential ID | int unsigned       | NO   | PRI | NULL                | auto_increment |
@@ -17,4 +20,21 @@ Table intro
 | blocked    |               | boolean            | NO   |     | 1                   |                |
 | ignore     |               | boolean            | NO   |     | 0                   |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| contact-id | contact-id |
+| uid | uid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+| contact-id | [contact](help/database/db_contact) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_item-uri.md b/doc/database/db_item-uri.md
index 4b3dda5ced..3ce86fca16 100644
--- a/doc/database/db_item-uri.md
+++ b/doc/database/db_item-uri.md
@@ -3,10 +3,23 @@ Table item-uri
 
 URI and GUID for items
 
+Fields
+------
+
 | Field | Description                     | Type           | Null | Key | Default | Extra          |
 | ----- | ------------------------------- | -------------- | ---- | --- | ------- | -------------- |
 | id    |                                 | int unsigned   | NO   | PRI | NULL    | auto_increment |
 | uri   | URI of an item                  | varbinary(255) | NO   |     | NULL    |                |
 | guid  | A unique identifier for an item | varbinary(255) | YES  |     | NULL    |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uri | UNIQUE, uri |
+| guid | guid |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_locks.md b/doc/database/db_locks.md
index 3379990174..92d3e6434f 100644
--- a/doc/database/db_locks.md
+++ b/doc/database/db_locks.md
@@ -3,6 +3,9 @@ Table locks
 
 
 
+Fields
+------
+
 | Field   | Description                  | Type         | Null | Key | Default             | Extra          |
 | ------- | ---------------------------- | ------------ | ---- | --- | ------------------- | -------------- |
 | id      | sequential ID                | int unsigned | NO   | PRI | NULL                | auto_increment |
@@ -11,4 +14,13 @@ Table locks
 | pid     | Process ID                   | int unsigned | NO   |     | 0                   |                |
 | expires | datetime of cache expiration | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| name_expires | name, expires |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_mail.md b/doc/database/db_mail.md
index dbdacb6d31..685dd2a0f3 100644
--- a/doc/database/db_mail.md
+++ b/doc/database/db_mail.md
@@ -3,6 +3,9 @@ Table mail
 
 private messages
 
+Fields
+------
+
 | Field         | Description                                                    | Type               | Null | Key | Default             | Extra          |
 | ------------- | -------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
 | id            | sequential ID                                                  | int unsigned       | NO   | PRI | NULL                | auto_increment |
@@ -28,4 +31,31 @@ private messages
 | thr-parent-id | Id of the item-uri table that contains the thread parent uri   | int unsigned       | YES  |     | NULL                |                |
 | created       | creation time of the private message                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid_seen | uid, seen |
+| convid | convid |
+| uri | uri(64) |
+| parent-uri | parent-uri(64) |
+| contactid | contact-id(32) |
+| author-id | author-id |
+| uri-id | uri-id |
+| parent-uri-id | parent-uri-id |
+| thr-parent-id | thr-parent-id |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+| author-id | [contact](help/database/db_contact) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| parent-uri-id | [item-uri](help/database/db_item-uri) | id |
+| thr-parent-id | [item-uri](help/database/db_item-uri) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_mailacct.md b/doc/database/db_mailacct.md
index 8a1f380788..aaa0fa877d 100644
--- a/doc/database/db_mailacct.md
+++ b/doc/database/db_mailacct.md
@@ -3,6 +3,9 @@ Table mailacct
 
 Mail account data for fetching mails
 
+Fields
+------
+
 | Field        | Description   | Type               | Null | Key | Default             | Extra          |
 | ------------ | ------------- | ------------------ | ---- | --- | ------------------- | -------------- |
 | id           | sequential ID | int unsigned       | NO   | PRI | NULL                | auto_increment |
@@ -19,4 +22,19 @@ Mail account data for fetching mails
 | pubmail      |               | boolean            | NO   |     | 0                   |                |
 | last_check   |               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid | uid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_manage.md b/doc/database/db_manage.md
index c2dadfca4d..53e5a35bb9 100644
--- a/doc/database/db_manage.md
+++ b/doc/database/db_manage.md
@@ -3,10 +3,30 @@ Table manage
 
 table of accounts that can manage each other
 
+Fields
+------
+
 | Field | Description   | Type               | Null | Key | Default | Extra          |
 | ----- | ------------- | ------------------ | ---- | --- | ------- | -------------- |
 | id    | sequential ID | int unsigned       | NO   | PRI | NULL    | auto_increment |
 | uid   | User id       | mediumint unsigned | NO   |     | 0       |                |
 | mid   | User id       | mediumint unsigned | NO   |     | 0       |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid_mid | UNIQUE, uid, mid |
+| mid | mid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+| mid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notification.md b/doc/database/db_notification.md
index 0941ff1d36..4de2a53bf7 100644
--- a/doc/database/db_notification.md
+++ b/doc/database/db_notification.md
@@ -3,6 +3,9 @@ Table notification
 
 notifications
 
+Fields
+------
+
 | Field         | Description                                                                    | Type               | Null | Key | Default | Extra          |
 | ------------- | ------------------------------------------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |
 | id            | sequential ID                                                                  | int unsigned       | NO   | PRI | NULL    | auto_increment |
@@ -15,4 +18,28 @@ notifications
 | created       |                                                                                | datetime           | YES  |     | NULL    |                |
 | seen          |                                                                                | boolean            | YES  |     | 0       |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid_vid_type_actor-id_target-uri-id | UNIQUE, uid, vid, type, actor-id, target-uri-id |
+| vid | vid |
+| actor-id | actor-id |
+| target-uri-id | target-uri-id |
+| parent-uri-id | parent-uri-id |
+| seen_uid | seen, uid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+| vid | [verb](help/database/db_verb) | id |
+| actor-id | [contact](help/database/db_contact) | id |
+| target-uri-id | [item-uri](help/database/db_item-uri) | id |
+| parent-uri-id | [item-uri](help/database/db_item-uri) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notify-threads.md b/doc/database/db_notify-threads.md
index 0dd493975b..a58c45dabd 100644
--- a/doc/database/db_notify-threads.md
+++ b/doc/database/db_notify-threads.md
@@ -3,6 +3,9 @@ Table notify-threads
 
 
 
+Fields
+------
+
 | Field                | Description                                   | Type               | Null | Key | Default | Extra          |
 | -------------------- | --------------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |
 | id                   | sequential ID                                 | int unsigned       | NO   | PRI | NULL    | auto_increment |
@@ -12,4 +15,23 @@ Table notify-threads
 | parent-item          |                                               | int unsigned       | NO   |     | 0       |                |
 | receiver-uid         | User id                                       | mediumint unsigned | NO   |     | 0       |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| master-parent-uri-id | master-parent-uri-id |
+| receiver-uid | receiver-uid |
+| notify-id | notify-id |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| notify-id | [notify](help/database/db_notify) | id |
+| master-parent-uri-id | [item-uri](help/database/db_item-uri) | id |
+| receiver-uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_notify.md b/doc/database/db_notify.md
index a9eac5a3c8..338425ac96 100644
--- a/doc/database/db_notify.md
+++ b/doc/database/db_notify.md
@@ -3,6 +3,9 @@ Table notify
 
 notifications
 
+Fields
+------
+
 | Field         | Description                                   | Type               | Null | Key | Default             | Extra          |
 | ------------- | --------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
 | id            | sequential ID                                 | int unsigned       | NO   | PRI | NULL                | auto_increment |
@@ -24,4 +27,25 @@ notifications
 | name_cache    | Cached bbcode parsing of name                 | tinytext           | YES  |     | NULL                |                |
 | msg_cache     | Cached bbcode parsing of msg                  | mediumtext         | YES  |     | NULL                |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| seen_uid_date | seen, uid, date |
+| uid_date | uid, date |
+| uid_type_link | uid, type, link(190) |
+| uri-id | uri-id |
+| parent-uri-id | parent-uri-id |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| parent-uri-id | [item-uri](help/database/db_item-uri) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_oembed.md b/doc/database/db_oembed.md
index 3edee64c68..86b23f70f9 100644
--- a/doc/database/db_oembed.md
+++ b/doc/database/db_oembed.md
@@ -3,6 +3,9 @@ Table oembed
 
 cache for OEmbed queries
 
+Fields
+------
+
 | Field    | Description                    | Type               | Null | Key | Default             | Extra |
 | -------- | ------------------------------ | ------------------ | ---- | --- | ------------------- | ----- |
 | url      | page url                       | varbinary(255)     | NO   | PRI | NULL                |       |
@@ -10,4 +13,13 @@ cache for OEmbed queries
 | content  | OEmbed data of the page        | mediumtext         | YES  |     | NULL                |       |
 | created  | datetime of creation           | datetime           | NO   |     | 0001-01-01 00:00:00 |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | url, maxwidth |
+| created | created |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_openwebauth-token.md b/doc/database/db_openwebauth-token.md
index 1c3060f0f4..ad598087e9 100644
--- a/doc/database/db_openwebauth-token.md
+++ b/doc/database/db_openwebauth-token.md
@@ -3,6 +3,9 @@ Table openwebauth-token
 
 Store OpenWebAuth token to verify contacts
 
+Fields
+------
+
 | Field   | Description                | Type               | Null | Key | Default             | Extra          |
 | ------- | -------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
 | id      | sequential ID              | int unsigned       | NO   | PRI | NULL                | auto_increment |
@@ -12,4 +15,19 @@ Store OpenWebAuth token to verify contacts
 | meta    |                            | varchar(255)       | NO   |     |                     |                |
 | created | datetime of creation       | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid | uid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_parsed_url.md b/doc/database/db_parsed_url.md
index 29a3ff8521..8101883a36 100644
--- a/doc/database/db_parsed_url.md
+++ b/doc/database/db_parsed_url.md
@@ -3,6 +3,9 @@ Table parsed_url
 
 cache for &#039;parse_url&#039; queries
 
+Fields
+------
+
 | Field    | Description                       | Type       | Null | Key | Default             | Extra |
 | -------- | --------------------------------- | ---------- | ---- | --- | ------------------- | ----- |
 | url_hash | page url hash                     | binary(64) | NO   | PRI | NULL                |       |
@@ -13,4 +16,14 @@ cache for &#039;parse_url&#039; queries
 | created  | datetime of creation              | datetime   | NO   |     | 0001-01-01 00:00:00 |       |
 | expires  | datetime of expiration            | datetime   | NO   |     | 0001-01-01 00:00:00 |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | url_hash, guessing, oembed |
+| created | created |
+| expires | expires |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_pconfig.md b/doc/database/db_pconfig.md
index 7449c511d3..2de6dd294c 100644
--- a/doc/database/db_pconfig.md
+++ b/doc/database/db_pconfig.md
@@ -3,6 +3,9 @@ Table pconfig
 
 personal (per user) configuration storage
 
+Fields
+------
+
 | Field | Description | Type               | Null | Key | Default | Extra          |
 | ----- | ----------- | ------------------ | ---- | --- | ------- | -------------- |
 | id    | Primary key | int unsigned       | NO   | PRI | NULL    | auto_increment |
@@ -11,4 +14,19 @@ personal (per user) configuration storage
 | k     | Key         | varchar(100)       | NO   |     |         |                |
 | v     | Value       | mediumtext         | YES  |     | NULL    |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid_cat_k | UNIQUE, uid, cat, k |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_permissionset.md b/doc/database/db_permissionset.md
index 855ed1ea12..421c67abb3 100644
--- a/doc/database/db_permissionset.md
+++ b/doc/database/db_permissionset.md
@@ -3,6 +3,9 @@ Table permissionset
 
 
 
+Fields
+------
+
 | Field     | Description                                            | Type               | Null | Key | Default | Extra          |
 | --------- | ------------------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |
 | id        | sequential ID                                          | int unsigned       | NO   | PRI | NULL    | auto_increment |
@@ -12,4 +15,19 @@ Table permissionset
 | deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL    |                |
 | deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL    |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid_allow_cid_allow_gid_deny_cid_deny_gid | uid, allow_cid(50), allow_gid(30), deny_cid(50), deny_gid(30) |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_photo.md b/doc/database/db_photo.md
index 168797a1fb..5f98e4e349 100644
--- a/doc/database/db_photo.md
+++ b/doc/database/db_photo.md
@@ -3,6 +3,9 @@ Table photo
 
 photo storage
 
+Fields
+------
+
 | Field         | Description                                            | Type               | Null | Key | Default             | Extra          |
 | ------------- | ------------------------------------------------------ | ------------------ | ---- | --- | ------------------- | -------------- |
 | id            | sequential ID                                          | int unsigned       | NO   | PRI | NULL                | auto_increment |
@@ -33,4 +36,25 @@ photo storage
 | backend-ref   | Storage backend data reference                         | text               | YES  |     | NULL                |                |
 | updated       |                                                        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| contactid | contact-id |
+| uid_contactid | uid, contact-id |
+| uid_profile | uid, profile |
+| uid_album_scale_created | uid, album(32), scale, created |
+| uid_album_resource-id_created | uid, album(32), resource-id, created |
+| resource-id | resource-id |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+| contact-id | [contact](help/database/db_contact) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-category.md b/doc/database/db_post-category.md
index 14663cf5bb..77e9ed679f 100644
--- a/doc/database/db_post-category.md
+++ b/doc/database/db_post-category.md
@@ -3,6 +3,9 @@ Table post-category
 
 post relation to categories
 
+Fields
+------
+
 | Field  | Description                                               | Type               | Null | Key | Default | Extra |
 | ------ | --------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
 | uri-id | Id of the item-uri table entry that contains the item uri | int unsigned       | NO   | PRI | NULL    |       |
@@ -10,4 +13,22 @@ post relation to categories
 | type   |                                                           | tinyint unsigned   | NO   | PRI | 0       |       |
 | tid    |                                                           | int unsigned       | NO   | PRI | 0       |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | uri-id, uid, type, tid |
+| uri-id | tid |
+| uid | uid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| uid | [user](help/database/db_user) | uid |
+| tid | [tag](help/database/db_tag) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-content.md b/doc/database/db_post-content.md
index 4596a04a56..5b8b258ec7 100644
--- a/doc/database/db_post-content.md
+++ b/doc/database/db_post-content.md
@@ -3,6 +3,9 @@ Table post-content
 
 Content for all posts
 
+Fields
+------
+
 | Field           | Description                                                                                                               | Type         | Null | Key | Default | Extra |
 | --------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |
 | uri-id          | Id of the item-uri table entry that contains the item uri                                                                 | int unsigned | NO   | PRI | NULL    |       |
@@ -23,4 +26,21 @@ Content for all posts
 | resource-id     | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32)  | NO   |     |         |       |
 | plink           | permalink or URL to a displayable copy of the message at its source                                                       | varchar(255) | NO   |     |         |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | uri-id |
+| plink | plink(191) |
+| resource-id | resource-id |
+| title-content-warning-body | FULLTEXT, title, content-warning, body |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-delivery-data.md b/doc/database/db_post-delivery-data.md
index 1ed912d8bc..61f8b75de5 100644
--- a/doc/database/db_post-delivery-data.md
+++ b/doc/database/db_post-delivery-data.md
@@ -3,6 +3,9 @@ Table post-delivery-data
 
 Delivery data for items
 
+Fields
+------
+
 | Field        | Description                                                                                                                                                | Type         | Null | Key | Default | Extra |
 | ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |
 | uri-id       | Id of the item-uri table entry that contains the item uri                                                                                                  | int unsigned | NO   | PRI | NULL    |       |
@@ -17,4 +20,18 @@ Delivery data for items
 | diaspora     | Number of successful deliveries via Diaspora                                                                                                               | mediumint    | NO   |     | 0       |       |
 | ostatus      | Number of successful deliveries via OStatus                                                                                                                | mediumint    | NO   |     | 0       |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | uri-id |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-media.md b/doc/database/db_post-media.md
index e1e299f02e..ef599ed135 100644
--- a/doc/database/db_post-media.md
+++ b/doc/database/db_post-media.md
@@ -3,6 +3,9 @@ Table post-media
 
 Attached media
 
+Fields
+------
+
 | Field           | Description                                               | Type              | Null | Key | Default | Extra          |
 | --------------- | --------------------------------------------------------- | ----------------- | ---- | --- | ------- | -------------- |
 | id              | sequential ID                                             | int unsigned      | NO   | PRI | NULL    | auto_increment |
@@ -25,4 +28,19 @@ Attached media
 | publisher-name  | Name of the publisher of the media                        | varchar(255)      | YES  |     | NULL    |                |
 | publisher-image | Image of the publisher of the media                       | varbinary(255)    | YES  |     | NULL    |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uri-id-url | UNIQUE, uri-id, url |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-tag.md b/doc/database/db_post-tag.md
index 228f27708d..30e513cab4 100644
--- a/doc/database/db_post-tag.md
+++ b/doc/database/db_post-tag.md
@@ -3,6 +3,9 @@ Table post-tag
 
 post relation to tags
 
+Fields
+------
+
 | Field  | Description                                               | Type             | Null | Key | Default | Extra |
 | ------ | --------------------------------------------------------- | ---------------- | ---- | --- | ------- | ----- |
 | uri-id | Id of the item-uri table entry that contains the item uri | int unsigned     | NO   | PRI | NULL    |       |
@@ -10,4 +13,22 @@ post relation to tags
 | tid    |                                                           | int unsigned     | NO   | PRI | 0       |       |
 | cid    | Contact id of the mentioned public contact                | int unsigned     | NO   | PRI | 0       |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | uri-id, type, tid, cid |
+| tid | tid |
+| cid | cid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| tid | [tag](help/database/db_tag) | id |
+| cid | [contact](help/database/db_contact) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-thread-user.md b/doc/database/db_post-thread-user.md
index 29e5617d35..875aee4aa1 100644
--- a/doc/database/db_post-thread-user.md
+++ b/doc/database/db_post-thread-user.md
@@ -3,6 +3,9 @@ Table post-thread-user
 
 Thread related data per user
 
+Fields
+------
+
 | Field        | Description                                                                                             | Type               | Null | Key | Default             | Extra |
 | ------------ | ------------------------------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | ----- |
 | uri-id       | Id of the item-uri table entry that contains the item uri                                               | int unsigned       | NO   | PRI | NULL                |       |
@@ -29,4 +32,39 @@ Thread related data per user
 | psid         | ID of the permission set of this post                                                                   | int unsigned       | YES  |     | NULL                |       |
 | post-user-id | Id of the post-user table                                                                               | int unsigned       | YES  |     | NULL                |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | uid, uri-id |
+| uri-id | uri-id |
+| owner-id | owner-id |
+| author-id | author-id |
+| causer-id | causer-id |
+| uid | uid |
+| contact-id | contact-id |
+| psid | psid |
+| post-user-id | post-user-id |
+| commented | commented |
+| uid_received | uid, received |
+| uid_pinned | uid, pinned |
+| uid_commented | uid, commented |
+| uid_starred | uid, starred |
+| uid_mention | uid, mention |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| owner-id | [contact](help/database/db_contact) | id |
+| author-id | [contact](help/database/db_contact) | id |
+| causer-id | [contact](help/database/db_contact) | id |
+| uid | [user](help/database/db_user) | uid |
+| contact-id | [contact](help/database/db_contact) | id |
+| psid | [permissionset](help/database/db_permissionset) | id |
+| post-user-id | [post-user](help/database/db_post-user) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-thread.md b/doc/database/db_post-thread.md
index 8b847e6283..f5a8516500 100644
--- a/doc/database/db_post-thread.md
+++ b/doc/database/db_post-thread.md
@@ -3,6 +3,9 @@ Table post-thread
 
 Thread related data
 
+Fields
+------
+
 | Field     | Description                                                                                             | Type         | Null | Key | Default             | Extra |
 | --------- | ------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------------------- | ----- |
 | uri-id    | Id of the item-uri table entry that contains the item uri                                               | int unsigned | NO   | PRI | NULL                |       |
@@ -15,4 +18,26 @@ Thread related data
 | changed   | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime     | NO   |     | 0001-01-01 00:00:00 |       |
 | commented |                                                                                                         | datetime     | NO   |     | 0001-01-01 00:00:00 |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | uri-id |
+| owner-id | owner-id |
+| author-id | author-id |
+| causer-id | causer-id |
+| received | received |
+| commented | commented |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| owner-id | [contact](help/database/db_contact) | id |
+| author-id | [contact](help/database/db_contact) | id |
+| causer-id | [contact](help/database/db_contact) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-user-notification.md b/doc/database/db_post-user-notification.md
index 1607ce2c23..0ebe8ccaf1 100644
--- a/doc/database/db_post-user-notification.md
+++ b/doc/database/db_post-user-notification.md
@@ -3,10 +3,29 @@ Table post-user-notification
 
 User post notifications
 
+Fields
+------
+
 | Field             | Description                                               | Type               | Null | Key | Default | Extra |
 | ----------------- | --------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
 | uri-id            | Id of the item-uri table entry that contains the item uri | int unsigned       | NO   | PRI | NULL    |       |
 | uid               | Owner id which owns this copy of the item                 | mediumint unsigned | NO   | PRI | NULL    |       |
 | notification-type |                                                           | tinyint unsigned   | NO   |     | 0       |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | uid, uri-id |
+| uri-id | uri-id |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post-user.md b/doc/database/db_post-user.md
index 8fad8056ec..6d2f0c71b6 100644
--- a/doc/database/db_post-user.md
+++ b/doc/database/db_post-user.md
@@ -3,6 +3,9 @@ Table post-user
 
 User specific post data
 
+Fields
+------
+
 | Field             | Description                                                                       | Type               | Null | Key | Default             | Extra          |
 | ----------------- | --------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
 | id                |                                                                                   | int unsigned       | NO   | PRI | NULL                | auto_increment |
@@ -36,4 +39,48 @@ User specific post data
 | origin            | item originated at this site                                                      | boolean            | NO   |     | 0                   |                |
 | psid              | ID of the permission set of this post                                             | int unsigned       | YES  |     | NULL                |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid_uri-id | UNIQUE, uid, uri-id |
+| uri-id | uri-id |
+| parent-uri-id | parent-uri-id |
+| thr-parent-id | thr-parent-id |
+| external-id | external-id |
+| owner-id | owner-id |
+| author-id | author-id |
+| causer-id | causer-id |
+| vid | vid |
+| contact-id | contact-id |
+| event-id | event-id |
+| psid | psid |
+| author-id_uid | author-id, uid |
+| author-id_received | author-id, received |
+| parent-uri-id_uid | parent-uri-id, uid |
+| uid_contactid | uid, contact-id |
+| uid_unseen_contactid | uid, unseen, contact-id |
+| uid_unseen | uid, unseen |
+| uid_hidden_uri-id | uid, hidden, uri-id |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| parent-uri-id | [item-uri](help/database/db_item-uri) | id |
+| thr-parent-id | [item-uri](help/database/db_item-uri) | id |
+| external-id | [item-uri](help/database/db_item-uri) | id |
+| owner-id | [contact](help/database/db_contact) | id |
+| author-id | [contact](help/database/db_contact) | id |
+| causer-id | [contact](help/database/db_contact) | id |
+| vid | [verb](help/database/db_verb) | id |
+| uid | [user](help/database/db_user) | uid |
+| contact-id | [contact](help/database/db_contact) | id |
+| event-id | [event](help/database/db_event) | id |
+| psid | [permissionset](help/database/db_permissionset) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_post.md b/doc/database/db_post.md
index afde2ef871..7d5d7cc567 100644
--- a/doc/database/db_post.md
+++ b/doc/database/db_post.md
@@ -3,6 +3,9 @@ Table post
 
 Structure for all posts
 
+Fields
+------
+
 | Field         | Description                                                                       | Type              | Null | Key | Default             | Extra |
 | ------------- | --------------------------------------------------------------------------------- | ----------------- | ---- | --- | ------------------- | ----- |
 | uri-id        | Id of the item-uri table entry that contains the item uri                         | int unsigned      | NO   | PRI | NULL                |       |
@@ -24,4 +27,32 @@ Structure for all posts
 | visible       |                                                                                   | boolean           | NO   |     | 0                   |       |
 | deleted       | item has been marked for deletion                                                 | boolean           | NO   |     | 0                   |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | uri-id |
+| parent-uri-id | parent-uri-id |
+| thr-parent-id | thr-parent-id |
+| external-id | external-id |
+| owner-id | owner-id |
+| author-id | author-id |
+| causer-id | causer-id |
+| vid | vid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| parent-uri-id | [item-uri](help/database/db_item-uri) | id |
+| thr-parent-id | [item-uri](help/database/db_item-uri) | id |
+| external-id | [item-uri](help/database/db_item-uri) | id |
+| owner-id | [contact](help/database/db_contact) | id |
+| author-id | [contact](help/database/db_contact) | id |
+| causer-id | [contact](help/database/db_contact) | id |
+| vid | [verb](help/database/db_verb) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_process.md b/doc/database/db_process.md
index 648019e835..aca53c70a1 100644
--- a/doc/database/db_process.md
+++ b/doc/database/db_process.md
@@ -3,10 +3,22 @@ Table process
 
 Currently running system processes
 
+Fields
+------
+
 | Field   | Description | Type          | Null | Key | Default             | Extra |
 | ------- | ----------- | ------------- | ---- | --- | ------------------- | ----- |
 | pid     |             | int unsigned  | NO   | PRI | NULL                |       |
 | command |             | varbinary(32) | NO   |     |                     |       |
 | created |             | datetime      | NO   |     | 0001-01-01 00:00:00 |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | pid |
+| command | command |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_profile.md b/doc/database/db_profile.md
index be97c5d4a8..79de8ade5d 100644
--- a/doc/database/db_profile.md
+++ b/doc/database/db_profile.md
@@ -3,6 +3,9 @@ Table profile
 
 user profiles data
 
+Fields
+------
+
 | Field        | Description                                   | Type               | Null | Key | Default    | Extra          |
 | ------------ | --------------------------------------------- | ------------------ | ---- | --- | ---------- | -------------- |
 | id           | sequential ID                                 | int unsigned       | NO   | PRI | NULL       | auto_increment |
@@ -48,4 +51,20 @@ user profiles data
 | publish      | publish default profile in local directory    | boolean            | NO   |     | 0          |                |
 | net-publish  | publish profile in global directory           | boolean            | NO   |     | 0          |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid_is-default | uid, is-default |
+| pub_keywords | FULLTEXT, pub_keywords |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_profile_check.md b/doc/database/db_profile_check.md
index 77f4bb6188..1c7bc81476 100644
--- a/doc/database/db_profile_check.md
+++ b/doc/database/db_profile_check.md
@@ -3,6 +3,9 @@ Table profile_check
 
 DFRN remote auth use
 
+Fields
+------
+
 | Field   | Description   | Type               | Null | Key | Default | Extra          |
 | ------- | ------------- | ------------------ | ---- | --- | ------- | -------------- |
 | id      | sequential ID | int unsigned       | NO   | PRI | NULL    | auto_increment |
@@ -12,4 +15,21 @@ DFRN remote auth use
 | sec     |               | varchar(255)       | NO   |     |         |                |
 | expire  |               | int unsigned       | NO   |     | 0       |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid | uid |
+| cid | cid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+| cid | [contact](help/database/db_contact) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_profile_field.md b/doc/database/db_profile_field.md
index 7bf2e9dcd9..e920bcd1a0 100644
--- a/doc/database/db_profile_field.md
+++ b/doc/database/db_profile_field.md
@@ -3,6 +3,9 @@ Table profile_field
 
 Custom profile fields
 
+Fields
+------
+
 | Field   | Description                                                 | Type               | Null | Key | Default             | Extra          |
 | ------- | ----------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
 | id      | sequential ID                                               | int unsigned       | NO   | PRI | NULL                | auto_increment |
@@ -14,4 +17,22 @@ Custom profile fields
 | created | creation time                                               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 | edited  | last edit time                                              | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid | uid |
+| order | order |
+| psid | psid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+| psid | [permissionset](help/database/db_permissionset) | id |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_push_subscriber.md b/doc/database/db_push_subscriber.md
index fde15de14a..9c5094b6f5 100644
--- a/doc/database/db_push_subscriber.md
+++ b/doc/database/db_push_subscriber.md
@@ -3,6 +3,9 @@ Table push_subscriber
 
 Used for OStatus: Contains feed subscribers
 
+Fields
+------
+
 | Field        | Description                       | Type               | Null | Key | Default             | Extra          |
 | ------------ | --------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
 | id           | sequential ID                     | int unsigned       | NO   | PRI | NULL                | auto_increment |
@@ -16,4 +19,20 @@ Used for OStatus: Contains feed subscribers
 | renewed      | Date of last subscription renewal | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 | secret       |                                   | varchar(255)       | NO   |     |                     |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| next_try | next_try |
+| uid | uid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_register.md b/doc/database/db_register.md
index fac22811d4..856128a425 100644
--- a/doc/database/db_register.md
+++ b/doc/database/db_register.md
@@ -3,6 +3,9 @@ Table register
 
 registrations requiring admin approval
 
+Fields
+------
+
 | Field    | Description   | Type               | Null | Key | Default             | Extra          |
 | -------- | ------------- | ------------------ | ---- | --- | ------------------- | -------------- |
 | id       | sequential ID | int unsigned       | NO   | PRI | NULL                | auto_increment |
@@ -13,4 +16,19 @@ registrations requiring admin approval
 | language |               | varchar(16)        | NO   |     |                     |                |
 | note     |               | text               | YES  |     | NULL                |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid | uid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_search.md b/doc/database/db_search.md
index dc20ac42a5..2b7684b0b8 100644
--- a/doc/database/db_search.md
+++ b/doc/database/db_search.md
@@ -3,10 +3,29 @@ Table search
 
 
 
+Fields
+------
+
 | Field | Description   | Type               | Null | Key | Default | Extra          |
 | ----- | ------------- | ------------------ | ---- | --- | ------- | -------------- |
 | id    | sequential ID | int unsigned       | NO   | PRI | NULL    | auto_increment |
 | uid   | User id       | mediumint unsigned | NO   |     | 0       |                |
 | term  |               | varchar(255)       | NO   |     |         |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| uid_term | uid, term(64) |
+| term | term(64) |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_session.md b/doc/database/db_session.md
index d01b573647..72810e7e93 100644
--- a/doc/database/db_session.md
+++ b/doc/database/db_session.md
@@ -3,6 +3,9 @@ Table session
 
 web session storage
 
+Fields
+------
+
 | Field  | Description   | Type            | Null | Key | Default | Extra          |
 | ------ | ------------- | --------------- | ---- | --- | ------- | -------------- |
 | id     | sequential ID | bigint unsigned | NO   | PRI | NULL    | auto_increment |
@@ -10,4 +13,14 @@ web session storage
 | data   |               | text            | YES  |     | NULL    |                |
 | expire |               | int unsigned    | NO   |     | 0       |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| sid | sid(64) |
+| expire | expire |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_storage.md b/doc/database/db_storage.md
index 21596ba653..4278fbfd3d 100644
--- a/doc/database/db_storage.md
+++ b/doc/database/db_storage.md
@@ -3,9 +3,20 @@ Table storage
 
 Data stored by Database storage backend
 
+Fields
+------
+
 | Field | Description                    | Type         | Null | Key | Default | Extra          |
 | ----- | ------------------------------ | ------------ | ---- | --- | ------- | -------------- |
 | id    | Auto incremented image data id | int unsigned | NO   | PRI | NULL    | auto_increment |
 | data  | file data                      | longblob     | NO   |     | NULL    |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_tag.md b/doc/database/db_tag.md
index f52478c855..071eb7928d 100644
--- a/doc/database/db_tag.md
+++ b/doc/database/db_tag.md
@@ -3,10 +3,23 @@ Table tag
 
 tags and mentions
 
+Fields
+------
+
 | Field | Description | Type           | Null | Key | Default | Extra          |
 | ----- | ----------- | -------------- | ---- | --- | ------- | -------------- |
 | id    |             | int unsigned   | NO   | PRI | NULL    | auto_increment |
 | name  |             | varchar(96)    | NO   |     |         |                |
 | url   |             | varbinary(255) | NO   |     |         |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| type_name_url | UNIQUE, name, url |
+| url | url |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_tokens.md b/doc/database/db_tokens.md
index bf20f16b82..1169100549 100644
--- a/doc/database/db_tokens.md
+++ b/doc/database/db_tokens.md
@@ -3,6 +3,9 @@ Table tokens
 
 OAuth usage
 
+Fields
+------
+
 | Field     | Description | Type               | Null | Key | Default | Extra |
 | --------- | ----------- | ------------------ | ---- | --- | ------- | ----- |
 | id        |             | varchar(40)        | NO   | PRI | NULL    |       |
@@ -12,4 +15,21 @@ OAuth usage
 | scope     |             | varchar(200)       | NO   |     |         |       |
 | uid       | User id     | mediumint unsigned | NO   |     | 0       |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| client_id | client_id |
+| uid | uid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| client_id | [clients](help/database/db_clients) | client_id |
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_user-contact.md b/doc/database/db_user-contact.md
index 9bcbff7d33..8c8f12f75b 100644
--- a/doc/database/db_user-contact.md
+++ b/doc/database/db_user-contact.md
@@ -3,6 +3,9 @@ Table user-contact
 
 User specific public contact data
 
+Fields
+------
+
 | Field     | Description                                 | Type               | Null | Key | Default | Extra |
 | --------- | ------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
 | cid       | Contact id of the linked public contact     | int unsigned       | NO   | PRI | 0       |       |
@@ -11,4 +14,20 @@ User specific public contact data
 | ignored   | Posts from this contact are ignored         | boolean            | YES  |     | NULL    |       |
 | collapsed | Posts from this contact are collapsed       | boolean            | YES  |     | NULL    |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | uid, cid |
+| cid | cid |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| cid | [contact](help/database/db_contact) | id |
+| uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_user.md b/doc/database/db_user.md
index 8cc762cc22..8104e0f0f3 100644
--- a/doc/database/db_user.md
+++ b/doc/database/db_user.md
@@ -3,6 +3,9 @@ Table user
 
 The local users
 
+Fields
+------
+
 | Field                    | Description                                               | Type               | Null | Key | Default             | Extra          |
 | ------------------------ | --------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
 | uid                      | sequential ID                                             | mediumint unsigned | NO   | PRI | NULL                | auto_increment |
@@ -51,4 +54,22 @@ The local users
 | deny_gid                 | default permission for this user                          | mediumtext         | YES  |     | NULL                |                |
 | openidserver             |                                                           | text               | YES  |     | NULL                |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | uid |
+| nickname | nickname(32) |
+| parent-uid | parent-uid |
+| guid | guid |
+| email | email(64) |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| parent-uid | [user](help/database/db_user) | uid |
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_userd.md b/doc/database/db_userd.md
index eaef348749..cca71a2722 100644
--- a/doc/database/db_userd.md
+++ b/doc/database/db_userd.md
@@ -3,9 +3,21 @@ Table userd
 
 Deleted usernames
 
+Fields
+------
+
 | Field    | Description   | Type         | Null | Key | Default | Extra          |
 | -------- | ------------- | ------------ | ---- | --- | ------- | -------------- |
 | id       | sequential ID | int unsigned | NO   | PRI | NULL    | auto_increment |
 | username |               | varchar(255) | NO   |     | NULL    |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| username | username(32) |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_verb.md b/doc/database/db_verb.md
index cd5d66f835..6613225f93 100644
--- a/doc/database/db_verb.md
+++ b/doc/database/db_verb.md
@@ -3,9 +3,21 @@ Table verb
 
 Activity Verbs
 
+Fields
+------
+
 | Field | Description | Type              | Null | Key | Default | Extra          |
 | ----- | ----------- | ----------------- | ---- | --- | ------- | -------------- |
 | id    |             | smallint unsigned | NO   | PRI | NULL    | auto_increment |
 | name  |             | varchar(100)      | NO   |     |         |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| name | name |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_worker-ipc.md b/doc/database/db_worker-ipc.md
index 57ec489352..ac34d4649f 100644
--- a/doc/database/db_worker-ipc.md
+++ b/doc/database/db_worker-ipc.md
@@ -3,9 +3,20 @@ Table worker-ipc
 
 Inter process communication between the frontend and the worker
 
+Fields
+------
+
 | Field | Description               | Type    | Null | Key | Default | Extra |
 | ----- | ------------------------- | ------- | ---- | --- | ------- | ----- |
 | key   |                           | int     | NO   | PRI | NULL    |       |
 | jobs  | Flag for outstanding jobs | boolean | YES  |     | NULL    |       |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | key |
+
+
 Return to [database documentation](help/database)
diff --git a/doc/database/db_workerqueue.md b/doc/database/db_workerqueue.md
index 16b6a2e0d8..7510b7a762 100644
--- a/doc/database/db_workerqueue.md
+++ b/doc/database/db_workerqueue.md
@@ -3,6 +3,9 @@ Table workerqueue
 
 Background tasks queue entries
 
+Fields
+------
+
 | Field     | Description                                             | Type             | Null | Key | Default             | Extra          |
 | --------- | ------------------------------------------------------- | ---------------- | ---- | --- | ------------------- | -------------- |
 | id        | Auto incremented worker task id                         | int unsigned     | NO   | PRI | NULL                | auto_increment |
@@ -16,4 +19,20 @@ Background tasks queue entries
 | retrial   | Retrial counter                                         | tinyint          | NO   |     | 0                   |                |
 | done      | Marked 1 when the task was done - will be deleted later | boolean          | NO   |     | 0                   |                |
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+| PRIMARY | id |
+| command | command |
+| done_command_parameter | done, command, parameter(64) |
+| done_executed | done, executed |
+| done_priority_retrial_created | done, priority, retrial, created |
+| done_priority_next_try | done, priority, next_try |
+| done_pid_next_try | done, pid, next_try |
+| done_pid_retrial | done, pid, retrial |
+| done_pid_priority_created | done, pid, priority, created |
+
+
 Return to [database documentation](help/database)
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 4451b09ab6..864f2ded3f 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -166,6 +166,12 @@ class DBStructure
 
 		$tables = [];
 		foreach (self::definition(null) as $name => $definition) {
+			$indexes = [];
+			foreach ($definition['indexes'] as $key => $value) {
+				$indexes[] = ['name' => $key, 'fields' => implode(', ', $value)];
+			}
+
+			$foreign = [];
 			$fields  = [[
 				'name'    => 'Field',
 				'comment' => 'Description',
@@ -174,7 +180,7 @@ class DBStructure
 				'primary' => 'Key',
 				'default' => 'Default',
 				'extra'   => 'Extra',
-			], 
+			],
 			[
 				'name'    => '-',
 				'comment' => '-',
@@ -202,33 +208,43 @@ class DBStructure
 				$field['primary'] = ($value['primary'] ?? false) ? 'PRI' : '';
 				$field['default'] = $value['default'] ?? 'NULL';
 				$field['extra']   = $value['extra'] ?? '';
-		
+
 				foreach ($field as $fieldname => $fieldvalue) {
 					$lengths[$fieldname] = max($lengths[$fieldname] ?? 0, strlen($fieldvalue));
 				}
 				$fields[] = $field;
+
+				if (!empty($value['foreign'])) {
+					$foreign[] = [
+						'field'       => $key,
+						'targettable' => array_keys($value['foreign'])[0],
+						'targetfield' => array_values($value['foreign'])[0]
+					];
+				}
 			}
 
 			array_walk_recursive($fields, function(&$value, $key) use ($lengths)
 			{
 				$value = str_pad($value, $lengths[$key], $value === '-' ? '-' : ' ');
 			});
-			
+
 			$tables[] = ['name' => $name, 'comment' => $definition['comment']];
 			$content = Renderer::replaceMacros(Renderer::getMarkupTemplate('structure.tpl'), [
 				'$name'    => $name,
 				'$comment' => $definition['comment'],
 				'$fields'  => $fields,
+				'$indexes' => $indexes,
+				'$foreign' => $foreign,
 			]);
 			$filename = DI::basePath() . '/doc/database/db_' . $name . '.md';
 			file_put_contents($filename, $content);
 		}
 		asort($tables);
 		$content = Renderer::replaceMacros(Renderer::getMarkupTemplate('tables.tpl'), [
-			'$tables'  => $tables,	
+			'$tables'  => $tables,
 		]);
 		$filename = DI::basePath() . '/doc/database.md';
-		file_put_contents($filename, $content);		
+		file_put_contents($filename, $content);
 	}
 
 	public static function printStructure($basePath)
@@ -1278,7 +1294,7 @@ class DBStructure
 				if ($verbose) {
 					echo "Zero contact added\n";
 				}
-			}		
+			}
 		} elseif (self::existsTable('contact') && $verbose) {
 			echo "Zero contact already added\n";
 		} elseif ($verbose) {
@@ -1302,7 +1318,7 @@ class DBStructure
 
 		if (self::existsTable('permissionset')) {
 			if (!DBA::exists('permissionset', ['id' => 0])) {
-				DBA::insert('permissionset', ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']);	
+				DBA::insert('permissionset', ['allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '']);
 				$lastid = DBA::lastInsertId();
 				if ($lastid != 0) {
 					DBA::update('permissionset', ['id' => 0], ['id' => $lastid]);
@@ -1337,7 +1353,7 @@ class DBStructure
 		} elseif ($verbose) {
 			echo "permissionset: Table not found\n";
 		}
-	
+
 		if (!self::existsForeignKeyForField('tokens', 'client_id')) {
 			$tokens = DBA::p("SELECT `tokens`.`id` FROM `tokens`
 				LEFT JOIN `clients` ON `clients`.`client_id` = `tokens`.`client_id`
diff --git a/view/templates/structure.tpl b/view/templates/structure.tpl
index 3ec9ba9b2d..14704973a0 100644
--- a/view/templates/structure.tpl
+++ b/view/templates/structure.tpl
@@ -3,8 +3,31 @@ Table {{$name}}
 
 {{$comment}}
 
+Fields
+------
+
 {{foreach $fields as $field}}
 | {{$field.name}} | {{$field.comment}} | {{$field.type}} | {{$field.null}} | {{$field.primary}} | {{$field.default}} | {{$field.extra}} |
 {{/foreach}}
 
+Indexes
+------------
+
+| Name | Fields |
+|------|---------|
+{{foreach $indexes as $index}}
+| {{$index.name}} | {{$index.fields}} |
+{{/foreach}}
+
+{{if $foreign}}
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+{{foreach $foreign as $key}}
+| {{$key.field}} | [{{$key.targettable}}](help/database/db_{{$key.targettable}}) | {{$key.targetfield}} |
+{{/foreach}}
+{{/if}}
+
 Return to [database documentation](help/database)

From a29c21224d2b831875b265573e2647aa9b288de8 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 14 Jun 2021 08:54:31 +0000
Subject: [PATCH 10/14] Dash removed

---
 view/templates/structure.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/templates/structure.tpl b/view/templates/structure.tpl
index 14704973a0..77ee1e85ad 100644
--- a/view/templates/structure.tpl
+++ b/view/templates/structure.tpl
@@ -14,7 +14,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 {{foreach $indexes as $index}}
 | {{$index.name}} | {{$index.fields}} |
 {{/foreach}}

From 3d74d0a49c07162f6745e9576139a4823bb2af9d Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 14 Jun 2021 08:54:57 +0000
Subject: [PATCH 11/14] Updated documentation

---
 doc/database/db_2fa_app_specific_password.md | 2 +-
 doc/database/db_2fa_recovery_codes.md        | 2 +-
 doc/database/db_2fa_trusted_browser.md       | 2 +-
 doc/database/db_addon.md                     | 2 +-
 doc/database/db_apcontact.md                 | 2 +-
 doc/database/db_application-token.md         | 2 +-
 doc/database/db_application.md               | 2 +-
 doc/database/db_attach.md                    | 2 +-
 doc/database/db_auth_codes.md                | 2 +-
 doc/database/db_cache.md                     | 2 +-
 doc/database/db_challenge.md                 | 2 +-
 doc/database/db_clients.md                   | 2 +-
 doc/database/db_config.md                    | 2 +-
 doc/database/db_contact-relation.md          | 2 +-
 doc/database/db_contact.md                   | 2 +-
 doc/database/db_conv.md                      | 2 +-
 doc/database/db_conversation.md              | 2 +-
 doc/database/db_delayed-post.md              | 2 +-
 doc/database/db_diaspora-interaction.md      | 2 +-
 doc/database/db_event.md                     | 2 +-
 doc/database/db_fcontact.md                  | 2 +-
 doc/database/db_fsuggest.md                  | 2 +-
 doc/database/db_group.md                     | 2 +-
 doc/database/db_group_member.md              | 2 +-
 doc/database/db_gserver-tag.md               | 2 +-
 doc/database/db_gserver.md                   | 2 +-
 doc/database/db_hook.md                      | 2 +-
 doc/database/db_host.md                      | 2 +-
 doc/database/db_inbox-status.md              | 2 +-
 doc/database/db_intro.md                     | 2 +-
 doc/database/db_item-uri.md                  | 2 +-
 doc/database/db_locks.md                     | 2 +-
 doc/database/db_mail.md                      | 2 +-
 doc/database/db_mailacct.md                  | 2 +-
 doc/database/db_manage.md                    | 2 +-
 doc/database/db_notification.md              | 2 +-
 doc/database/db_notify-threads.md            | 2 +-
 doc/database/db_notify.md                    | 2 +-
 doc/database/db_oembed.md                    | 2 +-
 doc/database/db_openwebauth-token.md         | 2 +-
 doc/database/db_parsed_url.md                | 2 +-
 doc/database/db_pconfig.md                   | 2 +-
 doc/database/db_permissionset.md             | 2 +-
 doc/database/db_photo.md                     | 2 +-
 doc/database/db_post-category.md             | 2 +-
 doc/database/db_post-content.md              | 2 +-
 doc/database/db_post-delivery-data.md        | 2 +-
 doc/database/db_post-media.md                | 2 +-
 doc/database/db_post-tag.md                  | 2 +-
 doc/database/db_post-thread-user.md          | 2 +-
 doc/database/db_post-thread.md               | 2 +-
 doc/database/db_post-user-notification.md    | 2 +-
 doc/database/db_post-user.md                 | 2 +-
 doc/database/db_post.md                      | 2 +-
 doc/database/db_process.md                   | 2 +-
 doc/database/db_profile.md                   | 2 +-
 doc/database/db_profile_check.md             | 2 +-
 doc/database/db_profile_field.md             | 2 +-
 doc/database/db_push_subscriber.md           | 2 +-
 doc/database/db_register.md                  | 2 +-
 doc/database/db_search.md                    | 2 +-
 doc/database/db_session.md                   | 2 +-
 doc/database/db_storage.md                   | 2 +-
 doc/database/db_tag.md                       | 2 +-
 doc/database/db_tokens.md                    | 2 +-
 doc/database/db_user-contact.md              | 2 +-
 doc/database/db_user.md                      | 2 +-
 doc/database/db_userd.md                     | 2 +-
 doc/database/db_verb.md                      | 2 +-
 doc/database/db_worker-ipc.md                | 2 +-
 doc/database/db_workerqueue.md               | 2 +-
 71 files changed, 71 insertions(+), 71 deletions(-)

diff --git a/doc/database/db_2fa_app_specific_password.md b/doc/database/db_2fa_app_specific_password.md
index dd97735035..9d9c7ca452 100644
--- a/doc/database/db_2fa_app_specific_password.md
+++ b/doc/database/db_2fa_app_specific_password.md
@@ -19,7 +19,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid_description | uid, description(190) |
 
diff --git a/doc/database/db_2fa_recovery_codes.md b/doc/database/db_2fa_recovery_codes.md
index 53574c7541..e7c1940d85 100644
--- a/doc/database/db_2fa_recovery_codes.md
+++ b/doc/database/db_2fa_recovery_codes.md
@@ -17,7 +17,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | uid, code |
 
 Foreign Keys
diff --git a/doc/database/db_2fa_trusted_browser.md b/doc/database/db_2fa_trusted_browser.md
index 595d0ef5c7..9e12dabc7d 100644
--- a/doc/database/db_2fa_trusted_browser.md
+++ b/doc/database/db_2fa_trusted_browser.md
@@ -18,7 +18,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | cookie_hash |
 | uid | uid |
 
diff --git a/doc/database/db_addon.md b/doc/database/db_addon.md
index 6644ebaa2a..21fae66f34 100644
--- a/doc/database/db_addon.md
+++ b/doc/database/db_addon.md
@@ -20,7 +20,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | installed_name | installed, name |
 | name | UNIQUE, name |
diff --git a/doc/database/db_apcontact.md b/doc/database/db_apcontact.md
index a7ea4e9d4c..cb2f8327a8 100644
--- a/doc/database/db_apcontact.md
+++ b/doc/database/db_apcontact.md
@@ -37,7 +37,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | url |
 | addr | addr(32) |
 | alias | alias(190) |
diff --git a/doc/database/db_application-token.md b/doc/database/db_application-token.md
index 19230b10b0..15f85f06ea 100644
--- a/doc/database/db_application-token.md
+++ b/doc/database/db_application-token.md
@@ -23,7 +23,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | application-id, uid |
 | uid_id | uid, application-id |
 
diff --git a/doc/database/db_application.md b/doc/database/db_application.md
index e1743f28c7..2099b33743 100644
--- a/doc/database/db_application.md
+++ b/doc/database/db_application.md
@@ -24,7 +24,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | client_id | UNIQUE, client_id |
 
diff --git a/doc/database/db_attach.md b/doc/database/db_attach.md
index 218ce8b1d7..baef7c89dd 100644
--- a/doc/database/db_attach.md
+++ b/doc/database/db_attach.md
@@ -28,7 +28,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid | uid |
 
diff --git a/doc/database/db_auth_codes.md b/doc/database/db_auth_codes.md
index 9ebd15cbdf..df53a5b280 100644
--- a/doc/database/db_auth_codes.md
+++ b/doc/database/db_auth_codes.md
@@ -18,7 +18,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | client_id | client_id |
 
diff --git a/doc/database/db_cache.md b/doc/database/db_cache.md
index 2428a6f51a..770b4ab446 100644
--- a/doc/database/db_cache.md
+++ b/doc/database/db_cache.md
@@ -17,7 +17,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | k |
 | k_expires | k, expires |
 
diff --git a/doc/database/db_challenge.md b/doc/database/db_challenge.md
index bfd54c45da..a9f17bc631 100644
--- a/doc/database/db_challenge.md
+++ b/doc/database/db_challenge.md
@@ -19,7 +19,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | expire | expire |
 
diff --git a/doc/database/db_clients.md b/doc/database/db_clients.md
index 00e5ef6c31..29f9fe52f5 100644
--- a/doc/database/db_clients.md
+++ b/doc/database/db_clients.md
@@ -19,7 +19,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | client_id |
 | uid | uid |
 
diff --git a/doc/database/db_config.md b/doc/database/db_config.md
index 17c3cfee20..32396dc743 100644
--- a/doc/database/db_config.md
+++ b/doc/database/db_config.md
@@ -17,7 +17,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | cat_k | UNIQUE, cat, k |
 
diff --git a/doc/database/db_contact-relation.md b/doc/database/db_contact-relation.md
index c8dc95a3b7..d9f74a40a4 100644
--- a/doc/database/db_contact-relation.md
+++ b/doc/database/db_contact-relation.md
@@ -18,7 +18,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | cid, relation-cid |
 | relation-cid | relation-cid |
 
diff --git a/doc/database/db_contact.md b/doc/database/db_contact.md
index ae49777aa3..0cca0ed113 100644
--- a/doc/database/db_contact.md
+++ b/doc/database/db_contact.md
@@ -93,7 +93,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid_name | uid, name(190) |
 | self_uid | self, uid |
diff --git a/doc/database/db_conv.md b/doc/database/db_conv.md
index a92e154c25..f53918291e 100644
--- a/doc/database/db_conv.md
+++ b/doc/database/db_conv.md
@@ -21,7 +21,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid | uid |
 
diff --git a/doc/database/db_conversation.md b/doc/database/db_conversation.md
index eba69c9904..308d5ee2bd 100644
--- a/doc/database/db_conversation.md
+++ b/doc/database/db_conversation.md
@@ -21,7 +21,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | item-uri |
 | conversation-uri | conversation-uri |
 | received | received |
diff --git a/doc/database/db_delayed-post.md b/doc/database/db_delayed-post.md
index 16c31e46e2..d9faab2890 100644
--- a/doc/database/db_delayed-post.md
+++ b/doc/database/db_delayed-post.md
@@ -17,7 +17,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid_uri | UNIQUE, uid, uri(190) |
 
diff --git a/doc/database/db_diaspora-interaction.md b/doc/database/db_diaspora-interaction.md
index 3a15a5d19c..f56a72abd4 100644
--- a/doc/database/db_diaspora-interaction.md
+++ b/doc/database/db_diaspora-interaction.md
@@ -15,7 +15,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | uri-id |
 
 Foreign Keys
diff --git a/doc/database/db_event.md b/doc/database/db_event.md
index 6b893dafdf..b222dc9159 100644
--- a/doc/database/db_event.md
+++ b/doc/database/db_event.md
@@ -33,7 +33,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid_start | uid, start |
 | cid | cid |
diff --git a/doc/database/db_fcontact.md b/doc/database/db_fcontact.md
index a30bfb4ee6..e3cf61fa5e 100644
--- a/doc/database/db_fcontact.md
+++ b/doc/database/db_fcontact.md
@@ -30,7 +30,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | addr | addr(32) |
 | url | UNIQUE, url(190) |
diff --git a/doc/database/db_fsuggest.md b/doc/database/db_fsuggest.md
index 55c36e3c1d..37d63c7c60 100644
--- a/doc/database/db_fsuggest.md
+++ b/doc/database/db_fsuggest.md
@@ -22,7 +22,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | cid | cid |
 | uid | uid |
diff --git a/doc/database/db_group.md b/doc/database/db_group.md
index 48565aaeea..23150bdcbe 100644
--- a/doc/database/db_group.md
+++ b/doc/database/db_group.md
@@ -18,7 +18,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid | uid |
 
diff --git a/doc/database/db_group_member.md b/doc/database/db_group_member.md
index adebe933bd..2dd9fb41d6 100644
--- a/doc/database/db_group_member.md
+++ b/doc/database/db_group_member.md
@@ -16,7 +16,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | contactid | contact-id |
 | gid_contactid | UNIQUE, gid, contact-id |
diff --git a/doc/database/db_gserver-tag.md b/doc/database/db_gserver-tag.md
index 216bef1d56..bce171f11f 100644
--- a/doc/database/db_gserver-tag.md
+++ b/doc/database/db_gserver-tag.md
@@ -15,7 +15,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | gserver-id, tag |
 | tag | tag |
 
diff --git a/doc/database/db_gserver.md b/doc/database/db_gserver.md
index 5d5f2226b3..66339427ee 100644
--- a/doc/database/db_gserver.md
+++ b/doc/database/db_gserver.md
@@ -36,7 +36,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | nurl | UNIQUE, nurl(190) |
 | next_contact | next_contact |
diff --git a/doc/database/db_hook.md b/doc/database/db_hook.md
index 500e8f91d0..622695a26f 100644
--- a/doc/database/db_hook.md
+++ b/doc/database/db_hook.md
@@ -18,7 +18,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | priority | priority |
 | hook_file_function | UNIQUE, hook, file, function |
diff --git a/doc/database/db_host.md b/doc/database/db_host.md
index 802001e1b1..bccea5f870 100644
--- a/doc/database/db_host.md
+++ b/doc/database/db_host.md
@@ -15,7 +15,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | name | UNIQUE, name |
 
diff --git a/doc/database/db_inbox-status.md b/doc/database/db_inbox-status.md
index 1f3463ad4b..7f6a5d5996 100644
--- a/doc/database/db_inbox-status.md
+++ b/doc/database/db_inbox-status.md
@@ -20,7 +20,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | url |
 
 
diff --git a/doc/database/db_intro.md b/doc/database/db_intro.md
index ed4dd54b69..5ea923fcef 100644
--- a/doc/database/db_intro.md
+++ b/doc/database/db_intro.md
@@ -24,7 +24,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | contact-id | contact-id |
 | uid | uid |
diff --git a/doc/database/db_item-uri.md b/doc/database/db_item-uri.md
index 3ce86fca16..c49ef3813f 100644
--- a/doc/database/db_item-uri.md
+++ b/doc/database/db_item-uri.md
@@ -16,7 +16,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uri | UNIQUE, uri |
 | guid | guid |
diff --git a/doc/database/db_locks.md b/doc/database/db_locks.md
index 92d3e6434f..821db5fee7 100644
--- a/doc/database/db_locks.md
+++ b/doc/database/db_locks.md
@@ -18,7 +18,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | name_expires | name, expires |
 
diff --git a/doc/database/db_mail.md b/doc/database/db_mail.md
index 685dd2a0f3..0558cff69a 100644
--- a/doc/database/db_mail.md
+++ b/doc/database/db_mail.md
@@ -35,7 +35,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid_seen | uid, seen |
 | convid | convid |
diff --git a/doc/database/db_mailacct.md b/doc/database/db_mailacct.md
index aaa0fa877d..dba0fd9581 100644
--- a/doc/database/db_mailacct.md
+++ b/doc/database/db_mailacct.md
@@ -26,7 +26,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid | uid |
 
diff --git a/doc/database/db_manage.md b/doc/database/db_manage.md
index 53e5a35bb9..ccfa7170df 100644
--- a/doc/database/db_manage.md
+++ b/doc/database/db_manage.md
@@ -16,7 +16,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid_mid | UNIQUE, uid, mid |
 | mid | mid |
diff --git a/doc/database/db_notification.md b/doc/database/db_notification.md
index 4de2a53bf7..b5c0d7b1e3 100644
--- a/doc/database/db_notification.md
+++ b/doc/database/db_notification.md
@@ -22,7 +22,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid_vid_type_actor-id_target-uri-id | UNIQUE, uid, vid, type, actor-id, target-uri-id |
 | vid | vid |
diff --git a/doc/database/db_notify-threads.md b/doc/database/db_notify-threads.md
index a58c45dabd..5a0157d844 100644
--- a/doc/database/db_notify-threads.md
+++ b/doc/database/db_notify-threads.md
@@ -19,7 +19,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | master-parent-uri-id | master-parent-uri-id |
 | receiver-uid | receiver-uid |
diff --git a/doc/database/db_notify.md b/doc/database/db_notify.md
index 338425ac96..f1eb358816 100644
--- a/doc/database/db_notify.md
+++ b/doc/database/db_notify.md
@@ -31,7 +31,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | seen_uid_date | seen, uid, date |
 | uid_date | uid, date |
diff --git a/doc/database/db_oembed.md b/doc/database/db_oembed.md
index 86b23f70f9..f3a6a02319 100644
--- a/doc/database/db_oembed.md
+++ b/doc/database/db_oembed.md
@@ -17,7 +17,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | url, maxwidth |
 | created | created |
 
diff --git a/doc/database/db_openwebauth-token.md b/doc/database/db_openwebauth-token.md
index ad598087e9..05313df621 100644
--- a/doc/database/db_openwebauth-token.md
+++ b/doc/database/db_openwebauth-token.md
@@ -19,7 +19,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid | uid |
 
diff --git a/doc/database/db_parsed_url.md b/doc/database/db_parsed_url.md
index 8101883a36..1bb4083578 100644
--- a/doc/database/db_parsed_url.md
+++ b/doc/database/db_parsed_url.md
@@ -20,7 +20,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | url_hash, guessing, oembed |
 | created | created |
 | expires | expires |
diff --git a/doc/database/db_pconfig.md b/doc/database/db_pconfig.md
index 2de6dd294c..f1e031f2a0 100644
--- a/doc/database/db_pconfig.md
+++ b/doc/database/db_pconfig.md
@@ -18,7 +18,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid_cat_k | UNIQUE, uid, cat, k |
 
diff --git a/doc/database/db_permissionset.md b/doc/database/db_permissionset.md
index 421c67abb3..a9e2374292 100644
--- a/doc/database/db_permissionset.md
+++ b/doc/database/db_permissionset.md
@@ -19,7 +19,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid_allow_cid_allow_gid_deny_cid_deny_gid | uid, allow_cid(50), allow_gid(30), deny_cid(50), deny_gid(30) |
 
diff --git a/doc/database/db_photo.md b/doc/database/db_photo.md
index 5f98e4e349..964530d7ec 100644
--- a/doc/database/db_photo.md
+++ b/doc/database/db_photo.md
@@ -40,7 +40,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | contactid | contact-id |
 | uid_contactid | uid, contact-id |
diff --git a/doc/database/db_post-category.md b/doc/database/db_post-category.md
index 77e9ed679f..2d758905f3 100644
--- a/doc/database/db_post-category.md
+++ b/doc/database/db_post-category.md
@@ -17,7 +17,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | uri-id, uid, type, tid |
 | uri-id | tid |
 | uid | uid |
diff --git a/doc/database/db_post-content.md b/doc/database/db_post-content.md
index 5b8b258ec7..2e055d820b 100644
--- a/doc/database/db_post-content.md
+++ b/doc/database/db_post-content.md
@@ -30,7 +30,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | uri-id |
 | plink | plink(191) |
 | resource-id | resource-id |
diff --git a/doc/database/db_post-delivery-data.md b/doc/database/db_post-delivery-data.md
index 61f8b75de5..f7273b5ef9 100644
--- a/doc/database/db_post-delivery-data.md
+++ b/doc/database/db_post-delivery-data.md
@@ -24,7 +24,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | uri-id |
 
 Foreign Keys
diff --git a/doc/database/db_post-media.md b/doc/database/db_post-media.md
index ef599ed135..a6c151d035 100644
--- a/doc/database/db_post-media.md
+++ b/doc/database/db_post-media.md
@@ -32,7 +32,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uri-id-url | UNIQUE, uri-id, url |
 
diff --git a/doc/database/db_post-tag.md b/doc/database/db_post-tag.md
index 30e513cab4..5d4caad221 100644
--- a/doc/database/db_post-tag.md
+++ b/doc/database/db_post-tag.md
@@ -17,7 +17,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | uri-id, type, tid, cid |
 | tid | tid |
 | cid | cid |
diff --git a/doc/database/db_post-thread-user.md b/doc/database/db_post-thread-user.md
index 875aee4aa1..9b6accc23d 100644
--- a/doc/database/db_post-thread-user.md
+++ b/doc/database/db_post-thread-user.md
@@ -36,7 +36,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | uid, uri-id |
 | uri-id | uri-id |
 | owner-id | owner-id |
diff --git a/doc/database/db_post-thread.md b/doc/database/db_post-thread.md
index f5a8516500..c13be54ba4 100644
--- a/doc/database/db_post-thread.md
+++ b/doc/database/db_post-thread.md
@@ -22,7 +22,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | uri-id |
 | owner-id | owner-id |
 | author-id | author-id |
diff --git a/doc/database/db_post-user-notification.md b/doc/database/db_post-user-notification.md
index 0ebe8ccaf1..db024b621d 100644
--- a/doc/database/db_post-user-notification.md
+++ b/doc/database/db_post-user-notification.md
@@ -16,7 +16,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | uid, uri-id |
 | uri-id | uri-id |
 
diff --git a/doc/database/db_post-user.md b/doc/database/db_post-user.md
index 6d2f0c71b6..a3b30c9b14 100644
--- a/doc/database/db_post-user.md
+++ b/doc/database/db_post-user.md
@@ -43,7 +43,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid_uri-id | UNIQUE, uid, uri-id |
 | uri-id | uri-id |
diff --git a/doc/database/db_post.md b/doc/database/db_post.md
index 7d5d7cc567..8d74100523 100644
--- a/doc/database/db_post.md
+++ b/doc/database/db_post.md
@@ -31,7 +31,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | uri-id |
 | parent-uri-id | parent-uri-id |
 | thr-parent-id | thr-parent-id |
diff --git a/doc/database/db_process.md b/doc/database/db_process.md
index aca53c70a1..fb76d998ef 100644
--- a/doc/database/db_process.md
+++ b/doc/database/db_process.md
@@ -16,7 +16,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | pid |
 | command | command |
 
diff --git a/doc/database/db_profile.md b/doc/database/db_profile.md
index 79de8ade5d..d0bbcb6d2e 100644
--- a/doc/database/db_profile.md
+++ b/doc/database/db_profile.md
@@ -55,7 +55,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid_is-default | uid, is-default |
 | pub_keywords | FULLTEXT, pub_keywords |
diff --git a/doc/database/db_profile_check.md b/doc/database/db_profile_check.md
index 1c7bc81476..96931618ca 100644
--- a/doc/database/db_profile_check.md
+++ b/doc/database/db_profile_check.md
@@ -19,7 +19,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid | uid |
 | cid | cid |
diff --git a/doc/database/db_profile_field.md b/doc/database/db_profile_field.md
index e920bcd1a0..e2fbad3031 100644
--- a/doc/database/db_profile_field.md
+++ b/doc/database/db_profile_field.md
@@ -21,7 +21,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid | uid |
 | order | order |
diff --git a/doc/database/db_push_subscriber.md b/doc/database/db_push_subscriber.md
index 9c5094b6f5..ffcf56f888 100644
--- a/doc/database/db_push_subscriber.md
+++ b/doc/database/db_push_subscriber.md
@@ -23,7 +23,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | next_try | next_try |
 | uid | uid |
diff --git a/doc/database/db_register.md b/doc/database/db_register.md
index 856128a425..2367b9d9fb 100644
--- a/doc/database/db_register.md
+++ b/doc/database/db_register.md
@@ -20,7 +20,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid | uid |
 
diff --git a/doc/database/db_search.md b/doc/database/db_search.md
index 2b7684b0b8..42c179a046 100644
--- a/doc/database/db_search.md
+++ b/doc/database/db_search.md
@@ -16,7 +16,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | uid_term | uid, term(64) |
 | term | term(64) |
diff --git a/doc/database/db_session.md b/doc/database/db_session.md
index 72810e7e93..775088c0aa 100644
--- a/doc/database/db_session.md
+++ b/doc/database/db_session.md
@@ -17,7 +17,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | sid | sid(64) |
 | expire | expire |
diff --git a/doc/database/db_storage.md b/doc/database/db_storage.md
index 4278fbfd3d..9c8495967f 100644
--- a/doc/database/db_storage.md
+++ b/doc/database/db_storage.md
@@ -15,7 +15,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 
 
diff --git a/doc/database/db_tag.md b/doc/database/db_tag.md
index 071eb7928d..a7c47e9fc1 100644
--- a/doc/database/db_tag.md
+++ b/doc/database/db_tag.md
@@ -16,7 +16,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | type_name_url | UNIQUE, name, url |
 | url | url |
diff --git a/doc/database/db_tokens.md b/doc/database/db_tokens.md
index 1169100549..3620f5fb5e 100644
--- a/doc/database/db_tokens.md
+++ b/doc/database/db_tokens.md
@@ -19,7 +19,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | client_id | client_id |
 | uid | uid |
diff --git a/doc/database/db_user-contact.md b/doc/database/db_user-contact.md
index 8c8f12f75b..69adc0c6b1 100644
--- a/doc/database/db_user-contact.md
+++ b/doc/database/db_user-contact.md
@@ -18,7 +18,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | uid, cid |
 | cid | cid |
 
diff --git a/doc/database/db_user.md b/doc/database/db_user.md
index 8104e0f0f3..a2f9d931de 100644
--- a/doc/database/db_user.md
+++ b/doc/database/db_user.md
@@ -58,7 +58,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | uid |
 | nickname | nickname(32) |
 | parent-uid | parent-uid |
diff --git a/doc/database/db_userd.md b/doc/database/db_userd.md
index cca71a2722..7fce9ce9ab 100644
--- a/doc/database/db_userd.md
+++ b/doc/database/db_userd.md
@@ -15,7 +15,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | username | username(32) |
 
diff --git a/doc/database/db_verb.md b/doc/database/db_verb.md
index 6613225f93..887f5fc4e8 100644
--- a/doc/database/db_verb.md
+++ b/doc/database/db_verb.md
@@ -15,7 +15,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | name | name |
 
diff --git a/doc/database/db_worker-ipc.md b/doc/database/db_worker-ipc.md
index ac34d4649f..be9a07d0f7 100644
--- a/doc/database/db_worker-ipc.md
+++ b/doc/database/db_worker-ipc.md
@@ -15,7 +15,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | key |
 
 
diff --git a/doc/database/db_workerqueue.md b/doc/database/db_workerqueue.md
index 7510b7a762..81596192c6 100644
--- a/doc/database/db_workerqueue.md
+++ b/doc/database/db_workerqueue.md
@@ -23,7 +23,7 @@ Indexes
 ------------
 
 | Name | Fields |
-|------|---------|
+|------|--------|
 | PRIMARY | id |
 | command | command |
 | done_command_parameter | done, command, parameter(64) |

From 7106106f11ca1212351e785c6bd4c1f8e343d82c Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 14 Jun 2021 12:15:10 +0000
Subject: [PATCH 12/14] Formatted index list

---
 doc/database/db_2fa_app_specific_password.md |  6 +--
 doc/database/db_2fa_recovery_codes.md        |  4 +-
 doc/database/db_2fa_trusted_browser.md       |  6 +--
 doc/database/db_addon.md                     |  8 ++--
 doc/database/db_apcontact.md                 | 16 +++----
 doc/database/db_application-token.md         |  6 +--
 doc/database/db_application.md               |  6 +--
 doc/database/db_attach.md                    |  8 ++--
 doc/database/db_auth_codes.md                |  6 +--
 doc/database/db_cache.md                     |  6 +--
 doc/database/db_challenge.md                 |  8 ++--
 doc/database/db_clients.md                   |  6 +--
 doc/database/db_config.md                    |  8 ++--
 doc/database/db_contact-relation.md          |  8 ++--
 doc/database/db_contact.md                   | 50 ++++++++++----------
 doc/database/db_conv.md                      |  8 ++--
 doc/database/db_conversation.md              |  8 ++--
 doc/database/db_delayed-post.md              |  6 +--
 doc/database/db_diaspora-interaction.md      |  4 +-
 doc/database/db_event.md                     |  8 ++--
 doc/database/db_fcontact.md                  | 10 ++--
 doc/database/db_fsuggest.md                  | 10 ++--
 doc/database/db_group.md                     |  8 ++--
 doc/database/db_group_member.md              |  8 ++--
 doc/database/db_gserver-tag.md               |  6 +--
 doc/database/db_gserver.md                   | 12 ++---
 doc/database/db_hook.md                      |  8 ++--
 doc/database/db_host.md                      |  8 ++--
 doc/database/db_inbox-status.md              |  6 +--
 doc/database/db_intro.md                     |  8 ++--
 doc/database/db_item-uri.md                  | 10 ++--
 doc/database/db_locks.md                     |  6 +--
 doc/database/db_mail.md                      | 24 +++++-----
 doc/database/db_mailacct.md                  |  8 ++--
 doc/database/db_manage.md                    |  8 ++--
 doc/database/db_notification.md              | 16 +++----
 doc/database/db_notify-threads.md            | 10 ++--
 doc/database/db_notify.md                    | 14 +++---
 doc/database/db_oembed.md                    |  6 +--
 doc/database/db_openwebauth-token.md         |  8 ++--
 doc/database/db_parsed_url.md                |  8 ++--
 doc/database/db_pconfig.md                   |  6 +--
 doc/database/db_permissionset.md             |  6 +--
 doc/database/db_photo.md                     | 16 +++----
 doc/database/db_post-category.md             |  8 ++--
 doc/database/db_post-content.md              | 10 ++--
 doc/database/db_post-delivery-data.md        |  4 +-
 doc/database/db_post-media.md                |  6 +--
 doc/database/db_post-tag.md                  |  8 ++--
 doc/database/db_post-thread-user.md          | 32 ++++++-------
 doc/database/db_post-thread.md               | 10 ++--
 doc/database/db_post-user-notification.md    |  6 +--
 doc/database/db_post-user.md                 | 42 ++++++++--------
 doc/database/db_post.md                      | 16 +++----
 doc/database/db_process.md                   |  6 +--
 doc/database/db_profile.md                   | 10 ++--
 doc/database/db_profile_check.md             | 10 ++--
 doc/database/db_profile_field.md             | 12 ++---
 doc/database/db_push_subscriber.md           |  8 ++--
 doc/database/db_register.md                  |  8 ++--
 doc/database/db_search.md                    |  8 ++--
 doc/database/db_session.md                   | 10 ++--
 doc/database/db_storage.md                   |  6 +--
 doc/database/db_tag.md                       |  8 ++--
 doc/database/db_tokens.md                    |  8 ++--
 doc/database/db_user-contact.md              |  6 +--
 doc/database/db_user.md                      | 14 +++---
 doc/database/db_userd.md                     |  6 +--
 doc/database/db_verb.md                      |  8 ++--
 doc/database/db_worker-ipc.md                |  6 +--
 doc/database/db_workerqueue.md               | 20 ++++----
 src/Database/DBStructure.php                 | 21 +++++++-
 view/templates/structure.tpl                 |  2 -
 73 files changed, 375 insertions(+), 360 deletions(-)

diff --git a/doc/database/db_2fa_app_specific_password.md b/doc/database/db_2fa_app_specific_password.md
index 9d9c7ca452..66dd77c95c 100644
--- a/doc/database/db_2fa_app_specific_password.md
+++ b/doc/database/db_2fa_app_specific_password.md
@@ -18,9 +18,9 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name            | Fields                |
+| --------------- | --------------------- |
+| PRIMARY         | id                    |
 | uid_description | uid, description(190) |
 
 Foreign Keys
diff --git a/doc/database/db_2fa_recovery_codes.md b/doc/database/db_2fa_recovery_codes.md
index e7c1940d85..69c34e6547 100644
--- a/doc/database/db_2fa_recovery_codes.md
+++ b/doc/database/db_2fa_recovery_codes.md
@@ -16,8 +16,8 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
+| Name    | Fields    |
+| ------- | --------- |
 | PRIMARY | uid, code |
 
 Foreign Keys
diff --git a/doc/database/db_2fa_trusted_browser.md b/doc/database/db_2fa_trusted_browser.md
index 9e12dabc7d..d12d9e1fc0 100644
--- a/doc/database/db_2fa_trusted_browser.md
+++ b/doc/database/db_2fa_trusted_browser.md
@@ -17,10 +17,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
+| Name    | Fields      |
+| ------- | ----------- |
 | PRIMARY | cookie_hash |
-| uid | uid |
+| uid     | uid         |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_addon.md b/doc/database/db_addon.md
index 21fae66f34..7233b80095 100644
--- a/doc/database/db_addon.md
+++ b/doc/database/db_addon.md
@@ -19,11 +19,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name           | Fields          |
+| -------------- | --------------- |
+| PRIMARY        | id              |
 | installed_name | installed, name |
-| name | UNIQUE, name |
+| name           | UNIQUE, name    |
 
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_apcontact.md b/doc/database/db_apcontact.md
index cb2f8327a8..5f5d21e4eb 100644
--- a/doc/database/db_apcontact.md
+++ b/doc/database/db_apcontact.md
@@ -36,15 +36,15 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | url |
-| addr | addr(32) |
-| alias | alias(190) |
-| followers | followers(190) |
-| baseurl | baseurl(190) |
+| Name        | Fields           |
+| ----------- | ---------------- |
+| PRIMARY     | url              |
+| addr        | addr(32)         |
+| alias       | alias(190)       |
+| followers   | followers(190)   |
+| baseurl     | baseurl(190)     |
 | sharedinbox | sharedinbox(190) |
-| gsid | gsid |
+| gsid        | gsid             |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_application-token.md b/doc/database/db_application-token.md
index 15f85f06ea..9899a5e8b3 100644
--- a/doc/database/db_application-token.md
+++ b/doc/database/db_application-token.md
@@ -22,10 +22,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
+| Name    | Fields              |
+| ------- | ------------------- |
 | PRIMARY | application-id, uid |
-| uid_id | uid, application-id |
+| uid_id  | uid, application-id |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_application.md b/doc/database/db_application.md
index 2099b33743..0a91e703ad 100644
--- a/doc/database/db_application.md
+++ b/doc/database/db_application.md
@@ -23,9 +23,9 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name      | Fields            |
+| --------- | ----------------- |
+| PRIMARY   | id                |
 | client_id | UNIQUE, client_id |
 
 
diff --git a/doc/database/db_attach.md b/doc/database/db_attach.md
index baef7c89dd..9eb0f36e94 100644
--- a/doc/database/db_attach.md
+++ b/doc/database/db_attach.md
@@ -27,10 +27,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| uid | uid |
+| Name    | Fields |
+| ------- | ------ |
+| PRIMARY | id     |
+| uid     | uid    |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_auth_codes.md b/doc/database/db_auth_codes.md
index df53a5b280..a1d28e0965 100644
--- a/doc/database/db_auth_codes.md
+++ b/doc/database/db_auth_codes.md
@@ -17,9 +17,9 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name      | Fields    |
+| --------- | --------- |
+| PRIMARY   | id        |
 | client_id | client_id |
 
 Foreign Keys
diff --git a/doc/database/db_cache.md b/doc/database/db_cache.md
index 770b4ab446..27a11daa66 100644
--- a/doc/database/db_cache.md
+++ b/doc/database/db_cache.md
@@ -16,9 +16,9 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | k |
+| Name      | Fields     |
+| --------- | ---------- |
+| PRIMARY   | k          |
 | k_expires | k, expires |
 
 
diff --git a/doc/database/db_challenge.md b/doc/database/db_challenge.md
index a9f17bc631..1618389094 100644
--- a/doc/database/db_challenge.md
+++ b/doc/database/db_challenge.md
@@ -18,10 +18,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| expire | expire |
+| Name    | Fields |
+| ------- | ------ |
+| PRIMARY | id     |
+| expire  | expire |
 
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_clients.md b/doc/database/db_clients.md
index 29f9fe52f5..a97e796edd 100644
--- a/doc/database/db_clients.md
+++ b/doc/database/db_clients.md
@@ -18,10 +18,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
+| Name    | Fields    |
+| ------- | --------- |
 | PRIMARY | client_id |
-| uid | uid |
+| uid     | uid       |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_config.md b/doc/database/db_config.md
index 32396dc743..7d7618794a 100644
--- a/doc/database/db_config.md
+++ b/doc/database/db_config.md
@@ -16,10 +16,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| cat_k | UNIQUE, cat, k |
+| Name    | Fields         |
+| ------- | -------------- |
+| PRIMARY | id             |
+| cat_k   | UNIQUE, cat, k |
 
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_contact-relation.md b/doc/database/db_contact-relation.md
index d9f74a40a4..8628b1ef66 100644
--- a/doc/database/db_contact-relation.md
+++ b/doc/database/db_contact-relation.md
@@ -17,10 +17,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | cid, relation-cid |
-| relation-cid | relation-cid |
+| Name         | Fields            |
+| ------------ | ----------------- |
+| PRIMARY      | cid, relation-cid |
+| relation-cid | relation-cid      |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_contact.md b/doc/database/db_contact.md
index 0cca0ed113..0e04c1ece8 100644
--- a/doc/database/db_contact.md
+++ b/doc/database/db_contact.md
@@ -92,31 +92,31 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| uid_name | uid, name(190) |
-| self_uid | self, uid |
-| alias_uid | alias(128), uid |
-| pending_uid | pending, uid |
-| blocked_uid | blocked, uid |
-| uid_rel_network_poll | uid, rel, network, poll(64), archive |
-| uid_network_batch | uid, network, batch(64) |
-| batch_contact-type | batch(64), contact-type |
-| addr_uid | addr(128), uid |
-| nurl_uid | nurl(128), uid |
-| nick_uid | nick(128), uid |
-| attag_uid | attag(96), uid |
-| dfrn-id | dfrn-id(64) |
-| issued-id | issued-id(64) |
-| network_uid_lastupdate | network, uid, last-update |
-| uid_network_self_lastupdate | uid, network, self, last-update |
-| uid_lastitem | uid, last-item |
-| baseurl | baseurl(64) |
-| uid_contact-type | uid, contact-type |
-| uid_self_contact-type | uid, self, contact-type |
-| self_network_uid | self, network, uid |
-| gsid | gsid |
+| Name                        | Fields                               |
+| --------------------------- | ------------------------------------ |
+| PRIMARY                     | id                                   |
+| uid_name                    | uid, name(190)                       |
+| self_uid                    | self, uid                            |
+| alias_uid                   | alias(128), uid                      |
+| pending_uid                 | pending, uid                         |
+| blocked_uid                 | blocked, uid                         |
+| uid_rel_network_poll        | uid, rel, network, poll(64), archive |
+| uid_network_batch           | uid, network, batch(64)              |
+| batch_contact-type          | batch(64), contact-type              |
+| addr_uid                    | addr(128), uid                       |
+| nurl_uid                    | nurl(128), uid                       |
+| nick_uid                    | nick(128), uid                       |
+| attag_uid                   | attag(96), uid                       |
+| dfrn-id                     | dfrn-id(64)                          |
+| issued-id                   | issued-id(64)                        |
+| network_uid_lastupdate      | network, uid, last-update            |
+| uid_network_self_lastupdate | uid, network, self, last-update      |
+| uid_lastitem                | uid, last-item                       |
+| baseurl                     | baseurl(64)                          |
+| uid_contact-type            | uid, contact-type                    |
+| uid_self_contact-type       | uid, self, contact-type              |
+| self_network_uid            | self, network, uid                   |
+| gsid                        | gsid                                 |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_conv.md b/doc/database/db_conv.md
index f53918291e..c1d50b5de5 100644
--- a/doc/database/db_conv.md
+++ b/doc/database/db_conv.md
@@ -20,10 +20,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| uid | uid |
+| Name    | Fields |
+| ------- | ------ |
+| PRIMARY | id     |
+| uid     | uid    |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_conversation.md b/doc/database/db_conversation.md
index 308d5ee2bd..504b0dd4ae 100644
--- a/doc/database/db_conversation.md
+++ b/doc/database/db_conversation.md
@@ -20,11 +20,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | item-uri |
+| Name             | Fields           |
+| ---------------- | ---------------- |
+| PRIMARY          | item-uri         |
 | conversation-uri | conversation-uri |
-| received | received |
+| received         | received         |
 
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_delayed-post.md b/doc/database/db_delayed-post.md
index d9faab2890..fe3251f70a 100644
--- a/doc/database/db_delayed-post.md
+++ b/doc/database/db_delayed-post.md
@@ -16,9 +16,9 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name    | Fields                |
+| ------- | --------------------- |
+| PRIMARY | id                    |
 | uid_uri | UNIQUE, uid, uri(190) |
 
 Foreign Keys
diff --git a/doc/database/db_diaspora-interaction.md b/doc/database/db_diaspora-interaction.md
index f56a72abd4..4ac4325909 100644
--- a/doc/database/db_diaspora-interaction.md
+++ b/doc/database/db_diaspora-interaction.md
@@ -14,8 +14,8 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
+| Name    | Fields |
+| ------- | ------ |
 | PRIMARY | uri-id |
 
 Foreign Keys
diff --git a/doc/database/db_event.md b/doc/database/db_event.md
index b222dc9159..d8b009639f 100644
--- a/doc/database/db_event.md
+++ b/doc/database/db_event.md
@@ -32,11 +32,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name      | Fields     |
+| --------- | ---------- |
+| PRIMARY   | id         |
 | uid_start | uid, start |
-| cid | cid |
+| cid       | cid        |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_fcontact.md b/doc/database/db_fcontact.md
index e3cf61fa5e..43a073f619 100644
--- a/doc/database/db_fcontact.md
+++ b/doc/database/db_fcontact.md
@@ -29,11 +29,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| addr | addr(32) |
-| url | UNIQUE, url(190) |
+| Name    | Fields           |
+| ------- | ---------------- |
+| PRIMARY | id               |
+| addr    | addr(32)         |
+| url     | UNIQUE, url(190) |
 
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_fsuggest.md b/doc/database/db_fsuggest.md
index 37d63c7c60..6ccf732971 100644
--- a/doc/database/db_fsuggest.md
+++ b/doc/database/db_fsuggest.md
@@ -21,11 +21,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| cid | cid |
-| uid | uid |
+| Name    | Fields |
+| ------- | ------ |
+| PRIMARY | id     |
+| cid     | cid    |
+| uid     | uid    |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_group.md b/doc/database/db_group.md
index 23150bdcbe..1892de3e40 100644
--- a/doc/database/db_group.md
+++ b/doc/database/db_group.md
@@ -17,10 +17,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| uid | uid |
+| Name    | Fields |
+| ------- | ------ |
+| PRIMARY | id     |
+| uid     | uid    |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_group_member.md b/doc/database/db_group_member.md
index 2dd9fb41d6..a544f3b0ec 100644
--- a/doc/database/db_group_member.md
+++ b/doc/database/db_group_member.md
@@ -15,10 +15,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| contactid | contact-id |
+| Name          | Fields                  |
+| ------------- | ----------------------- |
+| PRIMARY       | id                      |
+| contactid     | contact-id              |
 | gid_contactid | UNIQUE, gid, contact-id |
 
 Foreign Keys
diff --git a/doc/database/db_gserver-tag.md b/doc/database/db_gserver-tag.md
index bce171f11f..82b0ccc881 100644
--- a/doc/database/db_gserver-tag.md
+++ b/doc/database/db_gserver-tag.md
@@ -14,10 +14,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
+| Name    | Fields          |
+| ------- | --------------- |
 | PRIMARY | gserver-id, tag |
-| tag | tag |
+| tag     | tag             |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_gserver.md b/doc/database/db_gserver.md
index 66339427ee..905602b3b8 100644
--- a/doc/database/db_gserver.md
+++ b/doc/database/db_gserver.md
@@ -35,12 +35,12 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| nurl | UNIQUE, nurl(190) |
-| next_contact | next_contact |
-| network | network |
+| Name         | Fields            |
+| ------------ | ----------------- |
+| PRIMARY      | id                |
+| nurl         | UNIQUE, nurl(190) |
+| next_contact | next_contact      |
+| network      | network           |
 
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_hook.md b/doc/database/db_hook.md
index 622695a26f..0ad0981f0c 100644
--- a/doc/database/db_hook.md
+++ b/doc/database/db_hook.md
@@ -17,10 +17,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| priority | priority |
+| Name               | Fields                       |
+| ------------------ | ---------------------------- |
+| PRIMARY            | id                           |
+| priority           | priority                     |
 | hook_file_function | UNIQUE, hook, file, function |
 
 
diff --git a/doc/database/db_host.md b/doc/database/db_host.md
index bccea5f870..4b2d4d1e5d 100644
--- a/doc/database/db_host.md
+++ b/doc/database/db_host.md
@@ -14,10 +14,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| name | UNIQUE, name |
+| Name    | Fields       |
+| ------- | ------------ |
+| PRIMARY | id           |
+| name    | UNIQUE, name |
 
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_inbox-status.md b/doc/database/db_inbox-status.md
index 7f6a5d5996..3b82cf46a0 100644
--- a/doc/database/db_inbox-status.md
+++ b/doc/database/db_inbox-status.md
@@ -19,9 +19,9 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | url |
+| Name    | Fields |
+| ------- | ------ |
+| PRIMARY | url    |
 
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_intro.md b/doc/database/db_intro.md
index 5ea923fcef..426d8579dd 100644
--- a/doc/database/db_intro.md
+++ b/doc/database/db_intro.md
@@ -23,11 +23,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name       | Fields     |
+| ---------- | ---------- |
+| PRIMARY    | id         |
 | contact-id | contact-id |
-| uid | uid |
+| uid        | uid        |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_item-uri.md b/doc/database/db_item-uri.md
index c49ef3813f..c6d1c4c376 100644
--- a/doc/database/db_item-uri.md
+++ b/doc/database/db_item-uri.md
@@ -15,11 +15,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| uri | UNIQUE, uri |
-| guid | guid |
+| Name    | Fields      |
+| ------- | ----------- |
+| PRIMARY | id          |
+| uri     | UNIQUE, uri |
+| guid    | guid        |
 
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_locks.md b/doc/database/db_locks.md
index 821db5fee7..dc5371184d 100644
--- a/doc/database/db_locks.md
+++ b/doc/database/db_locks.md
@@ -17,9 +17,9 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name         | Fields        |
+| ------------ | ------------- |
+| PRIMARY      | id            |
 | name_expires | name, expires |
 
 
diff --git a/doc/database/db_mail.md b/doc/database/db_mail.md
index 0558cff69a..460c03bf6a 100644
--- a/doc/database/db_mail.md
+++ b/doc/database/db_mail.md
@@ -34,18 +34,18 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| uid_seen | uid, seen |
-| convid | convid |
-| uri | uri(64) |
-| parent-uri | parent-uri(64) |
-| contactid | contact-id(32) |
-| author-id | author-id |
-| uri-id | uri-id |
-| parent-uri-id | parent-uri-id |
-| thr-parent-id | thr-parent-id |
+| Name          | Fields         |
+| ------------- | -------------- |
+| PRIMARY       | id             |
+| uid_seen      | uid, seen      |
+| convid        | convid         |
+| uri           | uri(64)        |
+| parent-uri    | parent-uri(64) |
+| contactid     | contact-id(32) |
+| author-id     | author-id      |
+| uri-id        | uri-id         |
+| parent-uri-id | parent-uri-id  |
+| thr-parent-id | thr-parent-id  |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_mailacct.md b/doc/database/db_mailacct.md
index dba0fd9581..59f34250ce 100644
--- a/doc/database/db_mailacct.md
+++ b/doc/database/db_mailacct.md
@@ -25,10 +25,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| uid | uid |
+| Name    | Fields |
+| ------- | ------ |
+| PRIMARY | id     |
+| uid     | uid    |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_manage.md b/doc/database/db_manage.md
index ccfa7170df..8a2228a5ef 100644
--- a/doc/database/db_manage.md
+++ b/doc/database/db_manage.md
@@ -15,11 +15,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name    | Fields           |
+| ------- | ---------------- |
+| PRIMARY | id               |
 | uid_mid | UNIQUE, uid, mid |
-| mid | mid |
+| mid     | mid              |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_notification.md b/doc/database/db_notification.md
index b5c0d7b1e3..ff059c344f 100644
--- a/doc/database/db_notification.md
+++ b/doc/database/db_notification.md
@@ -21,15 +21,15 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name                                | Fields                                          |
+| ----------------------------------- | ----------------------------------------------- |
+| PRIMARY                             | id                                              |
 | uid_vid_type_actor-id_target-uri-id | UNIQUE, uid, vid, type, actor-id, target-uri-id |
-| vid | vid |
-| actor-id | actor-id |
-| target-uri-id | target-uri-id |
-| parent-uri-id | parent-uri-id |
-| seen_uid | seen, uid |
+| vid                                 | vid                                             |
+| actor-id                            | actor-id                                        |
+| target-uri-id                       | target-uri-id                                   |
+| parent-uri-id                       | parent-uri-id                                   |
+| seen_uid                            | seen, uid                                       |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_notify-threads.md b/doc/database/db_notify-threads.md
index 5a0157d844..82ed225f7d 100644
--- a/doc/database/db_notify-threads.md
+++ b/doc/database/db_notify-threads.md
@@ -18,12 +18,12 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name                 | Fields               |
+| -------------------- | -------------------- |
+| PRIMARY              | id                   |
 | master-parent-uri-id | master-parent-uri-id |
-| receiver-uid | receiver-uid |
-| notify-id | notify-id |
+| receiver-uid         | receiver-uid         |
+| notify-id            | notify-id            |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_notify.md b/doc/database/db_notify.md
index f1eb358816..250734e56c 100644
--- a/doc/database/db_notify.md
+++ b/doc/database/db_notify.md
@@ -30,14 +30,14 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| seen_uid_date | seen, uid, date |
-| uid_date | uid, date |
+| Name          | Fields               |
+| ------------- | -------------------- |
+| PRIMARY       | id                   |
+| seen_uid_date | seen, uid, date      |
+| uid_date      | uid, date            |
 | uid_type_link | uid, type, link(190) |
-| uri-id | uri-id |
-| parent-uri-id | parent-uri-id |
+| uri-id        | uri-id               |
+| parent-uri-id | parent-uri-id        |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_oembed.md b/doc/database/db_oembed.md
index f3a6a02319..8304a32f4b 100644
--- a/doc/database/db_oembed.md
+++ b/doc/database/db_oembed.md
@@ -16,10 +16,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
+| Name    | Fields        |
+| ------- | ------------- |
 | PRIMARY | url, maxwidth |
-| created | created |
+| created | created       |
 
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_openwebauth-token.md b/doc/database/db_openwebauth-token.md
index 05313df621..c330623d92 100644
--- a/doc/database/db_openwebauth-token.md
+++ b/doc/database/db_openwebauth-token.md
@@ -18,10 +18,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| uid | uid |
+| Name    | Fields |
+| ------- | ------ |
+| PRIMARY | id     |
+| uid     | uid    |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_parsed_url.md b/doc/database/db_parsed_url.md
index 1bb4083578..67ea5caebf 100644
--- a/doc/database/db_parsed_url.md
+++ b/doc/database/db_parsed_url.md
@@ -19,11 +19,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
+| Name    | Fields                     |
+| ------- | -------------------------- |
 | PRIMARY | url_hash, guessing, oembed |
-| created | created |
-| expires | expires |
+| created | created                    |
+| expires | expires                    |
 
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_pconfig.md b/doc/database/db_pconfig.md
index f1e031f2a0..cf9b0d7810 100644
--- a/doc/database/db_pconfig.md
+++ b/doc/database/db_pconfig.md
@@ -17,9 +17,9 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name      | Fields              |
+| --------- | ------------------- |
+| PRIMARY   | id                  |
 | uid_cat_k | UNIQUE, uid, cat, k |
 
 Foreign Keys
diff --git a/doc/database/db_permissionset.md b/doc/database/db_permissionset.md
index a9e2374292..107cedea18 100644
--- a/doc/database/db_permissionset.md
+++ b/doc/database/db_permissionset.md
@@ -18,9 +18,9 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name                                      | Fields                                                        |
+| ----------------------------------------- | ------------------------------------------------------------- |
+| PRIMARY                                   | id                                                            |
 | uid_allow_cid_allow_gid_deny_cid_deny_gid | uid, allow_cid(50), allow_gid(30), deny_cid(50), deny_gid(30) |
 
 Foreign Keys
diff --git a/doc/database/db_photo.md b/doc/database/db_photo.md
index 964530d7ec..aad26bdbeb 100644
--- a/doc/database/db_photo.md
+++ b/doc/database/db_photo.md
@@ -39,15 +39,15 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| contactid | contact-id |
-| uid_contactid | uid, contact-id |
-| uid_profile | uid, profile |
-| uid_album_scale_created | uid, album(32), scale, created |
+| Name                          | Fields                               |
+| ----------------------------- | ------------------------------------ |
+| PRIMARY                       | id                                   |
+| contactid                     | contact-id                           |
+| uid_contactid                 | uid, contact-id                      |
+| uid_profile                   | uid, profile                         |
+| uid_album_scale_created       | uid, album(32), scale, created       |
 | uid_album_resource-id_created | uid, album(32), resource-id, created |
-| resource-id | resource-id |
+| resource-id                   | resource-id                          |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_post-category.md b/doc/database/db_post-category.md
index 2d758905f3..b825a8f4b1 100644
--- a/doc/database/db_post-category.md
+++ b/doc/database/db_post-category.md
@@ -16,11 +16,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
+| Name    | Fields                 |
+| ------- | ---------------------- |
 | PRIMARY | uri-id, uid, type, tid |
-| uri-id | tid |
-| uid | uid |
+| uri-id  | tid                    |
+| uid     | uid                    |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_post-content.md b/doc/database/db_post-content.md
index 2e055d820b..0addf43a31 100644
--- a/doc/database/db_post-content.md
+++ b/doc/database/db_post-content.md
@@ -29,11 +29,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | uri-id |
-| plink | plink(191) |
-| resource-id | resource-id |
+| Name                       | Fields                                 |
+| -------------------------- | -------------------------------------- |
+| PRIMARY                    | uri-id                                 |
+| plink                      | plink(191)                             |
+| resource-id                | resource-id                            |
 | title-content-warning-body | FULLTEXT, title, content-warning, body |
 
 Foreign Keys
diff --git a/doc/database/db_post-delivery-data.md b/doc/database/db_post-delivery-data.md
index f7273b5ef9..ad4ca6af32 100644
--- a/doc/database/db_post-delivery-data.md
+++ b/doc/database/db_post-delivery-data.md
@@ -23,8 +23,8 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
+| Name    | Fields |
+| ------- | ------ |
 | PRIMARY | uri-id |
 
 Foreign Keys
diff --git a/doc/database/db_post-media.md b/doc/database/db_post-media.md
index a6c151d035..e17a04e5fb 100644
--- a/doc/database/db_post-media.md
+++ b/doc/database/db_post-media.md
@@ -31,9 +31,9 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name       | Fields              |
+| ---------- | ------------------- |
+| PRIMARY    | id                  |
 | uri-id-url | UNIQUE, uri-id, url |
 
 Foreign Keys
diff --git a/doc/database/db_post-tag.md b/doc/database/db_post-tag.md
index 5d4caad221..7811f32e07 100644
--- a/doc/database/db_post-tag.md
+++ b/doc/database/db_post-tag.md
@@ -16,11 +16,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
+| Name    | Fields                 |
+| ------- | ---------------------- |
 | PRIMARY | uri-id, type, tid, cid |
-| tid | tid |
-| cid | cid |
+| tid     | tid                    |
+| cid     | cid                    |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_post-thread-user.md b/doc/database/db_post-thread-user.md
index 9b6accc23d..3efb5a77af 100644
--- a/doc/database/db_post-thread-user.md
+++ b/doc/database/db_post-thread-user.md
@@ -35,23 +35,23 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | uid, uri-id |
-| uri-id | uri-id |
-| owner-id | owner-id |
-| author-id | author-id |
-| causer-id | causer-id |
-| uid | uid |
-| contact-id | contact-id |
-| psid | psid |
-| post-user-id | post-user-id |
-| commented | commented |
-| uid_received | uid, received |
-| uid_pinned | uid, pinned |
+| Name          | Fields         |
+| ------------- | -------------- |
+| PRIMARY       | uid, uri-id    |
+| uri-id        | uri-id         |
+| owner-id      | owner-id       |
+| author-id     | author-id      |
+| causer-id     | causer-id      |
+| uid           | uid            |
+| contact-id    | contact-id     |
+| psid          | psid           |
+| post-user-id  | post-user-id   |
+| commented     | commented      |
+| uid_received  | uid, received  |
+| uid_pinned    | uid, pinned    |
 | uid_commented | uid, commented |
-| uid_starred | uid, starred |
-| uid_mention | uid, mention |
+| uid_starred   | uid, starred   |
+| uid_mention   | uid, mention   |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_post-thread.md b/doc/database/db_post-thread.md
index c13be54ba4..96fd0d4275 100644
--- a/doc/database/db_post-thread.md
+++ b/doc/database/db_post-thread.md
@@ -21,13 +21,13 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | uri-id |
-| owner-id | owner-id |
+| Name      | Fields    |
+| --------- | --------- |
+| PRIMARY   | uri-id    |
+| owner-id  | owner-id  |
 | author-id | author-id |
 | causer-id | causer-id |
-| received | received |
+| received  | received  |
 | commented | commented |
 
 Foreign Keys
diff --git a/doc/database/db_post-user-notification.md b/doc/database/db_post-user-notification.md
index db024b621d..36edd4a289 100644
--- a/doc/database/db_post-user-notification.md
+++ b/doc/database/db_post-user-notification.md
@@ -15,10 +15,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
+| Name    | Fields      |
+| ------- | ----------- |
 | PRIMARY | uid, uri-id |
-| uri-id | uri-id |
+| uri-id  | uri-id      |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_post-user.md b/doc/database/db_post-user.md
index a3b30c9b14..5fbc3e985a 100644
--- a/doc/database/db_post-user.md
+++ b/doc/database/db_post-user.md
@@ -42,28 +42,28 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| uid_uri-id | UNIQUE, uid, uri-id |
-| uri-id | uri-id |
-| parent-uri-id | parent-uri-id |
-| thr-parent-id | thr-parent-id |
-| external-id | external-id |
-| owner-id | owner-id |
-| author-id | author-id |
-| causer-id | causer-id |
-| vid | vid |
-| contact-id | contact-id |
-| event-id | event-id |
-| psid | psid |
-| author-id_uid | author-id, uid |
-| author-id_received | author-id, received |
-| parent-uri-id_uid | parent-uri-id, uid |
-| uid_contactid | uid, contact-id |
+| Name                 | Fields                  |
+| -------------------- | ----------------------- |
+| PRIMARY              | id                      |
+| uid_uri-id           | UNIQUE, uid, uri-id     |
+| uri-id               | uri-id                  |
+| parent-uri-id        | parent-uri-id           |
+| thr-parent-id        | thr-parent-id           |
+| external-id          | external-id             |
+| owner-id             | owner-id                |
+| author-id            | author-id               |
+| causer-id            | causer-id               |
+| vid                  | vid                     |
+| contact-id           | contact-id              |
+| event-id             | event-id                |
+| psid                 | psid                    |
+| author-id_uid        | author-id, uid          |
+| author-id_received   | author-id, received     |
+| parent-uri-id_uid    | parent-uri-id, uid      |
+| uid_contactid        | uid, contact-id         |
 | uid_unseen_contactid | uid, unseen, contact-id |
-| uid_unseen | uid, unseen |
-| uid_hidden_uri-id | uid, hidden, uri-id |
+| uid_unseen           | uid, unseen             |
+| uid_hidden_uri-id    | uid, hidden, uri-id     |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_post.md b/doc/database/db_post.md
index 8d74100523..303269b1c6 100644
--- a/doc/database/db_post.md
+++ b/doc/database/db_post.md
@@ -30,16 +30,16 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | uri-id |
+| Name          | Fields        |
+| ------------- | ------------- |
+| PRIMARY       | uri-id        |
 | parent-uri-id | parent-uri-id |
 | thr-parent-id | thr-parent-id |
-| external-id | external-id |
-| owner-id | owner-id |
-| author-id | author-id |
-| causer-id | causer-id |
-| vid | vid |
+| external-id   | external-id   |
+| owner-id      | owner-id      |
+| author-id     | author-id     |
+| causer-id     | causer-id     |
+| vid           | vid           |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_process.md b/doc/database/db_process.md
index fb76d998ef..062e6ff22c 100644
--- a/doc/database/db_process.md
+++ b/doc/database/db_process.md
@@ -15,9 +15,9 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | pid |
+| Name    | Fields  |
+| ------- | ------- |
+| PRIMARY | pid     |
 | command | command |
 
 
diff --git a/doc/database/db_profile.md b/doc/database/db_profile.md
index d0bbcb6d2e..4ea3b56003 100644
--- a/doc/database/db_profile.md
+++ b/doc/database/db_profile.md
@@ -54,11 +54,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| uid_is-default | uid, is-default |
-| pub_keywords | FULLTEXT, pub_keywords |
+| Name           | Fields                 |
+| -------------- | ---------------------- |
+| PRIMARY        | id                     |
+| uid_is-default | uid, is-default        |
+| pub_keywords   | FULLTEXT, pub_keywords |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_profile_check.md b/doc/database/db_profile_check.md
index 96931618ca..4049bd6048 100644
--- a/doc/database/db_profile_check.md
+++ b/doc/database/db_profile_check.md
@@ -18,11 +18,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| uid | uid |
-| cid | cid |
+| Name    | Fields |
+| ------- | ------ |
+| PRIMARY | id     |
+| uid     | uid    |
+| cid     | cid    |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_profile_field.md b/doc/database/db_profile_field.md
index e2fbad3031..56e8e3d0b6 100644
--- a/doc/database/db_profile_field.md
+++ b/doc/database/db_profile_field.md
@@ -20,12 +20,12 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| uid | uid |
-| order | order |
-| psid | psid |
+| Name    | Fields |
+| ------- | ------ |
+| PRIMARY | id     |
+| uid     | uid    |
+| order   | order  |
+| psid    | psid   |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_push_subscriber.md b/doc/database/db_push_subscriber.md
index ffcf56f888..4ba50a4d1d 100644
--- a/doc/database/db_push_subscriber.md
+++ b/doc/database/db_push_subscriber.md
@@ -22,11 +22,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name     | Fields   |
+| -------- | -------- |
+| PRIMARY  | id       |
 | next_try | next_try |
-| uid | uid |
+| uid      | uid      |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_register.md b/doc/database/db_register.md
index 2367b9d9fb..8ace3c199b 100644
--- a/doc/database/db_register.md
+++ b/doc/database/db_register.md
@@ -19,10 +19,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| uid | uid |
+| Name    | Fields |
+| ------- | ------ |
+| PRIMARY | id     |
+| uid     | uid    |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_search.md b/doc/database/db_search.md
index 42c179a046..157d09ecb8 100644
--- a/doc/database/db_search.md
+++ b/doc/database/db_search.md
@@ -15,11 +15,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name     | Fields        |
+| -------- | ------------- |
+| PRIMARY  | id            |
 | uid_term | uid, term(64) |
-| term | term(64) |
+| term     | term(64)      |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_session.md b/doc/database/db_session.md
index 775088c0aa..794e49c6a7 100644
--- a/doc/database/db_session.md
+++ b/doc/database/db_session.md
@@ -16,11 +16,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| sid | sid(64) |
-| expire | expire |
+| Name    | Fields  |
+| ------- | ------- |
+| PRIMARY | id      |
+| sid     | sid(64) |
+| expire  | expire  |
 
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_storage.md b/doc/database/db_storage.md
index 9c8495967f..55911e28a6 100644
--- a/doc/database/db_storage.md
+++ b/doc/database/db_storage.md
@@ -14,9 +14,9 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name    | Fields |
+| ------- | ------ |
+| PRIMARY | id     |
 
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_tag.md b/doc/database/db_tag.md
index a7c47e9fc1..8c742917a7 100644
--- a/doc/database/db_tag.md
+++ b/doc/database/db_tag.md
@@ -15,11 +15,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name          | Fields            |
+| ------------- | ----------------- |
+| PRIMARY       | id                |
 | type_name_url | UNIQUE, name, url |
-| url | url |
+| url           | url               |
 
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_tokens.md b/doc/database/db_tokens.md
index 3620f5fb5e..7cf9bba4cc 100644
--- a/doc/database/db_tokens.md
+++ b/doc/database/db_tokens.md
@@ -18,11 +18,11 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name      | Fields    |
+| --------- | --------- |
+| PRIMARY   | id        |
 | client_id | client_id |
-| uid | uid |
+| uid       | uid       |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_user-contact.md b/doc/database/db_user-contact.md
index 69adc0c6b1..35d140cfff 100644
--- a/doc/database/db_user-contact.md
+++ b/doc/database/db_user-contact.md
@@ -17,10 +17,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
+| Name    | Fields   |
+| ------- | -------- |
 | PRIMARY | uid, cid |
-| cid | cid |
+| cid     | cid      |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_user.md b/doc/database/db_user.md
index a2f9d931de..611fb76b05 100644
--- a/doc/database/db_user.md
+++ b/doc/database/db_user.md
@@ -57,13 +57,13 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | uid |
-| nickname | nickname(32) |
-| parent-uid | parent-uid |
-| guid | guid |
-| email | email(64) |
+| Name       | Fields       |
+| ---------- | ------------ |
+| PRIMARY    | uid          |
+| nickname   | nickname(32) |
+| parent-uid | parent-uid   |
+| guid       | guid         |
+| email      | email(64)    |
 
 Foreign Keys
 ------------
diff --git a/doc/database/db_userd.md b/doc/database/db_userd.md
index 7fce9ce9ab..17a81b408a 100644
--- a/doc/database/db_userd.md
+++ b/doc/database/db_userd.md
@@ -14,9 +14,9 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
+| Name     | Fields       |
+| -------- | ------------ |
+| PRIMARY  | id           |
 | username | username(32) |
 
 
diff --git a/doc/database/db_verb.md b/doc/database/db_verb.md
index 887f5fc4e8..43507053b2 100644
--- a/doc/database/db_verb.md
+++ b/doc/database/db_verb.md
@@ -14,10 +14,10 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| name | name |
+| Name    | Fields |
+| ------- | ------ |
+| PRIMARY | id     |
+| name    | name   |
 
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_worker-ipc.md b/doc/database/db_worker-ipc.md
index be9a07d0f7..1635981d70 100644
--- a/doc/database/db_worker-ipc.md
+++ b/doc/database/db_worker-ipc.md
@@ -14,9 +14,9 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | key |
+| Name    | Fields |
+| ------- | ------ |
+| PRIMARY | key    |
 
 
 Return to [database documentation](help/database)
diff --git a/doc/database/db_workerqueue.md b/doc/database/db_workerqueue.md
index 81596192c6..a479ecbcaa 100644
--- a/doc/database/db_workerqueue.md
+++ b/doc/database/db_workerqueue.md
@@ -22,17 +22,17 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
-| PRIMARY | id |
-| command | command |
-| done_command_parameter | done, command, parameter(64) |
-| done_executed | done, executed |
+| Name                          | Fields                           |
+| ----------------------------- | -------------------------------- |
+| PRIMARY                       | id                               |
+| command                       | command                          |
+| done_command_parameter        | done, command, parameter(64)     |
+| done_executed                 | done, executed                   |
 | done_priority_retrial_created | done, priority, retrial, created |
-| done_priority_next_try | done, priority, next_try |
-| done_pid_next_try | done, pid, next_try |
-| done_pid_retrial | done, pid, retrial |
-| done_pid_priority_created | done, pid, priority, created |
+| done_priority_next_try        | done, priority, next_try         |
+| done_pid_next_try             | done, pid, next_try              |
+| done_pid_retrial              | done, pid, retrial               |
+| done_pid_priority_created     | done, pid, priority, created     |
 
 
 Return to [database documentation](help/database)
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 864f2ded3f..9af6100a0a 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -166,11 +166,28 @@ class DBStructure
 
 		$tables = [];
 		foreach (self::definition(null) as $name => $definition) {
-			$indexes = [];
+			$indexes  = [[
+				'name'   => 'Name',
+				'fields' => 'Fields',
+			],
+			[
+				'name'   => '-',
+				'fields' => '-',
+			]];
+
+			$lengths = ['name' => 4, 'fields' => 6];
 			foreach ($definition['indexes'] as $key => $value) {
-				$indexes[] = ['name' => $key, 'fields' => implode(', ', $value)];
+				$fieldlist = implode(', ', $value);
+				$indexes[] = ['name' => $key, 'fields' => $fieldlist];
+				$lengths['name']   = max($lengths['name'], strlen($key));
+				$lengths['fields'] = max($lengths['fields'], strlen($fieldlist));
 			}
 
+			array_walk_recursive($indexes, function(&$value, $key) use ($lengths)
+			{
+				$value = str_pad($value, $lengths[$key], $value === '-' ? '-' : ' ');
+			});
+
 			$foreign = [];
 			$fields  = [[
 				'name'    => 'Field',
diff --git a/view/templates/structure.tpl b/view/templates/structure.tpl
index 77ee1e85ad..954712f12a 100644
--- a/view/templates/structure.tpl
+++ b/view/templates/structure.tpl
@@ -13,8 +13,6 @@ Fields
 Indexes
 ------------
 
-| Name | Fields |
-|------|--------|
 {{foreach $indexes as $index}}
 | {{$index.name}} | {{$index.fields}} |
 {{/foreach}}

From c3cfc443ae06986234631a7651c7b9386c8817f1 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 14 Jun 2021 12:38:42 +0000
Subject: [PATCH 13/14] Handling of special characters

---
 doc/database.md                  |  2 +-
 doc/database/db_apcontact.md     |  2 +-
 doc/database/db_attach.md        |  2 +-
 doc/database/db_event.md         |  2 +-
 doc/database/db_parsed_url.md    |  4 ++--
 doc/database/db_permissionset.md |  2 +-
 doc/database/db_photo.md         |  2 +-
 view/templates/structure.tpl     | 10 +++++-----
 view/templates/tables.tpl        |  2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/doc/database.md b/doc/database.md
index 5e5413916d..60e3253fe3 100644
--- a/doc/database.md
+++ b/doc/database.md
@@ -45,7 +45,7 @@ Database Tables
 | [notify-threads](help/database/db_notify-threads) |  |
 | [oembed](help/database/db_oembed) | cache for OEmbed queries |
 | [openwebauth-token](help/database/db_openwebauth-token) | Store OpenWebAuth token to verify contacts |
-| [parsed_url](help/database/db_parsed_url) | cache for &#039;parse_url&#039; queries |
+| [parsed_url](help/database/db_parsed_url) | cache for 'parse_url' queries |
 | [pconfig](help/database/db_pconfig) | personal (per user) configuration storage |
 | [permissionset](help/database/db_permissionset) |  |
 | [photo](help/database/db_photo) | photo storage |
diff --git a/doc/database/db_apcontact.md b/doc/database/db_apcontact.md
index 5f5d21e4eb..539be251ae 100644
--- a/doc/database/db_apcontact.md
+++ b/doc/database/db_apcontact.md
@@ -27,7 +27,7 @@ Fields
 | subscribe        |                              | varchar(255)   | YES  |     | NULL                |       |
 | baseurl          | baseurl of the ap contact    | varchar(255)   | YES  |     | NULL                |       |
 | gsid             | Global Server ID             | int unsigned   | YES  |     | NULL                |       |
-| generator        | Name of the contact&#039;s system | varchar(255)   | YES  |     | NULL                |       |
+| generator        | Name of the contact's system | varchar(255)   | YES  |     | NULL                |       |
 | following_count  | Number of following contacts | int unsigned   | YES  |     | 0                   |       |
 | followers_count  | Number of followers          | int unsigned   | YES  |     | 0                   |       |
 | statuses_count   | Number of posts              | int unsigned   | YES  |     | 0                   |       |
diff --git a/doc/database/db_attach.md b/doc/database/db_attach.md
index 9eb0f36e94..76d8e01f20 100644
--- a/doc/database/db_attach.md
+++ b/doc/database/db_attach.md
@@ -17,7 +17,7 @@ Fields
 | data          | file data                                             | longblob           | NO   |     | NULL                |                |
 | created       | creation time                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 | edited        | last edit time                                        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
-| allow_cid     | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt; | mediumtext         | YES  |     | NULL                |                |
+| allow_cid     | Access Control - list of allowed contact.id '<19><78> | mediumtext         | YES  |     | NULL                |                |
 | allow_gid     | Access Control - list of allowed groups               | mediumtext         | YES  |     | NULL                |                |
 | deny_cid      | Access Control - list of denied contact.id            | mediumtext         | YES  |     | NULL                |                |
 | deny_gid      | Access Control - list of denied groups                | mediumtext         | YES  |     | NULL                |                |
diff --git a/doc/database/db_event.md b/doc/database/db_event.md
index d8b009639f..37048599bb 100644
--- a/doc/database/db_event.md
+++ b/doc/database/db_event.md
@@ -24,7 +24,7 @@ Fields
 | nofinish  | if event does have no end this is 1                    | boolean            | NO   |     | 0                   |                |
 | adjust    | adjust to timezone of the recipient (0 or 1)           | boolean            | NO   |     | 1                   |                |
 | ignore    | 0 or 1                                                 | boolean            | NO   |     | 0                   |                |
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES  |     | NULL                |                |
+| allow_cid | Access Control - list of allowed contact.id '<19><78>' | mediumtext         | YES  |     | NULL                |                |
 | allow_gid | Access Control - list of allowed groups                | mediumtext         | YES  |     | NULL                |                |
 | deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL                |                |
 | deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL                |                |
diff --git a/doc/database/db_parsed_url.md b/doc/database/db_parsed_url.md
index 67ea5caebf..1752cd0b5b 100644
--- a/doc/database/db_parsed_url.md
+++ b/doc/database/db_parsed_url.md
@@ -1,7 +1,7 @@
 Table parsed_url
 ===========
 
-cache for &#039;parse_url&#039; queries
+cache for 'parse_url' queries
 
 Fields
 ------
@@ -9,7 +9,7 @@ Fields
 | Field    | Description                       | Type       | Null | Key | Default             | Extra |
 | -------- | --------------------------------- | ---------- | ---- | --- | ------------------- | ----- |
 | url_hash | page url hash                     | binary(64) | NO   | PRI | NULL                |       |
-| guessing | is the &#039;guessing&#039; mode active?    | boolean    | NO   | PRI | 0                   |       |
+| guessing | is the 'guessing' mode active?    | boolean    | NO   | PRI | 0                   |       |
 | oembed   | is the data the result of oembed? | boolean    | NO   | PRI | 0                   |       |
 | url      | page url                          | text       | NO   |     | NULL                |       |
 | content  | page data                         | mediumtext | YES  |     | NULL                |       |
diff --git a/doc/database/db_permissionset.md b/doc/database/db_permissionset.md
index 107cedea18..38c6fe8f31 100644
--- a/doc/database/db_permissionset.md
+++ b/doc/database/db_permissionset.md
@@ -10,7 +10,7 @@ Fields
 | --------- | ------------------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |
 | id        | sequential ID                                          | int unsigned       | NO   | PRI | NULL    | auto_increment |
 | uid       | Owner id of this permission set                        | mediumint unsigned | NO   |     | 0       |                |
-| allow_cid | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES  |     | NULL    |                |
+| allow_cid | Access Control - list of allowed contact.id '<19><78>' | mediumtext         | YES  |     | NULL    |                |
 | allow_gid | Access Control - list of allowed groups                | mediumtext         | YES  |     | NULL    |                |
 | deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL    |                |
 | deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL    |                |
diff --git a/doc/database/db_photo.md b/doc/database/db_photo.md
index aad26bdbeb..b641ae4596 100644
--- a/doc/database/db_photo.md
+++ b/doc/database/db_photo.md
@@ -27,7 +27,7 @@ Fields
 | data          |                                                        | mediumblob         | NO   |     | NULL                |                |
 | scale         |                                                        | tinyint unsigned   | NO   |     | 0                   |                |
 | profile       |                                                        | boolean            | NO   |     | 0                   |                |
-| allow_cid     | Access Control - list of allowed contact.id &#039;&lt;19&gt;&lt;78&gt;&#039; | mediumtext         | YES  |     | NULL                |                |
+| allow_cid     | Access Control - list of allowed contact.id '<19><78>' | mediumtext         | YES  |     | NULL                |                |
 | allow_gid     | Access Control - list of allowed groups                | mediumtext         | YES  |     | NULL                |                |
 | deny_cid      | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL                |                |
 | deny_gid      | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL                |                |
diff --git a/view/templates/structure.tpl b/view/templates/structure.tpl
index 954712f12a..f6a647b791 100644
--- a/view/templates/structure.tpl
+++ b/view/templates/structure.tpl
@@ -1,20 +1,20 @@
-Table {{$name}}
+Table {{$name nofilter}}
 ===========
 
-{{$comment}}
+{{$comment nofilter}}
 
 Fields
 ------
 
 {{foreach $fields as $field}}
-| {{$field.name}} | {{$field.comment}} | {{$field.type}} | {{$field.null}} | {{$field.primary}} | {{$field.default}} | {{$field.extra}} |
+| {{$field.name nofilter}} | {{$field.comment nofilter}} | {{$field.type nofilter}} | {{$field.null nofilter}} | {{$field.primary nofilter}} | {{$field.default nofilter}} | {{$field.extra nofilter}} |
 {{/foreach}}
 
 Indexes
 ------------
 
 {{foreach $indexes as $index}}
-| {{$index.name}} | {{$index.fields}} |
+| {{$index.name nofilter}} | {{$index.fields nofilter}} |
 {{/foreach}}
 
 {{if $foreign}}
@@ -24,7 +24,7 @@ Foreign Keys
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
 {{foreach $foreign as $key}}
-| {{$key.field}} | [{{$key.targettable}}](help/database/db_{{$key.targettable}}) | {{$key.targetfield}} |
+| {{$key.field nofilter}} | [{{$key.targettable nofilter}}](help/database/db_{{$key.targettable nofilter}}) | {{$key.targetfield nofilter}} |
 {{/foreach}}
 {{/if}}
 
diff --git a/view/templates/tables.tpl b/view/templates/tables.tpl
index 8fdd12a37b..2bf38c9f10 100644
--- a/view/templates/tables.tpl
+++ b/view/templates/tables.tpl
@@ -6,5 +6,5 @@ Database Tables
 | Table | Description |
 |-------|-------------|
 {{foreach $tables as $table}}
-| [{{$table.name}}](help/database/db_{{$table.name}}) | {{$table.comment}} |
+| [{{$table.name nofilter}}](help/database/db_{{$table.name nofilter}}) | {{$table.comment nofilter}} |
 {{/foreach}}

From d348e4afca7bac43bd1d21c9c1ced0622429afbe Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 14 Jun 2021 18:34:11 +0000
Subject: [PATCH 14/14] Possibly fixes notice "Undefined index: private in
 .../src/Model/Item.php on line 3115"

---
 src/Model/Event.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Model/Event.php b/src/Model/Event.php
index c59baba9cb..81e33013fb 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -586,10 +586,10 @@ class Event
 		$last_date = '';
 		$fmt = DI::l10n()->t('l, F j');
 		foreach ($event_result as $event) {
-			$item = Post::selectFirst(['plink', 'author-name', 'author-avatar', 'author-link'], ['id' => $event['itemid']]);
+			$item = Post::selectFirst(['plink', 'author-name', 'author-avatar', 'author-link', 'private'], ['id' => $event['itemid']]);
 			if (!DBA::isResult($item)) {
 				// Using default values when no item had been found
-				$item = ['plink' => '', 'author-name' => '', 'author-avatar' => '', 'author-link' => ''];
+				$item = ['plink' => '', 'author-name' => '', 'author-avatar' => '', 'author-link' => '', 'private' => Item::PUBLIC];
 			}
 
 			$event = array_merge($event, $item);