Merge branch '9.2RC'master

541 files changed, 236 insertions, 278 deletions

diff --git a/doc/context/de/apps/edit/help.html b/doc/context/de/apps/edit/help.html
deleted file mode 100644
index 5381aeea6..000000000
--- a/doc/context/de/apps/edit/help.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<dl class="dl-horizontal">
-  <dt>Allgemein</dt>
-  <dd>Ändere oder lösche deine Apps mit Hilfe der Steuerknöpfe neben jedem App-Icon in der Liste.</dd>
-</dl>
\ No newline at end of file
diff --git a/doc/context/de/apps/help.html b/doc/context/de/apps/help.html
deleted file mode 100644
index b63352324..000000000
--- a/doc/context/de/apps/help.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<dl class="dl-horizontal">
-  <dt>Allgemein</dt>
-  <dd>Diese Seite listet alle verfügbaren Apps für Deinen Kanal. Sie enthält die Core Apps wie auch die von Addons. Wenn eine App im <a href='#' onclick='contextualHelpFocus("#app-menu", 1); return false;' title="Klicke zum Öffnen...">App Menü</a> erscheinen soll, dann markiere die App in der Liste mit dem Stern.</dd>
-  <dt>Apps verwalten</dt>
-  <dd>Der Knopf "Apps verwalten" öffnet eine Seite, mit der Du den Namen, die Kategorie und andere Eigenschaften deiner Apps ändern kannst.</dd>
-</dl>
\ No newline at end of file
diff --git a/doc/context/en/apps/edit/help.html b/doc/context/en/apps/edit/help.html
deleted file mode 100644
index 1d378f962..000000000
--- a/doc/context/en/apps/edit/help.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<dl class="dl-horizontal">
-  <dt>General</dt>
-  <dd>Edit or delete your apps using the control buttons beside each app icon in the list.</dd>
-</dl>
\ No newline at end of file
diff --git a/doc/context/en/apps/help.html b/doc/context/en/apps/help.html
deleted file mode 100644
index ad6daade5..000000000
--- a/doc/context/en/apps/help.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<dl class="dl-horizontal">
-  <dt>General</dt>
-  <dd>This page shows you what apps are available to your channel, including both core apps and those supplied by addons. To add an app to the <a href='#' onclick='contextualHelpFocus("#app-menu", 1); return false;' title="Click to open...">app menu</a> "star" the app in the list below.</dd>
-  <dt>Manage Apps</dt>
-  <dd>Press the "Manage Apps" button to open a page where you can edit the name, categories, and other properties of your apps.</dd>
-</dl>
\ No newline at end of file
diff --git a/doc/context/es-es/apps/edit/help.html b/doc/context/es-es/apps/edit/help.html
deleted file mode 100644
index 28e92328e..000000000
--- a/doc/context/es-es/apps/edit/help.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<dl class="dl-horizontal">
-  <dt>General</dt>
-  <dd>Modificar o eliminar sus "apps" usando el botón de control que está junto al icono de cada aplicación de la lista.</dd>
-</dl>
\ No newline at end of file
diff --git a/doc/context/es-es/apps/help.html b/doc/context/es-es/apps/help.html
deleted file mode 100644
index a6bfd0093..000000000
--- a/doc/context/es-es/apps/help.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<dl class="dl-horizontal">
-  <dt>General</dt>
-  <dd>Esta página le muestra qué aplicaciones están disponibles para su canal, incluyendo tanto las aplicaciones principales como las proporcionadas por addons. Para añadir una aplicación al <a href=' #' onclick=' contextualHelpFocus ("#app-menu", 1); devuelve false;' title="Pulsar para abrir...">menú de aplicaciones</a> "estrelle" la aplicación de la siguiente lista.</dd>
-  <dt>Gestionar las aplicaciones (apps)</dt>
-  <dd>Pulse el botón "Gestionar aplicaciones" para abrir una página en la podrá editar el nombre, las categorías y otras propiedades de sus aplicaciones.</dd>
-</dl>
diff --git a/doc/context/fr/apps/edit/index.html b/doc/context/fr/apps/edit/index.html
deleted file mode 100644
index 93fd8dec6..000000000
--- a/doc/context/fr/apps/edit/index.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<dl class="dl-horizontal">
-  <dt>Informations de base</dt>
-  <dd>Modifiez ou supprimez vos applications à l'aide des boutons de contrôle situés à côté de chaque icône d'application dans la liste.</dd>
-</dl>
diff --git a/doc/context/fr/apps/help.html b/doc/context/fr/apps/help.html
deleted file mode 100644
index 65eb63d84..000000000
--- a/doc/context/fr/apps/help.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<dl class="dl-horizontal">
-  <dt>Informations de base</dt>
-  <dd>Cette page vous montre quelles applications sont disponibles pour votre canal, y compris les applications centrales et celles fournies par les greffons. Pour ajouter une application au <a href='#' onclick='contextualHelpFocus("#app-menu", 1); return false;' title="Cliquez pour ouvrir...">menu de l'application</a>, cliquez sur le bouton étoile l'application dans la liste ci-dessous.</dd>
-  <dt>Gérer les applications</dt>
-  <dd>Appuyez sur le bouton &laquo;Gérer les applications&raquo; pour ouvrir une page où vous pouvez éditer le nom, les catégories et autres propriétés de vos applications.
-  </dd>
-</dl>
diff --git a/doc/context/pl/apps/edit/help.html b/doc/context/pl/apps/edit/help.html
deleted file mode 100644
index 42db07d17..000000000
--- a/doc/context/pl/apps/edit/help.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<dl class="dl-horizontal">
-  <dt>Ogólne</dt>
-  <dd>
-  Edytowanie lub usuwanie aplikacje za pomocą przycisków sterowania widocznych
-  na liście obok każdej ikony aplikacji.
-  </dd>
-</dl>
\ No newline at end of file
diff --git a/doc/context/pl/apps/help.html b/doc/context/pl/apps/help.html
deleted file mode 100644
index 7ad3bef5c..000000000
--- a/doc/context/pl/apps/help.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<dl class="dl-horizontal">
-  <dt>Ogólne</dt>
-  <dd>
-  Ta strona pokazuje, jakie aplikacje są dostępne na Twoim kanale, w tym zarówno
-  aplikacje podstawowe, jak i te dostarczane przez dodatki. Aby dodać aplikację
-  do <a href = '#' onclick = 'contextualHelpFocus("# app-menu",1); return false;'
-  title = "Kliknij, aby otworzyć ...">menu aplikacji</a> oznacz gwiazdką
-  aplikację na poniższej liście.
-  </dd>
-  <dt>Zarządzanie aplikacjami</dt>
-  <dd>
-  Naciśnij przycisk "Zarządzaj aplikacjami", aby otworzyć stronę, na której
-  możesz edytować nazwę, kategorie i inne właściwości swoich aplikacji.
-  </dd>
-</dl>
\ No newline at end of file
diff --git a/doc/AdvancedSearch.md b/doc/en/AdvancedSearch.md
index a67c1fc1f..a67c1fc1f 100644
--- a/doc/AdvancedSearch.md
+++ b/doc/en/AdvancedSearch.md
diff --git a/doc/Comparison-of-activity-stream-networks.md b/doc/en/Comparison-of-activity-stream-networks.md
index d76ae1006..d76ae1006 100644
--- a/doc/Comparison-of-activity-stream-networks.md
+++ b/doc/en/Comparison-of-activity-stream-networks.md
diff --git a/doc/Creating-Templates.md b/doc/en/Creating-Templates.md
index fc3f18dd3..fc3f18dd3 100644
--- a/doc/Creating-Templates.md
+++ b/doc/en/Creating-Templates.md
diff --git a/doc/DerivedTheme1.md b/doc/en/DerivedTheme1.md
index b120c628c..b120c628c 100644
--- a/doc/DerivedTheme1.md
+++ b/doc/en/DerivedTheme1.md
diff --git a/doc/Developers.md b/doc/en/Developers.md
index 624c058d2..624c058d2 100644
--- a/doc/Developers.md
+++ b/doc/en/Developers.md
diff --git a/doc/Features.md b/doc/en/Features.md
index a43fd73fa..a43fd73fa 100644
--- a/doc/Features.md
+++ b/doc/en/Features.md
diff --git a/doc/Hubzilla_on_OpenShift.bb b/doc/en/Hubzilla_on_OpenShift.bb
index 7bdd70955..7bdd70955 100644
--- a/doc/Hubzilla_on_OpenShift.bb
+++ b/doc/en/Hubzilla_on_OpenShift.bb
diff --git a/doc/Plugins.md b/doc/en/Plugins.md
index 88b42185b..88b42185b 100644
--- a/doc/Plugins.md
+++ b/doc/en/Plugins.md
diff --git a/doc/Primary-Directory.md b/doc/en/Primary-Directory.md
index 92460c346..92460c346 100644
--- a/doc/Primary-Directory.md
+++ b/doc/en/Primary-Directory.md
diff --git a/doc/Remove-Account.md b/doc/en/Remove-Account.md
index a8ef733a6..a8ef733a6 100644
--- a/doc/Remove-Account.md
+++ b/doc/en/Remove-Account.md
diff --git a/doc/Schema-development.md b/doc/en/Schema-development.md
index e811bb8c3..e811bb8c3 100644
--- a/doc/Schema-development.md
+++ b/doc/en/Schema-development.md
diff --git a/doc/TermsOfService.md b/doc/en/TermsOfService.md
index 1e085559e..1e085559e 100644
--- a/doc/TermsOfService.md
+++ b/doc/en/TermsOfService.md
diff --git a/doc/Translations.md b/doc/en/Translations.md
index 6106e43b1..6106e43b1 100644
--- a/doc/Translations.md
+++ b/doc/en/Translations.md
diff --git a/doc/Widgets.md b/doc/en/Widgets.md
index 6779d7ffd..6779d7ffd 100644
--- a/doc/Widgets.md
+++ b/doc/en/Widgets.md
diff --git a/doc/Zot---A-High-Level-Overview.md b/doc/en/Zot---A-High-Level-Overview.md
index 990ea037b..990ea037b 100644
--- a/doc/Zot---A-High-Level-Overview.md
+++ b/doc/en/Zot---A-High-Level-Overview.md
diff --git a/doc/about/about.bb b/doc/en/about/about.bb
index e909f54cd..e909f54cd 100644
--- a/doc/about/about.bb
+++ b/doc/en/about/about.bb
diff --git a/doc/about/about_hub.bb b/doc/en/about/about_hub.bb
index 0c1082f51..0c1082f51 100644
--- a/doc/about/about_hub.bb
+++ b/doc/en/about/about_hub.bb
diff --git a/doc/about/project.bb b/doc/en/about/project.bb
index fe90b4d36..fe90b4d36 100644
--- a/doc/about/project.bb
+++ b/doc/en/about/project.bb
diff --git a/doc/accounts_profiles_channels_basics.bb b/doc/en/accounts_profiles_channels_basics.bb
index 63b13f036..63b13f036 100644
--- a/doc/accounts_profiles_channels_basics.bb
+++ b/doc/en/accounts_profiles_channels_basics.bb
diff --git a/doc/acl_dialog_post.html b/doc/en/acl_dialog_post.html
index 80b2c68b6..80b2c68b6 100644
--- a/doc/acl_dialog_post.html
+++ b/doc/en/acl_dialog_post.html
diff --git a/doc/addons.bb b/doc/en/addons.bb
index 4bfa7a9fd..4bfa7a9fd 100644
--- a/doc/addons.bb
+++ b/doc/en/addons.bb
diff --git a/doc/addons_gnusocial.bb b/doc/en/addons_gnusocial.bb
index fbb387476..fbb387476 100644
--- a/doc/addons_gnusocial.bb
+++ b/doc/en/addons_gnusocial.bb
diff --git a/doc/admin/administrator_guide.md b/doc/en/admin/administrator_guide.md
index bf4dc7355..bf4dc7355 100644
--- a/doc/admin/administrator_guide.md
+++ b/doc/en/admin/administrator_guide.md
diff --git a/doc/admin/hub_snapshots.md b/doc/en/admin/hub_snapshots.md
index ab0948aa8..ab0948aa8 100644
--- a/doc/admin/hub_snapshots.md
+++ b/doc/en/admin/hub_snapshots.md
diff --git a/doc/admin/zarlog_msgs.md b/doc/en/admin/zarlog_msgs.md
index 0fe16a1e2..0fe16a1e2 100644
--- a/doc/admin/zarlog_msgs.md
+++ b/doc/en/admin/zarlog_msgs.md
diff --git a/doc/admins.bb b/doc/en/admins.bb
index 6c78ce999..6c78ce999 100644
--- a/doc/admins.bb
+++ b/doc/en/admins.bb
diff --git a/doc/api/api_albums.md b/doc/en/api/api_albums.md
index 230daae3c..230daae3c 100644
--- a/doc/api/api_albums.md
+++ b/doc/en/api/api_albums.md
diff --git a/doc/api/api_filedata.md b/doc/en/api/api_filedata.md
index 1d46a495c..1d46a495c 100644
--- a/doc/api/api_filedata.md
+++ b/doc/en/api/api_filedata.md
diff --git a/doc/api/api_files.md b/doc/en/api/api_files.md
index c2a10fce5..c2a10fce5 100644
--- a/doc/api/api_files.md
+++ b/doc/en/api/api_files.md
diff --git a/doc/api/api_functions.bb b/doc/en/api/api_functions.bb
index fe7cb11ba..fe7cb11ba 100644
--- a/doc/api/api_functions.bb
+++ b/doc/en/api/api_functions.bb
diff --git a/doc/api/api_group_members.md b/doc/en/api/api_group_members.md
index 497e0aac6..497e0aac6 100644
--- a/doc/api/api_group_members.md
+++ b/doc/en/api/api_group_members.md
diff --git a/doc/api/api_item_update.md b/doc/en/api/api_item_update.md
index cf1a28044..cf1a28044 100644
--- a/doc/api/api_item_update.md
+++ b/doc/en/api/api_item_update.md
diff --git a/doc/api/api_posting.bb b/doc/en/api/api_posting.bb
index c708ad143..c708ad143 100644
--- a/doc/api/api_posting.bb
+++ b/doc/en/api/api_posting.bb
diff --git a/doc/api/api_xchan.md b/doc/en/api/api_xchan.md
index d2b15e04c..d2b15e04c 100644
--- a/doc/api/api_xchan.md
+++ b/doc/en/api/api_xchan.md
diff --git a/doc/api/group.md b/doc/en/api/group.md
index 8829ff416..8829ff416 100644
--- a/doc/api/group.md
+++ b/doc/en/api/group.md
diff --git a/doc/api/statuses_update.bb b/doc/en/api/statuses_update.bb
index acad440de..acad440de 100644
--- a/doc/api/statuses_update.bb
+++ b/doc/en/api/statuses_update.bb
diff --git a/doc/bugs.bb b/doc/en/bugs.bb
index 3bf2a0e29..3bf2a0e29 100644
--- a/doc/bugs.bb
+++ b/doc/en/bugs.bb
diff --git a/doc/campaign.bb b/doc/en/campaign.bb
index dddc614f9..dddc614f9 100644
--- a/doc/campaign.bb
+++ b/doc/en/campaign.bb
diff --git a/doc/checking_account_quota_usage.bb b/doc/en/checking_account_quota_usage.bb
index 7612d03d8..7612d03d8 100644
--- a/doc/checking_account_quota_usage.bb
+++ b/doc/en/checking_account_quota_usage.bb
diff --git a/doc/comanche.bb b/doc/en/comanche.bb
index faf7e695e..faf7e695e 100644
--- a/doc/comanche.bb
+++ b/doc/en/comanche.bb
diff --git a/doc/context/de/admin/logs/help.html b/doc/en/context/de/admin/logs/help.html
index 1441d9075..1441d9075 100644
--- a/doc/context/de/admin/logs/help.html
+++ b/doc/en/context/de/admin/logs/help.html
diff --git a/doc/context/de/admin/queue/help.html b/doc/en/context/de/admin/queue/help.html
index e59fdcaee..e59fdcaee 100644
--- a/doc/context/de/admin/queue/help.html
+++ b/doc/en/context/de/admin/queue/help.html
diff --git a/doc/context/de/admin/security/help.html b/doc/en/context/de/admin/security/help.html
index 6465e8f0e..6465e8f0e 100644
--- a/doc/context/de/admin/security/help.html
+++ b/doc/en/context/de/admin/security/help.html
diff --git a/doc/context/de/appman/help.html b/doc/en/context/de/appman/help.html
index 888ee6206..888ee6206 100644
--- a/doc/context/de/appman/help.html
+++ b/doc/en/context/de/appman/help.html
diff --git a/doc/context/de/channel/help.html b/doc/en/context/de/channel/help.html
index fbfcac3c1..fbfcac3c1 100644
--- a/doc/context/de/channel/help.html
+++ b/doc/en/context/de/channel/help.html
diff --git a/doc/context/de/chat/help.html b/doc/en/context/de/chat/help.html
index ba355365f..ba355365f 100644
--- a/doc/context/de/chat/help.html
+++ b/doc/en/context/de/chat/help.html
diff --git a/doc/context/de/cloud/help.html b/doc/en/context/de/cloud/help.html
index e72ad1743..e72ad1743 100644
--- a/doc/context/de/cloud/help.html
+++ b/doc/en/context/de/cloud/help.html
diff --git a/doc/context/de/connections/help.html b/doc/en/context/de/connections/help.html
index 61789ea38..61789ea38 100644
--- a/doc/context/de/connections/help.html
+++ b/doc/en/context/de/connections/help.html
diff --git a/doc/context/de/connections/ifpending/help.html b/doc/en/context/de/connections/ifpending/help.html
index 3e55b34c3..3e55b34c3 100644
--- a/doc/context/de/connections/ifpending/help.html
+++ b/doc/en/context/de/connections/ifpending/help.html
diff --git a/doc/context/de/events/help.html b/doc/en/context/de/events/help.html
index b0dc95b3e..b0dc95b3e 100644
--- a/doc/context/de/events/help.html
+++ b/doc/en/context/de/events/help.html
diff --git a/doc/context/de/mail/help.html b/doc/en/context/de/mail/help.html
index b89135d8c..b89135d8c 100644
--- a/doc/context/de/mail/help.html
+++ b/doc/en/context/de/mail/help.html
diff --git a/doc/context/de/network/help.html b/doc/en/context/de/network/help.html
index 6590f597d..6590f597d 100644
--- a/doc/context/de/network/help.html
+++ b/doc/en/context/de/network/help.html
diff --git a/doc/context/de/photos/help.html b/doc/en/context/de/photos/help.html
index 437d2c369..437d2c369 100644
--- a/doc/context/de/photos/help.html
+++ b/doc/en/context/de/photos/help.html
diff --git a/doc/context/de/profile/help.html b/doc/en/context/de/profile/help.html
index ece33457d..ece33457d 100644
--- a/doc/context/de/profile/help.html
+++ b/doc/en/context/de/profile/help.html
diff --git a/doc/context/de/register/help.html b/doc/en/context/de/register/help.html
index 9ee062ee8..9ee062ee8 100644
--- a/doc/context/de/register/help.html
+++ b/doc/en/context/de/register/help.html
diff --git a/doc/context/de/settings/account/help.html b/doc/en/context/de/settings/account/help.html
index 03fc0cc14..03fc0cc14 100644
--- a/doc/context/de/settings/account/help.html
+++ b/doc/en/context/de/settings/account/help.html
diff --git a/doc/context/de/settings/channel/help.html b/doc/en/context/de/settings/channel/help.html
index 98a388f77..98a388f77 100644
--- a/doc/context/de/settings/channel/help.html
+++ b/doc/en/context/de/settings/channel/help.html
diff --git a/doc/context/de/settings/features/help.html b/doc/en/context/de/settings/features/help.html
index a019d2d60..a019d2d60 100644
--- a/doc/context/de/settings/features/help.html
+++ b/doc/en/context/de/settings/features/help.html
diff --git a/doc/context/de/settings/tokens/help.html b/doc/en/context/de/settings/tokens/help.html
index 4a7776109..4a7776109 100644
--- a/doc/context/de/settings/tokens/help.html
+++ b/doc/en/context/de/settings/tokens/help.html
diff --git a/doc/context/de/wiki/help.html b/doc/en/context/de/wiki/help.html
index e203ee221..e203ee221 100644
--- a/doc/context/de/wiki/help.html
+++ b/doc/en/context/de/wiki/help.html
diff --git a/doc/context/en/admin/addons/assets/addon_repo_gui_1.png b/doc/en/context/en/admin/addons/assets/addon_repo_gui_1.png
index 37139b345..37139b345 100644
--- a/doc/context/en/admin/addons/assets/addon_repo_gui_1.png
+++ b/doc/en/context/en/admin/addons/assets/addon_repo_gui_1.png
diff --git a/doc/context/en/admin/addons/help.html b/doc/en/context/en/admin/addons/help.html
index bfb5e416a..bfb5e416a 100644
--- a/doc/context/en/admin/addons/help.html
+++ b/doc/en/context/en/admin/addons/help.html
diff --git a/doc/context/en/admin/logs/help.html b/doc/en/context/en/admin/logs/help.html
index 708ec9bde..708ec9bde 100644
--- a/doc/context/en/admin/logs/help.html
+++ b/doc/en/context/en/admin/logs/help.html
diff --git a/doc/context/en/admin/queue/help.html b/doc/en/context/en/admin/queue/help.html
index 28885a154..28885a154 100644
--- a/doc/context/en/admin/queue/help.html
+++ b/doc/en/context/en/admin/queue/help.html
diff --git a/doc/context/en/admin/security/help.html b/doc/en/context/en/admin/security/help.html
index bfe81b132..bfe81b132 100644
--- a/doc/context/en/admin/security/help.html
+++ b/doc/en/context/en/admin/security/help.html
diff --git a/doc/context/en/appman/help.html b/doc/en/context/en/appman/help.html
index 27cb03624..27cb03624 100644
--- a/doc/context/en/appman/help.html
+++ b/doc/en/context/en/appman/help.html
diff --git a/doc/context/en/cards/help.html b/doc/en/context/en/cards/help.html
index 9dbed3f97..9dbed3f97 100644
--- a/doc/context/en/cards/help.html
+++ b/doc/en/context/en/cards/help.html
diff --git a/doc/context/en/channel/help.html b/doc/en/context/en/channel/help.html
index 0c5b99754..0c5b99754 100644
--- a/doc/context/en/channel/help.html
+++ b/doc/en/context/en/channel/help.html
diff --git a/doc/context/en/chat/help.html b/doc/en/context/en/chat/help.html
index cc71686d8..cc71686d8 100644
--- a/doc/context/en/chat/help.html
+++ b/doc/en/context/en/chat/help.html
diff --git a/doc/context/en/cloud/help.html b/doc/en/context/en/cloud/help.html
index a8f193223..a8f193223 100644
--- a/doc/context/en/cloud/help.html
+++ b/doc/en/context/en/cloud/help.html
diff --git a/doc/context/en/connections/help.html b/doc/en/context/en/connections/help.html
index 0f95fde63..0f95fde63 100644
--- a/doc/context/en/connections/help.html
+++ b/doc/en/context/en/connections/help.html
diff --git a/doc/context/en/connections/ifpending/help.html b/doc/en/context/en/connections/ifpending/help.html
index 0f95fde63..0f95fde63 100644
--- a/doc/context/en/connections/ifpending/help.html
+++ b/doc/en/context/en/connections/ifpending/help.html
diff --git a/doc/context/en/connedit/help.html b/doc/en/context/en/connedit/help.html
index 9eb62ecc7..9eb62ecc7 100644
--- a/doc/context/en/connedit/help.html
+++ b/doc/en/context/en/connedit/help.html
diff --git a/doc/context/en/events/help.html b/doc/en/context/en/events/help.html
index 8c0b1d4ab..8c0b1d4ab 100644
--- a/doc/context/en/events/help.html
+++ b/doc/en/context/en/events/help.html
diff --git a/doc/context/en/mail/help.html b/doc/en/context/en/mail/help.html
index a2361a135..a2361a135 100644
--- a/doc/context/en/mail/help.html
+++ b/doc/en/context/en/mail/help.html
diff --git a/doc/context/en/network/help.html b/doc/en/context/en/network/help.html
index 53e993b69..53e993b69 100644
--- a/doc/context/en/network/help.html
+++ b/doc/en/context/en/network/help.html
diff --git a/doc/context/en/photos/help.html b/doc/en/context/en/photos/help.html
index 78b442bb4..78b442bb4 100644
--- a/doc/context/en/photos/help.html
+++ b/doc/en/context/en/photos/help.html
diff --git a/doc/context/en/profile/help.html b/doc/en/context/en/profile/help.html
index 563e0df99..563e0df99 100644
--- a/doc/context/en/profile/help.html
+++ b/doc/en/context/en/profile/help.html
diff --git a/doc/context/en/profiles/help.html b/doc/en/context/en/profiles/help.html
index 41f00fe64..41f00fe64 100644
--- a/doc/context/en/profiles/help.html
+++ b/doc/en/context/en/profiles/help.html
diff --git a/doc/context/en/register/help.html b/doc/en/context/en/register/help.html
index 9e94ab762..9e94ab762 100644
--- a/doc/context/en/register/help.html
+++ b/doc/en/context/en/register/help.html
diff --git a/doc/context/en/settings/account/help.html b/doc/en/context/en/settings/account/help.html
index 41f00fe64..41f00fe64 100644
--- a/doc/context/en/settings/account/help.html
+++ b/doc/en/context/en/settings/account/help.html
diff --git a/doc/context/en/settings/channel/help.html b/doc/en/context/en/settings/channel/help.html
index 41f00fe64..41f00fe64 100644
--- a/doc/context/en/settings/channel/help.html
+++ b/doc/en/context/en/settings/channel/help.html
diff --git a/doc/context/en/settings/features/help.html b/doc/en/context/en/settings/features/help.html
index 86e4f5dae..86e4f5dae 100644
--- a/doc/context/en/settings/features/help.html
+++ b/doc/en/context/en/settings/features/help.html
diff --git a/doc/context/en/settings/tokens/help.html b/doc/en/context/en/settings/tokens/help.html
index 6d7e6b98d..6d7e6b98d 100644
--- a/doc/context/en/settings/tokens/help.html
+++ b/doc/en/context/en/settings/tokens/help.html
diff --git a/doc/context/en/webpages/help.html b/doc/en/context/en/webpages/help.html
index a4817e4bf..a4817e4bf 100644
--- a/doc/context/en/webpages/help.html
+++ b/doc/en/context/en/webpages/help.html
diff --git a/doc/context/en/wiki/help.html b/doc/en/context/en/wiki/help.html
index 5dee85375..5dee85375 100644
--- a/doc/context/en/wiki/help.html
+++ b/doc/en/context/en/wiki/help.html
diff --git a/doc/context/es b/doc/en/context/es
index c8ba7666b..c8ba7666b 120000
--- a/doc/context/es
+++ b/doc/en/context/es
diff --git a/doc/context/es-es/admin/addons/assets/addon_repo_gui_1.png b/doc/en/context/es-es/admin/addons/assets/addon_repo_gui_1.png
index 37139b345..37139b345 100644
--- a/doc/context/es-es/admin/addons/assets/addon_repo_gui_1.png
+++ b/doc/en/context/es-es/admin/addons/assets/addon_repo_gui_1.png
diff --git a/doc/context/es-es/admin/addons/help.html b/doc/en/context/es-es/admin/addons/help.html
index 49a047f5e..49a047f5e 100644
--- a/doc/context/es-es/admin/addons/help.html
+++ b/doc/en/context/es-es/admin/addons/help.html
diff --git a/doc/context/es-es/admin/logs/help.html b/doc/en/context/es-es/admin/logs/help.html
index 3a2ec413d..3a2ec413d 100644
--- a/doc/context/es-es/admin/logs/help.html
+++ b/doc/en/context/es-es/admin/logs/help.html
diff --git a/doc/context/es-es/admin/queue/help.html b/doc/en/context/es-es/admin/queue/help.html
index de9e6cdbb..de9e6cdbb 100644
--- a/doc/context/es-es/admin/queue/help.html
+++ b/doc/en/context/es-es/admin/queue/help.html
diff --git a/doc/context/es-es/admin/security/help.html b/doc/en/context/es-es/admin/security/help.html
index 229a91561..229a91561 100644
--- a/doc/context/es-es/admin/security/help.html
+++ b/doc/en/context/es-es/admin/security/help.html
diff --git a/doc/context/es-es/appman/help.html b/doc/en/context/es-es/appman/help.html
index 1b799a52b..1b799a52b 100644
--- a/doc/context/es-es/appman/help.html
+++ b/doc/en/context/es-es/appman/help.html
diff --git a/doc/context/es-es/articles/help.html b/doc/en/context/es-es/articles/help.html
index 0bf176fdd..0bf176fdd 100644
--- a/doc/context/es-es/articles/help.html
+++ b/doc/en/context/es-es/articles/help.html
diff --git a/doc/context/es-es/cards/help.html b/doc/en/context/es-es/cards/help.html
index 34889cd25..34889cd25 100644
--- a/doc/context/es-es/cards/help.html
+++ b/doc/en/context/es-es/cards/help.html
diff --git a/doc/context/es-es/channel/help.html b/doc/en/context/es-es/channel/help.html
index 682125e27..682125e27 100644
--- a/doc/context/es-es/channel/help.html
+++ b/doc/en/context/es-es/channel/help.html
diff --git a/doc/context/es-es/chat/help.html b/doc/en/context/es-es/chat/help.html
index 94df6a1d2..94df6a1d2 100644
--- a/doc/context/es-es/chat/help.html
+++ b/doc/en/context/es-es/chat/help.html
diff --git a/doc/context/es-es/cloud/help.html b/doc/en/context/es-es/cloud/help.html
index af891da17..af891da17 100644
--- a/doc/context/es-es/cloud/help.html
+++ b/doc/en/context/es-es/cloud/help.html
diff --git a/doc/context/es-es/connections/help.html b/doc/en/context/es-es/connections/help.html
index a0aa9cf32..a0aa9cf32 100644
--- a/doc/context/es-es/connections/help.html
+++ b/doc/en/context/es-es/connections/help.html
diff --git a/doc/context/es-es/connections/ifpending/help.html b/doc/en/context/es-es/connections/ifpending/help.html
index 84e547851..84e547851 100644
--- a/doc/context/es-es/connections/ifpending/help.html
+++ b/doc/en/context/es-es/connections/ifpending/help.html
diff --git a/doc/context/es-es/connedit/help.html b/doc/en/context/es-es/connedit/help.html
index e8c92ca28..e8c92ca28 100644
--- a/doc/context/es-es/connedit/help.html
+++ b/doc/en/context/es-es/connedit/help.html
diff --git a/doc/context/es-es/events/help.html b/doc/en/context/es-es/events/help.html
index b0ac1f9ea..b0ac1f9ea 100644
--- a/doc/context/es-es/events/help.html
+++ b/doc/en/context/es-es/events/help.html
diff --git a/doc/context/es-es/mail/help.html b/doc/en/context/es-es/mail/help.html
index 794af38a9..794af38a9 100644
--- a/doc/context/es-es/mail/help.html
+++ b/doc/en/context/es-es/mail/help.html
diff --git a/doc/context/es-es/network/help.html b/doc/en/context/es-es/network/help.html
index 082f52a49..082f52a49 100644
--- a/doc/context/es-es/network/help.html
+++ b/doc/en/context/es-es/network/help.html
diff --git a/doc/context/es-es/photos/help.html b/doc/en/context/es-es/photos/help.html
index 6623456eb..6623456eb 100644
--- a/doc/context/es-es/photos/help.html
+++ b/doc/en/context/es-es/photos/help.html
diff --git a/doc/context/es-es/profile/help.html b/doc/en/context/es-es/profile/help.html
index 28ff22499..28ff22499 100644
--- a/doc/context/es-es/profile/help.html
+++ b/doc/en/context/es-es/profile/help.html
diff --git a/doc/context/es-es/profiles/help.html b/doc/en/context/es-es/profiles/help.html
index 9303e049c..9303e049c 100644
--- a/doc/context/es-es/profiles/help.html
+++ b/doc/en/context/es-es/profiles/help.html
diff --git a/doc/context/es-es/settings/account/help.html b/doc/en/context/es-es/settings/account/help.html
index 9303e049c..9303e049c 100644
--- a/doc/context/es-es/settings/account/help.html
+++ b/doc/en/context/es-es/settings/account/help.html
diff --git a/doc/context/es-es/settings/channel/help.html b/doc/en/context/es-es/settings/channel/help.html
index 9303e049c..9303e049c 100644
--- a/doc/context/es-es/settings/channel/help.html
+++ b/doc/en/context/es-es/settings/channel/help.html
diff --git a/doc/context/es-es/settings/features/help.html b/doc/en/context/es-es/settings/features/help.html
index a9c3c2d6c..a9c3c2d6c 100644
--- a/doc/context/es-es/settings/features/help.html
+++ b/doc/en/context/es-es/settings/features/help.html
diff --git a/doc/context/es-es/settings/tokens/help.html b/doc/en/context/es-es/settings/tokens/help.html
index 6d6a8d81f..6d6a8d81f 100644
--- a/doc/context/es-es/settings/tokens/help.html
+++ b/doc/en/context/es-es/settings/tokens/help.html
diff --git a/doc/context/es-es/webpages/help.html b/doc/en/context/es-es/webpages/help.html
index 7cd7f7c11..7cd7f7c11 100644
--- a/doc/context/es-es/webpages/help.html
+++ b/doc/en/context/es-es/webpages/help.html
diff --git a/doc/context/es-es/wiki/help.html b/doc/en/context/es-es/wiki/help.html
index fdae1f095..fdae1f095 100644
--- a/doc/context/es-es/wiki/help.html
+++ b/doc/en/context/es-es/wiki/help.html
diff --git a/doc/context/fr/admin/logs/help.html b/doc/en/context/fr/admin/logs/help.html
index 53f8e65c3..53f8e65c3 100644
--- a/doc/context/fr/admin/logs/help.html
+++ b/doc/en/context/fr/admin/logs/help.html
diff --git a/doc/context/fr/admin/queue/help.html b/doc/en/context/fr/admin/queue/help.html
index 836d81b92..836d81b92 100644
--- a/doc/context/fr/admin/queue/help.html
+++ b/doc/en/context/fr/admin/queue/help.html
diff --git a/doc/context/fr/appman/help.html b/doc/en/context/fr/appman/help.html
index d65f78378..d65f78378 100644
--- a/doc/context/fr/appman/help.html
+++ b/doc/en/context/fr/appman/help.html
diff --git a/doc/context/fr/cards/help.html b/doc/en/context/fr/cards/help.html
index a58a9a73e..a58a9a73e 100644
--- a/doc/context/fr/cards/help.html
+++ b/doc/en/context/fr/cards/help.html
diff --git a/doc/context/fr/channel/help.html b/doc/en/context/fr/channel/help.html
index b2cf958b9..b2cf958b9 100644
--- a/doc/context/fr/channel/help.html
+++ b/doc/en/context/fr/channel/help.html
diff --git a/doc/context/fr/chat/help.html b/doc/en/context/fr/chat/help.html
index 5f354c3c6..5f354c3c6 100644
--- a/doc/context/fr/chat/help.html
+++ b/doc/en/context/fr/chat/help.html
diff --git a/doc/context/fr/cloud/help.html b/doc/en/context/fr/cloud/help.html
index c72e2ca1b..c72e2ca1b 100644
--- a/doc/context/fr/cloud/help.html
+++ b/doc/en/context/fr/cloud/help.html
diff --git a/doc/context/fr/connections/help.html b/doc/en/context/fr/connections/help.html
index 38e581866..38e581866 100644
--- a/doc/context/fr/connections/help.html
+++ b/doc/en/context/fr/connections/help.html
diff --git a/doc/context/fr/connections/ifpending/help.html b/doc/en/context/fr/connections/ifpending/help.html
index 38e581866..38e581866 100644
--- a/doc/context/fr/connections/ifpending/help.html
+++ b/doc/en/context/fr/connections/ifpending/help.html
diff --git a/doc/context/fr/connedit/help.html b/doc/en/context/fr/connedit/help.html
index c9b784d3e..c9b784d3e 100644
--- a/doc/context/fr/connedit/help.html
+++ b/doc/en/context/fr/connedit/help.html
diff --git a/doc/context/fr/events/help.html b/doc/en/context/fr/events/help.html
index aafd49703..aafd49703 100644
--- a/doc/context/fr/events/help.html
+++ b/doc/en/context/fr/events/help.html
diff --git a/doc/context/fr/mail/help.html b/doc/en/context/fr/mail/help.html
index fcf4eff21..fcf4eff21 100644
--- a/doc/context/fr/mail/help.html
+++ b/doc/en/context/fr/mail/help.html
diff --git a/doc/context/fr/photos/help.html b/doc/en/context/fr/photos/help.html
index 8609e9849..8609e9849 100644
--- a/doc/context/fr/photos/help.html
+++ b/doc/en/context/fr/photos/help.html
diff --git a/doc/context/fr/profile/help.html b/doc/en/context/fr/profile/help.html
index 26559db6f..26559db6f 100644
--- a/doc/context/fr/profile/help.html
+++ b/doc/en/context/fr/profile/help.html
diff --git a/doc/context/fr/settings/account/help.html b/doc/en/context/fr/settings/account/help.html
index ed8e7f374..ed8e7f374 100644
--- a/doc/context/fr/settings/account/help.html
+++ b/doc/en/context/fr/settings/account/help.html
diff --git a/doc/context/fr/settings/channel/help.html b/doc/en/context/fr/settings/channel/help.html
index ed8e7f374..ed8e7f374 100644
--- a/doc/context/fr/settings/channel/help.html
+++ b/doc/en/context/fr/settings/channel/help.html
diff --git a/doc/context/fr/settings/features/help.html b/doc/en/context/fr/settings/features/help.html
index 2811c932e..2811c932e 100644
--- a/doc/context/fr/settings/features/help.html
+++ b/doc/en/context/fr/settings/features/help.html
diff --git a/doc/context/fr/settings/tokens b/doc/en/context/fr/settings/tokens
index 6be17a615..6be17a615 100644
--- a/doc/context/fr/settings/tokens
+++ b/doc/en/context/fr/settings/tokens
diff --git a/doc/context/fr/webpages/help.html b/doc/en/context/fr/webpages/help.html
index c9d34c08f..c9d34c08f 100644
--- a/doc/context/fr/webpages/help.html
+++ b/doc/en/context/fr/webpages/help.html
diff --git a/doc/context/fr/wiki/help.html b/doc/en/context/fr/wiki/help.html
index af46899e4..af46899e4 100644
--- a/doc/context/fr/wiki/help.html
+++ b/doc/en/context/fr/wiki/help.html
diff --git a/doc/context/it/wiki/help.html b/doc/en/context/it/wiki/help.html
index e93e18eb4..e93e18eb4 100644
--- a/doc/context/it/wiki/help.html
+++ b/doc/en/context/it/wiki/help.html
diff --git a/doc/context/pl/admin/addons/assets/addon_repo_gui_1.png b/doc/en/context/pl/admin/addons/assets/addon_repo_gui_1.png
index 37139b345..37139b345 100644
--- a/doc/context/pl/admin/addons/assets/addon_repo_gui_1.png
+++ b/doc/en/context/pl/admin/addons/assets/addon_repo_gui_1.png
diff --git a/doc/context/pl/admin/addons/help.html b/doc/en/context/pl/admin/addons/help.html
index fe63718df..fe63718df 100644
--- a/doc/context/pl/admin/addons/help.html
+++ b/doc/en/context/pl/admin/addons/help.html
diff --git a/doc/context/pl/admin/logs/help.html b/doc/en/context/pl/admin/logs/help.html
index 1d79d6a8c..1d79d6a8c 100644
--- a/doc/context/pl/admin/logs/help.html
+++ b/doc/en/context/pl/admin/logs/help.html
diff --git a/doc/context/pl/admin/queue/help.html b/doc/en/context/pl/admin/queue/help.html
index af5c06787..af5c06787 100644
--- a/doc/context/pl/admin/queue/help.html
+++ b/doc/en/context/pl/admin/queue/help.html
diff --git a/doc/context/pl/admin/security/help.html b/doc/en/context/pl/admin/security/help.html
index 0e582e6b4..0e582e6b4 100644
--- a/doc/context/pl/admin/security/help.html
+++ b/doc/en/context/pl/admin/security/help.html
diff --git a/doc/context/pl/appman/help.html b/doc/en/context/pl/appman/help.html
index 867b5b482..867b5b482 100644
--- a/doc/context/pl/appman/help.html
+++ b/doc/en/context/pl/appman/help.html
diff --git a/doc/context/pl/cards/help.html b/doc/en/context/pl/cards/help.html
index 2e9886283..2e9886283 100644
--- a/doc/context/pl/cards/help.html
+++ b/doc/en/context/pl/cards/help.html
diff --git a/doc/context/pl/channel/help.html b/doc/en/context/pl/channel/help.html
index bd454c361..bd454c361 100644
--- a/doc/context/pl/channel/help.html
+++ b/doc/en/context/pl/channel/help.html
diff --git a/doc/context/pl/chat/help.html b/doc/en/context/pl/chat/help.html
index 0cf063aa8..0cf063aa8 100644
--- a/doc/context/pl/chat/help.html
+++ b/doc/en/context/pl/chat/help.html
diff --git a/doc/context/pl/cloud/help.html b/doc/en/context/pl/cloud/help.html
index d629e6d41..d629e6d41 100644
--- a/doc/context/pl/cloud/help.html
+++ b/doc/en/context/pl/cloud/help.html
diff --git a/doc/context/pl/connections/help.html b/doc/en/context/pl/connections/help.html
index 837184334..837184334 100644
--- a/doc/context/pl/connections/help.html
+++ b/doc/en/context/pl/connections/help.html
diff --git a/doc/context/pl/connections/ifpending/help.html b/doc/en/context/pl/connections/ifpending/help.html
index b2d05947a..b2d05947a 100644
--- a/doc/context/pl/connections/ifpending/help.html
+++ b/doc/en/context/pl/connections/ifpending/help.html
diff --git a/doc/context/pl/connedit/help.html b/doc/en/context/pl/connedit/help.html
index 746908cf2..746908cf2 100644
--- a/doc/context/pl/connedit/help.html
+++ b/doc/en/context/pl/connedit/help.html
diff --git a/doc/context/pl/events/help.html b/doc/en/context/pl/events/help.html
index 542661fa5..542661fa5 100644
--- a/doc/context/pl/events/help.html
+++ b/doc/en/context/pl/events/help.html
diff --git a/doc/context/pl/mail/help.html b/doc/en/context/pl/mail/help.html
index b077aa2c4..b077aa2c4 100644
--- a/doc/context/pl/mail/help.html
+++ b/doc/en/context/pl/mail/help.html
diff --git a/doc/context/pl/network/help.html b/doc/en/context/pl/network/help.html
index f6ba75241..f6ba75241 100644
--- a/doc/context/pl/network/help.html
+++ b/doc/en/context/pl/network/help.html
diff --git a/doc/context/pl/photos/help.html b/doc/en/context/pl/photos/help.html
index e9ff7ee9d..e9ff7ee9d 100644
--- a/doc/context/pl/photos/help.html
+++ b/doc/en/context/pl/photos/help.html
diff --git a/doc/context/pl/profile/help.html b/doc/en/context/pl/profile/help.html
index 9ec5b0e73..9ec5b0e73 100644
--- a/doc/context/pl/profile/help.html
+++ b/doc/en/context/pl/profile/help.html
diff --git a/doc/context/pl/profiles/help.html b/doc/en/context/pl/profiles/help.html
index 874303908..874303908 100644
--- a/doc/context/pl/profiles/help.html
+++ b/doc/en/context/pl/profiles/help.html
diff --git a/doc/context/pl/register/help.html b/doc/en/context/pl/register/help.html
index c5c879e36..c5c879e36 100644
--- a/doc/context/pl/register/help.html
+++ b/doc/en/context/pl/register/help.html
diff --git a/doc/context/pl/settings/account/help.html b/doc/en/context/pl/settings/account/help.html
index dfe82f025..dfe82f025 100644
--- a/doc/context/pl/settings/account/help.html
+++ b/doc/en/context/pl/settings/account/help.html
diff --git a/doc/context/pl/settings/channel/help.html b/doc/en/context/pl/settings/channel/help.html
index dfe82f025..dfe82f025 100644
--- a/doc/context/pl/settings/channel/help.html
+++ b/doc/en/context/pl/settings/channel/help.html
diff --git a/doc/context/pl/settings/features/help.html b/doc/en/context/pl/settings/features/help.html
index fc5a62363..fc5a62363 100644
--- a/doc/context/pl/settings/features/help.html
+++ b/doc/en/context/pl/settings/features/help.html
diff --git a/doc/context/pl/settings/tokens/help.html b/doc/en/context/pl/settings/tokens/help.html
index 4c79841d6..4c79841d6 100644
--- a/doc/context/pl/settings/tokens/help.html
+++ b/doc/en/context/pl/settings/tokens/help.html
diff --git a/doc/context/pl/webpages/help.html b/doc/en/context/pl/webpages/help.html
index 64858fcf6..64858fcf6 100644
--- a/doc/context/pl/webpages/help.html
+++ b/doc/en/context/pl/webpages/help.html
diff --git a/doc/context/pl/wiki/help.html b/doc/en/context/pl/wiki/help.html
index 6aa6a7192..6aa6a7192 100644
--- a/doc/context/pl/wiki/help.html
+++ b/doc/en/context/pl/wiki/help.html
diff --git a/doc/context/ru/cards/help.html b/doc/en/context/ru/cards/help.html
index ccdf9d6d9..ccdf9d6d9 100644
--- a/doc/context/ru/cards/help.html
+++ b/doc/en/context/ru/cards/help.html
diff --git a/doc/context/ru/connections/help.html b/doc/en/context/ru/connections/help.html
index 6c9b9a0e9..6c9b9a0e9 100644
--- a/doc/context/ru/connections/help.html
+++ b/doc/en/context/ru/connections/help.html
diff --git a/doc/context/ru/network/help.html b/doc/en/context/ru/network/help.html
index 19b5452e2..19b5452e2 100644
--- a/doc/context/ru/network/help.html
+++ b/doc/en/context/ru/network/help.html
diff --git a/doc/database.bb b/doc/en/database.bb
index a0c1e8841..a0c1e8841 100644
--- a/doc/database.bb
+++ b/doc/en/database.bb
diff --git a/doc/database/db_abook.bb b/doc/en/database/db_abook.bb
index a346480d7..a346480d7 100644
--- a/doc/database/db_abook.bb
+++ b/doc/en/database/db_abook.bb
diff --git a/doc/database/db_account.bb b/doc/en/database/db_account.bb
index 35d7a9eb3..35d7a9eb3 100644
--- a/doc/database/db_account.bb
+++ b/doc/en/database/db_account.bb
diff --git a/doc/database/db_addon.bb b/doc/en/database/db_addon.bb
index bccd295f5..bccd295f5 100644
--- a/doc/database/db_addon.bb
+++ b/doc/en/database/db_addon.bb
diff --git a/doc/database/db_app.bb b/doc/en/database/db_app.bb
index 09df473ee..09df473ee 100644
--- a/doc/database/db_app.bb
+++ b/doc/en/database/db_app.bb
diff --git a/doc/database/db_attach.bb b/doc/en/database/db_attach.bb
index 5098401de..5098401de 100644
--- a/doc/database/db_attach.bb
+++ b/doc/en/database/db_attach.bb
diff --git a/doc/database/db_auth_codes.bb b/doc/en/database/db_auth_codes.bb
index c60f064a4..c60f064a4 100644
--- a/doc/database/db_auth_codes.bb
+++ b/doc/en/database/db_auth_codes.bb
diff --git a/doc/database/db_cache.bb b/doc/en/database/db_cache.bb
index 02c292f20..02c292f20 100644
--- a/doc/database/db_cache.bb
+++ b/doc/en/database/db_cache.bb
diff --git a/doc/database/db_channel.bb b/doc/en/database/db_channel.bb
index 518ff0978..518ff0978 100644
--- a/doc/database/db_channel.bb
+++ b/doc/en/database/db_channel.bb
diff --git a/doc/database/db_chat.bb b/doc/en/database/db_chat.bb
index 1aac2bd15..1aac2bd15 100644
--- a/doc/database/db_chat.bb
+++ b/doc/en/database/db_chat.bb
diff --git a/doc/database/db_chatpresence.bb b/doc/en/database/db_chatpresence.bb
index 0a7f666c9..0a7f666c9 100644
--- a/doc/database/db_chatpresence.bb
+++ b/doc/en/database/db_chatpresence.bb
diff --git a/doc/database/db_chatroom.bb b/doc/en/database/db_chatroom.bb
index 1d316288d..1d316288d 100644
--- a/doc/database/db_chatroom.bb
+++ b/doc/en/database/db_chatroom.bb
diff --git a/doc/database/db_clients.bb b/doc/en/database/db_clients.bb
index 0c66a4fc2..0c66a4fc2 100644
--- a/doc/database/db_clients.bb
+++ b/doc/en/database/db_clients.bb
diff --git a/doc/database/db_config.bb b/doc/en/database/db_config.bb
index f32d3c259..f32d3c259 100644
--- a/doc/database/db_config.bb
+++ b/doc/en/database/db_config.bb
diff --git a/doc/database/db_conv.bb b/doc/en/database/db_conv.bb
index 5adfa8c80..5adfa8c80 100644
--- a/doc/database/db_conv.bb
+++ b/doc/en/database/db_conv.bb
diff --git a/doc/database/db_event.bb b/doc/en/database/db_event.bb
index ad3c15789..ad3c15789 100644
--- a/doc/database/db_event.bb
+++ b/doc/en/database/db_event.bb
diff --git a/doc/database/db_fcontact.bb b/doc/en/database/db_fcontact.bb
index 9bd8c20fe..9bd8c20fe 100644
--- a/doc/database/db_fcontact.bb
+++ b/doc/en/database/db_fcontact.bb
diff --git a/doc/database/db_ffinder.bb b/doc/en/database/db_ffinder.bb
index c20158d56..c20158d56 100644
--- a/doc/database/db_ffinder.bb
+++ b/doc/en/database/db_ffinder.bb
diff --git a/doc/database/db_fserver.bb b/doc/en/database/db_fserver.bb
index 4c4b0b530..4c4b0b530 100644
--- a/doc/database/db_fserver.bb
+++ b/doc/en/database/db_fserver.bb
diff --git a/doc/database/db_fsuggest.bb b/doc/en/database/db_fsuggest.bb
index 9da1f2f6d..9da1f2f6d 100644
--- a/doc/database/db_fsuggest.bb
+++ b/doc/en/database/db_fsuggest.bb
diff --git a/doc/database/db_hook.bb b/doc/en/database/db_hook.bb
index 233062f98..233062f98 100644
--- a/doc/database/db_hook.bb
+++ b/doc/en/database/db_hook.bb
diff --git a/doc/database/db_hubloc.bb b/doc/en/database/db_hubloc.bb
index e4ab7159d..e4ab7159d 100644
--- a/doc/database/db_hubloc.bb
+++ b/doc/en/database/db_hubloc.bb
diff --git a/doc/database/db_issue.bb b/doc/en/database/db_issue.bb
index 0a6f2912b..0a6f2912b 100644
--- a/doc/database/db_issue.bb
+++ b/doc/en/database/db_issue.bb
diff --git a/doc/database/db_item.bb b/doc/en/database/db_item.bb
index 6383e13f8..6383e13f8 100644
--- a/doc/database/db_item.bb
+++ b/doc/en/database/db_item.bb
diff --git a/doc/database/db_item_id.bb b/doc/en/database/db_item_id.bb
index ba4cca247..ba4cca247 100644
--- a/doc/database/db_item_id.bb
+++ b/doc/en/database/db_item_id.bb
diff --git a/doc/database/db_likes.bb b/doc/en/database/db_likes.bb
index 118c9a87e..118c9a87e 100644
--- a/doc/database/db_likes.bb
+++ b/doc/en/database/db_likes.bb
diff --git a/doc/database/db_mail.bb b/doc/en/database/db_mail.bb
index 0628584ae..0628584ae 100644
--- a/doc/database/db_mail.bb
+++ b/doc/en/database/db_mail.bb
diff --git a/doc/database/db_menu.bb b/doc/en/database/db_menu.bb
index 5b478115d..5b478115d 100644
--- a/doc/database/db_menu.bb
+++ b/doc/en/database/db_menu.bb
diff --git a/doc/database/db_menu_item.bb b/doc/en/database/db_menu_item.bb
index b14aac5e4..b14aac5e4 100644
--- a/doc/database/db_menu_item.bb
+++ b/doc/en/database/db_menu_item.bb
diff --git a/doc/database/db_notify.bb b/doc/en/database/db_notify.bb
index 4787266cd..4787266cd 100644
--- a/doc/database/db_notify.bb
+++ b/doc/en/database/db_notify.bb
diff --git a/doc/database/db_obj.bb b/doc/en/database/db_obj.bb
index cc5e75598..cc5e75598 100644
--- a/doc/database/db_obj.bb
+++ b/doc/en/database/db_obj.bb
diff --git a/doc/database/db_outq.bb b/doc/en/database/db_outq.bb
index 970f99de5..970f99de5 100644
--- a/doc/database/db_outq.bb
+++ b/doc/en/database/db_outq.bb
diff --git a/doc/database/db_pconfig.bb b/doc/en/database/db_pconfig.bb
index 2ac36e61a..2ac36e61a 100644
--- a/doc/database/db_pconfig.bb
+++ b/doc/en/database/db_pconfig.bb
diff --git a/doc/database/db_pgrp.bb b/doc/en/database/db_pgrp.bb
index 73265b90e..73265b90e 100644
--- a/doc/database/db_pgrp.bb
+++ b/doc/en/database/db_pgrp.bb
diff --git a/doc/database/db_pgrp_member.bb b/doc/en/database/db_pgrp_member.bb
index b9ab8171d..b9ab8171d 100644
--- a/doc/database/db_pgrp_member.bb
+++ b/doc/en/database/db_pgrp_member.bb
diff --git a/doc/database/db_photo.bb b/doc/en/database/db_photo.bb
index 91840ec1e..91840ec1e 100644
--- a/doc/database/db_photo.bb
+++ b/doc/en/database/db_photo.bb
diff --git a/doc/database/db_poll.bb b/doc/en/database/db_poll.bb
index 57d808b71..57d808b71 100644
--- a/doc/database/db_poll.bb
+++ b/doc/en/database/db_poll.bb
diff --git a/doc/database/db_poll_elm.bb b/doc/en/database/db_poll_elm.bb
index fd649d5a6..fd649d5a6 100644
--- a/doc/database/db_poll_elm.bb
+++ b/doc/en/database/db_poll_elm.bb
diff --git a/doc/database/db_profdef.bb b/doc/en/database/db_profdef.bb
index a0904fd79..a0904fd79 100644
--- a/doc/database/db_profdef.bb
+++ b/doc/en/database/db_profdef.bb
diff --git a/doc/database/db_profext.bb b/doc/en/database/db_profext.bb
index ada9dce2a..ada9dce2a 100644
--- a/doc/database/db_profext.bb
+++ b/doc/en/database/db_profext.bb
diff --git a/doc/database/db_profile.bb b/doc/en/database/db_profile.bb
index 717fae585..717fae585 100644
--- a/doc/database/db_profile.bb
+++ b/doc/en/database/db_profile.bb
diff --git a/doc/database/db_profile_check.bb b/doc/en/database/db_profile_check.bb
index 3be64c5da..3be64c5da 100644
--- a/doc/database/db_profile_check.bb
+++ b/doc/en/database/db_profile_check.bb
diff --git a/doc/database/db_register.bb b/doc/en/database/db_register.bb
index 50672b5e1..50672b5e1 100644
--- a/doc/database/db_register.bb
+++ b/doc/en/database/db_register.bb
diff --git a/doc/database/db_session.bb b/doc/en/database/db_session.bb
index d7ff0482d..d7ff0482d 100644
--- a/doc/database/db_session.bb
+++ b/doc/en/database/db_session.bb
diff --git a/doc/database/db_shares.bb b/doc/en/database/db_shares.bb
index be5255c03..be5255c03 100644
--- a/doc/database/db_shares.bb
+++ b/doc/en/database/db_shares.bb
diff --git a/doc/database/db_sign.bb b/doc/en/database/db_sign.bb
index e80ea7ef3..e80ea7ef3 100644
--- a/doc/database/db_sign.bb
+++ b/doc/en/database/db_sign.bb
diff --git a/doc/database/db_site.bb b/doc/en/database/db_site.bb
index 8dea4dae6..8dea4dae6 100644
--- a/doc/database/db_site.bb
+++ b/doc/en/database/db_site.bb
diff --git a/doc/database/db_source.bb b/doc/en/database/db_source.bb
index 92850a82e..92850a82e 100644
--- a/doc/database/db_source.bb
+++ b/doc/en/database/db_source.bb
diff --git a/doc/database/db_spam.bb b/doc/en/database/db_spam.bb
index b75e1edd3..b75e1edd3 100644
--- a/doc/database/db_spam.bb
+++ b/doc/en/database/db_spam.bb
diff --git a/doc/database/db_sys_perms.bb b/doc/en/database/db_sys_perms.bb
index 04416a26b..04416a26b 100644
--- a/doc/database/db_sys_perms.bb
+++ b/doc/en/database/db_sys_perms.bb
diff --git a/doc/database/db_term.bb b/doc/en/database/db_term.bb
index bd155fe21..bd155fe21 100644
--- a/doc/database/db_term.bb
+++ b/doc/en/database/db_term.bb
diff --git a/doc/database/db_tokens.bb b/doc/en/database/db_tokens.bb
index 35da2458c..35da2458c 100644
--- a/doc/database/db_tokens.bb
+++ b/doc/en/database/db_tokens.bb
diff --git a/doc/database/db_updates.bb b/doc/en/database/db_updates.bb
index f2e25d84c..f2e25d84c 100644
--- a/doc/database/db_updates.bb
+++ b/doc/en/database/db_updates.bb
diff --git a/doc/database/db_verify.bb b/doc/en/database/db_verify.bb
index 9d01181c5..9d01181c5 100644
--- a/doc/database/db_verify.bb
+++ b/doc/en/database/db_verify.bb
diff --git a/doc/database/db_vote.bb b/doc/en/database/db_vote.bb
index 0b9a423eb..0b9a423eb 100644
--- a/doc/database/db_vote.bb
+++ b/doc/en/database/db_vote.bb
diff --git a/doc/database/db_xchan.bb b/doc/en/database/db_xchan.bb
index 8932969c5..8932969c5 100644
--- a/doc/database/db_xchan.bb
+++ b/doc/en/database/db_xchan.bb
diff --git a/doc/database/db_xchat.bb b/doc/en/database/db_xchat.bb
index 0897408d1..0897408d1 100644
--- a/doc/database/db_xchat.bb
+++ b/doc/en/database/db_xchat.bb
diff --git a/doc/database/db_xconfig.bb b/doc/en/database/db_xconfig.bb
index 111d1ce3a..111d1ce3a 100644
--- a/doc/database/db_xconfig.bb
+++ b/doc/en/database/db_xconfig.bb
diff --git a/doc/database/db_xign.bb b/doc/en/database/db_xign.bb
index 63c6569de..63c6569de 100644
--- a/doc/database/db_xign.bb
+++ b/doc/en/database/db_xign.bb
diff --git a/doc/database/db_xlink.bb b/doc/en/database/db_xlink.bb
index 528f8da19..528f8da19 100644
--- a/doc/database/db_xlink.bb
+++ b/doc/en/database/db_xlink.bb
diff --git a/doc/database/db_xprof.bb b/doc/en/database/db_xprof.bb
index bed79e9ca..bed79e9ca 100644
--- a/doc/database/db_xprof.bb
+++ b/doc/en/database/db_xprof.bb
diff --git a/doc/database/db_xtag.bb b/doc/en/database/db_xtag.bb
index 1e6fb9961..1e6fb9961 100644
--- a/doc/database/db_xtag.bb
+++ b/doc/en/database/db_xtag.bb
diff --git a/doc/dev-function-overview.md b/doc/en/dev-function-overview.md
index cd2526ead..4dccc8cef 100644
--- a/doc/dev-function-overview.md
+++ b/doc/en/dev-function-overview.md
@@ -21,11 +21,15 @@ returns an xchan structure representing the current viewer if authenticated (loc
 
 * get_config($family,$key), get_pconfig($uid,$family,$key)
 
-Returns the config setting for $family and $key or false if unset. 
+Returns the config setting for $family and $key or false if unset.
+
+Deprecated: Use Zotlabs\Lib\Config::Get instead.
 
 * set_config($family,$key,$value), set_pconfig($uid,$family,$key,$value)
 
-Sets the value of config setting for $family and $key to $value. Returns $value. The config versions operate on system-wide settings. The pconfig versions get/set the values for a specific integer uid (channel_id).  
+Sets the value of config setting for $family and $key to $value. Returns $value. The config versions operate on system-wide settings. The pconfig versions get/set the values for a specific integer uid (channel_id).
+
+Deprecated: Use Zotlabs\Lib\Config::Set instead.
 
 * dbesc()
 
@@ -33,7 +37,7 @@ Always escape strings being used in DB queries. This function returns the escape
 
 * q($sql,$var1...)
 
-Perform a DB query with the SQL statement $sql. printf style arguments %s and %d are replaced with variable arguments, which should each be appropriately dbesc() or intval(). SELECT queries return an array of results or false if SQL or DB error. Other queries return true if the command was successful or false if it wasn't. 
+Perform a DB query with the SQL statement $sql. printf style arguments %s and %d are replaced with variable arguments, which should each be appropriately dbesc() or intval(). SELECT queries return an array of results or false if SQL or DB error. Other queries return true if the command was successful or false if it wasn't.
 
 * t($string)
 
diff --git a/doc/dev_beginner.bb b/doc/en/dev_beginner.bb
index 4ac69c301..4ac69c301 100644
--- a/doc/dev_beginner.bb
+++ b/doc/en/dev_beginner.bb
diff --git a/doc/develop.bb b/doc/en/develop.bb
index 20e987a5a..20e987a5a 100644
--- a/doc/develop.bb
+++ b/doc/en/develop.bb
diff --git a/doc/developer/api_zot.bb b/doc/en/developer/api_zot.bb
index ff937bfa5..ff937bfa5 100644
--- a/doc/developer/api_zot.bb
+++ b/doc/en/developer/api_zot.bb
diff --git a/doc/developer/covenant.bb b/doc/en/developer/covenant.bb
index 431cc74e9..431cc74e9 100644
--- a/doc/developer/covenant.bb
+++ b/doc/en/developer/covenant.bb
diff --git a/doc/developer/developer_guide.bb b/doc/en/developer/developer_guide.bb
index d04cec121..d04cec121 100644
--- a/doc/developer/developer_guide.bb
+++ b/doc/en/developer/developer_guide.bb
diff --git a/doc/developer/testing.md b/doc/en/developer/testing.md
index f7e8ffeba..f7e8ffeba 100644
--- a/doc/developer/testing.md
+++ b/doc/en/developer/testing.md
diff --git a/doc/developer/unorganized.md b/doc/en/developer/unorganized.md
index 5ba719226..5ba719226 100644
--- a/doc/developer/unorganized.md
+++ b/doc/en/developer/unorganized.md
diff --git a/doc/developer/zot_protocol.bb b/doc/en/developer/zot_protocol.bb
index e9355bca8..e9355bca8 100644
--- a/doc/developer/zot_protocol.bb
+++ b/doc/en/developer/zot_protocol.bb
diff --git a/doc/developer_function_primer.bb b/doc/en/developer_function_primer.bb
index 48af9523d..f39954d73 100644
--- a/doc/developer_function_primer.bb
+++ b/doc/en/developer_function_primer.bb
@@ -20,10 +20,14 @@ returns an xchan structure representing the current viewer if authenticated (loc
 
 Returns the config setting for $family and $key or false if unset.
 
+Deprecated: Use Zotlabs\Lib\Config::Get instead.
+
 [b]    set_config($family,$key,$value), set_pconfig($uid,$family,$key,$value)[/b]
 
 Sets the value of config setting for $family and $key to $value. Returns $value. The config versions operate on system-wide settings. The pconfig versions get/set the values for a specific integer uid (channel_id).  The xconfig version get/sets the value for a specific xchan hash - generally used for remote users.
 
+Deprecated: Use Zotlabs\Lib\Config::Set instead.
+
 [b]dbesc()[/b]
 
 Always escape strings being used in DB queries. This function returns the escaped string. Integer DB parameters should all be proven integers by wrapping with intval()
diff --git a/doc/developers.bb b/doc/en/developers.bb
index 22dc82d7e..22dc82d7e 100644
--- a/doc/developers.bb
+++ b/doc/en/developers.bb
diff --git a/doc/diaspora_compat.bb b/doc/en/diaspora_compat.bb
index f27a63b9d..f27a63b9d 100644
--- a/doc/diaspora_compat.bb
+++ b/doc/en/diaspora_compat.bb
diff --git a/doc/directories.bb b/doc/en/directories.bb
index 60a0b624d..60a0b624d 100644
--- a/doc/directories.bb
+++ b/doc/en/directories.bb
diff --git a/doc/dnt-policy.txt b/doc/en/dnt-policy.txt
index ad946d1f8..ad946d1f8 100644
--- a/doc/dnt-policy.txt
+++ b/doc/en/dnt-policy.txt
diff --git a/doc/doco.bb b/doc/en/doco.bb
index 7ca64cfea..7ca64cfea 100644
--- a/doc/doco.bb
+++ b/doc/en/doco.bb
diff --git a/doc/encryption.bb b/doc/en/encryption.bb
index 9985f4b33..9985f4b33 100644
--- a/doc/encryption.bb
+++ b/doc/en/encryption.bb
diff --git a/doc/external-resource-links.bb b/doc/en/external-resource-links.bb
index 338db8023..338db8023 100644
--- a/doc/external-resource-links.bb
+++ b/doc/en/external-resource-links.bb
diff --git a/doc/extra_features.bb b/doc/en/extra_features.bb
index 17d85228e..17d85228e 100644
--- a/doc/extra_features.bb
+++ b/doc/en/extra_features.bb
diff --git a/doc/faq_admins.bb b/doc/en/faq_admins.bb
index 0b54a41de..0b54a41de 100644
--- a/doc/faq_admins.bb
+++ b/doc/en/faq_admins.bb
diff --git a/doc/feature/access_tokens.bb b/doc/en/feature/access_tokens.bb
index eb5c03717..eb5c03717 100644
--- a/doc/feature/access_tokens.bb
+++ b/doc/en/feature/access_tokens.bb
diff --git a/doc/feature/additional/access.md b/doc/en/feature/additional/access.md
index b7f0df717..b7f0df717 100644
--- a/doc/feature/additional/access.md
+++ b/doc/en/feature/additional/access.md
diff --git a/doc/feature/additional/composition.md b/doc/en/feature/additional/composition.md
index 1256f7501..1256f7501 100644
--- a/doc/feature/additional/composition.md
+++ b/doc/en/feature/additional/composition.md
diff --git a/doc/feature/additional/filtering.md b/doc/en/feature/additional/filtering.md
index ba8e1e29f..ba8e1e29f 100644
--- a/doc/feature/additional/filtering.md
+++ b/doc/en/feature/additional/filtering.md
diff --git a/doc/feature/additional/general.md b/doc/en/feature/additional/general.md
index a1b712b12..a1b712b12 100644
--- a/doc/feature/additional/general.md
+++ b/doc/en/feature/additional/general.md
diff --git a/doc/feature/additional/overview.md b/doc/en/feature/additional/overview.md
index b51f60bcd..b51f60bcd 100644
--- a/doc/feature/additional/overview.md
+++ b/doc/en/feature/additional/overview.md
diff --git a/doc/feature/additional/posts.md b/doc/en/feature/additional/posts.md
index d3f6b37db..d3f6b37db 100644
--- a/doc/feature/additional/posts.md
+++ b/doc/en/feature/additional/posts.md
diff --git a/doc/federate.bb b/doc/en/federate.bb
index 9137ec160..9137ec160 100644
--- a/doc/federate.bb
+++ b/doc/en/federate.bb
diff --git a/doc/filesync.md b/doc/en/filesync.md
index 4c64bdb09..4c64bdb09 100644
--- a/doc/filesync.md
+++ b/doc/en/filesync.md
diff --git a/doc/first-post.bb b/doc/en/first-post.bb
index cf6ed5b49..cf6ed5b49 100644
--- a/doc/first-post.bb
+++ b/doc/en/first-post.bb
diff --git a/doc/gdpr1.md b/doc/en/gdpr1.md
index daa401a3d..daa401a3d 100644
--- a/doc/gdpr1.md
+++ b/doc/en/gdpr1.md
diff --git a/doc/general.bb b/doc/en/general.bb
index 0b80db756..0b80db756 100644
--- a/doc/general.bb
+++ b/doc/en/general.bb
diff --git a/doc/git_for_non_developers.bb b/doc/en/git_for_non_developers.bb
index 5fba17439..5fba17439 100644
--- a/doc/git_for_non_developers.bb
+++ b/doc/en/git_for_non_developers.bb
diff --git a/doc/hidden_configs.bb b/doc/en/hidden_configs.bb
index 4eac1aa6e..4eac1aa6e 100644
--- a/doc/hidden_configs.bb
+++ b/doc/en/hidden_configs.bb
diff --git a/doc/hook/about_hook.bb b/doc/en/hook/about_hook.bb
index 22b60d786..22b60d786 100644
--- a/doc/hook/about_hook.bb
+++ b/doc/en/hook/about_hook.bb
diff --git a/doc/hook/accept_follow.bb b/doc/en/hook/accept_follow.bb
index e8b1ed0c4..e8b1ed0c4 100644
--- a/doc/hook/accept_follow.bb
+++ b/doc/en/hook/accept_follow.bb
diff --git a/doc/hook/account_downgrade.bb b/doc/en/hook/account_downgrade.bb
index 63bae0a58..63bae0a58 100644
--- a/doc/hook/account_downgrade.bb
+++ b/doc/en/hook/account_downgrade.bb
diff --git a/doc/hook/account_settings.bb b/doc/en/hook/account_settings.bb
index 91b3a8385..91b3a8385 100644
--- a/doc/hook/account_settings.bb
+++ b/doc/en/hook/account_settings.bb
diff --git a/doc/hook/account_settings_post.bb b/doc/en/hook/account_settings_post.bb
index bbd7a57a8..bbd7a57a8 100644
--- a/doc/hook/account_settings_post.bb
+++ b/doc/en/hook/account_settings_post.bb
diff --git a/doc/hook/activity_decode_mapper.bb b/doc/en/hook/activity_decode_mapper.bb
index 43d08a136..43d08a136 100644
--- a/doc/hook/activity_decode_mapper.bb
+++ b/doc/en/hook/activity_decode_mapper.bb
diff --git a/doc/hook/activity_filter.bb b/doc/en/hook/activity_filter.bb
index 9d0768577..9d0768577 100644
--- a/doc/hook/activity_filter.bb
+++ b/doc/en/hook/activity_filter.bb
diff --git a/doc/hook/activity_mapper.bb b/doc/en/hook/activity_mapper.bb
index db65fadc4..db65fadc4 100644
--- a/doc/hook/activity_mapper.bb
+++ b/doc/en/hook/activity_mapper.bb
diff --git a/doc/hook/activity_obj_decode_mapper.bb b/doc/en/hook/activity_obj_decode_mapper.bb
index a96b32eee..a96b32eee 100644
--- a/doc/hook/activity_obj_decode_mapper.bb
+++ b/doc/en/hook/activity_obj_decode_mapper.bb
diff --git a/doc/hook/activity_obj_mapper.bb b/doc/en/hook/activity_obj_mapper.bb
index 7c14a1b81..7c14a1b81 100644
--- a/doc/hook/activity_obj_mapper.bb
+++ b/doc/en/hook/activity_obj_mapper.bb
diff --git a/doc/hook/activity_order.bb b/doc/en/hook/activity_order.bb
index 4a4670d03..4a4670d03 100644
--- a/doc/hook/activity_order.bb
+++ b/doc/en/hook/activity_order.bb
diff --git a/doc/hook/activity_received.bb b/doc/en/hook/activity_received.bb
index 2e9d68bf3..2e9d68bf3 100644
--- a/doc/hook/activity_received.bb
+++ b/doc/en/hook/activity_received.bb
diff --git a/doc/hook/addon_app_installed_filter.bb b/doc/en/hook/addon_app_installed_filter.bb
index e610b3205..e610b3205 100644
--- a/doc/hook/addon_app_installed_filter.bb
+++ b/doc/en/hook/addon_app_installed_filter.bb
diff --git a/doc/hook/affinity_labels.bb b/doc/en/hook/affinity_labels.bb
index 7234b7632..7234b7632 100644
--- a/doc/hook/affinity_labels.bb
+++ b/doc/en/hook/affinity_labels.bb
diff --git a/doc/hook/api_perm_is_allowed.bb b/doc/en/hook/api_perm_is_allowed.bb
index 862cbd653..862cbd653 100644
--- a/doc/hook/api_perm_is_allowed.bb
+++ b/doc/en/hook/api_perm_is_allowed.bb
diff --git a/doc/hook/app_destroy.bb b/doc/en/hook/app_destroy.bb
index 386d7af16..386d7af16 100644
--- a/doc/hook/app_destroy.bb
+++ b/doc/en/hook/app_destroy.bb
diff --git a/doc/hook/app_installed_filter.bb b/doc/en/hook/app_installed_filter.bb
index f0d91d6f0..f0d91d6f0 100644
--- a/doc/hook/app_installed_filter.bb
+++ b/doc/en/hook/app_installed_filter.bb
diff --git a/doc/hook/atom_author.bb b/doc/en/hook/atom_author.bb
index c9d05a593..c9d05a593 100644
--- a/doc/hook/atom_author.bb
+++ b/doc/en/hook/atom_author.bb
diff --git a/doc/hook/atom_entry.bb b/doc/en/hook/atom_entry.bb
index 0aec89f16..0aec89f16 100644
--- a/doc/hook/atom_entry.bb
+++ b/doc/en/hook/atom_entry.bb
diff --git a/doc/hook/atom_feed.bb b/doc/en/hook/atom_feed.bb
index 69775ca5e..69775ca5e 100644
--- a/doc/hook/atom_feed.bb
+++ b/doc/en/hook/atom_feed.bb
diff --git a/doc/hook/atom_feed_end.bb b/doc/en/hook/atom_feed_end.bb
index 4f019fc8f..4f019fc8f 100644
--- a/doc/hook/atom_feed_end.bb
+++ b/doc/en/hook/atom_feed_end.bb
diff --git a/doc/hook/attach_delete.bb b/doc/en/hook/attach_delete.bb
index 3b63f28d3..3b63f28d3 100644
--- a/doc/hook/attach_delete.bb
+++ b/doc/en/hook/attach_delete.bb
diff --git a/doc/hook/attach_upload_file.bb b/doc/en/hook/attach_upload_file.bb
index 1f8056caa..1f8056caa 100644
--- a/doc/hook/attach_upload_file.bb
+++ b/doc/en/hook/attach_upload_file.bb
diff --git a/doc/hook/authenticate.bb b/doc/en/hook/authenticate.bb
index eb8071e73..eb8071e73 100644
--- a/doc/hook/authenticate.bb
+++ b/doc/en/hook/authenticate.bb
diff --git a/doc/hook/author_is_pmable.bb b/doc/en/hook/author_is_pmable.bb
index 11d1185f3..11d1185f3 100644
--- a/doc/hook/author_is_pmable.bb
+++ b/doc/en/hook/author_is_pmable.bb
diff --git a/doc/hook/bb2diaspora.bb b/doc/en/hook/bb2diaspora.bb
index c28f1883e..c28f1883e 100644
--- a/doc/hook/bb2diaspora.bb
+++ b/doc/en/hook/bb2diaspora.bb
diff --git a/doc/hook/bbcode.bb b/doc/en/hook/bbcode.bb
index f6b8711b0..f6b8711b0 100644
--- a/doc/hook/bbcode.bb
+++ b/doc/en/hook/bbcode.bb
diff --git a/doc/hook/bbcode_filter.bb b/doc/en/hook/bbcode_filter.bb
index efeb2e1b0..efeb2e1b0 100644
--- a/doc/hook/bbcode_filter.bb
+++ b/doc/en/hook/bbcode_filter.bb
diff --git a/doc/hook/build_pagehead.bb b/doc/en/hook/build_pagehead.bb
index 8fc3486c7..8fc3486c7 100644
--- a/doc/hook/build_pagehead.bb
+++ b/doc/en/hook/build_pagehead.bb
diff --git a/doc/hook/can_comment_on_post.bb b/doc/en/hook/can_comment_on_post.bb
index 2cfd3b2da..2cfd3b2da 100644
--- a/doc/hook/can_comment_on_post.bb
+++ b/doc/en/hook/can_comment_on_post.bb
diff --git a/doc/hook/change_channel.bb b/doc/en/hook/change_channel.bb
index 4514b9265..4514b9265 100644
--- a/doc/hook/change_channel.bb
+++ b/doc/en/hook/change_channel.bb
diff --git a/doc/hook/channel_links.bb b/doc/en/hook/channel_links.bb
index c0243dac6..c0243dac6 100644
--- a/doc/hook/channel_links.bb
+++ b/doc/en/hook/channel_links.bb
diff --git a/doc/hook/channel_remove.bb b/doc/en/hook/channel_remove.bb
index db9e9dd82..db9e9dd82 100644
--- a/doc/hook/channel_remove.bb
+++ b/doc/en/hook/channel_remove.bb
diff --git a/doc/hook/chat_message.bb b/doc/en/hook/chat_message.bb
index ccc93bb2c..ccc93bb2c 100644
--- a/doc/hook/chat_message.bb
+++ b/doc/en/hook/chat_message.bb
diff --git a/doc/hook/chat_post.bb b/doc/en/hook/chat_post.bb
index 7cb3c9fa1..7cb3c9fa1 100644
--- a/doc/hook/chat_post.bb
+++ b/doc/en/hook/chat_post.bb
diff --git a/doc/hook/check_account_email.bb b/doc/en/hook/check_account_email.bb
index b309706a0..b309706a0 100644
--- a/doc/hook/check_account_email.bb
+++ b/doc/en/hook/check_account_email.bb
diff --git a/doc/hook/check_account_invite.bb b/doc/en/hook/check_account_invite.bb
index 8d4a40522..8d4a40522 100644
--- a/doc/hook/check_account_invite.bb
+++ b/doc/en/hook/check_account_invite.bb
diff --git a/doc/hook/check_account_password.bb b/doc/en/hook/check_account_password.bb
index ce5202f48..ce5202f48 100644
--- a/doc/hook/check_account_password.bb
+++ b/doc/en/hook/check_account_password.bb
diff --git a/doc/hook/check_channelallowed.bb b/doc/en/hook/check_channelallowed.bb
index e7559c92f..e7559c92f 100644
--- a/doc/hook/check_channelallowed.bb
+++ b/doc/en/hook/check_channelallowed.bb
diff --git a/doc/hook/check_siteallowed.bb b/doc/en/hook/check_siteallowed.bb
index 28134cbd2..28134cbd2 100644
--- a/doc/hook/check_siteallowed.bb
+++ b/doc/en/hook/check_siteallowed.bb
diff --git a/doc/hook/collect_public_recipients.bb b/doc/en/hook/collect_public_recipients.bb
index de3f4049e..de3f4049e 100644
--- a/doc/hook/collect_public_recipients.bb
+++ b/doc/en/hook/collect_public_recipients.bb
diff --git a/doc/hook/comments_are_now_closed.bb b/doc/en/hook/comments_are_now_closed.bb
index 4d3baa95a..4d3baa95a 100644
--- a/doc/hook/comments_are_now_closed.bb
+++ b/doc/en/hook/comments_are_now_closed.bb
diff --git a/doc/hook/connect_premium.bb b/doc/en/hook/connect_premium.bb
index ae3aafc66..ae3aafc66 100644
--- a/doc/hook/connect_premium.bb
+++ b/doc/en/hook/connect_premium.bb
diff --git a/doc/hook/connection_remove.bb b/doc/en/hook/connection_remove.bb
index bd13ae5f2..bd13ae5f2 100644
--- a/doc/hook/connection_remove.bb
+++ b/doc/en/hook/connection_remove.bb
diff --git a/doc/hook/connector_settings.bb b/doc/en/hook/connector_settings.bb
index 9b59c49da..9b59c49da 100644
--- a/doc/hook/connector_settings.bb
+++ b/doc/en/hook/connector_settings.bb
diff --git a/doc/hook/construct_page.bb b/doc/en/hook/construct_page.bb
index 700d9256f..700d9256f 100644
--- a/doc/hook/construct_page.bb
+++ b/doc/en/hook/construct_page.bb
diff --git a/doc/hook/contact_block_end.bb b/doc/en/hook/contact_block_end.bb
index 30a7d2d76..30a7d2d76 100644
--- a/doc/hook/contact_block_end.bb
+++ b/doc/en/hook/contact_block_end.bb
diff --git a/doc/hook/contact_edit.bb b/doc/en/hook/contact_edit.bb
index 5fd31fb1d..5fd31fb1d 100644
--- a/doc/hook/contact_edit.bb
+++ b/doc/en/hook/contact_edit.bb
diff --git a/doc/hook/contact_edit_post.bb b/doc/en/hook/contact_edit_post.bb
index bc736f8b8..bc736f8b8 100644
--- a/doc/hook/contact_edit_post.bb
+++ b/doc/en/hook/contact_edit_post.bb
diff --git a/doc/hook/contact_select_options.bb b/doc/en/hook/contact_select_options.bb
index 65f9154ff..65f9154ff 100644
--- a/doc/hook/contact_select_options.bb
+++ b/doc/en/hook/contact_select_options.bb
diff --git a/doc/hook/content_security_policy.bb b/doc/en/hook/content_security_policy.bb
index 96b8095ae..96b8095ae 100644
--- a/doc/hook/content_security_policy.bb
+++ b/doc/en/hook/content_security_policy.bb
diff --git a/doc/hook/conversation_start.bb b/doc/en/hook/conversation_start.bb
index 7208c8d8f..7208c8d8f 100644
--- a/doc/hook/conversation_start.bb
+++ b/doc/en/hook/conversation_start.bb
diff --git a/doc/hook/create_identity.bb b/doc/en/hook/create_identity.bb
index 5c1da2d43..5c1da2d43 100644
--- a/doc/hook/create_identity.bb
+++ b/doc/en/hook/create_identity.bb
diff --git a/doc/hook/cron.bb b/doc/en/hook/cron.bb
index 55120b6c2..55120b6c2 100644
--- a/doc/hook/cron.bb
+++ b/doc/en/hook/cron.bb
diff --git a/doc/hook/cron_daily.bb b/doc/en/hook/cron_daily.bb
index 802bea5e4..802bea5e4 100644
--- a/doc/hook/cron_daily.bb
+++ b/doc/en/hook/cron_daily.bb
diff --git a/doc/hook/cron_weekly.bb b/doc/en/hook/cron_weekly.bb
index c01bf9611..c01bf9611 100644
--- a/doc/hook/cron_weekly.bb
+++ b/doc/en/hook/cron_weekly.bb
diff --git a/doc/hook/crypto_methods.bb b/doc/en/hook/crypto_methods.bb
index 1b16f567d..1b16f567d 100644
--- a/doc/hook/crypto_methods.bb
+++ b/doc/en/hook/crypto_methods.bb
diff --git a/doc/hook/daemon_addon.bb b/doc/en/hook/daemon_addon.bb
index b60b25748..b60b25748 100644
--- a/doc/hook/daemon_addon.bb
+++ b/doc/en/hook/daemon_addon.bb
diff --git a/doc/hook/daemon_master_release.bb b/doc/en/hook/daemon_master_release.bb
index a17216d48..a17216d48 100644
--- a/doc/hook/daemon_master_release.bb
+++ b/doc/en/hook/daemon_master_release.bb
diff --git a/doc/hook/directory_item.bb b/doc/en/hook/directory_item.bb
index cb710e0b4..cb710e0b4 100644
--- a/doc/hook/directory_item.bb
+++ b/doc/en/hook/directory_item.bb
diff --git a/doc/hook/discover_channel_webfinger.bb b/doc/en/hook/discover_channel_webfinger.bb
index b0eb5f2c4..b0eb5f2c4 100644
--- a/doc/hook/discover_channel_webfinger.bb
+++ b/doc/en/hook/discover_channel_webfinger.bb
diff --git a/doc/hook/display_item.bb b/doc/en/hook/display_item.bb
index a6bfd621d..a6bfd621d 100644
--- a/doc/hook/display_item.bb
+++ b/doc/en/hook/display_item.bb
diff --git a/doc/hook/display_settings.bb b/doc/en/hook/display_settings.bb
index 1f1e0b491..1f1e0b491 100644
--- a/doc/hook/display_settings.bb
+++ b/doc/en/hook/display_settings.bb
diff --git a/doc/hook/display_settings_post.bb b/doc/en/hook/display_settings_post.bb
index d3bb39359..d3bb39359 100644
--- a/doc/hook/display_settings_post.bb
+++ b/doc/en/hook/display_settings_post.bb
diff --git a/doc/hook/donate_contributors.bb b/doc/en/hook/donate_contributors.bb
index f97c77efa..f97c77efa 100644
--- a/doc/hook/donate_contributors.bb
+++ b/doc/en/hook/donate_contributors.bb
diff --git a/doc/hook/donate_plugin.bb b/doc/en/hook/donate_plugin.bb
index db4a6f113..db4a6f113 100644
--- a/doc/hook/donate_plugin.bb
+++ b/doc/en/hook/donate_plugin.bb
diff --git a/doc/hook/donate_sponsors.bb b/doc/en/hook/donate_sponsors.bb
index 3abd46d42..3abd46d42 100644
--- a/doc/hook/donate_sponsors.bb
+++ b/doc/en/hook/donate_sponsors.bb
diff --git a/doc/hook/dreport_is_storable.bb b/doc/en/hook/dreport_is_storable.bb
index 9ca99b896..9ca99b896 100644
--- a/doc/hook/dreport_is_storable.bb
+++ b/doc/en/hook/dreport_is_storable.bb
diff --git a/doc/hook/dreport_process.bb b/doc/en/hook/dreport_process.bb
index 3ad331f41..3ad331f41 100644
--- a/doc/hook/dreport_process.bb
+++ b/doc/en/hook/dreport_process.bb
diff --git a/doc/hook/drop_item.bb b/doc/en/hook/drop_item.bb
index 35bb80f82..35bb80f82 100644
--- a/doc/hook/drop_item.bb
+++ b/doc/en/hook/drop_item.bb
diff --git a/doc/hook/dropdown_extras.bb b/doc/en/hook/dropdown_extras.bb
index 6d7110a76..6d7110a76 100644
--- a/doc/hook/dropdown_extras.bb
+++ b/doc/en/hook/dropdown_extras.bb
diff --git a/doc/hook/encode_object.bb b/doc/en/hook/encode_object.bb
index 0c8e86458..0c8e86458 100644
--- a/doc/hook/encode_object.bb
+++ b/doc/en/hook/encode_object.bb
diff --git a/doc/hook/enotify.bb b/doc/en/hook/enotify.bb
index 703a3ffa0..703a3ffa0 100644
--- a/doc/hook/enotify.bb
+++ b/doc/en/hook/enotify.bb
diff --git a/doc/hook/enotify_mail.bb b/doc/en/hook/enotify_mail.bb
index adeb8bd30..adeb8bd30 100644
--- a/doc/hook/enotify_mail.bb
+++ b/doc/en/hook/enotify_mail.bb
diff --git a/doc/hook/enotify_store.bb b/doc/en/hook/enotify_store.bb
index dc44cc320..dc44cc320 100644
--- a/doc/hook/enotify_store.bb
+++ b/doc/en/hook/enotify_store.bb
diff --git a/doc/hook/event_created.bb b/doc/en/hook/event_created.bb
index 222602e77..222602e77 100644
--- a/doc/hook/event_created.bb
+++ b/doc/en/hook/event_created.bb
diff --git a/doc/hook/event_store_event.bb b/doc/en/hook/event_store_event.bb
index 7015a8322..7015a8322 100644
--- a/doc/hook/event_store_event.bb
+++ b/doc/en/hook/event_store_event.bb
diff --git a/doc/hook/event_updated.bb b/doc/en/hook/event_updated.bb
index 69e3c72c1..69e3c72c1 100644
--- a/doc/hook/event_updated.bb
+++ b/doc/en/hook/event_updated.bb
diff --git a/doc/hook/externals_url_select.bb b/doc/en/hook/externals_url_select.bb
index a542dcb29..a542dcb29 100644
--- a/doc/hook/externals_url_select.bb
+++ b/doc/en/hook/externals_url_select.bb
diff --git a/doc/hook/feature_enabled.bb b/doc/en/hook/feature_enabled.bb
index 5630cc768..5630cc768 100644
--- a/doc/hook/feature_enabled.bb
+++ b/doc/en/hook/feature_enabled.bb
diff --git a/doc/hook/feature_settings.bb b/doc/en/hook/feature_settings.bb
index d1691eb38..d1691eb38 100644
--- a/doc/hook/feature_settings.bb
+++ b/doc/en/hook/feature_settings.bb
diff --git a/doc/hook/feature_settings_post.bb b/doc/en/hook/feature_settings_post.bb
index eecf941ff..eecf941ff 100644
--- a/doc/hook/feature_settings_post.bb
+++ b/doc/en/hook/feature_settings_post.bb
diff --git a/doc/hook/fetch_and_store.bb b/doc/en/hook/fetch_and_store.bb
index afece11a6..afece11a6 100644
--- a/doc/hook/fetch_and_store.bb
+++ b/doc/en/hook/fetch_and_store.bb
diff --git a/doc/hook/follow.bb b/doc/en/hook/follow.bb
index a97632b06..a97632b06 100644
--- a/doc/hook/follow.bb
+++ b/doc/en/hook/follow.bb
diff --git a/doc/hook/follow_allow.bb b/doc/en/hook/follow_allow.bb
index fdab1865c..fdab1865c 100644
--- a/doc/hook/follow_allow.bb
+++ b/doc/en/hook/follow_allow.bb
diff --git a/doc/hook/gender_selector.bb b/doc/en/hook/gender_selector.bb
index 0b56b5c9b..0b56b5c9b 100644
--- a/doc/hook/gender_selector.bb
+++ b/doc/en/hook/gender_selector.bb
diff --git a/doc/hook/gender_selector_min.bb b/doc/en/hook/gender_selector_min.bb
index 9d143855a..9d143855a 100644
--- a/doc/hook/gender_selector_min.bb
+++ b/doc/en/hook/gender_selector_min.bb
diff --git a/doc/hook/generate_map.bb b/doc/en/hook/generate_map.bb
index 33672d552..33672d552 100644
--- a/doc/hook/generate_map.bb
+++ b/doc/en/hook/generate_map.bb
diff --git a/doc/hook/generate_named_map.bb b/doc/en/hook/generate_named_map.bb
index 5bacb846d..5bacb846d 100644
--- a/doc/hook/generate_named_map.bb
+++ b/doc/en/hook/generate_named_map.bb
diff --git a/doc/hook/get_all_api_perms.bb b/doc/en/hook/get_all_api_perms.bb
index eb41f8a02..eb41f8a02 100644
--- a/doc/hook/get_all_api_perms.bb
+++ b/doc/en/hook/get_all_api_perms.bb
diff --git a/doc/hook/get_all_perms.bb b/doc/en/hook/get_all_perms.bb
index 149f8c78c..149f8c78c 100644
--- a/doc/hook/get_all_perms.bb
+++ b/doc/en/hook/get_all_perms.bb
diff --git a/doc/hook/get_default_export_sections b/doc/en/hook/get_default_export_sections
index 09b146643..09b146643 100644
--- a/doc/hook/get_default_export_sections
+++ b/doc/en/hook/get_default_export_sections
diff --git a/doc/hook/get_features.bb b/doc/en/hook/get_features.bb
index 66e81f13c..66e81f13c 100644
--- a/doc/hook/get_features.bb
+++ b/doc/en/hook/get_features.bb
diff --git a/doc/hook/get_photo.bb b/doc/en/hook/get_photo.bb
index eaf3beffb..eaf3beffb 100644
--- a/doc/hook/get_photo.bb
+++ b/doc/en/hook/get_photo.bb
diff --git a/doc/hook/get_profile_photo.bb b/doc/en/hook/get_profile_photo.bb
index ab07179ae..ab07179ae 100644
--- a/doc/hook/get_profile_photo.bb
+++ b/doc/en/hook/get_profile_photo.bb
diff --git a/doc/hook/get_role_perms.bb b/doc/en/hook/get_role_perms.bb
index 87830f8e3..87830f8e3 100644
--- a/doc/hook/get_role_perms.bb
+++ b/doc/en/hook/get_role_perms.bb
diff --git a/doc/hook/global_permissions.bb b/doc/en/hook/global_permissions.bb
index fe998ee9c..fe998ee9c 100644
--- a/doc/hook/global_permissions.bb
+++ b/doc/en/hook/global_permissions.bb
diff --git a/doc/hook/home_content.bb b/doc/en/hook/home_content.bb
index 7f32b3547..7f32b3547 100644
--- a/doc/hook/home_content.bb
+++ b/doc/en/hook/home_content.bb
diff --git a/doc/hook/home_init.bb b/doc/en/hook/home_init.bb
index 25dd72792..25dd72792 100644
--- a/doc/hook/home_init.bb
+++ b/doc/en/hook/home_init.bb
diff --git a/doc/hook/hostxrd.bb b/doc/en/hook/hostxrd.bb
index 2b67320cf..2b67320cf 100644
--- a/doc/hook/hostxrd.bb
+++ b/doc/en/hook/hostxrd.bb
diff --git a/doc/hook/html2bbcode.bb b/doc/en/hook/html2bbcode.bb
index 3061f05f0..3061f05f0 100644
--- a/doc/hook/html2bbcode.bb
+++ b/doc/en/hook/html2bbcode.bb
diff --git a/doc/hook/identity_basic_export.bb b/doc/en/hook/identity_basic_export.bb
index 71329ba1e..71329ba1e 100644
--- a/doc/hook/identity_basic_export.bb
+++ b/doc/en/hook/identity_basic_export.bb
diff --git a/doc/hook/import_author_xchan.bb b/doc/en/hook/import_author_xchan.bb
index e2340469d..e2340469d 100644
--- a/doc/hook/import_author_xchan.bb
+++ b/doc/en/hook/import_author_xchan.bb
diff --git a/doc/hook/import_channel.bb b/doc/en/hook/import_channel.bb
index b220b7415..b220b7415 100644
--- a/doc/hook/import_channel.bb
+++ b/doc/en/hook/import_channel.bb
diff --git a/doc/hook/import_directory_profile.bb b/doc/en/hook/import_directory_profile.bb
index e2fac59bc..e2fac59bc 100644
--- a/doc/hook/import_directory_profile.bb
+++ b/doc/en/hook/import_directory_profile.bb
diff --git a/doc/hook/import_xchan.bb b/doc/en/hook/import_xchan.bb
index 40e0783ce..40e0783ce 100644
--- a/doc/hook/import_xchan.bb
+++ b/doc/en/hook/import_xchan.bb
diff --git a/doc/hook/item_custom.bb b/doc/en/hook/item_custom.bb
index d20c7d76c..d20c7d76c 100644
--- a/doc/hook/item_custom.bb
+++ b/doc/en/hook/item_custom.bb
diff --git a/doc/hook/item_photo_menu.bb b/doc/en/hook/item_photo_menu.bb
index 8f9860a90..8f9860a90 100644
--- a/doc/hook/item_photo_menu.bb
+++ b/doc/en/hook/item_photo_menu.bb
diff --git a/doc/hook/item_store.bb b/doc/en/hook/item_store.bb
index 5d49b725c..5d49b725c 100644
--- a/doc/hook/item_store.bb
+++ b/doc/en/hook/item_store.bb
diff --git a/doc/hook/item_store_update.bb b/doc/en/hook/item_store_update.bb
index a7c58939a..a7c58939a 100644
--- a/doc/hook/item_store_update.bb
+++ b/doc/en/hook/item_store_update.bb
diff --git a/doc/hook/item_stored.bb b/doc/en/hook/item_stored.bb
index 8d706cb4e..8d706cb4e 100644
--- a/doc/hook/item_stored.bb
+++ b/doc/en/hook/item_stored.bb
diff --git a/doc/hook/item_stored_update.bb b/doc/en/hook/item_stored_update.bb
index 4532a347c..4532a347c 100644
--- a/doc/hook/item_stored_update.bb
+++ b/doc/en/hook/item_stored_update.bb
diff --git a/doc/hook/item_translate.bb b/doc/en/hook/item_translate.bb
index 695494b9c..695494b9c 100644
--- a/doc/hook/item_translate.bb
+++ b/doc/en/hook/item_translate.bb
diff --git a/doc/hook/jot_header_tpl_filter.bb b/doc/en/hook/jot_header_tpl_filter.bb
index b17d81d03..b17d81d03 100644
--- a/doc/hook/jot_header_tpl_filter.bb
+++ b/doc/en/hook/jot_header_tpl_filter.bb
diff --git a/doc/hook/jot_networks.bb b/doc/en/hook/jot_networks.bb
index 4c1629ba7..4c1629ba7 100644
--- a/doc/hook/jot_networks.bb
+++ b/doc/en/hook/jot_networks.bb
diff --git a/doc/hook/jot_tool.bb b/doc/en/hook/jot_tool.bb
index 22ba9701e..22ba9701e 100644
--- a/doc/hook/jot_tool.bb
+++ b/doc/en/hook/jot_tool.bb
diff --git a/doc/hook/jot_tpl_filter.bb b/doc/en/hook/jot_tpl_filter.bb
index 426da3c56..426da3c56 100644
--- a/doc/hook/jot_tpl_filter.bb
+++ b/doc/en/hook/jot_tpl_filter.bb
diff --git a/doc/hook/legal_webbie.bb b/doc/en/hook/legal_webbie.bb
index 8c7d32d56..8c7d32d56 100644
--- a/doc/hook/legal_webbie.bb
+++ b/doc/en/hook/legal_webbie.bb
diff --git a/doc/hook/legal_webbie_text.bb b/doc/en/hook/legal_webbie_text.bb
index 32c74c93b..32c74c93b 100644
--- a/doc/hook/legal_webbie_text.bb
+++ b/doc/en/hook/legal_webbie_text.bb
diff --git a/doc/hook/load_pdl.bb b/doc/en/hook/load_pdl.bb
index 149a3e766..149a3e766 100644
--- a/doc/hook/load_pdl.bb
+++ b/doc/en/hook/load_pdl.bb
diff --git a/doc/hook/local_dir_update.bb b/doc/en/hook/local_dir_update.bb
index d0b0f8ac1..d0b0f8ac1 100644
--- a/doc/hook/local_dir_update.bb
+++ b/doc/en/hook/local_dir_update.bb
diff --git a/doc/hook/logged_in.bb b/doc/en/hook/logged_in.bb
index b01041576..b01041576 100644
--- a/doc/hook/logged_in.bb
+++ b/doc/en/hook/logged_in.bb
diff --git a/doc/hook/logger.bb b/doc/en/hook/logger.bb
index 8fe989abd..8fe989abd 100644
--- a/doc/hook/logger.bb
+++ b/doc/en/hook/logger.bb
diff --git a/doc/hook/logging_out.bb b/doc/en/hook/logging_out.bb
index d47b9f1df..d47b9f1df 100644
--- a/doc/hook/logging_out.bb
+++ b/doc/en/hook/logging_out.bb
diff --git a/doc/hook/login_hook.bb b/doc/en/hook/login_hook.bb
index 156a0afcd..156a0afcd 100644
--- a/doc/hook/login_hook.bb
+++ b/doc/en/hook/login_hook.bb
diff --git a/doc/hook/magic_auth.bb b/doc/en/hook/magic_auth.bb
index 80d6edb27..80d6edb27 100644
--- a/doc/hook/magic_auth.bb
+++ b/doc/en/hook/magic_auth.bb
diff --git a/doc/hook/magic_auth_openid_success.bb b/doc/en/hook/magic_auth_openid_success.bb
index 810f2e06d..810f2e06d 100644
--- a/doc/hook/magic_auth_openid_success.bb
+++ b/doc/en/hook/magic_auth_openid_success.bb
diff --git a/doc/hook/magic_auth_success.bb b/doc/en/hook/magic_auth_success.bb
index d795e43e5..d795e43e5 100644
--- a/doc/hook/magic_auth_success.bb
+++ b/doc/en/hook/magic_auth_success.bb
diff --git a/doc/hook/main_slider.bb b/doc/en/hook/main_slider.bb
index a63c2170a..a63c2170a 100644
--- a/doc/hook/main_slider.bb
+++ b/doc/en/hook/main_slider.bb
diff --git a/doc/hook/marital_selector.bb b/doc/en/hook/marital_selector.bb
index 0f76c3f5a..0f76c3f5a 100644
--- a/doc/hook/marital_selector.bb
+++ b/doc/en/hook/marital_selector.bb
diff --git a/doc/hook/marital_selector_min.bb b/doc/en/hook/marital_selector_min.bb
index f02d21f20..f02d21f20 100644
--- a/doc/hook/marital_selector_min.bb
+++ b/doc/en/hook/marital_selector_min.bb
diff --git a/doc/hook/markdown_to_bb.bb b/doc/en/hook/markdown_to_bb.bb
index 8af637c8c..8af637c8c 100644
--- a/doc/hook/markdown_to_bb.bb
+++ b/doc/en/hook/markdown_to_bb.bb
diff --git a/doc/hook/module_loaded.bb b/doc/en/hook/module_loaded.bb
index cb0d2302d..cb0d2302d 100644
--- a/doc/hook/module_loaded.bb
+++ b/doc/en/hook/module_loaded.bb
diff --git a/doc/hook/module_mod_aftercontent.bb b/doc/en/hook/module_mod_aftercontent.bb
index 04e3c8d88..04e3c8d88 100644
--- a/doc/hook/module_mod_aftercontent.bb
+++ b/doc/en/hook/module_mod_aftercontent.bb
diff --git a/doc/hook/module_mod_content.bb b/doc/en/hook/module_mod_content.bb
index eef5b7ba5..eef5b7ba5 100644
--- a/doc/hook/module_mod_content.bb
+++ b/doc/en/hook/module_mod_content.bb
diff --git a/doc/hook/module_mod_init.bb b/doc/en/hook/module_mod_init.bb
index 52fe5a616..52fe5a616 100644
--- a/doc/hook/module_mod_init.bb
+++ b/doc/en/hook/module_mod_init.bb
diff --git a/doc/hook/module_mod_post.bb b/doc/en/hook/module_mod_post.bb
index 3adb0e737..3adb0e737 100644
--- a/doc/hook/module_mod_post.bb
+++ b/doc/en/hook/module_mod_post.bb
diff --git a/doc/hook/mood_verbs.bb b/doc/en/hook/mood_verbs.bb
index 67fb719dd..67fb719dd 100644
--- a/doc/hook/mood_verbs.bb
+++ b/doc/en/hook/mood_verbs.bb
diff --git a/doc/hook/nav.bb b/doc/en/hook/nav.bb
index b52f90602..b52f90602 100644
--- a/doc/hook/nav.bb
+++ b/doc/en/hook/nav.bb
diff --git a/doc/hook/network_content_init.bb b/doc/en/hook/network_content_init.bb
index 224da393a..224da393a 100644
--- a/doc/hook/network_content_init.bb
+++ b/doc/en/hook/network_content_init.bb
diff --git a/doc/hook/network_ping.bb b/doc/en/hook/network_ping.bb
index 78deefe78..78deefe78 100644
--- a/doc/hook/network_ping.bb
+++ b/doc/en/hook/network_ping.bb
diff --git a/doc/hook/network_to_name.bb b/doc/en/hook/network_to_name.bb
index eea4a1841..eea4a1841 100644
--- a/doc/hook/network_to_name.bb
+++ b/doc/en/hook/network_to_name.bb
diff --git a/doc/hook/notifier_end.bb b/doc/en/hook/notifier_end.bb
index df9d852bd..df9d852bd 100644
--- a/doc/hook/notifier_end.bb
+++ b/doc/en/hook/notifier_end.bb
diff --git a/doc/hook/notifier_hub.bb b/doc/en/hook/notifier_hub.bb
index 4255ce446..4255ce446 100644
--- a/doc/hook/notifier_hub.bb
+++ b/doc/en/hook/notifier_hub.bb
diff --git a/doc/hook/notifier_normal.bb b/doc/en/hook/notifier_normal.bb
index 0059baa47..0059baa47 100644
--- a/doc/hook/notifier_normal.bb
+++ b/doc/en/hook/notifier_normal.bb
diff --git a/doc/hook/obj_verbs.bb b/doc/en/hook/obj_verbs.bb
index ca98229aa..ca98229aa 100644
--- a/doc/hook/obj_verbs.bb
+++ b/doc/en/hook/obj_verbs.bb
diff --git a/doc/hook/oembed_probe.bb b/doc/en/hook/oembed_probe.bb
index 4f32ac267..4f32ac267 100644
--- a/doc/hook/oembed_probe.bb
+++ b/doc/en/hook/oembed_probe.bb
diff --git a/doc/hook/other_encapsulate.bb b/doc/en/hook/other_encapsulate.bb
index ea0cdf622..ea0cdf622 100644
--- a/doc/hook/other_encapsulate.bb
+++ b/doc/en/hook/other_encapsulate.bb
diff --git a/doc/hook/other_unencapsulate.bb b/doc/en/hook/other_unencapsulate.bb
index c8b0b617f..c8b0b617f 100644
--- a/doc/hook/other_unencapsulate.bb
+++ b/doc/en/hook/other_unencapsulate.bb
diff --git a/doc/hook/page_content_top.bb b/doc/en/hook/page_content_top.bb
index 137e3abfd..137e3abfd 100644
--- a/doc/hook/page_content_top.bb
+++ b/doc/en/hook/page_content_top.bb
diff --git a/doc/hook/page_end.bb b/doc/en/hook/page_end.bb
index 09293cf50..09293cf50 100644
--- a/doc/hook/page_end.bb
+++ b/doc/en/hook/page_end.bb
diff --git a/doc/hook/page_header.bb b/doc/en/hook/page_header.bb
index ffaa791c9..ffaa791c9 100644
--- a/doc/hook/page_header.bb
+++ b/doc/en/hook/page_header.bb
diff --git a/doc/hook/page_meta.bb b/doc/en/hook/page_meta.bb
index 30a8f9440..30a8f9440 100644
--- a/doc/hook/page_meta.bb
+++ b/doc/en/hook/page_meta.bb
diff --git a/doc/hook/parse_atom.bb b/doc/en/hook/parse_atom.bb
index c8037317f..c8037317f 100644
--- a/doc/hook/parse_atom.bb
+++ b/doc/en/hook/parse_atom.bb
diff --git a/doc/hook/parse_link.bb b/doc/en/hook/parse_link.bb
index 1c328059c..1c328059c 100644
--- a/doc/hook/parse_link.bb
+++ b/doc/en/hook/parse_link.bb
diff --git a/doc/hook/pdl_selector.bb b/doc/en/hook/pdl_selector.bb
index bee01c843..bee01c843 100644
--- a/doc/hook/pdl_selector.bb
+++ b/doc/en/hook/pdl_selector.bb
diff --git a/doc/hook/perm_is_allowed.bb b/doc/en/hook/perm_is_allowed.bb
index aac647609..aac647609 100644
--- a/doc/hook/perm_is_allowed.bb
+++ b/doc/en/hook/perm_is_allowed.bb
diff --git a/doc/hook/permissions_create.bb b/doc/en/hook/permissions_create.bb
index 22f80a80e..22f80a80e 100644
--- a/doc/hook/permissions_create.bb
+++ b/doc/en/hook/permissions_create.bb
diff --git a/doc/hook/permissions_update.bb b/doc/en/hook/permissions_update.bb
index 40366b33d..40366b33d 100644
--- a/doc/hook/permissions_update.bb
+++ b/doc/en/hook/permissions_update.bb
diff --git a/doc/hook/permit_hook.bb b/doc/en/hook/permit_hook.bb
index e69de29bb..e69de29bb 100644
--- a/doc/hook/permit_hook.bb
+++ b/doc/en/hook/permit_hook.bb
diff --git a/doc/hook/personal_xrd.bb b/doc/en/hook/personal_xrd.bb
index 71d4bd8dd..71d4bd8dd 100644
--- a/doc/hook/personal_xrd.bb
+++ b/doc/en/hook/personal_xrd.bb
diff --git a/doc/hook/photo_post_end.bb b/doc/en/hook/photo_post_end.bb
index 8a3291763..8a3291763 100644
--- a/doc/hook/photo_post_end.bb
+++ b/doc/en/hook/photo_post_end.bb
diff --git a/doc/hook/photo_upload_begin.bb b/doc/en/hook/photo_upload_begin.bb
index 5e441a12a..5e441a12a 100644
--- a/doc/hook/photo_upload_begin.bb
+++ b/doc/en/hook/photo_upload_begin.bb
diff --git a/doc/hook/photo_upload_end.bb b/doc/en/hook/photo_upload_end.bb
index 956175f1d..956175f1d 100644
--- a/doc/hook/photo_upload_end.bb
+++ b/doc/en/hook/photo_upload_end.bb
diff --git a/doc/hook/photo_upload_file.bb b/doc/en/hook/photo_upload_file.bb
index 726622ac0..726622ac0 100644
--- a/doc/hook/photo_upload_file.bb
+++ b/doc/en/hook/photo_upload_file.bb
diff --git a/doc/hook/photo_upload_form.bb b/doc/en/hook/photo_upload_form.bb
index 70b8318b8..70b8318b8 100644
--- a/doc/hook/photo_upload_form.bb
+++ b/doc/en/hook/photo_upload_form.bb
diff --git a/doc/hook/photo_view_filter.bb b/doc/en/hook/photo_view_filter.bb
index 0780c1edc..0780c1edc 100644
--- a/doc/hook/photo_view_filter.bb
+++ b/doc/en/hook/photo_view_filter.bb
diff --git a/doc/hook/poke_verbs.bb b/doc/en/hook/poke_verbs.bb
index 54d68c3a2..54d68c3a2 100644
--- a/doc/hook/poke_verbs.bb
+++ b/doc/en/hook/poke_verbs.bb
diff --git a/doc/hook/post_local.bb b/doc/en/hook/post_local.bb
index 5aa723cb9..5aa723cb9 100644
--- a/doc/hook/post_local.bb
+++ b/doc/en/hook/post_local.bb
diff --git a/doc/hook/post_local_end.bb b/doc/en/hook/post_local_end.bb
index 380166fdb..380166fdb 100644
--- a/doc/hook/post_local_end.bb
+++ b/doc/en/hook/post_local_end.bb
diff --git a/doc/hook/post_local_start.bb b/doc/en/hook/post_local_start.bb
index 2f684f67a..2f684f67a 100644
--- a/doc/hook/post_local_start.bb
+++ b/doc/en/hook/post_local_start.bb
diff --git a/doc/hook/post_mail.bb b/doc/en/hook/post_mail.bb
index 8f67ad4f0..8f67ad4f0 100644
--- a/doc/hook/post_mail.bb
+++ b/doc/en/hook/post_mail.bb
diff --git a/doc/hook/post_mail_end.bb b/doc/en/hook/post_mail_end.bb
index 7f0085773..7f0085773 100644
--- a/doc/hook/post_mail_end.bb
+++ b/doc/en/hook/post_mail_end.bb
diff --git a/doc/hook/post_remote.bb b/doc/en/hook/post_remote.bb
index f8e087eee..f8e087eee 100644
--- a/doc/hook/post_remote.bb
+++ b/doc/en/hook/post_remote.bb
diff --git a/doc/hook/post_remote_end.bb b/doc/en/hook/post_remote_end.bb
index 0fef20cbf..0fef20cbf 100644
--- a/doc/hook/post_remote_end.bb
+++ b/doc/en/hook/post_remote_end.bb
diff --git a/doc/hook/post_remote_update.bb b/doc/en/hook/post_remote_update.bb
index fd358db28..fd358db28 100644
--- a/doc/hook/post_remote_update.bb
+++ b/doc/en/hook/post_remote_update.bb
diff --git a/doc/hook/post_remote_update_end.bb b/doc/en/hook/post_remote_update_end.bb
index 95f1e6f78..95f1e6f78 100644
--- a/doc/hook/post_remote_update_end.bb
+++ b/doc/en/hook/post_remote_update_end.bb
diff --git a/doc/hook/prepare_body.bb b/doc/en/hook/prepare_body.bb
index 3f1eaef85..3f1eaef85 100644
--- a/doc/hook/prepare_body.bb
+++ b/doc/en/hook/prepare_body.bb
diff --git a/doc/hook/prepare_body_final.bb b/doc/en/hook/prepare_body_final.bb
index 96d1ae389..96d1ae389 100644
--- a/doc/hook/prepare_body_final.bb
+++ b/doc/en/hook/prepare_body_final.bb
diff --git a/doc/hook/prepare_body_init.bb b/doc/en/hook/prepare_body_init.bb
index f3de79970..f3de79970 100644
--- a/doc/hook/prepare_body_init.bb
+++ b/doc/en/hook/prepare_body_init.bb
diff --git a/doc/hook/privacygroup_extras.bb b/doc/en/hook/privacygroup_extras.bb
index bd67f2470..bd67f2470 100644
--- a/doc/hook/privacygroup_extras.bb
+++ b/doc/en/hook/privacygroup_extras.bb
diff --git a/doc/hook/privacygroup_extras_drop.bb b/doc/en/hook/privacygroup_extras_drop.bb
index fd27ab255..fd27ab255 100644
--- a/doc/hook/privacygroup_extras_drop.bb
+++ b/doc/en/hook/privacygroup_extras_drop.bb
diff --git a/doc/hook/privacygroup_extras_post.bb b/doc/en/hook/privacygroup_extras_post.bb
index 704db1997..704db1997 100644
--- a/doc/hook/privacygroup_extras_post.bb
+++ b/doc/en/hook/privacygroup_extras_post.bb
diff --git a/doc/hook/proc_run.bb b/doc/en/hook/proc_run.bb
index a3759794a..a3759794a 100644
--- a/doc/hook/proc_run.bb
+++ b/doc/en/hook/proc_run.bb
diff --git a/doc/hook/process_channel_sync_delivery.bb b/doc/en/hook/process_channel_sync_delivery.bb
index c0416c8cb..c0416c8cb 100644
--- a/doc/hook/process_channel_sync_delivery.bb
+++ b/doc/en/hook/process_channel_sync_delivery.bb
diff --git a/doc/hook/profile_advanced.bb b/doc/en/hook/profile_advanced.bb
index 65e56afd6..65e56afd6 100644
--- a/doc/hook/profile_advanced.bb
+++ b/doc/en/hook/profile_advanced.bb
diff --git a/doc/hook/profile_edit.bb b/doc/en/hook/profile_edit.bb
index e60663d4a..e60663d4a 100644
--- a/doc/hook/profile_edit.bb
+++ b/doc/en/hook/profile_edit.bb
diff --git a/doc/hook/profile_photo_content_end.bb b/doc/en/hook/profile_photo_content_end.bb
index 518415c4d..518415c4d 100644
--- a/doc/hook/profile_photo_content_end.bb
+++ b/doc/en/hook/profile_photo_content_end.bb
diff --git a/doc/hook/profile_post.bb b/doc/en/hook/profile_post.bb
index d22d8fbc7..d22d8fbc7 100644
--- a/doc/hook/profile_post.bb
+++ b/doc/en/hook/profile_post.bb
diff --git a/doc/hook/profile_sidebar.bb b/doc/en/hook/profile_sidebar.bb
index bfd059e4b..bfd059e4b 100644
--- a/doc/hook/profile_sidebar.bb
+++ b/doc/en/hook/profile_sidebar.bb
diff --git a/doc/hook/profile_sidebar_enter.bb b/doc/en/hook/profile_sidebar_enter.bb
index 9d6726a30..9d6726a30 100644
--- a/doc/hook/profile_sidebar_enter.bb
+++ b/doc/en/hook/profile_sidebar_enter.bb
diff --git a/doc/hook/register_account.bb b/doc/en/hook/register_account.bb
index df4de2b30..df4de2b30 100644
--- a/doc/hook/register_account.bb
+++ b/doc/en/hook/register_account.bb
diff --git a/doc/hook/render_location.bb b/doc/en/hook/render_location.bb
index 41501c087..41501c087 100644
--- a/doc/hook/render_location.bb
+++ b/doc/en/hook/render_location.bb
diff --git a/doc/hook/replace_macros.bb b/doc/en/hook/replace_macros.bb
index fac39dd7b..fac39dd7b 100644
--- a/doc/hook/replace_macros.bb
+++ b/doc/en/hook/replace_macros.bb
diff --git a/doc/hook/reverse_magic_auth.bb b/doc/en/hook/reverse_magic_auth.bb
index 4cbd84b93..4cbd84b93 100644
--- a/doc/hook/reverse_magic_auth.bb
+++ b/doc/en/hook/reverse_magic_auth.bb
diff --git a/doc/hook/settings_form.bb b/doc/en/hook/settings_form.bb
index d65341181..d65341181 100644
--- a/doc/hook/settings_form.bb
+++ b/doc/en/hook/settings_form.bb
diff --git a/doc/hook/settings_post.bb b/doc/en/hook/settings_post.bb
index f72546c11..f72546c11 100644
--- a/doc/hook/settings_post.bb
+++ b/doc/en/hook/settings_post.bb
diff --git a/doc/hook/sexpref_selector.bb b/doc/en/hook/sexpref_selector.bb
index b4dad6b38..b4dad6b38 100644
--- a/doc/hook/sexpref_selector.bb
+++ b/doc/en/hook/sexpref_selector.bb
diff --git a/doc/hook/sexpref_selector_min.bb b/doc/en/hook/sexpref_selector_min.bb
index 6f49946af..6f49946af 100644
--- a/doc/hook/sexpref_selector_min.bb
+++ b/doc/en/hook/sexpref_selector_min.bb
diff --git a/doc/hook/smilie.bb b/doc/en/hook/smilie.bb
index 575acc178..575acc178 100644
--- a/doc/hook/smilie.bb
+++ b/doc/en/hook/smilie.bb
diff --git a/doc/hook/status_editor.bb b/doc/en/hook/status_editor.bb
index 00e97a7c9..00e97a7c9 100644
--- a/doc/hook/status_editor.bb
+++ b/doc/en/hook/status_editor.bb
diff --git a/doc/hook/stream_item.bb b/doc/en/hook/stream_item.bb
index 30086961d..30086961d 100644
--- a/doc/hook/stream_item.bb
+++ b/doc/en/hook/stream_item.bb
diff --git a/doc/hook/system_app_installed_filter.bb b/doc/en/hook/system_app_installed_filter.bb
index a269a79a8..a269a79a8 100644
--- a/doc/hook/system_app_installed_filter.bb
+++ b/doc/en/hook/system_app_installed_filter.bb
diff --git a/doc/hook/tagged.bb b/doc/en/hook/tagged.bb
index 05d081d07..05d081d07 100644
--- a/doc/hook/tagged.bb
+++ b/doc/en/hook/tagged.bb
diff --git a/doc/hook/update_unseen.bb b/doc/en/hook/update_unseen.bb
index 8fb02c239..8fb02c239 100644
--- a/doc/hook/update_unseen.bb
+++ b/doc/en/hook/update_unseen.bb
diff --git a/doc/hook/validate_channelname.bb b/doc/en/hook/validate_channelname.bb
index 2ab12bbec..2ab12bbec 100644
--- a/doc/hook/validate_channelname.bb
+++ b/doc/en/hook/validate_channelname.bb
diff --git a/doc/hook/webfinger.bb b/doc/en/hook/webfinger.bb
index 7cc24322f..7cc24322f 100644
--- a/doc/hook/webfinger.bb
+++ b/doc/en/hook/webfinger.bb
diff --git a/doc/hook/well_known.bb b/doc/en/hook/well_known.bb
index 778b27a02..778b27a02 100644
--- a/doc/hook/well_known.bb
+++ b/doc/en/hook/well_known.bb
diff --git a/doc/hook/wiki_preprocess.bb b/doc/en/hook/wiki_preprocess.bb
index 913b601ba..913b601ba 100644
--- a/doc/hook/wiki_preprocess.bb
+++ b/doc/en/hook/wiki_preprocess.bb
diff --git a/doc/hook/zid.bb b/doc/en/hook/zid.bb
index 2210c1342..2210c1342 100644
--- a/doc/hook/zid.bb
+++ b/doc/en/hook/zid.bb
diff --git a/doc/hook/zid_init.bb b/doc/en/hook/zid_init.bb
index 131dd8f72..131dd8f72 100644
--- a/doc/hook/zid_init.bb
+++ b/doc/en/hook/zid_init.bb
diff --git a/doc/hook/zot_best_algorithm.bb b/doc/en/hook/zot_best_algorithm.bb
index ccde505cb..ccde505cb 100644
--- a/doc/hook/zot_best_algorithm.bb
+++ b/doc/en/hook/zot_best_algorithm.bb
diff --git a/doc/hook/zot_finger.bb b/doc/en/hook/zot_finger.bb
index 9383b4c31..9383b4c31 100644
--- a/doc/hook/zot_finger.bb
+++ b/doc/en/hook/zot_finger.bb
diff --git a/doc/hooklist.bb b/doc/en/hooklist.bb
index 7231cd185..7231cd185 100644
--- a/doc/hooklist.bb
+++ b/doc/en/hooklist.bb
diff --git a/doc/hooks.html b/doc/en/hooks.html
index a7ee314e7..a7ee314e7 100644
--- a/doc/hooks.html
+++ b/doc/en/hooks.html
diff --git a/doc/intro_for_developers.bb b/doc/en/intro_for_developers.bb
index 172008b7f..172008b7f 100644
--- a/doc/intro_for_developers.bb
+++ b/doc/en/intro_for_developers.bb
diff --git a/doc/macros/addons_footer.bb b/doc/en/macros/addons_footer.bb
index 32814c59b..32814c59b 100644
--- a/doc/macros/addons_footer.bb
+++ b/doc/en/macros/addons_footer.bb
diff --git a/doc/macros/cloud_footer.bb b/doc/en/macros/cloud_footer.bb
index 798cc9ea6..798cc9ea6 100644
--- a/doc/macros/cloud_footer.bb
+++ b/doc/en/macros/cloud_footer.bb
diff --git a/doc/macros/de/addons_footer.bb b/doc/en/macros/de/addons_footer.bb
index 068bb7ec7..068bb7ec7 100644
--- a/doc/macros/de/addons_footer.bb
+++ b/doc/en/macros/de/addons_footer.bb
diff --git a/doc/macros/de/cloud_footer.bb b/doc/en/macros/de/cloud_footer.bb
index 921448a3c..921448a3c 100644
--- a/doc/macros/de/cloud_footer.bb
+++ b/doc/en/macros/de/cloud_footer.bb
diff --git a/doc/macros/de/main_footer.bb b/doc/en/macros/de/main_footer.bb
index e71603626..e71603626 100644
--- a/doc/macros/de/main_footer.bb
+++ b/doc/en/macros/de/main_footer.bb
diff --git a/doc/macros/de/troubleshooting_footer.bb b/doc/en/macros/de/troubleshooting_footer.bb
index be8c13a28..be8c13a28 100644
--- a/doc/macros/de/troubleshooting_footer.bb
+++ b/doc/en/macros/de/troubleshooting_footer.bb
diff --git a/doc/macros/main_footer.bb b/doc/en/macros/main_footer.bb
index 08f671ded..08f671ded 100644
--- a/doc/macros/main_footer.bb
+++ b/doc/en/macros/main_footer.bb
diff --git a/doc/macros/pl/addons_footer.bb b/doc/en/macros/pl/addons_footer.bb
index 79ac0a71c..79ac0a71c 100644
--- a/doc/macros/pl/addons_footer.bb
+++ b/doc/en/macros/pl/addons_footer.bb
diff --git a/doc/macros/pl/cloud_footer.bb b/doc/en/macros/pl/cloud_footer.bb
index 48628ae1a..48628ae1a 100644
--- a/doc/macros/pl/cloud_footer.bb
+++ b/doc/en/macros/pl/cloud_footer.bb
diff --git a/doc/macros/pl/main_footer.bb b/doc/en/macros/pl/main_footer.bb
index 8bf25fed5..8bf25fed5 100644
--- a/doc/macros/pl/main_footer.bb
+++ b/doc/en/macros/pl/main_footer.bb
diff --git a/doc/macros/pl/troubleshooting_footer.bb b/doc/en/macros/pl/troubleshooting_footer.bb
index 19328ad64..19328ad64 100644
--- a/doc/macros/pl/troubleshooting_footer.bb
+++ b/doc/en/macros/pl/troubleshooting_footer.bb
diff --git a/doc/macros/troubleshooting_footer.bb b/doc/en/macros/troubleshooting_footer.bb
index c7603a62b..c7603a62b 100644
--- a/doc/macros/troubleshooting_footer.bb
+++ b/doc/en/macros/troubleshooting_footer.bb
diff --git a/doc/en/member/assets/bookmarker-save-icon.png b/doc/en/member/assets/bookmarker-save-icon.png
new file mode 100644
index 000000000..6a7c10eb9
--- /dev/null
+++ b/doc/en/member/assets/bookmarker-save-icon.png
diff --git a/doc/en/member/assets/bookmarks-menu-dropdown.png b/doc/en/member/assets/bookmarks-menu-dropdown.png
new file mode 100644
index 000000000..137ae52ad
--- /dev/null
+++ b/doc/en/member/assets/bookmarks-menu-dropdown.png
diff --git a/doc/en/member/assets/privacy-group-tool-public.png b/doc/en/member/assets/privacy-group-tool-public.png
new file mode 100644
index 000000000..828cb6411
--- /dev/null
+++ b/doc/en/member/assets/privacy-group-tool-public.png
diff --git a/doc/en/member/assets/privacy-tool-3.png b/doc/en/member/assets/privacy-tool-3.png
new file mode 100644
index 000000000..ba896403d
--- /dev/null
+++ b/doc/en/member/assets/privacy-tool-3.png
diff --git a/doc/member/assets/qr_text_to_post.png b/doc/en/member/assets/qr_text_to_post.png
index 887c85492..887c85492 100644
--- a/doc/member/assets/qr_text_to_post.png
+++ b/doc/en/member/assets/qr_text_to_post.png
diff --git a/doc/member/assets/zat_dialog.png b/doc/en/member/assets/zat_dialog.png
index 892964e95..892964e95 100644
--- a/doc/member/assets/zat_dialog.png
+++ b/doc/en/member/assets/zat_dialog.png
diff --git a/doc/member/bbcode.html b/doc/en/member/bbcode.html
index e3e079b4d..e3e079b4d 100644
--- a/doc/member/bbcode.html
+++ b/doc/en/member/bbcode.html
diff --git a/doc/member/member_faq.bb b/doc/en/member/member_faq.bb
index 9533cb557..9533cb557 100644
--- a/doc/member/member_faq.bb
+++ b/doc/en/member/member_faq.bb
diff --git a/doc/member/member_guide.bb b/doc/en/member/member_guide.bb
index 2b772d1c5..e3d62a4b5 100644
--- a/doc/member/member_guide.bb
+++ b/doc/en/member/member_guide.bb
@@ -46,17 +46,17 @@ In short, a channel that represents yourself is &quot;me, on the internet&quot;.
 
 [h3]Channel Permission Roles[/h3]
 
-When you create a new channel, you will be asked to select a permission role based on how you envision using this channel. The most popular permission roles are the Social Networking roles. You have many other choices, providing options which are analagous to Facebook Groups and Pages, collaborative spaces, newsfeeds, and more. These roles automatically configure several different system variables ranging from what permissions are granted to friends, to your default privacy settings and visibility choices. Advanced configurations are available to let you adjust each of these parameters to your needs, but we've found that most people prefer to "set it and forget it". Thew following describes some of the different roles which are currently available and how they impact your privacy and ability to interact. 
+When you create a new channel, you will be asked to select a permission role based on how you envision using this channel. The most popular permission roles are the Social Networking roles. You have many other choices, providing options which are analagous to Facebook Groups and Pages, collaborative spaces, newsfeeds, and more. These roles automatically configure several different system variables ranging from what permissions are granted to friends, to your default privacy settings and visibility choices. Advanced configurations are available to let you adjust each of these parameters to your needs, but we've found that most people prefer to "set it and forget it". Thew following describes some of the different roles which are currently available and how they impact your privacy and ability to interact.
 
 [h4]Social[/h4]
 
 [b]Federation[/b]
 
-The channel is a very permissive social networking profile which is compatible with other federated social networks. The permission policies are similar to Twitter and mostly compatible with Diaspora and Mastodon. Privacy is a lower priority than ease of access and connecting with others. Anybody in the network can comment on your public posts and send you private mail. By default posts and published items are public, but you can over-ride this when creating the item and restrict it. You are listed in the directory. Your online presence and connections are visible to others. This mode [i]may[/i] increase your exposure to undesired communications and spam. This role is not generally recommended [i]unless[/i] you need to interact regularly with members of other networks.  
+The channel is a very permissive social networking profile which is compatible with other federated social networks. The permission policies are similar to Twitter and mostly compatible with Diaspora and Mastodon. Privacy is a lower priority than ease of access and connecting with others. Anybody in the network can comment on your public posts and send you private mail. By default posts and published items are public, but you can over-ride this when creating the item and restrict it. You are listed in the directory. Your online presence and connections are visible to others. This mode [i]may[/i] increase your exposure to undesired communications and spam. This role is not generally recommended [i]unless[/i] you need to interact regularly with members of other networks.
 
 [b]Mostly Public[/b]
 
-The channel is a typical social networking profile. By default posts and published items are public, but you can over-ride this when creating the item and restrict it. You are listed in the directory. Your online presence and connections are visible to others. Only your immediate connections can comment on your public posts and send you private mail. The permission policies are similar to Facebook.   
+The channel is a typical social networking profile. By default posts and published items are public, but you can over-ride this when creating the item and restrict it. You are listed in the directory. Your online presence and connections are visible to others. Only your immediate connections can comment on your public posts and send you private mail. The permission policies are similar to Facebook.
 
 
 [b]Restricted[/b]
@@ -65,7 +65,7 @@ By default all posts and published items are sent to your 'Friends' privacy grou
 
 [b]Private[/b]
 
-By default all posts and published items are sent to your 'Friends' privacy group. New friends are added to this privacy group. You can over-ride this and create a public post or public item if you desire. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden. 
+By default all posts and published items are sent to your 'Friends' privacy group. New friends are added to this privacy group. You can over-ride this and create a public post or public item if you desire. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden.
 
 
 [h4]Forum[/h4]
@@ -77,11 +77,11 @@ The channel is a typical forum. By default posts and published items are public.
 
 [b]Restricted[/b]
 
-By default all posts and published items are sent to the channel's 'Friends' privacy group. New friends are added to this privacy group. Members may post by !mention or wall-to-wall post, but posts and replies may also be seen by other receipients of the top-level post who are not members. The channel is visible in the directory. Members must be manually added by the forum owner. 
+By default all posts and published items are sent to the channel's 'Friends' privacy group. New friends are added to this privacy group. Members may post by !mention or wall-to-wall post, but posts and replies may also be seen by other receipients of the top-level post who are not members. The channel is visible in the directory. Members must be manually added by the forum owner.
 
 [b]Private[/b]
 
-By default all posts and published items are sent to your 'Friends' privacy group. New friends are added to this privacy group. The owner can over-ride this and create a public post or public item if desired. Members cannot. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden. Members must be manually added by the forum owner. Posting by !mention is disabled. Posts can only be made via wall-to-wall posts, and sent to members of the 'Friends' privacy group. They are not publicly visible.  
+By default all posts and published items are sent to your 'Friends' privacy group. New friends are added to this privacy group. The owner can over-ride this and create a public post or public item if desired. Members cannot. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden. Members must be manually added by the forum owner. Posting by !mention is disabled. Posts can only be made via wall-to-wall posts, and sent to members of the 'Friends' privacy group. They are not publicly visible.
 
 
 [h4]Feed[/h4]
@@ -89,29 +89,29 @@ By default all posts and published items are sent to your 'Friends' privacy grou
 
 [b]Public[/b]
 
-Similiar to Social - Mostly Public, but tailored for RSS feed sources. Items may be freely republished and sourced. Online presence is meaningless, therefore hidden. New connections are automatically approved.  
+Similiar to Social - Mostly Public, but tailored for RSS feed sources. Items may be freely republished and sourced. Online presence is meaningless, therefore hidden. New connections are automatically approved.
 
 
 [b]Restricted[/b]
 
-Not listed in directory. Online presence is meaningless, therefore hidden. Feed is published only to members of the 'Friends' privacy group. New connections are automatically added to this privacy group. Members must be manually approved by the channel owner. 
+Not listed in directory. Online presence is meaningless, therefore hidden. Feed is published only to members of the 'Friends' privacy group. New connections are automatically added to this privacy group. Members must be manually approved by the channel owner.
 
 
 [h4]Special[/h4]
 
 [b]Celebrity/Soapbox[/b]
 
-Listed in directory. Communications are by default public. Online presence is hidden. No commenting or feedback of any form is allowed, though connections have the ability to "like" your profile. 
+Listed in directory. Communications are by default public. Online presence is hidden. No commenting or feedback of any form is allowed, though connections have the ability to "like" your profile.
 
 
 [b]Group Repository[/b]
 
-A public forum which allows members to post files/photos/webpages. 
+A public forum which allows members to post files/photos/webpages.
 
 
 [h4]Custom/Expert Mode[/h4]
 
-Set all the privacy and permissions manually to suit your specific needs. 
+Set all the privacy and permissions manually to suit your specific needs.
 
 
 [h3]Creating channels[/h3]
@@ -184,17 +184,17 @@ First, you need to find some channels to connect to. There are two primary ways
 
 The next thing you can do is look at the Directory. The directory is available on every $Projectname website which means searching from your own site will bring in results from the entire network. You can search by name, interest, location, and keyword.
 
-If you already know somebody's 'webbie' you can connect with them directly. A webbie looks just like an email address (for instance bob@example.com) but refers to somebody in the open social web. In order to connect they must be using a compatible network protocol. By default, this software supports the 'zot' protocol, however additional protocols may be provided through plugins/addons. See below for more information on connecting to channels on other networks.    
+If you already know somebody's 'webbie' you can connect with them directly. A webbie looks just like an email address (for instance bob@example.com) but refers to somebody in the open social web. In order to connect they must be using a compatible network protocol. By default, this software supports the 'zot' protocol, however additional protocols may be provided through plugins/addons. See below for more information on connecting to channels on other networks.
 
 To connect with other $Projectname channels:
 
-Visit their profile by clicking their photograph in the directory, matrix, or comments, and it will open their channel home page in the channel viewer. At the left hand side of the screen, you will usually see a link called &quot;connect&quot;. Click it, and you're done. Depending on the settings of the channel you are connecting to, you may need to wait for them to approve your connection, but no further action is needed on your part. Once you've initiated the connection, you will be taken to the connection editor. This allows you to assign specific permissions for this channel if you wish to make any changes. 
+Visit their profile by clicking their photograph in the directory, matrix, or comments, and it will open their channel home page in the channel viewer. At the left hand side of the screen, you will usually see a link called &quot;connect&quot;. Click it, and you're done. Depending on the settings of the channel you are connecting to, you may need to wait for them to approve your connection, but no further action is needed on your part. Once you've initiated the connection, you will be taken to the connection editor. This allows you to assign specific permissions for this channel if you wish to make any changes.
 
 You may also connect with any channel by visiting the &quot;Connections&quot; page of your site or the Directory and typing their &quot;webbie&quot; into the &quot;Add New Connection&quot; field. Use this method if somebody tells you their webbie and you wish to connect with them. The process is the same as connecting via the &quot;Connect&quot; button - you will then be taken to the connection editor to set permissions.
 
 To connect with channels on other networks:
 
-The process for connecting to channels on other networks (such as GNU-Social, Mastodon, and Diaspora) is similar - type their &quot;webbie&quot; into the &quot;Add New Connections&quot; box on the &quot;Connections&quot; page. Before you do this however, please visit your Settings page (Feature/Addon Settings) and ensure that the relevant protocol (Diaspora, GNU-Social/OStatus, or ActivityPub) is provided on your hub and [b][i]activated[/i] for your channel[/b]. These networks/protocols do not support account migration and location independence so if you move location or clone your channel elsewhere, communications with these connections may fail. For this reason these protocols are not activated by default, but only through your consent. Activating these protocols involves an important decision between communicating with friends on these networks or providing fail-safe account resilience if your server fails.    
+The process for connecting to channels on other networks (such as GNU-Social, Mastodon, and Diaspora) is similar - type their &quot;webbie&quot; into the &quot;Add New Connections&quot; box on the &quot;Connections&quot; page. Before you do this however, please visit your Settings page (Feature/Addon Settings) and ensure that the relevant protocol (Diaspora, GNU-Social/OStatus, or ActivityPub) is provided on your hub and [b][i]activated[/i] for your channel[/b]. These networks/protocols do not support account migration and location independence so if you move location or clone your channel elsewhere, communications with these connections may fail. For this reason these protocols are not activated by default, but only through your consent. Activating these protocols involves an important decision between communicating with friends on these networks or providing fail-safe account resilience if your server fails.
 
 Some communications offer more than one protocol. If you wish to connect with somebody on Mastodon (for instance) they can use either the 'ostatus' or the 'activitypub' protocol for communication. Generally the 'activitypub' protocol will provide a better experience than 'ostatus', but $Projectname will often choose the first protocol it discovers and this may not be the one you want. You may connect with somebody over a specific protocol by prepending the protocol name in square brackets to their &quot;webbie&quot;. For example
 
@@ -209,7 +209,7 @@ Some communications offer more than one protocol. If you wish to connect with so
 
 To connect with RSS feeds:
 
-Your hub admin may allow connecting to RSS feeds. The process for connecting to an RSS feed is the same, exept type (or paste) the URL of the feed into the &quot;Add New Connection&quot; box. Feeds are only processed once or twice per day and your hub admin may impose limits on how many feeds you may add.  
+Your hub admin may allow connecting to RSS feeds. The process for connecting to an RSS feed is the same, exept type (or paste) the URL of the feed into the &quot;Add New Connection&quot; box. Feeds are only processed once or twice per day and your hub admin may impose limits on how many feeds you may add.
 
 [h4]Block/Ignore/Archive/Hide channels [/h4]
 
@@ -234,7 +234,7 @@ Permissions in $Projectname are more complete than you may be used to. This allo
 
 [h4]Permission Roles[/h4]
 
-When you create a channel we allow you to select different 'roles' for that channel. These create an entire family of permissions and privacy settings that are appropriate for that role. Typical roles are "Social - mostly public", "Social - mostly private", "Forum - public" and many others. These bring a level of simplicity to managing permissions. Just choose a role and appropriate permissions are automatically applied. You can also choose 'Custom/Expert mode' and change any individual permission setting in any way you desire. 
+When you create a channel we allow you to select different 'roles' for that channel. These create an entire family of permissions and privacy settings that are appropriate for that role. Typical roles are "Social - mostly public", "Social - mostly private", "Forum - public" and many others. These bring a level of simplicity to managing permissions. Just choose a role and appropriate permissions are automatically applied. You can also choose 'Custom/Expert mode' and change any individual permission setting in any way you desire.
 
 
 [h4]Default Permission Limits[/h4]
@@ -242,8 +242,8 @@ When you create a channel we allow you to select different 'roles' for that chan
 There are a large number of individual permissions. These control everything from the ability to view your stream to the ability to chat with you. Every permission has a limit. The scope of these permissions varies from &quot;Only me&quot; to &quot;Everybody on the internet&quot; - though some scopes may not be available for some permissions. The limit applies to any published thing you create which has no privacy or access control. For example if you publish a photo and didn't select a specific audience with permission to view it, we apply the limit. These limits apply to everything within that permission rule, so you cannot apply a limit to one photo. The limit applies to all your photos. If all your photos are visible to everybody on the internet and you reduce the limit only to friends, [b]all[/b] of your photos will now be visible only to friends.
 
 [h4]Access Control[/h4]
- 
-Access Control is the preferred method of managing privacy in [i]most[/i] cases, rather than using permission limits. This creates lists of either connections or privacy groups (or both) and uses the access list to decide if a permission is allowed. An access list is attached to everything you publish. Unlike permission limits, if you change the access control list on a single photo, it doesn't affect any of your other photos. You can use privacy groups and a "default access control list" to create and automate the management of access control lists to provide any level of privacy you desire on anything you publish. 
+
+Access Control is the preferred method of managing privacy in [i]most[/i] cases, rather than using permission limits. This creates lists of either connections or privacy groups (or both) and uses the access list to decide if a permission is allowed. An access list is attached to everything you publish. Unlike permission limits, if you change the access control list on a single photo, it doesn't affect any of your other photos. You can use privacy groups and a "default access control list" to create and automate the management of access control lists to provide any level of privacy you desire on anything you publish.
 
 We highly recommend that you use the "typical social network" settings when you create your first channel, as it allows others to communicate with you and help you out if you have difficulty. You will find that these settings allow you as much privacy as you desire - when you desire it; but also allow you to communicate in public if you choose to. You are free to use much more private settings once you have learned your way around.
 
@@ -252,17 +252,17 @@ We highly recommend that you use the "typical social network" settings when you
 [*= The scopes of permissions are:]
 [dl terms="i"]
   [*= Nobody Except Yourself ] This is self explanatory. Only you will be allowed access.
-  
+
   [*= Only those you specifically allow ] By default, people you are not connected to, and all new contacts will   have this permission denied. You will be able to make exceptions for individual channels on their contact edit   screen.
-  
+
   [*= Anybody in your address book ] Anybody you do not know will have this permission denied, but anybody you   accept as a contact will have this permission approved. This is the way most legacy platforms handle   permissions.
-  
+
   [*= Anybody On This Hub ] Anybody with a channel on the same hub/website as you will have permission approved. Anybody who is registered at a different hub will have this permission denied.
-  
+
   [*= Anybody in this network ] Anybody in $Projectname will have this permission approved. Even complete   strangers. However, anybody not logged in/authenticated will have this permission denied.
-  
+
   [*= Anybody authenticated ] This is similar to "anybody in this network" except that it can include anybody   who can authenticate by any means - and therefore [i]may[/i] include visitors from other networks.
-  
+
   [*=Guest Access Token] This allows you to share a file, folder, photo, album, or channel with a specific person or group of people. They don't need to be $Projectname members. You can set an expiration for the Access Token.
 
   [*= Anybody on the internet ] Completely public. This permission will be approved for anybody at all.
@@ -279,7 +279,7 @@ We highly recommend that you use the "typical social network" settings when you
 
   [*= Can view my &quot;public&quot; file storage. ] This permission determines who can view your public files stored in your cloud.
 
-  [*= Can view my &quot;public&quot; pages. ] This permission determines who can view your public web pages. 
+  [*= Can view my &quot;public&quot; pages. ] This permission determines who can view your public web pages.
 
   [*= Can send me their channel stream and posts. ] This permission determines whose posts you will view. If your channel is a personal channel (ie, you as a person), you would probably want to set this to &quot;anyone in my address book&quot; at a minimum. A personal notes channel would probably want to choose &quot;nobody except myself&quot;. Setting this to &quot;Anybody in the network&quot; will show you posts from complete strangers, which is a good form of discovery.
 
@@ -334,50 +334,63 @@ $Projectname supports several markup languages for advanced formatting of conten
 [/table]
 
 [h3]Tags And Mentions[/h3]
-Like many other platforms, $Projectname uses a special notation inside messages to indicate &quot;tags&quot; or contextual links to other entities.
 
 [h4]Mentions[/h4]
-Channels are tagged by simply preceding their name with the @ character. 
+You can mention a channel by simply preceding their name with the [code]@[/code] character, like this:
 
 [code]
 @Jack
 [/code]
 
-When you start to mention somebody, it will create an auto-complete box to select from your immediate connections. Select one as appropriate.
+If the channel mentioned is in the list of recipients for the post or comment, they will receive a notification, bringing it to their attention. If they're [i]not[/i] among the recipients, the tag will simply work as a link to their profile.
+
+When you begin to mention somebody, it will create an auto-complete box to select from [u]your immediate connections[/u](?). Select one as appropriate.
 
-If the person mentioned is in the list of recipients for the post, they will receive a tag notification.   
 
-[h4]Deliverable Mentions[/h4]
+[h4]Private Mentions[/h4]
+If you wish to restrict a post to a single—or only a few—channels you can do this by selecting channels or privacy groups from the privacy tool.
 
-The [b]![/b] character designates a deliverable mention to a forum or special channel which allows "re-delivery of mentions". 
+[img=[baseurl]/help/en/member/assets/privacy-tool-3.png]Two views of the permissions dialogue. To the left: Selecing a single privacy group or forum as recipients for the post. To the right: Using the 'Custom selection' view to gain fine grained control over the recipients.[/img]
 
-[code]
-@Gardening  - mention the Gardening forum
-[/code]
+You can also just tag a channel with a [i]privacy tag[/i].
 
-[code]
-!Gardening - mention the Gardening Forum and also post to the Gardening "network" (e.g. send to all the forum members; if you have permission to do so)
-[/code]
+A privacy tag is a channel name preceded by the two characters [code]@![/code]. This will also change the privacy permissions of the post to only include the tagged channel. You can use more than one privacy tag, for instance [code]@!bob and @!linda[/code] will send the post only to Bob and Linda. This mechanism over-rides the privacy selector.
 
-Note: In previous releases, forums were delivered by using @forum+ with a plus sign at the end. This mechanism is no longer supported.
+[h4]Mentioning forums[/h4]
 
-[h4]Private Mentions[/h4]
-If you wish to restrict a post to a single person or a number of people, you can do this by selecting channels or privacy groups from the privacy tool. You can also just tag them with a privacy tag. A privacy tag is a name preceded by the two characters @! - and in addition to tagging these channels, will also change the privacy permissions of the post to only include them. You can have more than one privacy tag, for instance @!bob and @!linda will send the post only to Bob and Linda. This mechanism over-rides the privacy selector.  
+Forums may be mentioned in the same way. [code]@!dogs[/code] will post to the dogs forum privately. The forum will redeliver the post to all the forum members, but your own followers will not see the post unless they are also members of the dogs forum.
+
+[size=small][b]Note:[/b] In previous releases you could mention a forum by prefixing the forum name with the characters [code]!![/code]. This is no longer supported. The correct way to send to a forum is by using the [code]@![/code] tag.[/size]
+
+[h4]Mentioning privacy groups[/h4]
 
-Forums may be mentioned in the same way. !!dogs will post to the dogs forum privately. The forum will redeliver the post to all the forum members, but your own followers will not see the post unless they are also members of the dogs forum.
+You may also tag privacy groups which are "public".
 
-You may also tag privacy groups which are "public". When you create or edit a privacy group, there is a checkbox to allow the group members to be seen by others. If this box is checked for a group and you tag (for instance) @!Friends - the post will be restricted to the Friends group. Check that the group is public before doing this - as there is no way to take back a post except to delete it. The group name will appear in the post and will alert members of that group that they are members of it.    
+When you create or edit a privacy group, there is a checkbox to allow the group members to be seen by others. If this box is checked for a group and you tag (for instance) [code]@!Friends[/code] - the post will be restricted to the Friends group. Check that the group is public before doing this - as there is no way to take back a post except to delete it. The group name will appear in the post and will alert members of that group that they are members of it.
+
+Set the privacy group visible to others to make it public:
+[img=[baseurl]/help/en/member/assets/privacy-group-tool-public.png]The privacy group tool with 'Members are visible to other channels' set to 'yes'.[/img]
+
+To add or edit privacy groups, you need to have the [url=[baseurl]/group]Privacy Groups app[/url] installed.
 
 [h4]Mentions and Comments[/h4]
-The above mechanisms only apply to "top-level" posts you create. Mentioning a channel with any of the above mechanisms has no effect in comments, except that the mentioned channel may receive a notification if they were already included as a recipient in the conversation. 
+The above mechanisms only apply to "top-level" posts you create. Mentioning a channel with any of the above mechanisms has no effect in comments, except that the mentioned channel may receive a notification if they were already included as a recipient in the conversation.
 
 [h4]Topical Tags (also known as Hashtags)[/h4]
-Topical tags are indicated by preceding the tag name with the  # character. This will create a link in the post to a generalised site search for the term provided.  For example, #[zrl=[baseurl]/search?tag=cars]cars[/zrl] will provide a search link for all posts mentioning 'cars' on your site. Topical tags are generally a minimum of three characters in length.  Shorter search terms are not likely to yield any search results, although this depends on the database configuration. 
+Topical tags are indicated by preceding the tag name with the [code]#[/code] character. This will create a link in the post to a generalised site search for the term provided.  For example, #[zrl=[baseurl]/search?tag=cars]cars[/zrl] will provide a search link for all posts tagged with '[code]#cars[/code]' on your site. Topical tags are generally a minimum of three characters in length.  Shorter search terms are not likely to yield any search results, although this depends on the database configuration.
 
-Topical tags are also not normally linked if they are purely numeric, e.g. #1. If you wish to use a numeric hashtag, please add some descriptive text such as #2012-elections or enclose the entire tag in double quotes (for example #"2012"). Doubles quotes are also required if the tag contains spaces (#"My Tag") and may be required if the tag contains punctuation characters (#"EndsWithPeriod." or #"Exciting!!!"). 
+Topical tags are also not normally linked if they are purely numeric, e.g. [code]#1[/code]. If you wish to use a numeric hashtag, please add some descriptive text such as [code]#2012-elections[/code] or enclose the entire tag in double quotes (for example [code]#"2012"[/code]). Doubles quotes are also required if the tag contains spaces ([code]#"My Tag"[/code]) and may be required if the tag contains punctuation characters ([code]#"EndsWithPeriod."[/code] or [code]#"Exciting!!!"[/code]).
 
 [h4]Bookmarks[/h4]
-Bookmarks indicate a link which can be saved to your bookmark folder. They use the sequence #^ followed by the link. Often these are generated automatically. If the 'bookmarker' addon is installed, this sequence will be converted to a bookmark icon when viewing the post or comment online, and clicking the icon will save the bookmark. If the bookmarker addon is not installed, the post 'dropdown menu' contains a link for saving the bookmark or bookmarks. 
+Bookmarks indicate a link which can be saved to your bookmark folder. They use the sequence [code]#^[/code] followed by the link. Often these are generated automatically.
+
+[img=[baseurl]/help/en/member/assets/bookmarker-save-icon.png]Saving a bookmark by clicking the bookmark icon when the 'bookmarker' addon is enabled.[/img]
+
+If the site administrator has enabled the [url=[baseurl]/admin/addons/bookmarker]bookmarker[/url] addon for the site, this sequence will be converted to a bookmark icon when viewing the post or comment online. Clicking the icon will save the bookmark.
+
+Otherwise if the [url=[baseurl]/bookmarks]Bookmarks app[/url] is installed for the channel, the post dropdown menu contains a link for saving the bookmark or bookmarks.
+
+[img=[baseurl]/help/en/member/assets/bookmarks-menu-dropdown.png]A post with a bookmark, showing the dropdown menu.[/img]
 
 [h4]Manual Mentions[/h4]
 Where possible please use the auto-complete window to select tag and mention recipients, because it will generate a coded tag which uniquely identifies one channel. Names are sometimes ambiguous. However, you can "manually" tag a channel by matching the channel name or address.
@@ -386,7 +399,7 @@ Where possible please use the auto-complete window to select tag and mention rec
 @billy
 [/code]
 
-will tag a connection whose name or network address is 'billy' (exact match). If you have two connections with a name or network address of billy, for instance billy@server1.hubzilla.org and billy@server2.hubzilla2.org, you will need to supply the complete address or the results will be ambiguous and the wrong person may be tagged.   
+will tag a connection whose name or network address is 'billy' (exact match). If you have two connections with a name or network address of billy, for instance [code]billy@server1.hubzilla.org[/code] and [code]billy@server2.hubzilla2.org[/code], you will need to supply the complete address or the results will be ambiguous and the wrong person may be tagged.
 
 [code]
 @"Robert Johnson"
@@ -401,10 +414,10 @@ $Projectname allows members and allowed connections to create static webpages.
 
 Once enabled, a new tab will appear on your channel page labeled &quot;Webpages&quot;. Clicking this link will take you to the webpage editor. Pages will be accessible at [b][baseurl]/page/[observer=1][observer.webname][/observer][observer=0]channelname[/observer]/pagelinktitle[/b]
 
-The &quot;page link title&quot; box allows you to specify the &quot;pagelinktitle&quot; of this URL.  If no page link title is set, we will set one for you automatically, using the message ID of the item.  
+The &quot;page link title&quot; box allows you to specify the &quot;pagelinktitle&quot; of this URL.  If no page link title is set, we will set one for you automatically, using the message ID of the item.
 
 Beneath the page creation box, a list of existing pages will appear with an &quot;edit&quot; link.  Clicking this will take you to an editor, similar to that of the post editor, where you can make changes to your webpages.
-	
+
 [h4]Using Blocks[/h4]
 
 Blocks can be parts of webpages. The basic HTML of a block looks like this
@@ -417,7 +430,7 @@ Blocks can be parts of webpages. The basic HTML of a block looks like this
 
 If a block has text/html content type it can also contain menu elements. Sample content of
 [code]
-	<p>HTML block content</p> 
+	<p>HTML block content</p>
 	[menu]menuname[/menu]
 
 [/code]
@@ -484,7 +497,7 @@ will produce this HTML
 There are two methods of importing webpage elements: uploading a zip file or referencing a local cloud files folder. Both methods require that the webpage elements are specified using a specific folder structure. The import tool makes it possible to import all the elements necessary to construct an entire website or set of websites. The goal is to accommodate external development of webpages as well as tools to simplify and automate deployment on a hub.
 
 [h5] Folder structure [/h5]
-Element definitions must be stored in the repo root under folders called 
+Element definitions must be stored in the repo root under folders called
 [code]
 	/pages/
 	/blocks/
@@ -502,15 +515,15 @@ Page element metadata is specified in a JSON-formatted file called [code]page.js
 [*] layout
 [*] contentfile
 [/list]
-[b]Example[/b] 
+[b]Example[/b]
 
-Files: 
-[code]	
+Files:
+[code]
 	/pages/my-page/page.json
 	/pages/my-page/my-page.bbcode
-[/code]	
+[/code]
 Content of [code]page.json[/code]:
-[code]	
+[code]
 	{
 		"title": "My Page",
 		"pagelink": "mypage",
@@ -518,7 +531,7 @@ Content of [code]page.json[/code]:
 		"layout": "my-layout",
 		"contentfile": "my-page.bbcode"
 	}
-[/code]	
+[/code]
 [h5] Layout elements [/h5]
 
 Layout element metadata is specified in a JSON-formatted file called [code]layout.json[/code] with the following properties:
@@ -527,13 +540,13 @@ Layout element metadata is specified in a JSON-formatted file called [code]layou
 [*] description
 [*] contentfile
 [/list]
-[b]Example[/b] 
+[b]Example[/b]
 
 Files:
 [code]
 	/layouts/my-layout/layout.json
 	/layouts/my-layout/my-layout.bbcode
-[/code]	
+[/code]
 Content of [code]layout.json[/code]:
 [code]
 	{
@@ -552,14 +565,14 @@ Block element metadata is specified in a JSON-formatted file called [code]block.
 [*] mimetype
 [*] contentfile
 [/list]
-[b]Example[/b] 
+[b]Example[/b]
 
 Files:
-[code]	
+[code]
 	/blocks/my-block/block.json
 	/blocks/my-block/my-block.html
 [/code]
-Content of [code]block.json[/code]:	
+Content of [code]block.json[/code]:
 
 [code]
 	{
@@ -581,7 +594,7 @@ Currently there are five layout templates, unless your site provides additional
 
 [dl terms="b"]
 [*= default]
-The default template defines a &quot;nav&quot; region across the top, &quot;aside&quot; as a fixed width sidebar, 
+The default template defines a &quot;nav&quot; region across the top, &quot;aside&quot; as a fixed width sidebar,
 &quot;content&quot; for the main content region, and &quot;footer&quot; for a page footer.
 
 [*= full]
@@ -644,7 +657,7 @@ This will select the theme named &quot;suckerberg&quot;. By default your channel
 	[theme=passion]suckerberg[/theme]
 
 [/code]
-This will select the theme named &quot;suckerberg&quot; and select the &quot;passion&quot; schema (theme variant). Alternatively it may be possible to use a condensed theme notation for this. 
+This will select the theme named &quot;suckerberg&quot; and select the &quot;passion&quot; schema (theme variant). Alternatively it may be possible to use a condensed theme notation for this.
 
 [code]
 	[theme]suckerberg:passion[/theme]
@@ -693,13 +706,13 @@ Your webpage creation tools allow you to create menus and blocks, in addition to
 	[menu]mymenu[/menu]
 
 [/code]
-This places the menu called &quot;mymenu&quot; at this location on the page, which must be inside a region. 
+This places the menu called &quot;mymenu&quot; at this location on the page, which must be inside a region.
 
 [code]
 	[menu=horizontal]mymenu[/menu]
 
 [/code]
-This places the menu called &quot;mymenu&quot; at this location on the page, which must be inside a region. Additionally it applies the "horizontal" class to the menu. "horizontal" is defined in the redbasic theme. It may or may not be available in other themes. 
+This places the menu called &quot;mymenu&quot; at this location on the page, which must be inside a region. Additionally it applies the "horizontal" class to the menu. "horizontal" is defined in the redbasic theme. It may or may not be available in other themes.
 
 [code]
 	[menu][var=wrap]none[/var]mymenu[/menu]
@@ -734,8 +747,8 @@ Widgets and arguments are specified with the 'widget' and 'var' tags.
 
 [/code]
 
-This loads the &quot;recent_visitors&quot; widget and supplies it with the argument &quot;count&quot; set to &quot;24&quot;. 
- 
+This loads the &quot;recent_visitors&quot; widget and supplies it with the argument &quot;count&quot; set to &quot;24&quot;.
+
 [h4]Comments[/h4]
 The 'comment' tag is used to delimit comments. These comments will not appear on the rendered page.
 
@@ -760,7 +773,7 @@ You can use an 'if' construct to make decisions. These are currently based on sy
 
 [/code]
 
-	The 'else' clause is optional. 
+	The 'else' clause is optional.
 
 	Several tests are supported besides boolean evaluation.
 
@@ -848,7 +861,7 @@ To delete attachments or change the permissions on the stored files, visit [obse
 
 [h4]Web Access[/h4]
 
-Your files are visible on the web at the location [observer=1][baseurl]/cloud/[observer.webname][/observer][observer=0][baseurl]/cloud/username[/observer] to anybody who is allowed to view them. If the viewer has sufficient privileges, they may also have the ability to create new files and folders/directories. This should only be used for smaller files and photos (up to a few megabytes) as it uses internal memory. For larger files (videos, music, etc.), please upload using WebDAV. These files may still be retrieved via web access. 
+Your files are visible on the web at the location [observer=1][baseurl]/cloud/[observer.webname][/observer][observer=0][baseurl]/cloud/username[/observer] to anybody who is allowed to view them. If the viewer has sufficient privileges, they may also have the ability to create new files and folders/directories. This should only be used for smaller files and photos (up to a few megabytes) as it uses internal memory. For larger files (videos, music, etc.), please upload using WebDAV. These files may still be retrieved via web access.
 
 [h4]WebDAV access[/h4]
 
@@ -909,8 +922,8 @@ Now you need to add any user you want to be able to mount dav to the davfs2 grou
 
 [code]usermod -aG davfs2 &lt;DesktopUser&gt;[/code]
 
-[b]Note:[/b] on some systems the user group may be different, i.e. - "network" 
-on Arch Linux. If in doubt, check the davfs documentation for your 
+[b]Note:[/b] on some systems the user group may be different, i.e. - "network"
+on Arch Linux. If in doubt, check the davfs documentation for your
 particular OS.
 
 Edit /etc/fstab
@@ -925,7 +938,7 @@ Edit /etc/fstab
 
 Where [baseurl] is the URL of your hub, /mount/point is the location you want to mount the cloud, and &lt;DesktopUser&gt; is the user you log in to one your computer.  Note that if you are mounting as a normal user (not root) the mount point must be in your home directory.
 
-For example, if I wanted to mount my cloud to a directory called 'cloud' in my home directory, and my username was bob, my fstab would be 
+For example, if I wanted to mount my cloud to a directory called 'cloud' in my home directory, and my username was bob, my fstab would be
 
 [code][baseurl]/dav/ /home/bob/cloud davfs user,noauto,uid=bob,file_mode=600,dir_mode=700 0 1[/code]
 
@@ -965,7 +978,7 @@ With some webservers and certain configurations, you may find davfs2 creating fi
 
 [code]nano /etc/davfs2/davfs2.conf[/code]
 
-Your distribution will provide a sample configuration, and this file should already exist, however, most of it will be commented out with a # at the beginning of the line.  
+Your distribution will provide a sample configuration, and this file should already exist, however, most of it will be commented out with a # at the beginning of the line.
 
 First step is to remove locks.
 
@@ -989,7 +1002,7 @@ Note, if you are already logged in to the web interface via Konqueror, you will
 
 Simply visit webdavs://example.com/dav after logging in to your hub, where &quot;example.com&quot; is the URL of your hub.
 
-No further authentication is required if you are logged in to your hub in the normal manner.  
+No further authentication is required if you are logged in to your hub in the normal manner.
 
 Additionally, if one has authenticated at a different hub during their normal browser session, your identity will be passed to the cloud for these hubs too - meaning you can access any private files on any server, as long as you have permissions to see them, as long as you have visited that site earlier in your session.
 
@@ -1023,13 +1036,13 @@ Once open you can set a bookmark.
 
 [h5]Server Notes[/h5]
 
-Note: There have been reported issues with clients that use "chunked transfer encoding", which includes Apple iOS services, and also the "AnyClient" and "CyberDuck" tools. These work fine for downloads, but uploads often end up with files of zero size. This is caused by an incorrect implemention of chunked encoding in some current FCGI (fast-cgi) implementations. Apache running with PHP as a module does not have these issues, but when running under FCGI you may need to use alternative clients or use the web uploader. At the time of this writing the issue has been open and no updates provided for at least a year. If you encounter zero size files with other clients, please check the client notes; as there are occasional configuration issues which can also produce these symptoms.  
+Note: There have been reported issues with clients that use "chunked transfer encoding", which includes Apple iOS services, and also the "AnyClient" and "CyberDuck" tools. These work fine for downloads, but uploads often end up with files of zero size. This is caused by an incorrect implemention of chunked encoding in some current FCGI (fast-cgi) implementations. Apache running with PHP as a module does not have these issues, but when running under FCGI you may need to use alternative clients or use the web uploader. At the time of this writing the issue has been open and no updates provided for at least a year. If you encounter zero size files with other clients, please check the client notes; as there are occasional configuration issues which can also produce these symptoms.
 
 [h3]Saved Searches[/h3]
 
-In order to quickly find information, the 'saved search' widget may be used. This widget may be presented as a sidebar tool on your network page and possibly from your channel page. It is differentiated from the 'navigation bar' search tool in that it does not search the entire site, but only the subset of information available to your channel. 
+In order to quickly find information, the 'saved search' widget may be used. This widget may be presented as a sidebar tool on your network page and possibly from your channel page. It is differentiated from the 'navigation bar' search tool in that it does not search the entire site, but only the subset of information available to your channel.
 
-Additionally the search terms you provide may activate a one-time search or be saved in a list for re-use. Saving the search item also invokes the search in addition to adding it to the saved list (which is displayed below the search text entry box). Any item in the list may be discarded if it is no longer needed. 
+Additionally the search terms you provide may activate a one-time search or be saved in a list for re-use. Saving the search item also invokes the search in addition to adding it to the saved list (which is displayed below the search text entry box). Any item in the list may be discarded if it is no longer needed.
 
 The saved search widget will provide autocompletion of channels (the results are prefixed with '@'), and hashtags (prefixed with '#'). You do not need to enter these tags; although entering the desired tag will reduce the autocomplete results to only hold the relevant information. The behaviour maps as follows:
 
@@ -1046,9 +1059,9 @@ The saved search widget will provide autocompletion of channels (the results are
 
 Select the 'Remove Channel' link on your channel settings page or visit the URL:
 
-	[baseurl]/removeme 
+	[baseurl]/removeme
 
-You will need to confirm your password and the channel you are currently logged into will be removed. 
+You will need to confirm your password and the channel you are currently logged into will be removed.
 
 [hl][i][b]This is irreversible.[/b][/i][/hl]
 
@@ -1059,8 +1072,8 @@ If you have identity clones on other hubs this only removes  by default the chan
 Select 'Remove Account' from your account settings page or visit the URL:
 
 	[baseurl]/removeaccount
-	
-You will need to confirm your password and the account you are currently logged into will be removed. 
+
+You will need to confirm your password and the account you are currently logged into will be removed.
 
 [hl][i][b]This is irreversible.[/b][/i][/hl]
 
diff --git a/doc/plugins.bb b/doc/en/plugins.bb
index 3aecc458f..3aecc458f 100644
--- a/doc/plugins.bb
+++ b/doc/en/plugins.bb
diff --git a/doc/problems-following-an-update.bb b/doc/en/problems-following-an-update.bb
index 7376d6163..7376d6163 100644
--- a/doc/problems-following-an-update.bb
+++ b/doc/en/problems-following-an-update.bb
diff --git a/doc/red2pi.bb b/doc/en/red2pi.bb
index 8ae087fbf..8ae087fbf 100644
--- a/doc/red2pi.bb
+++ b/doc/en/red2pi.bb
diff --git a/doc/roadmap.bb b/doc/en/roadmap.bb
index dce19848a..dce19848a 100644
--- a/doc/roadmap.bb
+++ b/doc/en/roadmap.bb
diff --git a/doc/schema_development.bb b/doc/en/schema_development.bb
index 10832684a..10832684a 100644
--- a/doc/schema_development.bb
+++ b/doc/en/schema_development.bb
diff --git a/doc/schemaspy_hubzilla/zot.meta.xml b/doc/en/schemaspy_hubzilla/zot.meta.xml
index 98a9d370e..98a9d370e 100644
--- a/doc/schemaspy_hubzilla/zot.meta.xml
+++ b/doc/en/schemaspy_hubzilla/zot.meta.xml
diff --git a/doc/sql_conventions.bb b/doc/en/sql_conventions.bb
index f6a4e251f..f6a4e251f 100644
--- a/doc/sql_conventions.bb
+++ b/doc/en/sql_conventions.bb
diff --git a/doc/en/toc.html b/doc/en/toc.html
new file mode 100644
index 000000000..b1edef6d2
--- /dev/null
+++ b/doc/en/toc.html
@@ -0,0 +1,75 @@
+<div class="" id="accordion">
+    <div class="mb-3">
+        <div class="">
+            <h3 class="panel-title">
+                    Tutorials
+            </h3>
+        </div>
+        <div id="tutorials" class="doco-section">
+            <div class="vstack">
+                <a class="" href="/help/tutorials/personal_channel">Personal Channel</a>
+            </div>
+        </div>
+    </div>
+    <div class="mb-3">
+        <div class="">
+            <h3 class="panel-title">
+                    Members
+            </h3>
+        </div>
+        <div id="members" class="doco-section">
+            <div class="vstack">
+               <a class="" href="/help/member/member_guide">Guide</a>
+               <a class="" href="/help/member/bbcode">BBcode Reference</a>
+               <a class="" href="/help/feature/additional/overview">Additional Features</a>
+               <a class="" href="/help/bugs">Reporting Bugs</a>
+               <a class="" href="/help/member/member_faq">FAQ</a>
+            </div>
+        </div>
+    </div>
+    <div class="mb-3">
+        <div class="">
+            <h3 class="panel-title">
+                    Administrators
+            </h3>
+        </div>
+        <div id="administrators" class="doco-section">
+            <div class="vstack">
+                <a class="" href="/help/admin/administrator_guide">Guide</a>
+                <a class="" href="/help/admin/hub_snapshots">Hub Snapshots</a>
+                <a class="" href="/help/database">Database</a>
+                <a class="" href="/help/hidden_configs">Extra configs</a>
+            </div>
+        </div>
+    </div>
+    <div class="mb-3">
+        <div class="">
+            <h3 class="panel-title">
+                    Developers
+            </h3>
+        </div>
+        <div id="developers" class="doco-section">
+            <div class="vstack">
+                <a class="" href="/help/developer/developer_guide">Guide</a>
+                <a class="" href="/help/developer/covenant">Code of Conduct</a>
+                <a class="" href="/help/developer/zot_protocol">Zot Protocol</a>
+                <a class="" href="/help/developer/api_zot">Zot API</a>
+                <a class="" href="/help/hooklist">Hooks</a>
+            </div>
+        </div>
+    </div>
+    <div class="mb-3">
+        <div class="">
+            <h3 class="panel-title">
+                    About
+            </h3>
+        </div>
+        <div id="about" class="doco-section">
+            <div class="vstack">
+                <a class="" href="/help/about/about">About</a>
+                <a class="" href="/help/about/project">Project</a>
+                <a class="" href="/help/about/about_hub">About this hub</a>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/doc/tutorials/assets/0965ace945f0c95ae38aa5bfedd230d2a7233d3915ac15d629f9dd845854.png b/doc/en/tutorials/assets/0965ace945f0c95ae38aa5bfedd230d2a7233d3915ac15d629f9dd845854.png
index d5cf1093f..d5cf1093f 100644
--- a/doc/tutorials/assets/0965ace945f0c95ae38aa5bfedd230d2a7233d3915ac15d629f9dd845854.png
+++ b/doc/en/tutorials/assets/0965ace945f0c95ae38aa5bfedd230d2a7233d3915ac15d629f9dd845854.png
diff --git a/doc/tutorials/assets/1ebe02c205962dd25035c441631745d16acdb7a44e50d148256c8ad26a67.png b/doc/en/tutorials/assets/1ebe02c205962dd25035c441631745d16acdb7a44e50d148256c8ad26a67.png
index d613925aa..d613925aa 100644
--- a/doc/tutorials/assets/1ebe02c205962dd25035c441631745d16acdb7a44e50d148256c8ad26a67.png
+++ b/doc/en/tutorials/assets/1ebe02c205962dd25035c441631745d16acdb7a44e50d148256c8ad26a67.png
diff --git a/doc/tutorials/assets/2243e48ccea25bd907cce3dbd6fc9f7cd832a4c91a4c5dd294b7b219e7d8.png b/doc/en/tutorials/assets/2243e48ccea25bd907cce3dbd6fc9f7cd832a4c91a4c5dd294b7b219e7d8.png
index c403bf806..c403bf806 100644
--- a/doc/tutorials/assets/2243e48ccea25bd907cce3dbd6fc9f7cd832a4c91a4c5dd294b7b219e7d8.png
+++ b/doc/en/tutorials/assets/2243e48ccea25bd907cce3dbd6fc9f7cd832a4c91a4c5dd294b7b219e7d8.png
diff --git a/doc/tutorials/assets/25eaad2435200f72a1dd3a00ba17a76ca6db4c246b3c4fa286b390cae7c8.png b/doc/en/tutorials/assets/25eaad2435200f72a1dd3a00ba17a76ca6db4c246b3c4fa286b390cae7c8.png
index ca8ba6fb9..ca8ba6fb9 100644
--- a/doc/tutorials/assets/25eaad2435200f72a1dd3a00ba17a76ca6db4c246b3c4fa286b390cae7c8.png
+++ b/doc/en/tutorials/assets/25eaad2435200f72a1dd3a00ba17a76ca6db4c246b3c4fa286b390cae7c8.png
diff --git a/doc/tutorials/assets/2b539d5a8474d6ec6dc91155b628d9be5f99ab04a78108ec404f53ec7bb5.png b/doc/en/tutorials/assets/2b539d5a8474d6ec6dc91155b628d9be5f99ab04a78108ec404f53ec7bb5.png
index 0da2d96e2..0da2d96e2 100644
--- a/doc/tutorials/assets/2b539d5a8474d6ec6dc91155b628d9be5f99ab04a78108ec404f53ec7bb5.png
+++ b/doc/en/tutorials/assets/2b539d5a8474d6ec6dc91155b628d9be5f99ab04a78108ec404f53ec7bb5.png
diff --git a/doc/tutorials/assets/31f42a02bdbae095e0329db6c3814e2975979aff12f873f43d81724c5e61.png b/doc/en/tutorials/assets/31f42a02bdbae095e0329db6c3814e2975979aff12f873f43d81724c5e61.png
index 2a209b2be..2a209b2be 100644
--- a/doc/tutorials/assets/31f42a02bdbae095e0329db6c3814e2975979aff12f873f43d81724c5e61.png
+++ b/doc/en/tutorials/assets/31f42a02bdbae095e0329db6c3814e2975979aff12f873f43d81724c5e61.png
diff --git a/doc/tutorials/assets/324247680b605fd214fd61aecd8f216fa8f5dfa0f16a04c8e968fdbc43d0.png b/doc/en/tutorials/assets/324247680b605fd214fd61aecd8f216fa8f5dfa0f16a04c8e968fdbc43d0.png
index f992672b0..f992672b0 100644
--- a/doc/tutorials/assets/324247680b605fd214fd61aecd8f216fa8f5dfa0f16a04c8e968fdbc43d0.png
+++ b/doc/en/tutorials/assets/324247680b605fd214fd61aecd8f216fa8f5dfa0f16a04c8e968fdbc43d0.png
diff --git a/doc/tutorials/assets/3656a67dce40a1fc2515e9089217f2e136d4fcf8babe77bac00ecaad43ce.png b/doc/en/tutorials/assets/3656a67dce40a1fc2515e9089217f2e136d4fcf8babe77bac00ecaad43ce.png
index b656192dc..b656192dc 100644
--- a/doc/tutorials/assets/3656a67dce40a1fc2515e9089217f2e136d4fcf8babe77bac00ecaad43ce.png
+++ b/doc/en/tutorials/assets/3656a67dce40a1fc2515e9089217f2e136d4fcf8babe77bac00ecaad43ce.png
diff --git a/doc/tutorials/assets/458a842c2ea0fbe3b7869bb14dfffe1e5be098d1cd6e590bbead25b4cc05.png b/doc/en/tutorials/assets/458a842c2ea0fbe3b7869bb14dfffe1e5be098d1cd6e590bbead25b4cc05.png
index 6129195b6..6129195b6 100644
--- a/doc/tutorials/assets/458a842c2ea0fbe3b7869bb14dfffe1e5be098d1cd6e590bbead25b4cc05.png
+++ b/doc/en/tutorials/assets/458a842c2ea0fbe3b7869bb14dfffe1e5be098d1cd6e590bbead25b4cc05.png
diff --git a/doc/tutorials/assets/4aaaf1e124514c8d6999a5fe1d07be5af460cda4ba6cde9106ebc1564bb0.png b/doc/en/tutorials/assets/4aaaf1e124514c8d6999a5fe1d07be5af460cda4ba6cde9106ebc1564bb0.png
index 923403fe9..923403fe9 100644
--- a/doc/tutorials/assets/4aaaf1e124514c8d6999a5fe1d07be5af460cda4ba6cde9106ebc1564bb0.png
+++ b/doc/en/tutorials/assets/4aaaf1e124514c8d6999a5fe1d07be5af460cda4ba6cde9106ebc1564bb0.png
diff --git a/doc/tutorials/assets/4cf326152797a8ecdf5630e921756f825ee00f8ee464d3ef9fed971d2852.png b/doc/en/tutorials/assets/4cf326152797a8ecdf5630e921756f825ee00f8ee464d3ef9fed971d2852.png
index f158ad5d9..f158ad5d9 100644
--- a/doc/tutorials/assets/4cf326152797a8ecdf5630e921756f825ee00f8ee464d3ef9fed971d2852.png
+++ b/doc/en/tutorials/assets/4cf326152797a8ecdf5630e921756f825ee00f8ee464d3ef9fed971d2852.png
diff --git a/doc/tutorials/assets/75d2927b7ad0d2043d4d3b6ba1364fac8ead173edd39340adaf78be11c9d.png b/doc/en/tutorials/assets/75d2927b7ad0d2043d4d3b6ba1364fac8ead173edd39340adaf78be11c9d.png
index edc8b01cc..edc8b01cc 100644
--- a/doc/tutorials/assets/75d2927b7ad0d2043d4d3b6ba1364fac8ead173edd39340adaf78be11c9d.png
+++ b/doc/en/tutorials/assets/75d2927b7ad0d2043d4d3b6ba1364fac8ead173edd39340adaf78be11c9d.png
diff --git a/doc/tutorials/assets/7c976a06662a1357b3da8ed0680d1a721c85f2ae2bdd5739a8def466010e.png b/doc/en/tutorials/assets/7c976a06662a1357b3da8ed0680d1a721c85f2ae2bdd5739a8def466010e.png
index 5b259058b..5b259058b 100644
--- a/doc/tutorials/assets/7c976a06662a1357b3da8ed0680d1a721c85f2ae2bdd5739a8def466010e.png
+++ b/doc/en/tutorials/assets/7c976a06662a1357b3da8ed0680d1a721c85f2ae2bdd5739a8def466010e.png
diff --git a/doc/tutorials/assets/99a6efda4df631dfb2d2a849412044cc6a0f8aebeac289d28786f2649d24.png b/doc/en/tutorials/assets/99a6efda4df631dfb2d2a849412044cc6a0f8aebeac289d28786f2649d24.png
index c03ffd18d..c03ffd18d 100644
--- a/doc/tutorials/assets/99a6efda4df631dfb2d2a849412044cc6a0f8aebeac289d28786f2649d24.png
+++ b/doc/en/tutorials/assets/99a6efda4df631dfb2d2a849412044cc6a0f8aebeac289d28786f2649d24.png
diff --git a/doc/tutorials/assets/9eae9fad774a4cd29e665961d35affbd053368056f562c58200fb41027b0.png b/doc/en/tutorials/assets/9eae9fad774a4cd29e665961d35affbd053368056f562c58200fb41027b0.png
index 65d4c5f0a..65d4c5f0a 100644
--- a/doc/tutorials/assets/9eae9fad774a4cd29e665961d35affbd053368056f562c58200fb41027b0.png
+++ b/doc/en/tutorials/assets/9eae9fad774a4cd29e665961d35affbd053368056f562c58200fb41027b0.png
diff --git a/doc/tutorials/assets/b0bfdf02aef3710a37bb6092c3240b291eca8afa73133b3ac03b86f3302d.png b/doc/en/tutorials/assets/b0bfdf02aef3710a37bb6092c3240b291eca8afa73133b3ac03b86f3302d.png
index 45609a7bb..45609a7bb 100644
--- a/doc/tutorials/assets/b0bfdf02aef3710a37bb6092c3240b291eca8afa73133b3ac03b86f3302d.png
+++ b/doc/en/tutorials/assets/b0bfdf02aef3710a37bb6092c3240b291eca8afa73133b3ac03b86f3302d.png
diff --git a/doc/tutorials/assets/b334915c03a665493915598c69c17a87c910a39db2cd3b5292e4623ea4c4.png b/doc/en/tutorials/assets/b334915c03a665493915598c69c17a87c910a39db2cd3b5292e4623ea4c4.png
index d239d6965..d239d6965 100644
--- a/doc/tutorials/assets/b334915c03a665493915598c69c17a87c910a39db2cd3b5292e4623ea4c4.png
+++ b/doc/en/tutorials/assets/b334915c03a665493915598c69c17a87c910a39db2cd3b5292e4623ea4c4.png
diff --git a/doc/tutorials/assets/b3eece28e8db67f1024af42055f0f24ed5e81ba622aca8cac576ccf5930e.png b/doc/en/tutorials/assets/b3eece28e8db67f1024af42055f0f24ed5e81ba622aca8cac576ccf5930e.png
index 45ed64d00..45ed64d00 100644
--- a/doc/tutorials/assets/b3eece28e8db67f1024af42055f0f24ed5e81ba622aca8cac576ccf5930e.png
+++ b/doc/en/tutorials/assets/b3eece28e8db67f1024af42055f0f24ed5e81ba622aca8cac576ccf5930e.png
diff --git a/doc/tutorials/assets/bdbcf0ffd9004657237f6b7b7863da5a8e39a5bc17d2c67fa160efef2056.png b/doc/en/tutorials/assets/bdbcf0ffd9004657237f6b7b7863da5a8e39a5bc17d2c67fa160efef2056.png
index fcaed8bef..fcaed8bef 100644
--- a/doc/tutorials/assets/bdbcf0ffd9004657237f6b7b7863da5a8e39a5bc17d2c67fa160efef2056.png
+++ b/doc/en/tutorials/assets/bdbcf0ffd9004657237f6b7b7863da5a8e39a5bc17d2c67fa160efef2056.png
diff --git a/doc/tutorials/assets/c4cad3e4c356dd2a227df79bd4dc6d47edf1b66ea243f005b6b452ec366b.png b/doc/en/tutorials/assets/c4cad3e4c356dd2a227df79bd4dc6d47edf1b66ea243f005b6b452ec366b.png
index 0ccfc8995..0ccfc8995 100644
--- a/doc/tutorials/assets/c4cad3e4c356dd2a227df79bd4dc6d47edf1b66ea243f005b6b452ec366b.png
+++ b/doc/en/tutorials/assets/c4cad3e4c356dd2a227df79bd4dc6d47edf1b66ea243f005b6b452ec366b.png
diff --git a/doc/tutorials/assets/c9a880cc82ffa1f7c2f460397bb083bf7dc2a2b8f065e64da598b45b4a2b.png b/doc/en/tutorials/assets/c9a880cc82ffa1f7c2f460397bb083bf7dc2a2b8f065e64da598b45b4a2b.png
index 1cb4d2d22..1cb4d2d22 100644
--- a/doc/tutorials/assets/c9a880cc82ffa1f7c2f460397bb083bf7dc2a2b8f065e64da598b45b4a2b.png
+++ b/doc/en/tutorials/assets/c9a880cc82ffa1f7c2f460397bb083bf7dc2a2b8f065e64da598b45b4a2b.png
diff --git a/doc/tutorials/assets/d080e92d797af5e863fa39b2084c16a8410de1f7a6559633435817444aef.png b/doc/en/tutorials/assets/d080e92d797af5e863fa39b2084c16a8410de1f7a6559633435817444aef.png
index 22e4cb5d5..22e4cb5d5 100644
--- a/doc/tutorials/assets/d080e92d797af5e863fa39b2084c16a8410de1f7a6559633435817444aef.png
+++ b/doc/en/tutorials/assets/d080e92d797af5e863fa39b2084c16a8410de1f7a6559633435817444aef.png
diff --git a/doc/tutorials/assets/e05248fdc5688d6d24bde52432fdc7b39692a094559aa504de99352940b1.png b/doc/en/tutorials/assets/e05248fdc5688d6d24bde52432fdc7b39692a094559aa504de99352940b1.png
index 5674f5207..5674f5207 100644
--- a/doc/tutorials/assets/e05248fdc5688d6d24bde52432fdc7b39692a094559aa504de99352940b1.png
+++ b/doc/en/tutorials/assets/e05248fdc5688d6d24bde52432fdc7b39692a094559aa504de99352940b1.png
diff --git a/doc/tutorials/assets/e5d5674a34e848e2cce90a60fc416415271d9c51b81ad2a950fb0157222a.png b/doc/en/tutorials/assets/e5d5674a34e848e2cce90a60fc416415271d9c51b81ad2a950fb0157222a.png
index e6b4a9974..e6b4a9974 100644
--- a/doc/tutorials/assets/e5d5674a34e848e2cce90a60fc416415271d9c51b81ad2a950fb0157222a.png
+++ b/doc/en/tutorials/assets/e5d5674a34e848e2cce90a60fc416415271d9c51b81ad2a950fb0157222a.png
diff --git a/doc/tutorials/assets/ef78bc6aa3fafebd46f353514c907b3fdfe019918fc5553bb3f31388a36f.png b/doc/en/tutorials/assets/ef78bc6aa3fafebd46f353514c907b3fdfe019918fc5553bb3f31388a36f.png
index 8de042ae4..8de042ae4 100644
--- a/doc/tutorials/assets/ef78bc6aa3fafebd46f353514c907b3fdfe019918fc5553bb3f31388a36f.png
+++ b/doc/en/tutorials/assets/ef78bc6aa3fafebd46f353514c907b3fdfe019918fc5553bb3f31388a36f.png
diff --git a/doc/tutorials/assets/facb0bdfdecb4c779de9048cd14b417c0d76de17af476be5f296b78d70e9.png b/doc/en/tutorials/assets/facb0bdfdecb4c779de9048cd14b417c0d76de17af476be5f296b78d70e9.png
index cec391fb4..cec391fb4 100644
--- a/doc/tutorials/assets/facb0bdfdecb4c779de9048cd14b417c0d76de17af476be5f296b78d70e9.png
+++ b/doc/en/tutorials/assets/facb0bdfdecb4c779de9048cd14b417c0d76de17af476be5f296b78d70e9.png
diff --git a/doc/tutorials/personal_channel.html b/doc/en/tutorials/personal_channel.html
index bbf367571..3069cd44b 100644
--- a/doc/tutorials/personal_channel.html
+++ b/doc/en/tutorials/personal_channel.html
@@ -1,18 +1,18 @@
 
-<p>This tutorial is intended to be followed in sequence as if you were setting up a 
-channel for the first time. It introduces some of the tools and features related 
+<p>This tutorial is intended to be followed in sequence as if you were setting up a
+channel for the first time. It introduces some of the tools and features related
 to a personal channel in a natural way.</p>
 
 <h3 id="Create_a_new_channel">Create a new channel</h3>
 
-<p>When you log in for the first time after registering, you must create a channel. 
+<p>When you log in for the first time after registering, you must create a channel.
 (Alternatively you can visit https://your_website/new_channel)</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/c9a880cc82ffa1f7c2f460397bb083bf7dc2a2b8f065e64da598b45b4a2b.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/c9a880cc82ffa1f7c2f460397bb083bf7dc2a2b8f065e64da598b45b4a2b.png" alt="image"></p>
 
-<p>Enter your name and a nickname for the channel address, and select a "role". 
-Typically if this is a personal channel that represents you, select a <strong>Social</strong> role 
-with a level of default privacy that you are comfortable with. If you are unsure, 
+<p>Enter your name and a nickname for the channel address, and select a "role".
+Typically if this is a personal channel that represents you, select a <strong>Social</strong> role
+with a level of default privacy that you are comfortable with. If you are unsure,
 select <strong>Social - Mostly public</strong> which allows easy interaction and provides privacy when you need it.
 Alternatively, <strong>Social - Restricted</strong> is very popular among privacy advocates, though it may require a bit more
 effort to meet people. Whichever setting you choose can be changed later if you decide you require more or less privacy than what is provided.</p>
@@ -20,15 +20,15 @@ effort to meet people. Whichever setting you choose can be changed later if you
 <!-- This section no longer applicable
 <h3 id="Configure_your_channel_features">Configure your channel features</h3>
 
-<p>When your new channel is created you are directed to the channel settings page. 
-Take the time to look around at all the settings pages to familiarize yourself with 
+<p>When your new channel is created you are directed to the channel settings page.
+Take the time to look around at all the settings pages to familiarize yourself with
 your options, even if you don't understand everything you see right now.</p>
 
-<p>Navigate to the <strong>Additional Features</strong> settings and follow the screenshots below to 
+<p>Navigate to the <strong>Additional Features</strong> settings and follow the screenshots below to
 enable various features. Remember to press the Submit button when you are done with
 your selections.</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/3656a67dce40a1fc2515e9089217f2e136d4fcf8babe77bac00ecaad43ce.png" alt="image"><img class="img-responsive" src="/help/tutorials/assets/4aaaf1e124514c8d6999a5fe1d07be5af460cda4ba6cde9106ebc1564bb0.png" alt="image"><img class="img-responsive" src="/help/tutorials/assets/99a6efda4df631dfb2d2a849412044cc6a0f8aebeac289d28786f2649d24.png" alt="image"><img class="img-responsive" src="/help/tutorials/assets/e5d5674a34e848e2cce90a60fc416415271d9c51b81ad2a950fb0157222a.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/3656a67dce40a1fc2515e9089217f2e136d4fcf8babe77bac00ecaad43ce.png" alt="image"><img class="img-responsive" src="/help/en/tutorials/assets/4aaaf1e124514c8d6999a5fe1d07be5af460cda4ba6cde9106ebc1564bb0.png" alt="image"><img class="img-responsive" src="/help/en/tutorials/assets/99a6efda4df631dfb2d2a849412044cc6a0f8aebeac289d28786f2649d24.png" alt="image"><img class="img-responsive" src="/help/en/tutorials/assets/e5d5674a34e848e2cce90a60fc416415271d9c51b81ad2a950fb0157222a.png" alt="image"></p>
 -->
 
 <h3 id="Add_a_profile_photo">Add a profile photo</h3>
@@ -37,126 +37,126 @@ your selections.</p>
 
 <p>From the <strong>Profile Tools</strong> dropdown menu, select <strong>Change profile photo</strong> (or just click the profile photo).</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/31f42a02bdbae095e0329db6c3814e2975979aff12f873f43d81724c5e61.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/31f42a02bdbae095e0329db6c3814e2975979aff12f873f43d81724c5e61.png" alt="image"></p>
 
 <p>Upload your photo and size as necessary using the image editor.</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/458a842c2ea0fbe3b7869bb14dfffe1e5be098d1cd6e590bbead25b4cc05.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/458a842c2ea0fbe3b7869bb14dfffe1e5be098d1cd6e590bbead25b4cc05.png" alt="image"></p>
 
-<p>When you press <strong>Done Editing</strong> you will be redirected back to the profile editor. 
+<p>When you press <strong>Done Editing</strong> you will be redirected back to the profile editor.
 (You might need to clear your browser cache if you have trouble seeing the new photo.)</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/d080e92d797af5e863fa39b2084c16a8410de1f7a6559633435817444aef.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/d080e92d797af5e863fa39b2084c16a8410de1f7a6559633435817444aef.png" alt="image"></p>
 
-<p>Returning to your channel home page you will see that a post notifying others of your new 
+<p>Returning to your channel home page you will see that a post notifying others of your new
 profile pic has been automatically posted.</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/1ebe02c205962dd25035c441631745d16acdb7a44e50d148256c8ad26a67.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/1ebe02c205962dd25035c441631745d16acdb7a44e50d148256c8ad26a67.png" alt="image"></p>
 
 <h3 id="Compose_a_post">Compose a post</h3>
 
-<p>Go to your channel home and open the post editor by pressing the <strong>Share</strong> textbox 
-at the top of the channel "wall". Enter a message, and then drag-and-drop an image 
-file into the post editor text area (alternatively you can use the <strong>Attach file</strong> 
+<p>Go to your channel home and open the post editor by pressing the <strong>Share</strong> textbox
+at the top of the channel "wall". Enter a message, and then drag-and-drop an image
+file into the post editor text area (alternatively you can use the <strong>Attach file</strong>
 tool at the bottom).</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/b0bfdf02aef3710a37bb6092c3240b291eca8afa73133b3ac03b86f3302d.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/b0bfdf02aef3710a37bb6092c3240b291eca8afa73133b3ac03b86f3302d.png" alt="image"></p>
 
-<p>Your image file will be automatically uploaded and stored in your cloud files, and 
+<p>Your image file will be automatically uploaded and stored in your cloud files, and
 a link will appear in the post window. Pressing the post preview button will allow you to preview your post before publishing it.</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/7c976a06662a1357b3da8ed0680d1a721c85f2ae2bdd5739a8def466010e.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/7c976a06662a1357b3da8ed0680d1a721c85f2ae2bdd5739a8def466010e.png" alt="image"></p>
 
-<p>Pressing the lock button near the Submit button will open the <strong>Access Control List</strong> 
+<p>Pressing the lock button near the Submit button will open the <strong>Access Control List</strong>
 so you can specify exactly who can access this post.</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/2b539d5a8474d6ec6dc91155b628d9be5f99ab04a78108ec404f53ec7bb5.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/2b539d5a8474d6ec6dc91155b628d9be5f99ab04a78108ec404f53ec7bb5.png" alt="image"></p>
 
 <h3 id="Use_an_uploaded_image_as_a_channel_cover_photo">Use an uploaded image as a channel cover photo</h3>
 
-<p>One way to add some pizzazz your channel is to add a cover photo that visitors will 
-see when they load your channel page. The integrated cloud file system 
+<p>One way to add some pizzazz your channel is to add a cover photo that visitors will
+see when they load your channel page. The integrated cloud file system
 allows you to choose an existing photo for this purpose.</p>
 
 <p>Visit your photos in the <strong>Photos</strong> app</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/0965ace945f0c95ae38aa5bfedd230d2a7233d3915ac15d629f9dd845854.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/0965ace945f0c95ae38aa5bfedd230d2a7233d3915ac15d629f9dd845854.png" alt="image"></p>
 
 <p>Select the photo you wish to use and select <strong>Use as cover photo</strong> from the <strong>Photo Tools</strong>
 dropdown menu.</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/9eae9fad774a4cd29e665961d35affbd053368056f562c58200fb41027b0.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/9eae9fad774a4cd29e665961d35affbd053368056f562c58200fb41027b0.png" alt="image"></p>
 
 <p>Crop the image using the photo editor and save your changes.</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/b3eece28e8db67f1024af42055f0f24ed5e81ba622aca8cac576ccf5930e.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/b3eece28e8db67f1024af42055f0f24ed5e81ba622aca8cac576ccf5930e.png" alt="image"></p>
 
 <p>When you load your channel home page, you will first see the cover photo, and your
 channel page will fade in as you scroll down.</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/4cf326152797a8ecdf5630e921756f825ee00f8ee464d3ef9fed971d2852.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/4cf326152797a8ecdf5630e921756f825ee00f8ee464d3ef9fed971d2852.png" alt="image"></p>
 
 <h3 id="Make_a_connection">Make a connection</h3>
 
-<p>Making connections between channels to share things is what social communications are all about. 
+<p>Making connections between channels to share things is what social communications are all about.
 Making a connection is simple. If you do not already know how to reach a channel's home
-page, you might try a directory search by opening the <strong>Directory</strong> link from the menu on the right 
+page, you might try a directory search by opening the <strong>Directory</strong> link from the menu on the right
 side of the top navbar.</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/ef78bc6aa3fafebd46f353514c907b3fdfe019918fc5553bb3f31388a36f.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/ef78bc6aa3fafebd46f353514c907b3fdfe019918fc5553bb3f31388a36f.png" alt="image"></p>
 
-<p>You can connect directly from the directory entry using the <strong>Connect</strong> button there, 
-or you can open the channel page first and press the <strong>Connect</strong> button below the 
+<p>You can connect directly from the directory entry using the <strong>Connect</strong> button there,
+or you can open the channel page first and press the <strong>Connect</strong> button below the
 profile photo.</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/75d2927b7ad0d2043d4d3b6ba1364fac8ead173edd39340adaf78be11c9d.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/75d2927b7ad0d2043d4d3b6ba1364fac8ead173edd39340adaf78be11c9d.png" alt="image"></p>
 
-<p>After you connect you are immediately taken to the connection editor page, where 
+<p>After you connect you are immediately taken to the connection editor page, where
 you make some important decisions about what you plan to share with this channel.</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/b334915c03a665493915598c69c17a87c910a39db2cd3b5292e4623ea4c4.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/b334915c03a665493915598c69c17a87c910a39db2cd3b5292e4623ea4c4.png" alt="image"></p>
 
 <p>The two important settings are</p>
 
 <ul><li>The individual permissions for the newly connected channel</li>
 <li>The privacy group(s) the connection is a member of</li>
-</ul><p>The individual permissions are mostly straightforward, but they can be slightly 
+</ul><p>The individual permissions are mostly straightforward, but they can be slightly
 unclear at first. For example, <strong>Can view my file storage and photos</strong> does <em>not</em>
-mean that the connected channel will be able to view <em>all</em> of your photos and files! 
-It means that you will have the <em>option</em> to share photos and files with that 
+mean that the connected channel will be able to view <em>all</em> of your photos and files!
+It means that you will have the <em>option</em> to share photos and files with that
 channel. It is perfectly possible for you to allow someone to read your posts but
-disallow them from seeing photos in that post. This kind of unusual situation is, 
+disallow them from seeing photos in that post. This kind of unusual situation is,
 as they say, not a bug; it is a feature.</p>
 
 <p>Privacy groups allow you to conveniently share items with groups of people. You can
 create whatever groups fit your needs by opening the <strong>Add privacy group</strong> link.</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/facb0bdfdecb4c779de9048cd14b417c0d76de17af476be5f296b78d70e9.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/facb0bdfdecb4c779de9048cd14b417c0d76de17af476be5f296b78d70e9.png" alt="image"></p>
 
-<p>In this editor, you can switch between the existing privacy groups and see at a 
-glance what channels are and are not members of the group. Selecting the icon of 
+<p>In this editor, you can switch between the existing privacy groups and see at a
+glance what channels are and are not members of the group. Selecting the icon of
 a channel in either box will move it to the in or out of the group.</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/25eaad2435200f72a1dd3a00ba17a76ca6db4c246b3c4fa286b390cae7c8.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/25eaad2435200f72a1dd3a00ba17a76ca6db4c246b3c4fa286b390cae7c8.png" alt="image"></p>
 
-<p>When editing an individual channel's settings, you can set their privacy group 
+<p>When editing an individual channel's settings, you can set their privacy group
 membership using the widget on the left:</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/bdbcf0ffd9004657237f6b7b7863da5a8e39a5bc17d2c67fa160efef2056.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/bdbcf0ffd9004657237f6b7b7863da5a8e39a5bc17d2c67fa160efef2056.png" alt="image"></p>
 
 <p>Connections are a mutual engagement. The channel you connect can <em>choose</em> to approve your
 connection. They will receive a notification that you connected</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/324247680b605fd214fd61aecd8f216fa8f5dfa0f16a04c8e968fdbc43d0.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/324247680b605fd214fd61aecd8f216fa8f5dfa0f16a04c8e968fdbc43d0.png" alt="image"></p>
 
-<p>which takes them to their <a href="https://grid.reticu.li/connections"><strong>Connections</strong></a> editor page where 
+<p>which takes them to their <a href="https://grid.reticu.li/connections"><strong>Connections</strong></a> editor page where
 they can choose to approve the connection or not.</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/e05248fdc5688d6d24bde52432fdc7b39692a094559aa504de99352940b1.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/e05248fdc5688d6d24bde52432fdc7b39692a094559aa504de99352940b1.png" alt="image"></p>
 
-<p>After you approve a connection, it is a good idea to open the individual connection 
+<p>After you approve a connection, it is a good idea to open the individual connection
 editor by pressing the edit button beside the <strong>Delete</strong> button.</p>
 
-<p><img class="img-responsive" src="/help/tutorials/assets/c4cad3e4c356dd2a227df79bd4dc6d47edf1b66ea243f005b6b452ec366b.png" alt="image"></p>
+<p><img class="img-responsive" src="/help/en/tutorials/assets/c4cad3e4c356dd2a227df79bd4dc6d47edf1b66ea243f005b6b452ec366b.png" alt="image"></p>
+
 
-        
diff --git a/doc/toc.html b/doc/toc.html
deleted file mode 100644
index d2f2654a1..000000000
--- a/doc/toc.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<div class="" id="accordion">
-    <div class="">
-        <div class="">
-            <h3 class="panel-title">
-                    Tutorials
-            </h3>
-        </div>
-        <div id="tutorials" class="doco-section">
-            <div class="flex-column">
-                <a class="nav-link" href="/help/tutorials/personal_channel">Personal Channel</a>
-            </div>
-        </div>
-    </div>
-    <div class="">
-        <div class="">
-            <h3 class="panel-title">
-                    Members
-            </h3>
-        </div>
-        <div id="members" class="doco-section">
-            <div class="flex-column">
-               <a class="nav-link" href="/help/member/member_guide">Guide</a>
-               <a class="nav-link" href="/help/member/bbcode">BBcode Reference</a>
-               <a class="nav-link" href="/help/feature/additional/overview">Additional Features</a>
-               <a class="nav-link" href="/help/bugs">Reporting Bugs</a>
-               <a class="nav-link" href="/help/member/member_faq">FAQ</a>
-            </div>
-        </div>
-    </div>
-    <div class="panel">
-        <div class="">
-            <h3 class="panel-title">
-                    Administrators
-            </h3>
-        </div>
-        <div id="administrators" class="doco-section">
-            <div class="flex-column">
-                <a class="nav-link" href="/help/admin/administrator_guide">Guide</a>
-                <a class="nav-link" href="/help/admin/hub_snapshots">Hub Snapshots</a>
-                <a class="nav-link" href="/help/database">Database</a>
-                <a class="nav-link" href="/help/hidden_configs">Extra configs</a>
-            </div>
-        </div>
-    </div>
-    <div class="panel">
-        <div class="">
-            <h3 class="panel-title">
-                    Developers
-            </h3>
-        </div>
-        <div id="developers" class="doco-section">
-            <div class="flex-column">
-                <a class="nav-link" href="/help/developer/developer_guide">Guide</a>
-                <a class="nav-link" href="/help/developer/covenant">Code of Conduct</a>
-                <a class="nav-link" href="/help/developer/zot_protocol">Zot Protocol</a>
-                <a class="nav-link" href="/help/developer/api_zot">Zot API</a>
-                <a class="nav-link" href="/help/hooklist">Hooks</a>
-            </div>
-        </div>
-    </div>
-    <div class="panel">
-        <div class="">
-            <h3 class="panel-title">
-                    About
-            </h3>
-        </div>
-        <div id="about" class="doco-section">
-            <div class="flex-column">
-                <a class="nav-link" href="/help/about/about">About</a>
-                <a class="nav-link" href="/help/about/project">Project</a>
-                <a class="nav-link" href="/help/about/about_hub">About this hub</a>
-            </div>
-        </div>
-    </div>
-</div>