Merge pull request #15231 from Art4/update-devcontainer

Update devcontainer to PHP 8.4

.devcontainer/Dockerfile

@@ -1,11 +1,6 @@
-ARG VARIANT="8.2-apache-bullseye"
-FROM mcr.microsoft.com/vscode/devcontainers/php:${VARIANT}
+FROM php:8.4-apache
 
 ARG DEBIAN_FRONTEND=noninteractive
-ARG apcu_version=5.1.23
-ARG memcached_version=3.2.0
-ARG redis_version=6.0.2
-ARG imagick_version=3.7.0
 
 RUN apt-get update -y;
 
@@ -13,14 +8,22 @@ RUN apt-get update -y;
 RUN apt-get install -y mariadb-client
 
 # Base packages
-RUN apt install -y vim software-properties-common sudo nano gnupg2
+RUN apt-get install -y \
+        vim \
+        sudo \
+        nano \
+        git \
+        gnupg2 \
+        pinentry-curses \
+;
 
 # entrypoint.sh and cron.sh dependencies
 RUN apt-get install -y --no-install-recommends \
         rsync \
         bzip2 \
         msmtp \
-        tini
+        tini \
+;
 
 RUN apt-get install -y --no-install-recommends \
         bash \
@@ -38,36 +41,40 @@ RUN apt-get install -y --no-install-recommends \
         libzip-dev \
         libldap2-dev \
         libgmp-dev \
-        libmagickcore-6.q16-6-extra \
-        ; \
-        \
-	docker-php-ext-configure gd \
-            --with-freetype \
-            --with-jpeg \
-            --with-webp \
-        ; \
- 	docker-php-ext-install -j "$(nproc)" \
-            pdo_mysql \
-            gd \
-            exif \
-            zip \
-            opcache \
-            ctype \
-            pcntl \
-            ldap \
-            gmp \
-            intl
+        # libmagickcore-6.q16-6-extra \
+;
+
+RUN docker-php-ext-configure gd \
+        --with-freetype \
+        --with-jpeg \
+        --with-webp \
+;
+
+RUN docker-php-ext-install -j "$(nproc)" \
+        pdo_mysql \
+        gd \
+        exif \
+        zip \
+        opcache \
+        ctype \
+        pcntl \
+        ldap \
+        gmp \
+        intl \
+ ;
 
 # pecl will claim success even if one install fails, so we need to perform each install separately
-RUN pecl install apcu-${apcu_version}; \
-        pecl install memcached-${memcached_version}; \
-        pecl install redis-${redis_version}; \
-        pecl install imagick-${imagick_version}; \
-        docker-php-ext-enable \
-            apcu \
-            memcached \
-            redis \
-            imagick
+RUN pecl install apcu-5.1.27;
+RUN pecl install memcached-3.4.0;
+RUN pecl install redis-6.2.0;
+RUN pecl install imagick-3.8.0;
+
+RUN docker-php-ext-enable \
+        apcu \
+        memcached \
+        redis \
+        imagick \
+;
 
 RUN apt-get clean -y && rm -rf /var/lib/apt/lists/*
 
@@ -89,8 +96,8 @@ RUN { \
         echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
         echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
         echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \
-    } > /usr/local/etc/php/conf.d/friendica.ini; \
-    ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \
-    \
-    mkdir /var/www/data; \
-    chmod -R g=u /var/www
+    } > /usr/local/etc/php/conf.d/friendica.ini;
+
+RUN ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
+RUN mkdir /var/www/data
+RUN chmod -R g=u /var/www

.devcontainer/docker-compose.yml

@@ -1,6 +1,4 @@
-version: '3.8'
-
-services: 
+services:
   app:
     build:
       context: .
@@ -14,16 +12,14 @@ services:
     command: sleep infinity
 
     ports:
-      - 80:80
-      - 443:443
-      - 8080:8080
-      - 3306:3306
-       
-    # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. 
+      - ${ServerPort:-8080}:80
+      - 8443:443
+
+    # Use "forwardPorts" in **devcontainer.json** to forward an app port locally.
     # (Adding the "ports" property to this file will not forward from a Codespace.)
 
     extra_hosts:
-      - "${ServerAlias}:127.0.0.1"  
+      - "${ServerAlias}:127.0.0.1"
 
   db:
     image: mariadb:10.4
@@ -49,4 +45,3 @@ volumes:
 
 networks:
   default:
-  

REUSE.toml

@@ -260,11 +260,6 @@ path = "view/js/hls/**"
 SPDX-FileCopyrightText = "2017 Dailymotion (http://www.dailymotion.com)"
 SPDX-License-Identifier = "Apache-2.0"
 
-[[annotations]]
-path = "view/js/videojs/**"
-SPDX-FileCopyrightText = "Copyright 2010-present Video.js contributors"
-SPDX-License-Identifier = "Apache-2.0"
-
 [[annotations]]
 path = [ "images/rm-16.png", "images/rhash-16.png"]
 SPDX-FileCopyrightText = "Red Matrix Project"

database.sql

@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2025.07-rc (Interrupted Fern)
--- DB_UPDATE_VERSION 1584
+-- DB_UPDATE_VERSION 1582
 -- ------------------------------------------
 
 
@@ -1275,7 +1275,7 @@ CREATE TABLE IF NOT EXISTS `post-collection` (
 CREATE TABLE IF NOT EXISTS `post-content` (
 	`uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
 	`title` varchar(255) NOT NULL DEFAULT '' COMMENT 'item title',
-	`content-warning` varchar(500) NOT NULL DEFAULT '' COMMENT '',
+	`content-warning` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`body` mediumtext COMMENT 'item body content',
 	`raw-body` mediumtext COMMENT 'Body without embedded media links',
 	`quote-uri-id` int unsigned COMMENT 'Id of the item-uri table that contains the quoted uri',
@@ -1368,14 +1368,12 @@ CREATE TABLE IF NOT EXISTS `post-history` (
 	`uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
 	`edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of edit',
 	`title` varchar(255) NOT NULL DEFAULT '' COMMENT 'item title',
-	`content-warning` varchar(500) NOT NULL DEFAULT '' COMMENT '',
+	`content-warning` varchar(255) NOT NULL DEFAULT '' COMMENT '',
 	`body` mediumtext COMMENT 'item body content',
 	`raw-body` mediumtext COMMENT 'Body without embedded media links',
-	`quote-uri-id` int unsigned COMMENT 'Id of the item-uri table that contains the quoted uri',
 	`location` varchar(255) NOT NULL DEFAULT '' COMMENT 'text location where this item originated',
 	`coord` varchar(255) NOT NULL DEFAULT '' COMMENT 'longitude/latitude pair representing location where this item originated',
 	`language` text COMMENT 'Language information about this post',
-	`sensitive` boolean COMMENT 'If true, this post contains sensitive content',
 	`app` varchar(255) NOT NULL DEFAULT '' COMMENT 'application which generated this item',
 	`rendered-hash` varchar(32) NOT NULL DEFAULT '' COMMENT '',
 	`rendered-html` mediumtext COMMENT 'item.body converted to html',
@@ -1386,9 +1384,7 @@ CREATE TABLE IF NOT EXISTS `post-history` (
 	`resource-id` varchar(32) NOT NULL DEFAULT '' COMMENT 'Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type',
 	`plink` varbinary(383) NOT NULL DEFAULT '' COMMENT 'permalink or URL to a displayable copy of the message at its source',
 	 PRIMARY KEY(`uri-id`,`edited`),
-	 INDEX `quote-uri-id` (`quote-uri-id`),
-	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
-	FOREIGN KEY (`quote-uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
+	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Post history';
 
 --
@@ -1440,8 +1436,6 @@ CREATE TABLE IF NOT EXISTS `post-media` (
 	`embed-html` text COMMENT 'HTML embed code for this media',
 	`embed-height` smallint unsigned COMMENT 'Height of the embed',
 	`embed-width` smallint unsigned COMMENT 'Width of the embed',
-	`page-type` varchar(30) COMMENT 'Type of the page (e.g. article, website)',
-	`schematypes` varchar(255) COMMENT 'Schema types of the page as JSON string',
 	`language` char(3) COMMENT 'Language information about this media in the ISO 639 format',
 	`published` datetime COMMENT 'Publification date of this media',
 	`modified` datetime COMMENT 'Modification date of this media',

doc/API-Entities.md

@@ -1,7 +1,7 @@
 # Friendica API entities
 
 * [Home](help)
-  * [Using the APIs](help/spec/api/index)
+  * [Using the APIs](help/api)
 
 
 ## Activities
@@ -18,31 +18,31 @@
 
 <tr>
 <td><code>like</code></td>
-<td>List of <a href="help/spec/api/entities#contact">Contacts</a></td>
+<td>List of <a href="help/API-Entities#Contact">Contacts</a></td>
 <td align="center">No</td>
 </tr>
 
 <tr>
 <td><code>dislike</code></td>
-<td>List of <a href="help/spec/api/entities#contact">Contacts</a></td>
+<td>List of <a href="help/API-Entities#Contact">Contacts</a></td>
 <td align="center">No</td>
 </tr>
 
 <tr>
 <td><code>attendyes</code></td>
-<td>List of <a href="help/spec/api/entities#contact">Contacts</a></td>
+<td>List of <a href="help/API-Entities#Contact">Contacts</a></td>
 <td align="center">No</td>
 </tr>
 
 <tr>
 <td><code>attendno</code></td>
-<td>List of <a href="help/spec/api/entities#contact">Contacts</a></td>
+<td>List of <a href="help/API-Entities#Contact">Contacts</a></td>
 <td align="center">No</td>
 </tr>
 
 <tr>
 <td><code>attendmaybe</code></td>
-<td>List of <a href="help/spec/api/entities#contact">Contacts</a></td>
+<td>List of <a href="help/API-Entities#Contact">Contacts</a></td>
 <td align="center">No</td>
 </tr>
 
@@ -330,31 +330,31 @@ Ex: Wed May 23 06:01:13 +0000 2007
 
 <tr>
 <td><code>hashtags</code></td>
-<td>List of <a href="help/spec/api/entities#hashtag">Hashtags</a></td>
+<td>List of <a href="help/API-Entities#Hashtag">Hashtags</a></td>
 <td align="center">No</td>
 </tr>
 
 <tr>
 <td><code>symbols</code></td>
-<td>List of <a href="help/spec/api/entities#symbol">Symbols</a></td>
+<td>List of <a href="help/API-Entities#Symbol">Symbols</a></td>
 <td align="center">No</td>
 </tr>
 
 <tr>
 <td><code>urls</code></td>
-<td>List of <a href="help/spec/api/entities#url">URLs</a></td>
+<td>List of <a href="help/API-Entities#URL">URLs</a></td>
 <td align="center">No</td>
 </tr>
 
 <tr>
 <td><code>user_mentions</code></td>
-<td>List of <a href="help/spec/api/entities#user+mention">User mentions</a></td>
+<td>List of <a href="help/API-Entities#User+Mention">User mentions</a></td>
 <td align="center">No</td>
 </tr>
 
 <tr>
 <td><code>media</code></td>
-<td>List of <a href="help/spec/api/entities#media">Medias</a></td>
+<td>List of <a href="help/API-Entities#Media">Medias</a></td>
 <td align="center">No</td>
 </tr>
 
@@ -570,13 +570,13 @@ Ex: Wed May 23 06:01:13 +0000 2007
 
 <tr>
 <td><code>user</code></td>
-<td><a href="help/spec/api/entities#contact">Contact</a></td>
+<td><a href="help/API-Entities#Contact">Contact</a></td>
 <td align="center">No</td>
 </tr>
 
 <tr>
 <td><code>friendica_author</code></td>
-<td><a href="help/spec/api/entities#contact">Contact</a></td>
+<td><a href="help/API-Entities#Contact">Contact</a></td>
 <td align="center">No</td>
 </tr>
 
@@ -584,7 +584,7 @@ Ex: Wed May 23 06:01:13 +0000 2007
 <td><code>friendica_owner</code></td>
 <td>
 
-<a href="help/spec/api/entities#contact">Contact</a></td>
+<a href="help/API-Entities#Contact">Contact</a></td>
 <td align="center">No</td>
 </tr>
 
@@ -614,7 +614,7 @@ Ex: Wed May 23 06:01:13 +0000 2007
 
 <tr>
 <td><code>friendica_activities</code></td>
-<td><a href="help/spec/api/entities#activities">Activities</a></td>
+<td><a href="help/API-Entities#Activities">Activities</a></td>
 <td align="center">No</td>
 </tr>
 
@@ -632,13 +632,13 @@ Ex: Wed May 23 06:01:13 +0000 2007
 
 <tr>
 <td><code>attachments</code></td>
-<td>List of <a href="help/spec/api/entities#attachment">Attachments</a></td>
+<td>List of <a href="help/API-Entities#Attachment">Attachments</a></td>
 <td align="center">Yes</td>
 </tr>
 
 <tr>
 <td><code>entities</code></td>
-<td><a href="help/spec/api/entities#entities">Entities</a></td>
+<td><a href="help/API-Entities#Entities">Entities</a></td>
 <td align="center">Yes</td>
 </tr>
 
@@ -721,7 +721,7 @@ Identical to [the Twitter Media Object](https://developer.twitter.com/en/docs/tw
 
 <tr>
 <td><code>sizes</code></td>
-<td><a href="help/spec/api/entities#sizes">Sizes</a></td>
+<td><a href="help/API-Entities#Sizes">Sizes</a></td>
 <td align="center">No</td>
 </tr>
 
@@ -1036,13 +1036,13 @@ Mutually exclusive with <code>link</code>.
 
 <tr>
 <td><code>friendica_activities</code></td>
-<td><a href="help/spec/api/entities#activities">Activities</a></td>
+<td><a href="help/API-Entities#Activities">Activities</a></td>
 <td></td>
 </tr>
 
 <tr>
 <td><code>friendica_comments</code></td>
-<td>List of <a href="help/spec/api/entities#item">Items</a></td>
+<td>List of <a href="help/API-Entities#Item">Items</a></td>
 <td></td>
 </tr>
 
@@ -1260,13 +1260,13 @@ Mutually exclusive with <code>link</code>.
 
 <tr>
 <td><code>sender</code></td>
-<td><a href="help/spec/api/entities#contact">Contact</a></td>
+<td><a href="help/API-Entities#Contact">Contact</a></td>
 <td></td>
 </tr>
 
 <tr>
 <td><code>recipient</code></td>
-<td><a href="help/spec/api/entities#contact">Contact</a></td>
+<td><a href="help/API-Entities#Contact">Contact</a></td>
 <td></td>
 </tr>
 
@@ -1471,25 +1471,25 @@ Mutually exclusive with <code>link</code>.
 
 <tr>
 <td><code>medium</code></td>
-<td><a href="help/spec/api/entities#size">Size</a></td>
+<td><a href="help/API-Entities#Size">Size</a></td>
 <td align="center">No</td>
 </tr>
 
 <tr>
 <td><code>large</code></td>
-<td><a href="help/spec/api/entities#size">Size</a></td>
+<td><a href="help/API-Entities#Size">Size</a></td>
 <td align="center">Yes</td>
 </tr>
 
 <tr>
 <td><code>thumb</code></td>
-<td><a href="help/spec/api/entities#size">Size</a></td>
+<td><a href="help/API-Entities#Size">Size</a></td>
 <td align="center">Yes</td>
 </tr>
 
 <tr>
 <td><code>small</code></td>
-<td><a href="help/spec/api/entities#size">Size</a></td>
+<td><a href="help/API-Entities#Size">Size</a></td>
 <td align="center">Yes</td>
 </tr>
 

doc/API-Friendica.md

@@ -1,22 +1,23 @@
 # Friendica API
 
-* [Using the APIs](help/spec/api/index)
+* [Home](help)
+  * [Using the APIs](help/api)
 
 ## Overview
 
 Friendica provides the following specific endpoints.
 
-Authentication is the same as described in [Using the APIs](help/spec/api/index#authentication).
+Authentication is the same as described in [Using the APIs](help/api#Authentication).
 
 ## Entities
 
-These endpoints uses the [Friendica API entities](help/spec/api/entities).
+These endpoints uses the [Friendica API entities](help/API-Entities).
 
 ## Endpoints
 
 ### GET api/friendica/events
 
-Returns a list of [Event](help/spec/api/entities#event) entities for the current logged in user.
+Returns a list of [Event](help/API-Entities#Event) entities for the current logged in user.
 
 #### Parameters
 
@@ -51,7 +52,7 @@ Delete event from calendar (not the message)
 
 ### GET api/externalprofile/show
 
-Returns a [Contact](help/spec/api/entities#contact) entity for the provided profile URL.
+Returns a [Contact](help/API-Entities#Contact) entity for the provided profile URL.
 
 #### Parameters
 
@@ -59,7 +60,7 @@ Returns a [Contact](help/spec/api/entities#contact) entity for the provided prof
 
 ### GET api/statuses/public_timeline
 
-Returns a list of public [Items](help/spec/api/entities#item) posted on this node.
+Returns a list of public [Items](help/API-Entities#Item) posted on this node.
 Equivalent of the local community page.
 
 #### Parameters
@@ -78,7 +79,7 @@ Equivalent of the local community page.
 
 ### GET api/statuses/networkpublic_timeline
 
-Returns a list of public [Items](help/spec/api/entities#item) this node is aware of.
+Returns a list of public [Items](help/API-Entities#Item) this node is aware of.
 Equivalent of the global community page.
 
 #### Parameters
@@ -205,7 +206,7 @@ Deprecated Twitter received direct message list endpoint.
 
 ### GET api/direct_messages/all
 
-Returns all [Private Messages](help/spec/api/entities#private+message).
+Returns all [Private Messages](help/API-Entities#Private+message).
 
 #### Parameters
 
@@ -218,7 +219,7 @@ Returns all [Private Messages](help/spec/api/entities#private+message).
 
 ### GET api/direct_messages/conversation
 
-Returns all replies of a single private message conversation. Returns [Private Messages](help/spec/api/entities#private+message)
+Returns all replies of a single private message conversation. Returns [Private Messages](help/API-Entities#Private+message)
 
 #### Parameters
 
@@ -232,7 +233,7 @@ Returns all replies of a single private message conversation. Returns [Private M
 
 ### GET api/direct_messages/sent
 
-Deprecated Twitter sent direct message list endpoint. Returns [Private Messages](help/spec/api/entities#private+message).
+Deprecated Twitter sent direct message list endpoint. Returns [Private Messages](help/API-Entities#Private+message).
 
 #### Parameters
 
@@ -299,7 +300,7 @@ On error:
 
 ### GET api/friendica/direct_messages_search (GET; AUTH)
 
-Returns [Private Messages](help/spec/api/entities#private+message) matching the provided search string.
+Returns [Private Messages](help/API-Entities#Private+message) matching the provided search string.
 
 #### Parameters
 
@@ -338,7 +339,7 @@ Array of:
 
 * `name`: name of the circle
 * `gid`: id of the circle
-* `user`: array of [Contacts](help/spec/api/entities#contact)
+* `user`: array of [Contacts](help/API-Entities#Contact)
 
 ### POST api/friendica/circle_create
 
@@ -356,7 +357,7 @@ JSON data as Array like the result of [GET api/friendica/circle_show](#GET+api%2
 
 * `gid`
 * `name`
-* List of [Contacts](help/spec/api/entities#contact)
+* List of [Contacts](help/API-Entities#Contact)
 
 #### Return values
 
@@ -385,7 +386,7 @@ JSON data as array like the result of [GET api/friendica/circle_show](#GET+api%2
 
 * `gid`
 * `name`
-* List of [Contacts](help/spec/api/entities#contact)
+* List of [Contacts](help/API-Entities#Contact)
 
 #### Return values
 
@@ -422,7 +423,7 @@ Array of:
 
 ### GET api/friendica/notifications
 
-Return last 50 [Notifications](help/spec/api/entities#notification) for the current user, ordered by date with unseen item on top.
+Return last 50 [Notifications](help/API-Entities#Notification) for the current user, ordered by date with unseen item on top.
 
 #### Parameters
 
@@ -438,7 +439,7 @@ Set notification as seen.
 
 #### Return values
 
-If the note is linked to an item, returns an [Item](help/spec/api/entities#item).
+If the note is linked to an item, returns an [Item](help/API-Entities#Item).
 
 Otherwise, a success status is returned:
 
@@ -448,7 +449,7 @@ Otherwise, a success status is returned:
 
 ### GET api/friendica/photo
 
-Returns a [Photo](help/spec/api/entities#photo).
+Returns a [Photo](help/API-Entities#Photo).
 
 #### Parameters
 
@@ -522,7 +523,7 @@ xml:
 
 ### GET api/friendica/photos/list
 
-Returns the API user's [Photo List Items](help/spec/api/entities#photo+list+item).
+Returns the API user's [Photo List Items](help/API-Entities#Photo+List+Item).
 
 #### Return values
 
@@ -771,7 +772,7 @@ On success:
 
 ### GET api/friendica/profile/show
 
-Returns the [Profile](help/spec/api/entities#profile) data of the authenticated user.
+Returns the [Profile](help/API-Entities#Profile) data of the authenticated user.
 
 #### Return values
 

doc/API-GNU-Social.md

@@ -1,16 +1,17 @@
 # GNU Social API
 
-* [Using the APIs](help/spec/api/index)
+* [Home](help)
+  * [Using the APIs](help/api)
 
 ## Overview
 
 Friendica provides the following endpoints defined in [the official GNU Social Twitter-like API reference](https://gnusocial.net/doc/twitterapi).
 
-Authentication is the same as described in [Using the APIs](help/spec/api/index#authentication).
+Authentication is the same as described in [Using the APIs](help/api#Authentication).
 
 ## Entities
 
-These endpoints use the [Friendica API entities](help/spec/api/entities).
+These endpoints use the [Friendica API entities](help/API-Entities).
 
 ## Implemented endpoints
 

doc/API-Mastodon.md

@@ -1,16 +1,17 @@
 # Mastodon API
 
-* [Using the APIs](help/spec/api/index)
+* [Home](help)
+  * [Using the APIs](help/api)
 
 ## Overview
 
 Friendica provides the following endpoints defined in [the official Mastodon API reference](https://docs.joinmastodon.org/api/).
 
-Authentication is the same as described in [Using the APIs](help/spec/api/index#authentication).
+Authentication is the same as described in [Using the APIs](help/api#Authentication).
 
 ## Clients
 
-Please find a list of supported apps at [FAQ](help/user/faq#clients).
+Please find a list of supported apps at [FAQ](help/FAQ#clients).
 
 ## Entities
 

doc/API-Twitter.md

@@ -1,16 +1,17 @@
 # Twitter API
 
-* [Using the APIs](help/spec/api/index)
+* [Home](help)
+  * [Using the APIs](help/api)
 
 ## Overview
 
 Friendica provides the following endpoints defined in the [official Twitter API reference](https://developer.twitter.com/en/docs/api-reference-index).
 
-Authentication is the same as described in [Using the APIs](help/spec/api/index#authentication).
+Authentication is the same as described in [Using the APIs](help/api#Authentication).
 
 ## Entities
 
-These endpoints use the [Friendica API entities](help/spec/api/entities).
+These endpoints use the [Friendica API entities](help/API-Entities).
 
 ## Different behaviour
 
@@ -26,7 +27,7 @@ These endpoints use the [Friendica API entities](help/spec/api/entities).
 
 * `cursor`
 * `trim_user`
-* `contributor_details`
+* `contributor_details` 
 * `place_id`
 * `display_coordinates`
 * `include_rts`: To-Do
@@ -56,7 +57,7 @@ These endpoints use the [Friendica API entities](help/spec/api/entities).
         - `skip_status`
 - [POST api/account/update_profile_image](https://developer.twitter.com/en/docs/accounts-and-users/manage-account-settings/api-reference/post-account-update_profile_image)
     - Additional parameter:
-        - `profile_id` (optional):  Numerical id of the profile for which the image should be used, default is changing the default profile.
+        - `profile_id` (optional):  Numerical id of the profile for which the image should be used, default is changing the default profile. 
 
 
 - [POST api/statuses/update](https://developer.twitter.com/en/docs/tweets/post-and-engage/api-reference/post-statuses-update)
@@ -162,7 +163,7 @@ These endpoints use the [Friendica API entities](help/spec/api/entities).
     - Unsupported parameter:
         - `skip_status`: No status is returned even if it isn't set to true.
     - Caveats:
-        - `cursor` trumps `since_id` trumps `max_id` if any combination is provided.
+        - `cursor` trumps `since_id` trumps `max_id` if any combination is provided. 
         - `user_id` must be the ID of a contact associated with a local user account.
         - `screen_name` must be associated with a local user account.
         - `screen_name` trumps `user_id` if both are provided (undocumented Twitter behavior).
@@ -242,8 +243,8 @@ These endpoints use the [Friendica API entities](help/spec/api/entities).
 
 
 - [POST statuses/filter](https://developer.twitter.com/en/docs/tweets/filter-realtime/api-reference/post-statuses-filter)
-
-
+  
+  
 - [GET statuses/mentions_timeline](https://developer.twitter.com/en/docs/tweets/timelines/api-reference/get-statuses-mentions_timeline)
 
 
@@ -257,10 +258,10 @@ These endpoints use the [Friendica API entities](help/spec/api/entities).
 
 
 - [GET statuses/sample](https://developer.twitter.com/en/docs/tweets/sample-realtime/api-reference/get-statuses-sample)
-
+  
 
 - [GET compliance/firehose](https://developer.twitter.com/en/docs/tweets/compliance/api-reference/compliance-firehose)
-
+ 
 
 - [DELETE custom_profiles/destroy.json](https://developer.twitter.com/en/docs/direct-messages/custom-profiles/api-reference/delete-profile)
 - [GET custom_profiles/:id](https://developer.twitter.com/en/docs/direct-messages/custom-profiles/api-reference/get-profile)
@@ -274,8 +275,8 @@ These endpoints use the [Friendica API entities](help/spec/api/entities).
 - [POST direct_messages/events/new (message_create)](https://developer.twitter.com/en/docs/direct-messages/sending-and-receiving/api-reference/new-event)
 - [POST direct_messages/indicate_typing](https://developer.twitter.com/en/docs/direct-messages/typing-indicator-and-read-receipts/api-reference/new-typing-indicator)
 - [POST direct_messages/mark_read](https://developer.twitter.com/en/docs/direct-messages/typing-indicator-and-read-receipts/api-reference/new-read-receipt)
-
-
+  
+  
 - [DELETE direct_messages/welcome_messages/destroy](https://developer.twitter.com/en/docs/direct-messages/welcome-messages/api-reference/delete-welcome-message)
 - [DELETE direct_messages/welcome_messages/rules/destroy](https://developer.twitter.com/en/docs/direct-messages/welcome-messages/api-reference/delete-welcome-message-rule)
 - [PUT direct_messages/welcome_messages/update](https://developer.twitter.com/en/docs/direct-messages/welcome-messages/api-reference/update-welcome-message)
@@ -298,8 +299,8 @@ These endpoints use the [Friendica API entities](help/spec/api/entities).
 - [GET trends/available](https://developer.twitter.com/en/docs/trends/locations-with-trending-topics/api-reference/get-trends-available)
 - [GET trends/closest](https://developer.twitter.com/en/docs/trends/locations-with-trending-topics/api-reference/get-trends-closest)
 - [GET trends/place](https://developer.twitter.com/en/docs/trends/trends-for-location/api-reference/get-trends-place)
-
-
+ 
+ 
 - [GET geo/id/:place_id](https://developer.twitter.com/en/docs/geo/place-information/api-reference/get-geo-id-place_id)
 - [GET geo/reverse_geocode](https://developer.twitter.com/en/docs/geo/places-near-location/api-reference/get-geo-reverse_geocode)
 - [GET geo/search](https://developer.twitter.com/en/docs/geo/places-near-location/api-reference/get-geo-search)

doc/Accesskeys.md

@@ -1,4 +1,7 @@
-# Access keys reference
+Accesskeys reference
+=======================
+
+* [Home](help)
 
 Access keys are keyboard shortcuts that allow you to easily navigate the user interface.
 Access keys are currently not available with the Frio theme.
@@ -9,8 +12,8 @@ For example, for moving to profile page in Firefox, press these three keys simul
 
 [Shift] [Alt] [p]
 
-## General
-
+General
+-------
 * p - Profile
 * n - Network
 * l - Channel
@@ -21,13 +24,13 @@ For example, for moving to profile page in Firefox, press these three keys simul
 * f - Notifications
 * u - User menu
 
-## ../community
-
+../community
+--------
 * l - Local community
 * g - Global community
 
-## ../channel
-
+../channel
+--------
 * y - for you
 * f - followers
 * r - sharers of sharers
@@ -39,8 +42,8 @@ For example, for moving to profile page in Firefox, press these three keys simul
 * g - Posts in your language
 * o - Hot posts in your language
 
-## ../profile
-
+../profile
+--------
 * m - Status Messages and Posts
 * r - Profile Details
 * h - Photo Albums
@@ -50,8 +53,8 @@ For example, for moving to profile page in Firefox, press these three keys simul
 * o - Scheduled Posts
 * k - View Contacts
 
-## ../contacts (contact list)
-
+../contacts (contact list)
+---------
 * g - Suggestions
 * l - Show all Contacts
 * o - Only show unblocked contacts
@@ -61,8 +64,8 @@ For example, for moving to profile page in Firefox, press these three keys simul
 * h - Only show hidden contacts
 * e - Edit contact circles
 
-## ../contact (single contact view)
-
+../contact (single contact view)
+-------------------------------
 * m - Status messages
 * p - Posts and Comments
 * d - Media
@@ -70,12 +73,12 @@ For example, for moving to profile page in Firefox, press these three keys simul
 * t - Contacts
 * r - Advanced
 
-## ../message
-
+../message
+--------
 * m - New message
 
-## ../network
-
+../network
+--------
 * e - Sort by Comment Date
 * t - Sort by Receipt Date
 * q - Sort by Creation Date
@@ -83,16 +86,16 @@ For example, for moving to profile page in Firefox, press these three keys simul
 * w - New posts
 * m - Favourite Posts
 
-## ../notifications
-
+../notifications
+--------------
 * y - System
 * w - Network
 * r - Personal
 * h - Home
 * i - Introductions
 
-## ../settings
-
+../settings
+---------
 * o - Account
 * 2 - Two-factor authentication
 * p - Profiles

doc/Account-Basics.md

@@ -1,6 +1,10 @@
-# Account basics
+Account Basics
+==============
 
-## Registration
+* [Home](help)
+
+Registration
+---
 
 Not all Friendica sites allow open registration.
 If registration is allowed, you will see a "Register" link immediately below the login prompt on the site's home page.
@@ -42,13 +46,14 @@ It must contain only US-ASCII text characters and numbers, and must also start w
 It also must be unique on this system.
 This is used in many places to identify your account, and once set it cannot be changed.
 
+
 ### Directory Publishing
 
 The registration form also allows you to choose whether or not to list your account in the online directory of your node.
 This is like a "phone book" and you may choose to be unlisted.
 We recommend that you select 'Yes' so that other people (friends, family, etc.) will be able to find you.
 If you choose 'No', you will essentially be invisible and have few opportunities for interaction.
-Whichever you choose, this can be changed any time from your Settings page after you log in.
+Whichever you choose, this can be changed any time from your Settings page after you login.
 
 ### Register
 
@@ -56,7 +61,8 @@ Once you have provided the necessary details, click the 'Register' button.
 An email will be sent to you providing your account login details.
 Please check your email (including spam folders) for your registration details and initial password.
 
-## Login Page
+Login Page
+---
 
 On the 'Login' page, please enter your login information that was provided during registration.
 You may use either your nickname or email address as a Login Name.
@@ -70,25 +76,34 @@ Otherwise, enter your password.
 This will have been initially provided in your registration email message.
 Your password is case-sensitive, so please check your 'Caps Lock' key if you are having difficulty logging in.
 
-## Changing Your Password
+Changing Your Password
+---
 
 After your first login, please visit the 'Settings' page from the top menu bar and change your password to something that you will remember.
 
-## Getting Started
+Getting Started
+---
 
 A link with ['Tips for New Members'](newmember) will show up on your network and home pages for two weeks providing key information for getting started.
 
-## Retrieving Personal Data
+Retrieving Personal Data
+---
 
 You can export a copy of your personal data in JSON format from the "Export personal data" link at the top of your settings page.
 
 You need this file to relocate your Friendica account to another node.
 This might be necessary, e.g. if your node suffers a severe hardware problem and is not recoverable.
 
-## See Also
+See Also
+---
+
+* [Profiles](help/Profiles)
+
+* [Global Directory](help/Making-Friends#The+Directories)
+
+* [Circles and Privacy](help/Circles-and-Privacy)
+
+* [Move Account](help/Move-Account)
+
+* [Remove Account](help/Remove-Account)
 
-- [Account types: Groups and Pages](help/user/accounts-groups-pages)
-- [Global directory](help/user/making-friends#the+directories)
-- [Circles and privacy](help/user/circles-and-privacy)
-- [Moving an account](help/user/move-account)
-- [Deleting an account](help/user/delete-account)

doc/AddonStorageBackend.md

@@ -1,4 +1,7 @@
-# Friendica storage backend addon development
+Friendica Storage Backend Addon development
+===========================================
+
+* [Home](help)
 
 Storage backends can be added via addons.
 A storage backend is implemented as a class, and the plugin register the class to make it available to the system.

doc/Addons.md

@@ -1,4 +1,7 @@
-# Friendica addon development
+Friendica Addon development
+==============
+
+* [Home](help)
 
 Please see the sample addon 'randplace' for a working example of using some of these features.
 Addons work by intercepting event hooks - which must be registered.
@@ -141,7 +144,7 @@ No additional data is provided.
 ## Modules
 
 Addons may also act as "modules" and intercept all page requests for a given URL path.
-In order for an addon to act as a module it needs to declare an empty function `<addon>_module()`.
+In order for a addon to act as a module it needs to declare an empty function `<addon>_module()`.
 
 If this function exists, you will now receive all page requests for `https://my.web.site/<addon>` - with any number of URL components as additional arguments.
 These are parsed into the `App\Arguments` object.
@@ -557,7 +560,7 @@ For `select`, **field** is:
 Called just before dispatching the router.
 Hook data is a `\FastRoute\RouterCollector` object that should be used to add addon routes pointing to classes.
 
-**Notice**: The class whose name is provided in the route handler must be reachable via autoloader.
+**Notice**: The class whose name is provided in the route handler must be reachable via auto-loader.
 
 ### probe_detect
 
@@ -615,7 +618,7 @@ Called when unfollowing a remote contact on a non-native network (like Bluesky)
 Hook data:
 - **contact** (input): the target public contact (uid = 0) array.
 - **uid** (input): the id of the source local user.
-- **result** (output): whether the unfollowing is successful or not.
+- **result** (output): wether the unfollowing is successful or not.
 
 ### revoke_follow
 
@@ -624,7 +627,7 @@ Called when making a remote contact on a non-native network (like Bluesky) unfol
 Hook data:
 - **contact** (input): the target public contact (uid = 0) array.
 - **uid** (input): the id of the source local user.
-- **result** (output): a boolean value indicating whether the operation was successful or not.
+- **result** (output): a boolean value indicating wether the operation was successful or not.
 
 ### block
 
@@ -633,7 +636,7 @@ Called when blocking a remote contact on a non-native network (like Bluesky).
 Hook data:
 - **contact** (input): the remote contact (uid = 0) array.
 - **uid** (input): the user id to issue the block for.
-- **result** (output): a boolean value indicating whether the operation was successful or not.
+- **result** (output): a boolean value indicating wether the operation was successful or not.
 
 ### unblock
 
@@ -642,7 +645,7 @@ Called when unblocking a remote contact on a non-native network (like Bluesky).
 Hook data:
 - **contact** (input): the remote contact (uid = 0) array.
 - **uid** (input): the user id to revoke the block for.
-- **result** (output): a boolean value indicating whether the operation was successful or not.
+- **result** (output): a boolean value indicating wether the operation was successful or not.
 
 ### support_probe
 

doc/BBCode.md

@@ -1,6 +1,7 @@
-# Friendica BBCode tags reference
+Friendica BBCode tags reference
+========================
 
-* [Creating posts](help/user/text-editor)
+* [Creating posts](help/Text_editor)
 
 ## Inline
 
@@ -60,8 +61,8 @@ table.bbcodes > * > tr > th {
   <td><span style="color:  red;">red</span></td>
 </tr>
 <tr>
-  <td>[url=https://friendi.ca]Friendica[/url]</td>
-  <td><a href="https://friendi.ca" target="external-link">Friendica</a></td>
+  <td>[url=http://friendi.ca]Friendica[/url]</td>
+  <td><a href="http://friendi.ca" target="external-link">Friendica</a></td>
 </tr>
 <tr>
   <td>[img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png[/img]</td>
@@ -102,23 +103,23 @@ table.bbcodes > * > tr > th {
   <th>Result</th>
 </tr>
 <tr>
-  <td>[url]https://friendi.ca[/url]</td>
-  <td><a href="https://friendi.ca">https://friendi.ca</a></td>
+  <td>[url]http://friendi.ca[/url]</td>
+  <td><a href="http://friendi.ca">http://friendi.ca</a></td>
 </tr>
 <tr>
-  <td>[url=https://friendi.ca]Friendica[/url]</td>
-  <td><a href="https://friendi.ca">Friendica</a></td>
+  <td>[url=http://friendi.ca]Friendica[/url]</td>
+  <td><a href="http://friendi.ca">Friendica</a></td>
 </tr>
 <tr>
-  <td>[bookmark]https://friendi.ca[/bookmark]<br><br>
-#^[url]https://friendi.ca[/url]</td>
-  <td><span class="oembed link"><h4>Friendica: <a href="https://friendi.ca" rel="oembed"></a><a href="https://friendi.ca" target="_blank" rel="noopener noreferrer">https://friendi.ca</a></h4></span></td>
+  <td>[bookmark]http://friendi.ca[/bookmark]<br><br>
+#^[url]http://friendi.ca[/url]</td>
+  <td><span class="oembed link"><h4>Friendica: <a href="http://friendi.ca" rel="oembed"></a><a href="http://friendi.ca" target="_blank" rel="noopener noreferrer">http://friendi.ca</a></h4></span></td>
 </tr>
 <tr>
-  <td>[bookmark=https://friendi.ca]Bookmark[/bookmark]<br><br>
-#^[url=https://friendi.ca]Bookmark[/url]<br><br>
-#[url=https://friendi.ca]^[/url][url=https://friendi.ca]Bookmark[/url]</td>
-  <td><span class="oembed link"><h4>Friendica: <a href="https://friendi.ca" rel="oembed"></a><a href="https://friendi.ca" target="_blank" rel="noopener noreferrer">Bookmark</a></h4></span></td>
+  <td>[bookmark=http://friendi.ca]Bookmark[/bookmark]<br><br>
+#^[url=http://friendi.ca]Bookmark[/url]<br><br>
+#[url=http://friendi.ca]^[/url][url=http://friendi.ca]Bookmark[/url]</td>
+  <td><span class="oembed link"><h4>Friendica: <a href="http://friendi.ca" rel="oembed"></a><a href="http://friendi.ca" target="_blank" rel="noopener noreferrer">Bookmark</a></h4></span></td>
 </tr>
 <tr>
   <td>[url=/posts/f16d77b0630f0134740c0cc47a0ea02a]Diaspora post with GUID[/url]</td>
@@ -169,7 +170,7 @@ code</code></td>
 </tr>
 <tr>
   <td>[code=php]function text_highlight($s,$lang)[/code]<sup><a href="#supported-code">1</a></sup></td>
-  <td><code><div class="hl-main"><ol class="hl-main"><li><span class="hl-code"> </span><span class="hl-reserved">function</span><span class="hl-code"> </span><span class="hl-identifier">text_highlight</span><span class="hl-brackets">(</span><span class="hl-var">$s</span><span class="hl-code">,</span><span class="hl-var">$lang</span><span class="hl-brackets">)</span></li></ol></div></code></td>
+  <td><code><div class="hl-main"><ol class="hl-main"><li><span class="hl-code">&nbsp;</span><span class="hl-reserved">function</span><span class="hl-code"> </span><span class="hl-identifier">text_highlight</span><span class="hl-brackets">(</span><span class="hl-var">$s</span><span class="hl-code">,</span><span class="hl-var">$lang</span><span class="hl-brackets">)</span></li></ol></div></code></td>
 </tr>
 <tr>
   <td>[quote]quote[/quote]</td>
@@ -274,21 +275,21 @@ code</code></td>
 </tr>
 <tr>
   <td>[table]<br>
-  [tr]<br>
-    [th]Header 1[/th]<br>
-    [th]Header 2[/th]<br>
-    [th]Header 2[/th]<br>
-  [/tr]<br>
-  [tr]<br>
-    [td]Cell 1[/td]<br>
-    [td]Cell 2[/td]<br>
-    [td]Cell 3[/td]<br>
-  [/tr]<br>
-  [tr]<br>
-    [td]Cell 4[/td]<br>
-    [td]Cell 5[/td]<br>
-    [td]Cell 6[/td]<br>
-  [/tr]<br>
+&nbsp;&nbsp;[tr]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[th]Header 1[/th]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[th]Header 2[/th]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[th]Header 2[/th]<br>
+&nbsp;&nbsp;[/tr]<br>
+&nbsp;&nbsp;[tr]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 1[/td]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 2[/td]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 3[/td]<br>
+&nbsp;&nbsp;[/tr]<br>
+&nbsp;&nbsp;[tr]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 4[/td]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 5[/td]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[td]Cell 6[/td]<br>
+&nbsp;&nbsp;[/tr]<br>
 [/table]</td>
   <td>
 	<table>
@@ -371,12 +372,12 @@ code</code></td>
 </tr>
 <tr>
   <td>[ul]<br>
-  [li] First list element<br>
-  [li] Second list element<br>
+&nbsp;&nbsp;[li] First list element<br>
+&nbsp;&nbsp;[li] Second list element<br>
 [/ul]<br>
 [list]<br>
-  [li] First list element<br>
-  [li] Second list element<br>
+&nbsp;&nbsp;[li] First list element<br>
+&nbsp;&nbsp;[li] Second list element<br>
 [/list]</td>
   <td>
 	<ul class="listbullet" style="list-style-type: circle;">
@@ -387,12 +388,12 @@ code</code></td>
 </tr>
 <tr>
   <td>[ol]<br>
-  [li] First list element<br>
-  [li] Second list element<br>
+&nbsp;&nbsp;[li] First list element<br>
+&nbsp;&nbsp;[li] Second list element<br>
 [/ol]<br>
 [list=1]<br>
-  [li] First list element<br>
-  [li] Second list element<br>
+&nbsp;&nbsp;[li] First list element<br>
+&nbsp;&nbsp;[li] Second list element<br>
 [/list]</td>
   <td>
     <ul class="listdecimal" style="list-style-type: decimal;">
@@ -403,8 +404,8 @@ code</code></td>
 </tr>
 <tr>
   <td>[list=]<br>
-  [li] First list element<br>
-  [li] Second list element<br>
+&nbsp;&nbsp;[li] First list element<br>
+&nbsp;&nbsp;[li] Second list element<br>
 [/list]</td>
   <td>
     <ul class="listnone" style="list-style-type: none;">
@@ -415,8 +416,8 @@ code</code></td>
 </tr>
 <tr>
   <td>[list=i]<br>
-  [li] First list element<br>
-  [li] Second list element<br>
+&nbsp;&nbsp;[li] First list element<br>
+&nbsp;&nbsp;[li] Second list element<br>
 [/list]</td>
   <td>
     <ul class="listlowerroman" style="list-style-type: lower-roman;">
@@ -427,8 +428,8 @@ code</code></td>
 </tr>
 <tr>
   <td>[list=I]<br>
-  [li] First list element<br>
-  [li] Second list element<br>
+&nbsp;&nbsp;[li] First list element<br>
+&nbsp;&nbsp;[li] Second list element<br>
 [/list]</td>
   <td>
     <ul class="listupperroman" style="list-style-type: upper-roman;">
@@ -439,8 +440,8 @@ code</code></td>
 </tr>
 <tr>
   <td>[list=a]<br>
-  [li] First list element<br>
-  [li] Second list element<br>
+&nbsp;&nbsp;[li] First list element<br>
+&nbsp;&nbsp;[li] Second list element<br>
 [/list]</td>
   <td>
     <ul class="listloweralpha" style="list-style-type: lower-alpha;">
@@ -451,8 +452,8 @@ code</code></td>
 </tr>
 <tr>
   <td>[list=A]<br>
-  [li] First list element<br>
-  [li] Second list element<br>
+&nbsp;&nbsp;[li] First list element<br>
+&nbsp;&nbsp;[li] Second list element<br>
 [/list]</td>
   <td>
     <ul class="listupperalpha" style="list-style-type: upper-alpha;">
@@ -547,7 +548,7 @@ pictures?[/abstract]<br>
 that I wanted to share with you.[/abstract]<br>
 Today I was in the woods and took some real cool pictures ...</td>
   <td>For Twitter and App.net the system will use the defined abstracts.<br>
-For other networks (e.g. when you are using the "StatusNet" connector that is used to post to your GNU Social account) the general abstract element will be used.</td>
+For other networks (e.g. when you are using the "statusnet" connector that is used to post to your GNU Social account) the general abstract element will be used.</td>
 </tr>
 </table>
 
@@ -573,7 +574,7 @@ While taking pictures in the woods I had a really strange encounter...</td>
 </tr>
 </table>
 
-The [abstract] element is not working with connectors where we post HTML directly, like Tumblr, WordPress or Pump.io.
+The [abstract] element is not working with connectors where we post HTML directly, like Tumblr, Wordpress or Pump.io.
 For the native connections--that is to e.g. Friendica, Hubzilla, Diaspora or GNU Social--the full posting is used and the contacts instance will display the posting as desired.
 
 For postings that are delivered via ActivityPub, the text from the abstract is placed in the summary field.
@@ -610,10 +611,10 @@ On Mastodon this field is used for the content warning.
 <tr>
   <td>Additionally, [pre] blocks preserve spaces:
     <ul>
-      <li>[pre]      Spaces[/pre]</li>
+      <li>[pre]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Spaces[/pre]</li>
     </ul>
   </td>
-  <td>      Spaces</td>
+  <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Spaces</td>
 </tr>
 <tr>
   <td>[nosmile] is used to disable smilies on a post by post basis<br>

doc/Bugs-and-Issues.md

@@ -1,10 +1,13 @@
-# Bugs and issues
+Bugs and Issues
+===============
+
+* [Home](help)
 
 If your server has a support page, you should report any bugs/issues you encounter there first.
 Reporting to your support page before reporting to the developers makes their job easier, as they don't have to deal with bug reports that might not have anything to do with them.
 Reducing the workload in this way helps us get new features faster.
 You can also contact the [friendica support group](https://forum.friendi.ca/profile/helpers) and report your problem there.
-Bugs are rarely limited to one person, and the chances are somebody from another node has encountered the issue too, and will be able to help you.
+Bugs are rarely limited to one person, and the chances are somebody from another node has encountered the problem too, and will be able to help you.
 
 If you're a technical user, or your site doesn't have a support page, you'll need to use the [Bug Tracker](https://github.com/friendica/friendica/issues).
 This is also used for issues with addons.

doc/Channels.md

@@ -1,4 +1,7 @@
-# Channels
+Channels
+=====
+
+* [Home](help)
 
 Channels are a way to discover new content or to display content that you might have missed otherwise.
 There are several predefined channels, additionally you can create your own channels, based on some rules.
@@ -15,7 +18,8 @@ On the contact page you can define the channel frequency for every contact. The
 * Display only few posts: When a contact creates a lot of posts in a short period, this setting reduces the number of displayed posts in every channel.
 * Never display posts: Posts from this contact will never be displayed in any channel.
 
-## Predefined Channels
+Predefined Channels
+---
 
 * For you: Posts from contacts you interact with and who interact with you. In detail, it consists of:
     * Posts from people you interact with on a more than average level.
@@ -34,7 +38,8 @@ On the contact page you can define the channel frequency for every contact. The
 * Audio: Posts with audio.
 * Videos: Posts with videos.
 
-## User defined Channels
+User defined Channels
+---
 
 In the "Channels" settings you can create your own channels.
 
@@ -49,7 +54,8 @@ Each channel is defined by these values:
 * Full Text Search: This can be used to include or exclude content, based on the content and some additional keywords. It uses the "boolean mode" operators from MariaDB: https://mariadb.com/kb/en/full-text-index-overview/#in-boolean-mode
 * Images, Videos, Audio: When selected, you will see content with the selected media type. This can be combined. If none of these fields are checked, you will see any content, with or without attached media.
 
-## Additional keywords for the full text search
+Additional keywords for the full text search
+---
 
 Additionally to the search for content, there are keywords that can be used in the full text search.
 Alternatives are presented with "|".

doc/Chats.md

@@ -1,13 +1,17 @@
-# Chats
+Chats
+=====
+
+* [Home](help)
 
 There are two possibilities to use chat on your friendica site
 
 * IRC Chat
 * Jappix
 
-## IRC-Chat Addon
+IRC-Chat Addon
+---
 
-After activating the addon, you can find the chat at `https://your-site.info/irc`.
+After activating the addon, you can find the chat at [yoursite.com/irc](../irc).
 Note: you can use this chat without any login at your site so that everyone could use it.
 
 If you follow the link, you will see the login page of the IRC chat.
@@ -21,8 +25,8 @@ The first line shows your name and your current IP address.
 The right part of the window shows all users.
 The lower part of the window contains an input field.
 
-## Jappix Mini
-
+Jappix Mini
+---
 
 The Jappix Mini Addon creates a chatbox for jabber- and XMPP-contacts.
 You should already have a jabber/XMPP-account before setting up the addon.
@@ -35,11 +39,9 @@ You can use several servers to create an account:
 
 ### 1. Basics
 
-First you have to get the current version. You can either pull it from [GitHub](https://github.com) like so:
-```sh
-cd /var/www/virtual/YOURSPACE/html/addon
-git pull
-```
+At first you have to get the current version. You can either pull it from [GitHub](https://github.com) like so:
+
+    $> cd /var/www/virtual/YOURSPACE/html/addon; git pull
 
 Or you can download a tar archive here: [jappixmini.tgz](https://github.com/friendica/friendica-addons/blob/stable/jappixmini.tgz) (click at „view raw“).
 
@@ -57,13 +59,13 @@ Activate the BOSH proxy.
 Go to your user account settings next and choose the addon page.
 Scroll down until you find the Jappix Mini addon settings.
 
-First you have to activate the addon.
+At first you have to activate the addon.
 
 Now add your Jabber/XMPP name, the domain/server (without "http"; just "jappix.com").
 For „Jabber BOSH Host“ you could use "https://bind.jappix.com/".
 Note that you need another BOSH server if you do not use jappix.com for your XMPP account.
-You can find further information in the „Configuration Help“-section below these fields.
-Finally you enter your password (there are some more optional options, you can choose).
+You can find further information in the „Configuration Help“-section below this fields.
+At last you have enter your password (there are some more optional options, you can choose).
 Finish these steps with "send" to save the entries.
 Now, you should find the chatbox at the lower right corner of your browser window.
 

doc/Circles-and-Privacy.md

@@ -1,9 +1,13 @@
-# Circles and privacy
+Circles and Privacy
+==================
+
+* [Home](help)
+
 
 Circles are merely collections of friends.
 But Friendica uses these to unlock some very powerful features.
 
-## Setting Up Circles
+**Setting Up Circles**
 
 To create a circle, visit your Friendica "Contacts" page and select "Create a new circle".
 Give the circle a name.
@@ -17,7 +21,7 @@ Below that is another box containing all of your friends who are *not* members o
 If you click on a photo of a person who isn't in the circle, they will be put into the circle.
 If you click on a photo of a person who is in the circle, they will be removed from it.
 
-## Access Control
+**Access Control**
 
 Once you have created a circle, you may use it in any access control list.
 This is the little lock icon beneath the status update box on your home page.
@@ -36,7 +40,7 @@ You will see that since you are only viewing a certain circle of people, your st
 This is how you keep your future employers from seeing what you write to your drinking buddies.
 You can override this setting, but this makes it easy to separate your conversations into different friend circles.
 
-## Default Post Privacy
+**Default Post Privacy**
 
 By default, Friendica assumes that you want all of your posts to be private.
 Therefore, when you sign up, Friendica creates a circle for you that it will automatically add all of your contacts to.
@@ -47,7 +51,7 @@ Note that this behaviour can be overridden by your site admin, in which case you
 If you want your posts to be "public" by default, you can change your default post permissions on your Settings page.
 You also have the option to change which circles you post to by default or which circle your new contacts get placed into by default.
 
-## Privacy Concerns To Be Aware Of
+**Privacy Concerns To Be Aware Of**
 
 These private conversations work best when your friends are Friendica members.
 We know who else can see the conversations - nobody, *unless* your friends cut and paste the messages and send them to others.
@@ -62,18 +66,20 @@ If you look at the Contact Edit page for any person, we will tell you whether or
 Once you have created a post, you can not change the permissions assigned.
 Within seconds it has been delivered to lots of people - and perhaps everybody it was addressed to.
 If you mistakenly created a message and wish to take it back, the best you can do is delete it.
-We will send out a deleted notification to everybody who received the message - and this should wipe out the message with the same speed as it was initially propagated.
+We will send out a delete notification to everybody who received the message - and this should wipe out the message with the same speed as it was initially propagated.
 In most cases, it will be completely wiped from the Internet - in under a minute.
 Again, this applies to Friendica networks.
 Once a message spreads to other networks, it may not be removed quickly, and in some cases, it may not be removed at all.
 
 
-# Profiles, Photos, and Privacy
+
+Profiles, Photos, and Privacy
+=============================
 
 The decentralised nature of Friendica (many websites exchanging information rather than one website which controls everything) has some implications with privacy as it relates to people on other sites.
 There are things you should be aware of, so you can decide best how to interact privately.
 
-## Photos
+**Photos**
 
 Sharing photos privately is a problem.
 We can only share them __privately__ with Friendica members.
@@ -84,7 +90,7 @@ Your friends on other networks will be blocked from viewing these private photos
 Our developers are working on solutions to allow access to your friends - no matter what network they are on.
 However we take privacy seriously and don't behave like some networks that __pretend__ your photos are private, but make them available to others without proof of identity.
 
-## Profiles
+**Profiles**
 
 Your profile and "wall" may also be visited by your friends from other networks, and you can block access to these by web visitors that Friendica doesn't know.
 Be aware that this could include some of your friends on other networks.

doc/Composer.md

@@ -1,12 +1,14 @@
-# Using Composer
+Using Composer
+==============
 
-* [Developer Intro](help/developer/index)
+* [Home](help)
+  * [Developer Intro](help/Developers-Intro)
 
 Friendica uses [Composer](https://getcomposer.org) to manage dependencies libraries and the class autoloader both for libraries and namespaced Friendica classes.
 
 It's a command-line tool that downloads required libraries into the `vendor` folder and makes any namespaced class in `src` available through the whole application.
 
-* [Class autoloading](help/developer/autoloader)
+* [Class autoloading](help/autoloader)
 
 ## How to use Composer
 
@@ -53,8 +55,8 @@ If you don't need to use any third-party library, then you don't need to use Com
 
 #### Adding a third-party library to Friendica
 
-Does your shiny new [Addon](help/developer/addon-development) need to rely on a third-party library not required by Friendica yet?
-First, this library should be available on [Packagist](https://packagist.org) so that Composer knows how to fetch it directly just by mentioning its name in `composer.json`.
+Does your shiny new [Addon](help/Addons) need to rely on a third-party library not required by Friendica yet?
+First of all, this library should be available on [Packagist](https://packagist.org) so that Composer knows how to fetch it directly just by mentioning its name in `composer.json`.
 
 This file is the configuration of Friendica for Composer. It lists details about the Friendica project, but also a list of required dependencies and their target version.
 Here's a simplified version of the one we currently use on Friendica:
@@ -114,5 +116,5 @@ $> COMPOSER_HOME=/var/tmp/composer sudo -u [web user] bin/composer.phar [mode]
 
 ## Related
 
-* [Class autoloading](help/developer/autoloader)
-* [How To Move Classes to `src`](help/developer/developer-how-to-move-classes-to-src)
+* [Class autoloading](help/autoloader)
+* [How To Move Classes to `src`](help/Developer-How-To-Move-Classes-to-src)

doc/Config.md

@@ -1,4 +1,7 @@
-# Config values that can only be set in config/local.config.php
+Config values that can only be set in config/local.config.php
+==========================================================
+
+* [Home](help)
 
 Friendica's configuration is done in two places: in PHP array configuration files and in the `config` database table.
 Database config values overwrite the same file config values.

doc/Connectors.md

@@ -1,34 +1,42 @@
-# Connectors
+Connectors
+==========
+
+* [Home](help)
 
 Connectors allow you to connect with external social networks and services.
 They are only required for posting to existing accounts on for example Bluesky, Tumblr or Twitter.
 For Bluesky and Tumblr you can also enable a bidirectional synchronisation, so that you can use Friendica to read your timeline from Tumblr or Bluesky.
 There is also a connector for accessing your email INBOX.
 
-# Instructions For Connecting To People On Specific Services
+Instructions For Connecting To People On Specific Services
+==========================================================
 
-## Friendica
+Friendica
+---
 
 You can either connect to others by providing your Identity Address on the 'Connect' page of any Friendica member.
-Or you can put their Identity Address into the Connect box on your [Contacts](contact) page.
+Or you can put their Identity Address into the Connect box on your [Contacts](contacts) page. 
 
 
-## Diaspora
+Diaspora
+---
 
-Add the Diaspora 'handle' to the 'Connect/Follow' text box on your [Contacts](contact) page.
+Add the Diaspora 'handle' to the 'Connect/Follow' text box on your [Contacts](contacts) page. 
 
-## Blogger, WordPress, RSS feeds, arbitrary web pages
+Blogger, Wordpress, RSS feeds, arbitrary web pages
+---
 
-Put the URL into the Connect box on your [Contacts](contact) page.
-PLease note that you will not be able to reply to these contacts.
+Put the URL into the Connect box on your [Contacts](contacts) page.
+PLease note that you will not be able to reply to these contacts. 
 
 This feed reader feature will allow you to _connect_ with millions of pages on the internet.
-All that the pages need to have is a discoverable feed using either the RSS or Atom syndication format, and which provides an author name and a site image in a form which we can extract.
+All that the pages need to have is a discoverable feed using either the RSS or Atom syndication format, and which provides an author name and a site image in a form which we can extract. 
 
-## Email
+Email
+---
 
 If the php module for IMAP support is available on your server, Friendica can connect to email contacts as well.
 Configure the email connector from your [Settings](settings) page.
-Once this has been done, you may enter an email address to connect with using the Connect box on your [Contacts](contact) page.
+Once this has been done, you may enter an email address to connect with using the Connect box on your [Contacts](contacts) page.
 They must be the sender of a message which is currently in your INBOX for the connection to succeed.
 You may include email contacts in private conversations.

doc/Developer-Domain-Driven-Design.md

@@ -1,6 +1,8 @@
-# Domain-driven design
+Domain-Driven-Design
+==============
 
-* [Developer Intro](help/developer/index)
+* [Home](help)
+  * [Developer Intro](help/Developers-Intro)
 
 Friendica uses class structures inspired by Domain-Driven-Design programming patterns.
 This page is meant to explain what it means in practical terms for Friendica development.
@@ -83,7 +85,7 @@ class Model
     {
         $this->dba = $dba;
     }
-
+    
     function save()
     {
         return $this->dba->update('table', get_object_vars($this), ['id' => $this->id]);
@@ -134,7 +136,7 @@ class Factory
 
     public function create()
     {
-        return new Model($this->dba);
+        return new Model($this->dba);    
     }
 }
 
@@ -168,7 +170,7 @@ class Model
     {
         $this->dba = $dba;
     }
-
+    
     function save()
     {
         return $this->dba->update('table', get_object_vars($this), ['id' => $this->id]);
@@ -189,7 +191,7 @@ class Factory
 
     public function create()
     {
-        return new Model($this->dba);
+        return new Model($this->dba);    
     }
 }
 
@@ -221,7 +223,7 @@ class Repository extends Factory
 
     public function create()
     {
-        return new Model($this->dba);
+        return new Model($this->dba);    
     }
 
     public function save(Model $model)

doc/Developer-How-To-Move-Classes-to-src.md

@@ -1,16 +1,18 @@
-# How to move classes to `src`
+How To Move Classes to `src`
+==============
 
-* [Developer Intro](help/developer/index)
+* [Home](help)
+  * [Developer Intro](help/Developers-Intro)
 
-Friendica uses [Composer](help/developer/composer) to manage autoloading.
-This means that all the PHP class files moved to the `src` folder will be [automatically included](help/developer/autoloader) when the class it defines is first used in the flow.
+Friendica uses [Composer](help/Composer) to manage autoloading.
+This means that all the PHP class files moved to the `src` folder will be [automatically included](help/autoloader) when the class it defines is first used in the flow.
 This is an improvement over the current `require` usage since files will be included on an actual usage basis instead of the presence of a `require` call.
 
 However, there are a significant number of items to check when moving a class file from the `include` folder to the `src` folder, and this page is there to list them.
 
 ## Decide the namespace
 
-This isn't the most technical decision of them all, but it has long-lasting consequences as it will be the name that will be used to refer to this class from now on.
+This isn't the most technical decision of them all, but it has long lasting consequences as it will be the name that will be used to refer to this class from now on.
 There is [a shared Ethercalc sheet](https://ethercalc.org/friendica_classes) to suggest namespace/class names that lists all the already moved class files for inspiration.
 
 A few pointers though:
@@ -32,7 +34,7 @@ namespace Friendica\Core;
 From now on, the `Config` class can be referred to as `Friendica\Core\Config`, however it isn't very practical, especially when the class was previously used as `Config`.
 Thankfully, PHP provides namespace shortcuts through `use`.
 
-This language construct just provides a different naming scheme for a namespace or a class, but doesn't trigger the autoload-mechanism on its own.
+This language construct just provides a different naming scheme for a namespace or a class, but doesn't trigger the autoload mechanism on its own.
 Here are the different ways you can use `use`:
 
 ````php
@@ -102,5 +104,5 @@ Most of the time it's used for debugging purposes but there can be instances whe
 
 ## Related
 
-* [Class autoloading](help/developer/autoloader)
-* [Using Composer](help/developer/composer)
+* [Class autoloading](help/autoloader)
+* [Using Composer](help/Composer)

doc/Developers-Intro.md

@@ -2,9 +2,11 @@
 
 <!-- markdownlint-disable MD010 MD013 -->
 
+* [Home](help)
+
 Do you want to help us improve Friendica?
 Here we have compiled some hints on how to get started and some tasks to help you choose.
-A project like Friendica is the sum of many contributions.
+A project like Friendica is the sum of many different contributions.
 **Very different skills are required to make good software, not all of them involve coding!**
 We are looking for helpers in all areas, whether you write text or code, whether you spread the word to convince people or design new icons.
 Whether you feel like an expert or like a newbie - join us with your ideas!
@@ -23,7 +25,7 @@ Welcome them, answer their questions, point them to documentation or ping other
 
 ## Translation
 
-The documentation contains help on how to translate Friendica [at Transifex](/help/developer/translations) where the UI is translated.
+The documentation contains help on how to translate Friendica [at Transifex](/help/translations) where the UI is translated.
 If you don't want to translate the UI, or it is already done to your satisfaction, you might want to work on the translation of the /help files?
 
 ## Design
@@ -39,7 +41,7 @@ If you have seen Friendica you probably have ideas to improve it, haven't you?
 
 ## Programming
 
-Friendica uses an implementation of [Domain-Driven-Design](help/developer/domain-driven-design), please make sure to check out the provided links for hints at the expected code architecture.
+Friendica uses an implementation of [Domain-Driven-Design](help/Developer-Domain-Driven-Design), please make sure to check out the provided links for hints at the expected code architecture.
 
 ### Composer
 
@@ -64,9 +66,9 @@ If you want to have git automatically update the dependencies with composer, you
 
 just place it into `.git/hooks/post-merge` and make it executable.
 
-* [Class autoloading](help/developer/autoloader)
-* [Using Composer](help/developer/composer)
-* [How To Move Classes to `src`](help/developer/how-to-move-classes-to-src)
+* [Class autoloading](help/autoloader)
+* [Using Composer](help/Composer)
+* [How To Move Classes to `src`](help/Developer-How-To-Move-Classes-to-src)
 
 ### Coding standards
 
@@ -146,7 +148,7 @@ If you want to get involved here:
 
 ### Client software
 
-As Friendica is using a [Twitter/GNU Social compatible API](help/spec/api/index) any of the clients for those platforms should work with Friendica as well.
+As Friendica is using a [Twitter/GNU Social compatible API](help/api) any of the clients for those platforms should work with Friendica as well.
 Furthermore, there are several client projects, especially for use with Friendica.
 If you are interested in improving those clients, please contact the developers of the clients directly.
 

doc/Export-Import-Contacts.md

@@ -1,6 +1,8 @@
 # Export / Import of followed Contacts
 
-In addition to [move your account](help/user/move-account) you can export and import the list of accounts you follow.
+* [Home](help)
+
+In addition to [move your account](help/Move-Account) you can export and import the list of accounts you follow.
 The exported list is stored as CSV file that is compatible to the format used by other platforms as e.g. Mastodon, Misskey or Pleroma.
 
 ## Export of followed Contacts

doc/FAQ-admin.md

@@ -1,10 +1,22 @@
-# Frequently asked questions (Admin) - FAQ
+Frequently Asked Questions (Admin) - FAQ
+==============
 
-## Can I configure multiple domains with the same code instance?
+* [Home](help)
+
+* **[Can I configure multiple domains with the same code instance?](help/FAQ-admin#multiple)**
+* **[Where can I find the source code of friendica, addons and themes?](help/FAQ-admin#sources)**
+* **[I've changed the my email address now the admin panel is gone?](help/FAQ-admin#adminaccount1)**
+* **[Can there be more then just one admin for a node?](help/FAQ-admin#adminaccount2)**
+* **[The Database structure seems not to be updated. What can I do?](help/FAQ-admin#dbupdate)**
+
+
+<a name="multiple"></a>
+### Can I configure multiple domains with the same code instance?
 
 No, this function is no longer supported as of Friendica 3.3 onwards.
 
-## Where can I find the source code of friendica, addons and themes?
+<a name="sources"></a>
+### Where can I find the source code of friendica, addons and themes?
 
 You can find the main repository [here](https://github.com/friendica/friendica).
 There you will always find the current stable version of friendica.
@@ -13,11 +25,13 @@ Addons are listed at [this page](https://github.com/friendica/friendica-addons).
 
 If you are searching for new themes, you can find them at [github.com/bkil/friendica-themes](https://github.com/bkil/friendica-themes)
 
-## I've changed my email address now the admin panel is gone?
+<a name="adminaccount1"></a>
+### I've changed my email address now the admin panel is gone?
 
 Have a look into your <tt>config/local.config.php</tt> and fix your email address there.
 
-## Can there be more then one admin for a node?
+<a name="adminaccount2"></a>
+### Can there be more then one admin for a node?
 
 Yes.
 You just have to list more then one email address in the
@@ -28,14 +42,14 @@ The listed emails need to be separated by a comma like this:
 'admin_email' => 'mail1@example.com,mail2@example.com',
 ```
 
-## The Database structure seems not to be updated. What can I do?
+<a name="dbupdate"></a>
+### The Database structure seems not to be updated. What can I do?
 
 Please have a look at the Admin panel under [DB updates](/admin/dbsync/) and follow the link to *check database structure*.
 This will start a background process to check if the structure is up to the current definition.
 
 You can manually execute the structure update from the CLI in the base directory of your Friendica installation by running the following command:
-```sh
-bin/console dbstructure update
-```
+
+    bin/console dbstructure update
 
 if there occur any errors, please contact the [Friendica Support group](https://forum.friendi.ca/profile/helpers) or discuss in the [Friendica Admins group](https://forum.friendi.ca/profile/admins).

doc/FAQ.md

@@ -1,6 +1,23 @@
-# Frequently asked questions - FAQ
+Frequently Asked Questions - FAQ
+==============
 
-## Where I can find help?
+* [Home](help)
+
+* **[Where I can find help?](help/FAQ#help)**
+* **[Why do I get warnings about certificates?](help/FAQ#ssl)**
+* **[How can I upload images, files, links, videos and sound files to posts?](help/FAQ#upload)**
+* **[Is it possible to have different avatars per profile?](help/FAQ#avatars)**
+* **[How can I view Friendica in a certain language?](help/FAQ#language)**
+* **[How do blocked, ignored, archived and hidden contacts behave?](help/FAQ#contacts)**
+* **[What happens when an account is removed? Is it truly deleted?](help/FAQ#removed)**
+* **[Can I subscribe to a hashtag?](help/FAQ#hashtag)**
+* **[How to create an RSS feed of the stream?](help/FAQ#rss)**
+* **[What friendica clients can I use?](help/FAQ#clients)**
+
+
+<a name="help"></a>
+
+### Where I can find help?
 
 If this FAQ does not answer your question you can always reach out to the community via the following options:
 
@@ -16,7 +33,8 @@ If this FAQ does not answer your question you can always reach out to the commun
 	https://github.com/github/opensource.guide/pull/807
   --->
 
-## Why do I get warnings about SSL certificates?
+<a name="ssl"></a>
+### Why do I get warnings about SSL certificates?
 
 SSL (Secure Socket Layer) is a technology to encrypt data transfer between computers.
 Sometimes your browser warns you about a missing or invalid certificate.
@@ -26,11 +44,12 @@ These warnings can have three reasons:
 2. The server has a self-signed certificate (not recommended).
 3. The certificate is expired.
 
-We recommend to talk to the admin(s) of the affected friendica server. (Admins, please see the respective section of the [admin manual](help/admin/ssl).)
+We recommend to talk to the admin(s) of the affected friendica server. (Admins, please see the respective section of the [admin manual](help/SSL).)
 
-## How can I upload images, files, links, videos and sound files to posts?
+<a name="upload"></a>
+### How can I upload images, files, links, videos and sound files to posts?
 
-You can upload images from your computer using the [editor](help/user/text-editor).
+You can upload images from your computer using the [editor](help/Text_editor).
 An overview of all uploaded images is listed at *yourpage.com/profile/profilename/photos*.
 On that page, you can also upload images directly and choose if your contacts will receive a message about this upload.
 
@@ -56,14 +75,16 @@ Therefore, the supported files are dependent on your browser and operating syste
 Some supported file types are WebM, MP4, MP3 and OGG.
 See Wikipedia for more of them ([video](http://en.wikipedia.org/wiki/HTML5_video), [audio](http://en.wikipedia.org/wiki/HTML5_audio)).
 
-## Is it possible to have different avatars per profile?
+<a name="avatars"></a>
+### Is it possible to have different avatars per profile?
 
 Yes.
 On your Edit/Manage Profiles page, you will find a "change profile photo" link.
 Clicking this will take you to a page where you can upload a photograph and select which profile it will be associated with.
 To avoid privacy leakage, we only display the photograph associated with your default profile as the avatar in your posts.
 
-## How can I view Friendica in a certain language?
+<a name="language"></a>
+### How can I view Friendica in a certain language?
 
 You can do this by adding the `lang` parameter to the url in your url bar.
 The data in the parameter is a [ISO 639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) code.
@@ -80,12 +101,12 @@ in German:
 When a certain language is forced, the language remains until session is closed.
 
 <a name="contacts"></a>
-## How do blocked, ignored, archived and hidden contacts behave?
+### How do blocked, ignored, archived and hidden contacts behave?
 
 These are various categories of contacts that are restricted in some way.
-Many of these types are related to [Safety](help/user/safety).
+Many of these types are related to [Safety](help/Safety).
 
-### Blocked
+##### Blocked
 
 Direct communication will be blocked.
 Blocked contacts are not included in delivery, and their own posts to you are not imported.
@@ -93,7 +114,7 @@ However, their conversations with your friends will still be visible in your str
 If you remove a contact completely, they can send you another friend request.
 Blocked contacts cannot do this. They cannot communicate with you directly, only through friends.
 
-### Ignored
+##### Ignored
 
 Ignored contacts are included in delivery and will receive your posts and private messages.
 However, we do not import their posts or private messages to you.
@@ -101,17 +122,18 @@ Like blocking, you will still see this person's comments to posts made by your f
 
 An addon called "blockem" can be installed to collapse/hide all posts from a particular person in your stream if you desire complete blocking of an individual, including their conversations with your other friends.
 
-### Archived
+##### Archived
 
 Communication is not possible and will not be attempted.
 However, unlike blocking, existing posts this person made before being archived will be visible in your stream.
 
-### Hidden
+##### Hidden
 
 The contact not be displayed in your public friend list.
 However, a hidden contact will appear normally in conversations and this may expose their hidden status to anybody who can see the conversation.
 
-## What happens when an account is removed?
+<a name="removed"></a>
+### What happens when an account is removed?
 
 If you remove your account, it will be scheduled for permanent deletion in *seven days*.
 As soon as you activate the deletion process you won't be able to log in anymore.
@@ -121,17 +143,19 @@ After the elapsed time of seven days, all your posts, messages, photos, and pers
 Your node will also issue removal requests to all your contacts; this will also remove your profile from the global directory if you are listed.
 Your username cannot be reissued for future sign-ups for security reasons.
 
-## Can I follow a hashtag?
+<a name="hashtag"></a>
+### Can I follow a hashtag?
 
 Yes. Simply add the hashtag to your saved searches.
 The posts will appear on your network page.
 For technical reasons, your answers to such posts won't appear on the "personal" tab in the network page and the whole thread isn't accessible via the API.
 
-## How to create an RSS feed of the stream?
+<a name="rss"></a>
+### How to create an RSS feed of the stream?
 
 If you want to share your public page via rss you can use one of the following links:
 
-### RSS feed of your posts
+#### RSS feed of your posts
 
 	basic-url.com//feed/[nickname]/posts
 
@@ -147,14 +171,15 @@ Example: Friendica Support
 
 	https://forum.friendi.ca/feed/helpers/comments
 
-## What friendica clients can I use?
+<a name="clients"></a>
+### What friendica clients can I use?
 
-Friendica supports [Mastodon API](help/spec/api/mastodon) and [Twitter API | gnusocial](help/spec/api/index).
+Friendica supports [Mastodon API](help/API-Mastodon) and [Twitter API | gnusocial](help/api).
 This means you can use some of the Mastodon and Twitter clients for Friendica.
 The available features are client specific and may differ.
 Clients dedicated to Friendica are marked in **bold**.
 
-### Android
+#### Android
 
 * [AndStatus](http://andstatus.org) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.andstatus.app), [Google Play](https://play.google.com/store/apps/details?id=org.andstatus.app))
 * [Fedilab](https://fedilab.app) ([F-Droid](https://f-droid.org/app/fr.gouv.etalab.mastodon), [Google Play](https://play.google.com/store/apps/details?id=app.fedilab.android))
@@ -170,7 +195,7 @@ Clients dedicated to Friendica are marked in **bold**.
 * [TwidereX](https://github.com/TwidereProject/TwidereX-Android) ([F-Droid](https://f-droid.org/en/packages/com.twidere.twiderex/), [Google Play](https://play.google.com/store/apps/details?id=com.twidere.twiderex))
 * [Yuito](https://github.com/accelforce/Yuito) ([Google Play](https://play.google.com/store/apps/details?id=net.accelf.yuito))
 
-### iOS
+#### iOS
 
 * [Mastodon](https://joinmastodon.org/apps) ([App Store](https://apps.apple.com/us/app/mastodon-for-iphone/id1571998974))
 * **[Relatica](https://gitlab.com/mysocialportal/relatica)**
@@ -178,7 +203,7 @@ Clients dedicated to Friendica are marked in **bold**.
 * [Tooot](https://github.com/tooot-app) ([App Store](https://apps.apple.com/app/id1549772269))
 * [TwidereX](https://github.com/TwidereProject/TwidereX-iOS) ([App Store](https://apps.apple.com/app/twidere-x/id1530314034))
 
-### Linux
+#### Linux
 
 * [Choqok](https://choqok.kde.org)
 * **[Relatica](https://gitlab.com/mysocialportal/relatica)**
@@ -186,19 +211,19 @@ Clients dedicated to Friendica are marked in **bold**.
 * [Toot](https://toot.readthedocs.io/en/latest/)
 * [Whalebird](https://whalebird.social/en/desktop/contents) ([GitHub](https://github.com/h3poteto/whalebird-desktop))
 
-### macOS
+#### macOS
 
 * **[Relatica](https://gitlab.com/mysocialportal/relatica)**
 * [TheDesk](https://thedesk.top/en/) ([GitHub](https://github.com/cutls/TheDesk))
 * [Whalebird](https://whalebird.social/en/desktop/contents) ([App Store](https://apps.apple.com/de/app/whalebird/id1378283354), [GitHub](https://github.com/h3poteto/whalebird-desktop))
 
-### Windows
+#### Windows
 
 * **[Relatica](https://gitlab.com/mysocialportal/relatica)**
 * [TheDesk](https://thedesk.top/en/) ([GitHub](https://github.com/cutls/TheDesk))
 * [Whalebird](https://whalebird.social/en/desktop/contents) ([Microsoft Store](https://apps.microsoft.com/detail/9nbw4csdv5hc), [GitHub](https://github.com/h3poteto/whalebird-desktop))
 
-### Web Frontend
+#### Web Frontend
 
 * [Halcyon](https://www.halcyon.social/)
 * [Pinafore](https://github.com/nolanlawson/pinafore)

doc/GitHub.md

@@ -1,8 +1,12 @@
-# Friendica on GitHub
+Friendica on GitHub
+===================
+
+* [Home](help)
 
 Here is how you can work on the code with us. If you have any questions please write to the Friendica developers' group.
 
-## Introduction to the workflow with our GitHub repository
+Introduction to the workflow with our GitHub repository
+-------------------------------------------------------
 
 1. Install git on the system you will be developing on.
 2. Create your own [GitHub](https://github.com) account.
@@ -13,7 +17,8 @@ Follow the instructions provided here: [http://help.github.com/fork-a-repo/](htt
 6. Commit your changes to your fork.
 Then go to your GitHub page and create a "Pull request" to notify us to merge your work.
 
-## Our Git Branches
+Our Git Branches
+----------------
 
 There are two relevant branches in the main repo on GitHub:
 
@@ -21,7 +26,8 @@ There are two relevant branches in the main repo on GitHub:
 2. develop: This branch contains the latest code.
 This is what you want to work with.
 
-## Fast-forwarding
+Fast-forwarding
+---------------
 
 Fast forwarding is enabled by default in git.
 When you merge with fast-forwarding it does not add a new commit to mark when you've performed the merge and how.
@@ -31,7 +37,8 @@ This is done by running "git merge --no-ff".
 [Here](https://stackoverflow.com/questions/5519007/how-do-i-make-git-merges-default-be-no-ff-no-commit) is an explanation on how to configure git to turn off fast-forwarding by default.
 You can find some more background reading [here](http://nvie.com/posts/a-successful-git-branching-model/).
 
-## Release branches
+Release branches
+----------------
 
 A release branch is created when the develop branch contains all features it should have.
 A release branch is used for a few things.
@@ -48,7 +55,8 @@ If you were to merge develop into release-3.4 at this point, features and bug-fi
 This might introduce new bugs, too.
 Which defeats the purpose of the release branch.
 
-## Some important reminders
+Some important reminders
+------------------------
 
 1. Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request.
 We reserve the right to reject any patch which results in a large number of merge conflicts.
@@ -61,9 +69,8 @@ Don't hesitate to ask us in case of doubt.
 
 3. Check your code for typos.
 There is a console command called *typo* for this.
-```sh
-php bin/console.php typo
-```
 
-Check out how to work with [our Vagrant](help/developer/vagrant) to save a lot of setup time!
+	$> php bin/console.php typo
+
+Check out how to work with [our Vagrant](help/Vagrant) to save a lot of setup time!
 

doc/Groups.md

@@ -1,4 +1,8 @@
-# Account types: Groups and pages
+Groups
+=====
+
+* [Home](help)
+
 
 Friendica also lets you create accounts that can function as discussion groups, celebrity accounts, announcement channels, news reflectors, or organization pages, depending on how you want to interact with others.
 Management of these accounts can be delegated to other accounts, or a parent account can be designated to easily toggle multiple identities.
@@ -6,13 +10,14 @@ Management of these accounts can be delegated to other accounts, or a parent acc
 Every account in Friendica has a nickname and these must all be unique.
 This applies to all accounts, whether they are individual profiles or group profiles.
 
-## Managing Accounts
+Managing Accounts
+---
 
 To create a new linked account that can be used as a group, log in to your normal account and go to Settings > Manage Accounts.
 Here you can register additional accounts with new nicknames that will be linked to your primary account.
 
 You may appoint a delegate to manage your new account.
-The "Delegates" section of Manage Accounts page will provide you with a list of contacts on this instance under "Potential Delegates".
+The Delegates section of Manage Accounts page will provide you with a list of contacts on this instance under "Potential Delegates".
 Selecting one or more persons will give them access to manage your newly created account.
 They will be able to edit contacts, profiles, and all content for this account.
 Please use this facility wisely.
@@ -21,7 +26,8 @@ Delegated managers will not be able to alter basic account settings, such as pas
 Additionally, this page is also where you can choose to designate an account as a parent user.
 If your primary account is designated as the parent user, you will be able to easily toggle identities and manage your groups or other types of accounts.
 
-## Types of Accounts
+Types of Accounts
+---
 
 On the new account, visit the Settings > Account page.
 Towards the end of the page is a section for "Advanced account types".
@@ -41,7 +47,8 @@ Organization and New Pages automatically approve contact requests as followers.
 Community Group provide the ability for people to join the group without requiring approval.
 This creates a group where all members can freely interact.
 
-## Posting to Community groups
+Posting to Community groups
+---
 
 If you are a member of a community group, you may post to the group by including an @-mention in the post mentioning the group.
 For example @bicycle would send my post to all members of the group "bicycle" in addition to the normal recipients.

doc/Home.md

@@ -0,0 +1,82 @@
+Help
+====
+
+**User Manual**
+
+* General functions - first steps
+	* [Account Basics](help/Account-Basics)
+	* [New User Quick Start](help/Quick-Start-guide)
+	* [Creating posts](help/Text_editor)
+	* [BBCode tag reference](help/BBCode)
+	* [Comment, sort and delete posts](help/Text_comment)
+	* [Accesskey reference](help/Accesskeys)
+	* [Events](help/events)
+* You and other users
+	* [Connectors](help/Connectors)
+	* [Making Friends](help/Making-Friends)
+	* [Safety](help/Safety)
+	* [Circles and Privacy](help/Circles-and-Privacy)
+	* [Tags and Mentions](help/Tags-and-Mentions)
+	* [Community Groups](help/Groups)
+	* [Channels](help/Channels)
+	* [Chats](help/Chats)
+* Further information
+	* [Move your account](help/Move-Account)
+	* [Export / Import of followed Contacts](help/Export-Import-Contacts)
+	* [Delete your account](help/Remove-Account)
+	* [Frequently asked questions (FAQ)](help/FAQ)
+
+**Admin Manual**
+
+* [Install](help/Install)
+* [Update](help/Update)
+* [Settings & Admin Panel](help/Settings)
+* [Installing Connectors](help/Installing-Connectors)
+* [Install an ejabberd server (XMPP chat) with synchronized credentials](help/install-ejabberd)
+* [Using SSL with Friendica](help/SSL)
+* [Config values that can only be set in config/local.config.php](help/Config)
+* [Improve Performance](help/Improve-Performance)
+* [Migrate](help/Migrate)
+* [Administration Tools](help/tools)
+* [Admin FAQ](help/FAQ-admin)
+
+**Developer Manual**
+
+* [Get started](help/Developers-Intro)
+* Set up development environment
+	* [Help on GitHub](help/GitHub)
+	* [Help on Vagrant](help/Vagrant)
+	* [Bugs and Issues](help/Bugs-and-Issues)
+* Code structure
+    * [Domain-Driven-Design](help/Developer-Domain-Driven-Design)
+	* [Addon Development](help/Addons)
+	* [Theme Development](help/themes)
+	* [Smarty 3 Templates](help/smarty3-templates)
+	* [Storage backend addon](help/AddonStorageBackend)
+* How To
+	* [Translate Friendica](help/translations)
+	* [Use Composer](help/Composer)
+	* [Move classes to `src`](help/Developer-How-To-Move-Classes-to-src)
+	* [Run tests](help/Tests)
+* Reference
+	* [API endpoints](help/api)
+	* [Code (Doxygen generated - sets cookies)](doc/html/)
+	* [Protocol Documentation](help/Protocol)
+	* [Database schema documentation](help/database)
+	* [Class Autoloading](help/autoloader)
+
+**Links**
+
+* Website: [https://friendi.ca](https://friendi.ca)
+* Help Group: [@helpers@forum.friendi.ca](https://forum.friendi.ca/~helpers)
+* XMPP: [support@forum.friendi.ca](xmpp:support@forum.friendi.ca?join)
+* IRC: [https://web.libera.chat/?channels=#friendica](https://web.libera.chat/?channels=#friendica)
+* Matrix: [https://matrix.to/#/#friendi.ca:matrix.org](https://matrix.to/#/#friendi.ca:matrix.org)
+* Mailing List: [https://mailman.friendi.ca/mailman/listinfo/support-friendi.ca](http://mailman.friendi.ca/mailman/listinfo/support-friendi.ca)
+
+
+**About**
+
+* [Server Information](friendica)
+* [Terms of Service](tos)
+* [Credits](credits)

doc/Improve-Performance.md

@@ -1,20 +1,25 @@
-# How to improve the performance of a Friendica server
+How to improve the performance of a Friendica site
+==============
+
+* [Home](help)
 
 Feel free to ask in the [Friendica support group](https://forum.friendi.ca/profile/helpers) if you need some clarification about the following instructions or if you need help in any other way.
 
-## System configuration
+System configuration
+--------
 
-Please go to `/admin/site/` on your system and change the following values:
+Please go to /admin/site/ on your system and change the following values:
 
     Set "JPEG image quality" to 50.
 
-This value reduces the data that is sent from the server to the client. 50 is a value that doesn't influence image quality too much.
+This value reduces the data that is send from the server to the client. 50 is a value that doesn't influences image quality too much.
 
     Enable "Use MySQL full text engine"
 
 When using MyISAM (default) or InnoDB on MariaDB 10 this speeds up search.
 
-## Addons
+Addons
+--------
 
 Active the following addons:
 
@@ -38,7 +43,8 @@ They show your performance problems.
     Others: Everything else :)
     Total: The sum of all above values
 
-## Apache Webserver
+Apache Webserver
+--------
 
 The following Apache modules are recommended:
 
@@ -47,20 +53,20 @@ The following Apache modules are recommended:
 This module tells the client to cache the content of static files so that they aren't fetched with every request.
 Enable the module "mod_expires" by typing in "a2enmod expires" as root.
 Please add the following lines to your site configuration in the "directory" context.
-```
-ExpiresActive on ExpiresDefault "access plus 1 week"
-```
+
+	ExpiresActive on ExpiresDefault "access plus 1 week"
 
 Also see the Apache [2.2](http://httpd.apache.org/docs/2.2/mod/mod_expires.html) / [2.4](https://httpd.apache.org/docs/2.4/mod/mod_expires.html) documentation.
 
 ### Compress content
 
 This module compresses the traffic between the web server and the client.
-Enable the module `mod_deflate` by typing in `a2enmod deflate` as root.
+Enable the module "mod_deflate" by typing in "a2enmod deflate" as root.
 
-Also see the Apache [2.2](https://httpd.apache.org/docs/2.2/mod/mod_deflate.html) / [2.4](https://httpd.apache.org/docs/2.4/mod/mod_deflate.html) documentation.
+Also see the Apache [2.2](http://httpd.apache.org/docs/2.2/mod/mod_deflate.html) / [2.4](https://httpd.apache.org/docs/2.4/mod/mod_deflate.html) documentation.
 
-## PHP
+PHP
+--------
 
 ### FCGI
 

doc/Install.md

@@ -1,7 +1,7 @@
-# Friendica installation
+# Friendica Installation
 
 
-We've tried very hard to ensure that Friendica will run on commodity hosting platforms - such as those used to host WordPress blogs and Drupal websites.
+We've tried very hard to ensure that Friendica will run on commodity hosting platforms - such as those used to host Wordpress blogs and Drupal websites.
 We offer a manual and an automatic installation.
 But be aware that Friendica is more than a simple web application.
 
@@ -12,10 +12,10 @@ This kind of functionality requires a bit more of the host system than the typic
 Not every PHP/MySQL hosting provider will be able to support Friendica.
 Many will.
 
-But **please** review the requirements below and confirm these with your hosting provider prior to installation.
+But **please** review the [requirements](#Requirements) and confirm these with your hosting provider prior to installation.
 
 ## Support
-If you encounter installation issues, please let us know via the [helper](https://forum.friendi.ca/profile/helpers) or the [developer](https://forum.friendi.ca/profile/developers) group or [file an issue](https://github.com/friendica/friendica/issues).
+If you encounter installation issues, please let us know via the [helper](http://forum.friendi.ca/profile/helpers) or the [developer](https://forum.friendi.ca/profile/developers) group or [file an issue](https://github.com/friendica/friendica/issues).
 
 Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future.
 Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues.
@@ -27,7 +27,7 @@ Due to the large variety of operating systems and PHP platforms in existence we
 
 ### Requirements
 
-* Apache with `mod_rewrite` enabled and "[AllowOverride All](https://httpd.apache.org/docs/2.4/mod/core.html#allowoverride)" so you can use a local `.htaccess` file
+* Apache with mod_rewrite enabled and "[AllowOverride All](https://httpd.apache.org/docs/2.4/mod/core.html#allowoverride)" so you can use a local `.htaccess` file
 * PHP 7.4+
   * PHP *command line* access with register_argc_argv set to true in the php.ini file
   * Curl, GD, GMP, PDO, mbstring, MySQLi, xml, zip, IntlChar, IDN and OpenSSL extensions
@@ -74,40 +74,33 @@ Clone the [friendica/friendica GitHub repository](https://github.com/friendica/f
 This makes the software much easier to update.
 
 The Linux commands to clone the repository into a directory "mywebsite" would be
-```sh
-git clone https://github.com/friendica/friendica.git -b stable mywebsite
-```
+
+    git clone https://github.com/friendica/friendica.git -b stable mywebsite
 
 Get the addons by going into your website folder.
-```sh
-cd mywebsite
-```
+
+    cd mywebsite
 
 Clone the addon repository (separately):
-```sh
-git clone https://github.com/friendica/friendica-addons.git -b stable addon
-```
+
+	git clone https://github.com/friendica/friendica-addons.git -b stable addon
 
 Install the dependencies:
-```sh
-bin/composer.phar run install:prod
-```
+
+    bin/composer.phar run install:prod
 
 Make sure the folder *view/smarty3* exists and is writable by the webserver user, in this case *www-data*
-```sh
-mkdir -p view/smarty3
-chown www-data:www-data view/smarty3
-chmod 775 view/smarty3
-```
+
+    mkdir -p view/smarty3
+    chown www-data:www-data view/smarty3
+    chmod 775 view/smarty3
 
 If you want to use the development version of Friendica you can switch to the develop branch in the repository by running
 
-```sh
-git checkout develop
-bin/composer.phar run install:prod
-cd addon
-git checkout develop
-```
+    git checkout develop
+    bin/composer.phar run install:prod
+    cd addon
+    git checkout develop
 
 **Be aware that the develop branch is unstable and may break your Friendica node at any time.**
 You should have a recent backup before updating.
@@ -118,23 +111,19 @@ If you encounter a bug, please let us know.
 Create an empty database and note the access details (hostname, username, password, database name).
 Generate a strong password, then enter mysql with:
 
-```sh
-mysql
-```
+    mysql
 
 Then use the following script using the password you just generated:
 
-```sql
-CREATE DATABASE friendicadb;
-CREATE USER 'friendica'@'localhost' IDENTIFIED BY '<<your mysql password here>>';
-GRANT ALL ON friendicadb.* TO 'friendica'@'localhost';
-FLUSH PRIVILEGES;
-EXIT;
-```
+    CREATE DATABASE friendicadb;
+    CREATE USER 'friendica'@'localhost' IDENTIFIED BY '<<your mysql password here>>';
+    GRANT ALL ON friendicadb.* TO 'friendica'@'localhost';
+    FLUSH PRIVILEGES;
+    EXIT;
 
 Friendica needs the permission to create and delete fields and tables in its own database.
 
-Please check the Troubleshooting section below if running on MySQL 5.7.17 or newer.
+Please check the [troubleshooting](#Troubleshooting) section if running on MySQL 5.7.17 or newer.
 
 ### Option A: Run the installer
 
@@ -155,45 +144,42 @@ Registration errors should all be recoverable automatically.
 If you get any *critical* failure at this point, it generally indicates the database was not installed correctly.
 You might wish to move/rename `config/local.config.php` to another name and empty (called 'dropping') the database tables, so that you can start fresh.
 
-### Option B: Run the automatic installation script
+### Option B: Run the automatic install script
 
 You have the following options to automatically install Friendica:
-- creating a prepared config file (f.e. `prepared.config.php`)
-- using environment variables (f.e. `MYSQL_HOST`)
-- using options (f.e. `--dbhost <host>`)
+-	creating a prepared config file (f.e. `prepared.config.php`)
+-	using environment variables (f.e. `MYSQL_HOST`)
+-	using options (f.e. `--dbhost <host>`)
 
 You can combine environment variables and options, but be aware that options are prioritized over environment variables.
 
 For more information during the installation, you can use this command line option
-```sh
-bin/console autoinstall -v
-```
+
+    bin/console autoinstall -v
 
 If you wish to include all optional checks, use `-a` like this statement:
-```sh
-bin/console autoinstall -a
-```
+
+    bin/console autoinstall -a
 
 *If* the automatic installation fails for any reason, check the following:
 
-* Does `config/local.config.php` already exist? If yes, the automatic installation won't start
-* Are the options in the `config/local.config.php` correct? If not, edit them directly.
-* Is the empty MySQL-database created? If not, create it.
+*	Does `config/local.config.php` already exist? If yes, the automatic installation won't start
+*	Are the options in the `config/local.config.php` correct? If not, edit them directly.
+*	Is the empty MySQL-database created? If not, create it.
 
 #### B.1: Config file
 
 You can use a prepared config file like [local-sample.config.php](/config/local-sample.config.php).
 
 Navigate to the main Friendica directory and execute the following command:
-```sh
-bin/console autoinstall -f <prepared.config.php>
-```
+
+    bin/console autoinstall -f <prepared.config.php>
 
 #### B.2: Environment variables
 
 There are two types of environment variables.
-- those you can use in normal mode too (Currently just **database credentials**)
-- those you can only use during installation (because Friendica will normally ignore it)
+-	those you can use in normal mode too (Currently just **database credentials**)
+-	those you can only use during installation (because Friendica will normally ignore it)
 
 You can use the options during installation too and skip some of the environment variables.
 
@@ -201,56 +187,53 @@ You can use the options during installation too and skip some of the environment
 
 if you don't use the option `--savedb` during installation, the DB credentials will **not** be saved in the `config/local.config.php`.
 
-- `MYSQL_HOST` The host of the mysql/mariadb database
-- `MYSQL_PORT` The port of the mysql/mariadb database
-- `MYSQL_USERNAME` The username of the mysql database login (used for mysql)
-- `MYSQL_USER` The username of the mysql database login (used for mariadb)
-- `MYSQL_PASSWORD` The password of the mysql/mariadb database login
-- `MYSQL_DATABASE` The name of the mysql/mariadb database
+-	`MYSQL_HOST` The host of the mysql/mariadb database
+-	`MYSQL_PORT` The port of the mysql/mariadb database
+-	`MYSQL_USERNAME` The username of the mysql database login (used for mysql)
+-	`MYSQL_USER` The username of the mysql database login (used for mariadb)
+-	`MYSQL_PASSWORD` The password of the mysql/mariadb database login
+-	`MYSQL_DATABASE` The name of the mysql/mariadb database
 
 **Friendica settings**
 
-These variables won't be used at normal Friendica runtime.
+This variables wont be used at normal Friendica runtime.
 Instead, they get saved into `config/local.config.php`.
 
-- `FRIENDICA_URL_PATH` The URL path of Friendica (f.e. '/friendica')
-- `FRIENDICA_PHP_PATH` The path of the PHP binary
-- `FRIENDICA_ADMIN_MAIL` The admin email address of Friendica (this email will be used for admin access)
-- `FRIENDICA_TZ` The timezone of Friendica
-- `FRIENDICA_LANG` The language of Friendica
+-	`FRIENDICA_URL_PATH` The URL path of Friendica (f.e. '/friendica')
+-	`FRIENDICA_PHP_PATH` The path of the PHP binary
+-	`FRIENDICA_ADMIN_MAIL` The admin email address of Friendica (this email will be used for admin access)
+-	`FRIENDICA_TZ` The timezone of Friendica
+-	`FRIENDICA_LANG` The language of Friendica
 
 Navigate to the main Friendica directory and execute the following command:
-```sh
-bin/console autoinstall [--savedb]
-```
+
+    bin/console autoinstall [--savedb]
 
 #### B.3: Execution options
 
 All options will be saved in the `config/local.config.php` and are overruling the associated environment variables.
 
-- `-H|--dbhost <host>` The host of the mysql/mariadb database (env `MYSQL_HOST`)
-- `-p|--dbport <port>` The port of the mysql/mariadb database (env `MYSQL_PORT`)
-- `-U|--dbuser <username>` The username of the mysql/mariadb database login (env `MYSQL_USER` or `MYSQL_USERNAME`)
-- `-P|--dbpass <password>` The password of the mysql/mariadb database login (env `MYSQL_PASSWORD`)
-- `-d|--dbdata <database>` The name of the mysql/mariadb database (env `MYSQL_DATABASE`)
-- `-b|--phppath <php_path>` The path of the PHP binary (env `FRIENDICA_PHP_PATH`)
-- `-A|--admin <mail>` The admin email address of Friendica (env `FRIENDICA_ADMIN_MAIL`)
-- `-T|--tz <timezone>` The timezone of Friendica (env `FRIENDICA_TZ`)
-- `-L|--lang <language>` The language of Friendica (env `FRIENDICA_LANG`)
+-	`-H|--dbhost <host>` The host of the mysql/mariadb database (env `MYSQL_HOST`)
+-	`-p|--dbport <port>` The port of the mysql/mariadb database (env `MYSQL_PORT`)
+-	`-U|--dbuser <username>` The username of the mysql/mariadb database login (env `MYSQL_USER` or `MYSQL_USERNAME`)
+-	`-P|--dbpass <password>` The password of the mysql/mariadb database login (env `MYSQL_PASSWORD`)
+-	`-d|--dbdata <database>` The name of the mysql/mariadb database (env `MYSQL_DATABASE`)
+-	`-b|--phppath <php_path>` The path of the PHP binary (env `FRIENDICA_PHP_PATH`)
+-	`-A|--admin <mail>` The admin email address of Friendica (env `FRIENDICA_ADMIN_MAIL`)
+-	`-T|--tz <timezone>` The timezone of Friendica (env `FRIENDICA_TZ`)
+-	`-L|--lang <language>` The language of Friendica (env `FRIENDICA_LANG`)
 
 Navigate to the main Friendica directory and execute the following command:
-```sh
-bin/console autoinstall [options]
-```
+
+    bin/console autoinstall [options]
 
 ### Prepare .htaccess file
 
 Copy `.htaccess-dist` to `.htaccess` (be careful under Windows) to have working mod-rewrite again. If you have installed Friendica into a sub directory, like */friendica/* set this path in `RewriteBase` accordingly.
 
 Example:
-```sh
-cp .htaccess-dist .htaccess
-```
+
+    cp .htaccess-dist .htaccess
 
 *Note*: Do **not** rename the `.htaccess-dist` file as it is tracked by GIT and renaming will cause a dirty working directory.
 
@@ -267,9 +250,9 @@ Another common error related to host-meta is the "Invalid profile URL."
 
 Check for a `.well-known` directory that did not come with Friendica.
 The preferred configuration is to remove the directory, however this is not always possible.
-If there is any `/.well-known/.htaccess` file, it could interfere with this Friendica core requirement.
-You should remove any `RewriteRules` from that file, or remove that whole file if appropriate.
-It may be necessary to `chmod` the `/.well-known/.htaccess` file if you were not given write permissions by default.
+If there is any /.well-known/.htaccess file, it could interfere with this Friendica core requirement.
+You should remove any RewriteRules from that file, or remove that whole file if appropriate.
+It may be necessary to chmod the /.well-known/.htaccess file if you were not given write permissions by default.
 
 ## Register the admin account
 
@@ -285,9 +268,8 @@ You might wish to delete/rename `config/local.config.php` to another name and dr
 
 Set up a cron job or scheduled task to run the worker once every 5-10 minutes in order to perform background processing.
 Example:
-```sh
-cd /base/directory; /path/to/php bin/console.php worker
-```
+
+    cd /base/directory; /path/to/php bin/console.php worker
 
 Change "/base/directory", and "/path/to/php" as appropriate for your situation.
 
@@ -295,9 +277,8 @@ Change "/base/directory", and "/path/to/php" as appropriate for your situation.
 
 If you are using a Linux server, run "crontab -e" and add a line like the
 one shown, substituting for your unique paths and settings:
-```crontab
-*/10 * * * * cd /home/myname/mywebsite; /usr/bin/php bin/console.php worker
-```
+
+    */10 * * * * cd /home/myname/mywebsite; /usr/bin/php bin/console.php worker
 
 You can generally find the location of PHP by executing "which php".
 If you run into trouble with this section please contact your hosting provider for assistance.
@@ -309,15 +290,12 @@ Once you have installed Friendica and created an admin account as part of the pr
 
 #### worker alternative: daemon
 Otherwise, you’ll need to use the command line on your remote server and start the Friendica daemon (background task) using the following command:
-```sh
-cd /path/to/friendica; php bin/console.php daemon start
-```
+
+    cd /path/to/friendica; php bin/console.php daemon start
 
 Once started, you can check the daemon status using the following command:
 
-```sh
-cd /path/to/friendica; php bin/console.php daemon status
-```
+    cd /path/to/friendica; php bin/console.php daemon status
 
 After a server restart or any other failure, the daemon needs to be restarted.
 This could be achieved by a cronjob.
@@ -325,7 +303,7 @@ This could be achieved by a cronjob.
 ### (RECOMMENDED) Logging & Log Rotation
 
 At this point it is recommended that you set up logging and logrotation.
-To do so please visit [Settings](help/admin/settings) and search the 'Logs' section for more information.
+To do so please visit [Settings](help/Settings) and search the 'Logs' section for more information.
 
 ### (RECOMMENDED) Set up a backup plan
 
@@ -341,23 +319,16 @@ As it stores all your data, you should also have a recent dump of your Friendica
 Friendica looks for some well-known HTTP headers indicating a reverse-proxy
 terminating an HTTPS connection.
 While the standard from RFC 7239 specifies the use of the `Forwarded` header.
-```
-Forwarded: for=192.0.2.1; proto=https; by=192.0.2.2
-```
+
+    Forwarded: for=192.0.2.1; proto=https; by=192.0.2.2
 
 Friendica also supports a number on non-standard headers in common use.
 
-```
-X-Forwarded-Proto: https
-```
+    X-Forwarded-Proto: https
 
-```
-Front-End-Https: on
-```
+    Front-End-Https: on
 
-```
-X-Forwarded-Ssl: on
-```
+    X-Forwarded-Ssl: on
 
 It is however preferable to use the standard approach if configuring a new server.
 
@@ -384,12 +355,12 @@ Often this will need to be resolved with your hosting provider or (if self-hoste
 First check your file permissions.
 Your website and all contents must generally be world-readable.
 
-Ensure that `mod-rewrite` is installed and working, and that your `.htaccess` file
+Ensure that mod-rewrite is installed and working, and that your `.htaccess` file
 is being used. To verify the latter, create a file `test.out` containing the
 word "test" in the top directory of Friendica, make it world readable and point
 your web browser to
 
-> http://yoursitenamehere.com/test.out
+	http://yoursitenamehere.com/test.out
 
 This file should be blocked. You should get a permission denied message.
 
@@ -405,10 +376,9 @@ If you do not see the word "test", your `.htaccess` is working, but it is likely
 that mod-rewrite is not installed in your web server or is not working.
 
 On most Linux flavors:
-```sh
-a2enmod rewrite
-/etc/init.d/apache2 restart
-```
+
+	% a2enmod rewrite
+	% /etc/init.d/apache2 restart
 
 Consult your hosting provider, experts on your particular Linux distribution or
 (if Windows) the provider of your Apache server software if you need to change
@@ -421,17 +391,15 @@ distribution or Apache package (if using Windows).
 Create an empty `config/local.config.php`file and apply world-write permission.
 
 On Linux:
-```sh
-touch config/local.config.php
-chmod 664 config/local.config.php
-```
+
+	% touch config/local.config.php
+	% chmod 664 config/local.config.php
 
 Retry the installation. As soon as the database has been created,
 
 ******* this is important *********
-```sh
-chmod 644 config/local.config.php
-```
+
+	% chmod 644 config/local.config.php
 
 ### Suhosin issues
 
@@ -468,7 +436,7 @@ provided by one of our members.
 >     (attacker 'REMOTE_ADDR not set', file '/var/www/friendica/friendica/boot.php',
 >     line 1341)
 >
-> After a while I noticed, that `bin/console.php worker` calls further PHP scripts via `proc_open`.
+> After a while I noticed, that `bin/console.php worker` calls further PHP script via `proc_open`.
 > These scripts themselves also use `proc_open` and fail, because they are NOT
 > called with `-d suhosin.executor.func.blacklist=none`.
 >
@@ -489,13 +457,12 @@ provided by one of our members.
 If the setup fails to create all the database tables and/or manual creation from
 the command line fails, with this error:
 
-> ERROR 1067 (42000) at line XX: Invalid default value for 'created'
+	ERROR 1067 (42000) at line XX: Invalid default value for 'created'
 
 You need to adjust your my.cnf and add the following setting under the [mysqld]
 section:
-```
-sql_mode = '';
-```
+
+	sql_mode = '';
 
 After that, restart mysql and try again.
 
@@ -582,11 +549,9 @@ You may also set it manually in the config file or in the database within the `d
 
 Altering of a table may fail if it contains a large number of rows.
 First verify the existing timeout (50s by default):
-```sql
-show global variables like "innodb_lock_wait_timeout";
-```
+
+`show global variables like "innodb_lock_wait_timeout";`
 
 Then increase it:
-```sql
-set global innodb_lock_wait_timeout=600;
-```
+
+`set global innodb_lock_wait_timeout=600;`

doc/Installing-Connectors.md

@@ -1,11 +1,15 @@
-# Installing Connectors
+Installing Connectors
+==================================================
+
+* [Home](help)
 
 Friendica uses add-ons to connect to some networks, such as Tumblr or Bluesky.
 
 All of these add-ons require an account on the target network.
 In addition, you (or usually the server administrator) will need to obtain an API key to allow authenticated access to your Friendica server.
 
-## Site configuration
+Site configuration
+---
 
 Addons need to be installed by the site administrator before they can be used.
 This is done through the site administration panel.
@@ -16,7 +20,8 @@ Other connectors, such as Bluesky, don't require an API key at all.
 
 You can find more information about specific requirements on each addon's settings page, either on the admin page or the user page.
 
-## Bluesky Jetstream
+Bluesky Jetstream
+---
 
 To further improve connectivity to Bluesky, Admins can choose to enable 'Jetstream' connectivity.
 Jetstream is a service that connects to the Bluesky firehose.

doc/KeyboardShortcuts.md

@@ -0,0 +1,10 @@
+Keyboard shortcuts in Friendica
+=======================
+
+* [Home](help)
+
+General
+-------
+
+* j: Scroll to next thread
+* k: Scroll to previous thread

doc/Making-Friends.md

@@ -1,11 +1,14 @@
-# Making friends
+Making Friends
+==============
+
+* [Home](help)
 
 Friendship in Friendica can sometimes take on different meaning.
 But let's keep it simple; you want to be friends with somebody.
 How do you do it?
 
-## The Directories
-
+The Directories
+---
 Friendica has two different kinds of "address book".
 The directory of the Friendica server you are registered on and a global directory to which your and other Friendica servers submit account information.
 
@@ -20,7 +23,8 @@ If you click through to the global directory, you will be presented with a list
 You will also see a "Show Community Groups" link, which will direct you to Groups.
 You connect to people and groups the same way, public groups will automatically accept your introduction, whereas private groups and some individual users will need to manually approve it.
 
-## Connect to other Friendica users
+Connect to other Friendica users
+---
 
 Visit their profile.
 Just beneath their profile picture will be the word 'Connect' (we're assuming this is an English language profile).
@@ -44,8 +48,8 @@ If you already know somebody's Identity Address, you can enter it in the "connec
 This will take you through a similar process.
 
 
-## Connect to users of alternate networks
-
+Connect to users of alternate networks
+---
 ### Across the Federation and Fediverse
 You can also use your Identity Address or other people's Identity Addresses to become friends across the so-called Federation/Fediverse of open source social media.
 Currently, Friendica supports connections with people on diaspora*, Red, Hubzilla, GNU Social, StatusNet, Mastodon, Pleroma, socialhome, and ganggo platforms.
@@ -76,29 +80,31 @@ To subscribe to a mailing list, enter the email in following example format "mai
 You can "follow" almost anybody or any website that produces a syndication feed (RSS/Atom,etc.).
 If we can find an information stream and a name to attach to the contact, we'll try to connect with them.
 
-## Notification
-
+Notification
+---
 When somebody requests friendship you will receive a notification.
 You will usually need to approve this before the friendship is complete.
 
-## Approval
-
+Approval
+---
 Some networks allow people to send you messages without being friends and without your approval.
 Friendica does not allow this by default, as it would open a gateway for spam.
 
-## Unilateral or bilateral friendships
-
+Unilateral or bilateral friendships
+---
 When you receive a friendship notification from another Friendica member, you will have the option of allowing them as a "Follower" or as a "Friend".
 If they are a follower, they can see what you have to say, including private communications that you send to them, but not vice versa.
 As a friend, you can both communicate with each other.
 
 diaspora* uses a different terminology, and you are given the option of allowing them to "share with you", or being full friends.
 
-## Deleting
+Deleting
+---
 
 You can delete a friend no matter what the friendship status - which completely removes everything relating to that person from your website.
 
-## Unwanted Behaviour
+Unwanted Behaviour
+---
 
 If a contact engages in abuse, harrassment, or other unwanted behaviour, there are various actions you can take.
 These include:
@@ -107,4 +113,4 @@ These include:
 * Ignoring the contact, so that you will not see their posts
 * Blocking the contact from receiving your posts
 
-For more information, see [Safety](help/user/safety).
+For more information, see [Safety](help/Safety).

doc/Message-Flow.md

@@ -1,4 +1,5 @@
-# Friendica message flow
+Friendica Message Flow
+===
 
 This page documents some of the details of how messages get from one person to another in the Friendica network.
 There are multiple paths, using multiple protocols and message formats.
@@ -10,7 +11,7 @@ This file also invokes the local side of all deliveries including DFRN-notify.
 
 mod/dfrn_notify.php handles the remote side of DFRN-notify.
 
-Local feeds are generated by mod/dfrn_poll.php - which also handles the remote side of DFRN-poll protocol.
+Local feeds are generated by mod/dfrn_poll.php - which also handles the remote side of DFRN-poll protocol. 
 
 Salmon notifications arrive via mod/salmon.php.
 
@@ -18,7 +19,7 @@ Push (pubsubhubbub) feeds arrive via mod/pubsub.php
 
 DFRN-poll feed imports arrive via src/Worker/OnePoll.php as a scheduled task, this implements the local side of the DFRN-poll protocol.
 
-## Scenario #1. Bob posts a public status message
+### Scenario #1. Bob posts a public status message
 
 This is a public message with no conversation members so no private transport is used.
 There are two paths it can take - as a bbcode path to DFRN clients, and converted to HTML with the server's PuSH (pubsubhubbub) hubs notified.
@@ -27,30 +28,30 @@ They will fall back on a daily poll in case the hub has delivery issues (this is
 If there is no specified hub or hubs, DFRN clients will poll at a configurable (per-contact) rate at up to 5-minute intervals.
 Feeds retrieved via dfrn-poll are bbcode and may also contain private conversations which the worker has permissions to see.
 
-## Scenario #2. Jack replies to Bob's public message. Jack is on the Friendica/DFRN network.
+### Scenario #2. Jack replies to Bob's public message. Jack is on the Friendica/DFRN network.
 
 Jack uses dfrn-notify to send a direct reply to Bob.
 Bob then creates a feed of the conversation and sends it to everybody involved in the conversation using dfrn-notify.
 PuSH hubs are notified that new content is available.
-The hub or hubs will then retrieve the latest feed and transmit it to all hub subscribers (which may be on different networks).
+The hub or hubs will then retrieve the latest feed and transmit it to all hub subscribers (which may be on different networks). 
 
-## Scenario #3. Mary replies to Bob's public message. Mary is on the Friendica/DFRN network.
+### Scenario #3. Mary replies to Bob's public message. Mary is on the Friendica/DFRN network.
 
 Mary uses dfrn-notify to send a direct reply to Bob.
 Bob then creates a feed of the conversation and sends it to everybody involved in the conversation (excluding himself, the conversation is now sent to both Jack and Mary).
 Messages are sent using dfrn-notify.
 Push hubs are also notified that new content is available.
-The hub or hubs will then retrieve the latest feed and transmit it to all hub subscribers (which may be on different networks).
+The hub or hubs will then retrieve the latest feed and transmit it to all hub subscribers (which may be on different networks).  
 
-## Scenario #4. William replies to Bob's public message. William is on the OStatus network.
+### Scenario #4. William replies to Bob's public message. William is on the OStatus network.
 
 William uses salmon to notify Bob of the reply.
 Content is html embedded in salmon magic envelope.
 Bob then creates a feed of the conversation and sends it to all Friendica participants involved in the conversation using dfrn-notify (excluding himself, the conversation is sent to both Jack and Mary).
 Push hubs are notified that new content is available.
-The hub or hubs will then retrieve the latest feed and transmit it to all hub subscribers (which may be on different networks).
+The hub or hubs will then retrieve the latest feed and transmit it to all hub subscribers (which may be on different networks).  
 
-## Scenario #5. Bob posts a private message to Mary and Jack.
+### Scenario #5. Bob posts a private message to Mary and Jack.
 
 Message is delivered immediately to Mary and Jack using dfrn_notify.
 Public hubs are not notified.

doc/Migrate.md

@@ -1,4 +1,7 @@
-# Migrating to a new server installation
+Migrating to a new server installation
+===============
+
+* [Home](help)
 
 ## Preparation
 
@@ -36,9 +39,9 @@ Before transferring your database, you may want to clean it up; ensure the expir
 After adjusting these settings, the database cleaning up processes will be initiated according to your configured daily cron job.
 
 To review the size of your database, log into MySQL with ``mysql -p`` run the following query:
-```sql
+````
 SELECT table_schema AS "Database", SUM(data_length + index_length) / 1024 / 1024 / 1024 AS "Size (GB)" FROM information_schema.TABLES GROUP BY table_schema;
-```
+````
 
 You should see an output like this:
 ````
@@ -86,3 +89,4 @@ If you are unable to login to your newly migrated Friendica installation, check
 If still unable to resolve the problem, it's likely an issue with your [installation](Install).
 In this case, you may try to an entirely new Friendica installation on your new server, but use a different FQDN and DNS name.
 Once you have this up and running, take it offline and purge the database and configuration file and try migrating to this installation.
+

doc/Move-Account.md

@@ -1,4 +1,8 @@
-# Moving an account between servers
+How to move your account between servers
+============
+
+* [Home](help)
+
 
 ! **This is an experimental feature**
 
@@ -10,12 +14,13 @@
 * Load your saved account file and click "Import".
 * After the move, the account on the old server will not work reliably anymore, and should be not used.
 
-## Friendica contacts
 
+Friendica contacts
+---
 Friendica will recreate your account on the new server, with your contacts and circles.
 A message is sent to Friendica contacts, to inform them about your move:
 If your contacts are running on an updated server, your details on their side will be automatically updated.
 
-## Diaspora contacts
-
+Diaspora contacts
+---
 Newer Diaspora servers are able to process "account migration" messages.

doc/Protocol.md

@@ -1,14 +1,18 @@
-# Used protocols
+Used Protocols
+===============
 
-## Friendicas DFRN Protocol
+* [Home](help)
+
+Friendicas DFRN Protocol
+---
 
 * [Document with the DFRN specification](spec/dfrn2.pdf)
 * [Schema of the contact request process](spec/dfrn2_contact_request.png)
 * [Schema of the contact request confirmation](spec/dfrn2_contact_confirmation.png)
-* [Description of the message flow](help/spec/message-flow)
-
-## ActivityStreams
+* [Description of the message flow](help/Message-Flow)
 
+ActivityStreams
+---
 
 Friendica is using ActivityStreams in version 1.0 for its activities and object types.
 Additional types are used for non standard activities.
@@ -16,7 +20,8 @@ Additional types are used for non standard activities.
 * [Link to the specification](http://activitystrea.ms/head/activity-schema.html)
 * [List of used ActivityStreams verbs and object types.](https://github.com/friendica/friendica/wiki/ActivityStreams)
 
-## Portable Contacts
+Portable Contacts
+---
 
 Portable Contacts is used for friends lists.
 

doc/Quick-Start-andfinally.md

@@ -0,0 +1,14 @@
+And that brings the Quick Start to an end.
+
+Here are some more things to help get you started:
+
+**Groups**
+
+- <a href="https://forum.friendi.ca/profile/helpers">Friendica Support</a> - problems?  This is the place to ask.
+
+**Documentation**
+
+- <a href="help/Connectors">Connecting to more networks</a>
+- <a href="help">Help Index</a>
+
+

doc/Quick-Start-groupsandpages.md

@@ -1,5 +1,5 @@
 This is the global directory.
-If you get lost, you can [click this link](help/user/quick-start/groups-and-pages) to bring yourself back here.
+If you get lost, you can <a href = "help/Quick-Start-groupsandpages">click this link</a> to bring yourself back here.
 
 On this page, you'll find a collection of groups.
 Groups are not real people.
@@ -13,6 +13,8 @@ Simply find a group you're interested in, and connect to it the same way you did
 There are a lot of groups, and you're likely to get lost.
 Remember the link at the top of this page will bring you back here.
 
-Once you've added some groups, [move on to the next section](help/user/quick-start/finally).
+Once you've added some groups, <a href="help/Quick-Start-andfinally">move on to the next section</a>.
+
+<iframe src="https://dir.friendica.social/group" width="950" height="600"></iframe>
+
 
-<iframe src="https://dir.friendica.social/group" width="100%" height="600"></iframe>

doc/Quick-Start-guide.md

@@ -18,6 +18,8 @@ Once you've finished writing your post, click on the padlock icon or permissions
 If you do not change anything, your post will be public.
 This means it will appear to anybody who views your profile, and in the community tab if your site has it enabled, as well as in the network tab of any of your contacts.
 
-Play around with this a bit, then when you're ready to move on, we'll take a look at the [Network Tab](help/user/quick-start/network).
+Play around with this a bit, then when you're ready to move on, we'll take a look at the <a href="help/Quick-Start-network">Network Tab</a>
+
+<iframe src="login" width="950" height="600"></iframe>
+
 
-<iframe src="login" width="100%" height="600"></iframe>

doc/Quick-Start-makingnewfriends.md

@@ -1,5 +1,5 @@
 This is your Suggested Friends page.
-If you get lost, you can [click this link](help/user/quick-start/making-new-friends) to bring yourself back here.
+If you get lost, you can <a href="help/Quick-Start-makingnewfriends">click this link</a> to bring yourself back here.
 
 This is a bit like the Friend Suggestions page of Facebook.
 Everybody on this list has agreed that they may be suggested as a friend.
@@ -14,6 +14,8 @@ Now you've added one, you're probably lost.
 Click the link at the top of this page to go back to the suggested friends list and add some more.
 
 Feel uncomfortable adding people you don't know?
-Don't worry - that's where [Groups and Pages](help/user/quick-start/groups-and-pages) come in!
+Don't worry - that's where <a href="help/Quick-Start-groupsandpages">Groups and Pages</a> come in!
+
+<iframe src="contact/suggestions" width="950" height="600"></iframe>
+
 
-<iframe src="contact/suggestions" width="100%" height="600"></iframe>

doc/Quick-Start-network.md

@@ -1,5 +1,5 @@
 This is your Network Tab.
-If you get lost, you can [click this link](help/user/quick-start/network) to bring yourself back here.
+If you get lost, you can <a href="help/Quick-Start-network">click this link</a> to bring yourself back here.
 
 This is a bit like the Newsfeed at Facebook or the Stream at Diaspora.
 It's where all the posts from your contacts, groups, and feeds will appear.
@@ -7,6 +7,8 @@ If you're new, you won't see anything in this page, unless you posted your statu
 If you've already added a few friends, you'll be able to see their posts.
 Here, you can comment, like, or dislike posts, or click on somebody's name to visit their profile page where you can write on their wall.
 
-Now we need to fill it up, the first step, is to [make some new friends](help/user/quick-start/making-new-friends).
+Now we need to fill it up, the first step, is to <a href="help/Quick-Start-makingnewfriends"> make some new friends</a>.
+
+<iframe src="network" width="950" height="600"></iframe>
+
 
-<iframe src="network" width="100%" height="600"></iframe>

doc/README.md

@@ -1,27 +1,21 @@
 # About the docs of the Friendica Project
 
-**Note**: It is expected that some of the links in these files won't work in the Friendica repository as they are supposed to work on an installed Friendica node.
+**Note**: It is expected that some of the links in these files wont work in the Friendica repository as they are supposed to work on an installed Friendica node.
 
 ## User and Admin documentation
 
 Every Friendica node has the _current_ version of the user and admin documentation available in the `/help` location.
-
 The documentation is mainly done in English, but the pages can be translated and some are already to German.
-
-We greatly appreciate help in keeping Friendica well documented, with information that's up to date, so contributions are very welcome.
-The documentation lives in the core Friendica repository which, for now, [still lives on GitHub](https://github.com/friendica/friendica/).
-
-To contribute currently, you will need to make an account on GitHub, and if you're a developer or otherwise technically savvy you can create a `pull request` with your suggested changes
-You can make your changes using GitHub's builtin text editors, or locally.
-Alternatively you can create an `issue` with your suggested changes, and someone else can make a `pull request` based on your suggestions.
+If you want to help expanding the documentation or the translation, please register an account at the [Friendica wiki](https://wiki.friendi.ca) where the [texts are maintained](https://wiki.friendi.ca/docs).
+The documentation is periodically merged back from there to the _development_ branch of Friendica.
 
 Images that you use in the documentation should be located in the `img` sub-directory of this directory.
 Translations are located in sub-directories named after the language codes, e.g. `de`.
 Depending on the selected interface language the different translations will be applied, or the `en` original will be used as a fall-back.
 
-## Developer documentation
+## Developers Documentation
 
 We provide a configuration file for [Doxygen](https://www.doxygen.nl/index.html) in the root of the Friendica repository.
 With that you should be able to extract some documentation from the source code.
 
-In addition there are some documentation files about the database structure under the `database` subdirectory.
+In addition there are some documentation files about the database structure in `doc`db`.

doc/Remove-Account.md

@@ -1,4 +1,7 @@
-# Deleting an account
+Remove Account
+==============
+
+* [Home](help)
 
 We don't like to see people leave Friendica, but if you need to remove your account, you should visit the URL
 

doc/SSL.md

@@ -1,4 +1,7 @@
-# Using SSL with Friendica
+Using SSL with Friendica
+=====================================
+
+* [Home](help)
 
 ## Disclaimer
 
@@ -46,7 +49,7 @@ If you run your own server, we recommend to check out the ["Let's Encrypt" initi
 Not only do they offer free SSL certificates, but also a way to automate their renewal.
 You need to install a client software on your server to use it.
 Instructions for the official client are [here](https://certbot.eff.org/).
-Depending on your needs, you might want to look at the [list of alternative LetsEncrypt clients](https://letsencrypt.org/docs/client-options/).
+Depending on your needs, you might want to look at the [list of alternative letsencrypt clients](https://letsencrypt.org/docs/client-options/).
 
 ## Web server settings
 
@@ -67,26 +70,22 @@ This is the simplest way to enforce site-wide secure access.
 Every time a user tries to access any Friendica page by any mean (manual address bar entry or link), the web server issues a Permanent Redirect response with the secure protocol prepended to the requested URL.
 
 With Apache, enable the modules rewrite and ssl (with a shared hosting provider, this should be enabled already):
-```sh
-sudo a2enmod rewrite ssl
-```
+
+        sudo a2enmod rewrite ssl
 
 Add the following lines to the .htaccess file in the root folder of your Friendica instance (thanks to [AlfredSK](https://github.com/AlfredSK)):
 
-```
-RewriteEngine On
-RewriteCond %{SERVER_PORT} 80
-RewriteRule ^(.*)$ https://your.friendica.domain/$1 [R=301,L]
-```
+        RewriteEngine On
+        RewriteCond %{SERVER_PORT} 80
+        RewriteRule ^(.*)$ https://your.friendica.domain/$1 [R=301,L]
 
 With nginx, configure your server directive this way ([documentation](https://www.nginx.com/blog/creating-nginx-rewrite-rules/)):
-```
-server {
-    listen 80;
-    server_name your.friendica.domain;
-    return 301 https://$server_name$request_uri;
-}
-```
+
+        server {
+             listen 80;
+             server_name your.friendica.domain;
+             return 301 https://$server_name$request_uri;
+        }
 
 ### SSL Settings
 

doc/Safety.md

@@ -1,11 +1,15 @@
-# Safety
+Safety
+======
+
+* [Home](help)
 
 Each Friendica instance is linked together with a global network of other servers, some running Friendica and some running other software.
 These servers support a diverse global community of millions of users.
 Inevitably, some of these users are malicious.
 Friendica provides several features to keep you safe from abuse and harrassment.
 
-## Terms of Service
+Terms of Service
+---
 
 Each instance is entitled to define its own Terms of Service, also often called a Code of Conduct.
 These terms include rules for behaviour.
@@ -17,7 +21,8 @@ Remember that conversations frequently involve participants from different insta
 Participants are only bound by the rules of the server where they have an account, not by the rules of your server.
 Terms of Service may even be completely incompatible.
 
-## Reporting
+Reporting
+---
 
 Your local administrators are responsible for ensuring a safe online environment for all users on your server.
 They rely on reports from users to highlight behaviour that puts other users at risk.
@@ -27,7 +32,8 @@ You will be given an opportunity to select the type of problem you are seeing.
 Your local administrator then has the option of blocking that user for all users on your local instance.
 If a remote server is a constant source of abuse and their administrators are unable or unwilling to control their users behaviour, your administrator can even block the entire remote server.
 
-## Ignoring
+Ignoring
+---
 
 Once you have become friends, if you find the person constantly sends you spam or worthless information, you can "Ignore" them - without breaking off the friendship or even alerting them to the fact that you aren't interested in anything they are saying.
 In many ways they are like a "follower" - but they don't know this.
@@ -39,7 +45,8 @@ Some servers are frequent sources of abusive or other unwanted behaviour.
 For this reason you can also choose to ignore entire servers.
 Users on that server can still follow you as normal.
 
-## Blocking
+Blocking
+---
 
 You can also "block" a person.
 This completely blocks communications with that person.
@@ -59,7 +66,8 @@ In some cases this could lead to retaliation.
 There are several other ways someone can determine that you have blocked them, and see your public posts despite the block.
 For example, they can simply log out and view your posts.
 
-## Archiving
+Archiving
+---
 
 Archiving is similar to blocking.
 However, existing posts this person made before being archived will be visible in your stream.

doc/Settings.md

@@ -1,5 +1,7 @@
 # Settings
 
+* [Home](help)
+
 If you are the admin of a Friendica node, you have access to the **Admin Panel** where you can configure your Friendica node.
 
 ## Overview
@@ -46,16 +48,17 @@ It is used as fall back setting should Friendica fail to recognize the visitors
 
 The Friendica community offers some translations.
 Some more complete then others.
-See [this help page](/help/developer/translations) for more information about the translation process.
+See [this help page](/help/translations) for more information about the translation process.
 
 #### System Theme
 
 Choose a theme to be the default system theme.
 This can be over-ridden by user profiles.
-Default theme is `frio` at the moment.
+Default theme is `vier` at the moment.
 
 You may also want to set a special theme for mobile interfaces.
-It may or may not be necessary depending of the mobile friendliness of the desktop theme you have chosen.
+Which may or may not be necessary depending of the mobile friendliness of the desktop theme you have chosen.
+The `vier` theme for instance is mobile friendly.
 
 ### Registration
 
@@ -71,7 +74,7 @@ You can chose between the following modes:
 ##### Invitation based registry
 
 Additionally to the setting in the admin panel, you can decide if registrations are only possible using an invitation code or not.
-To enable invitation based registration, you have to set the `invitation_only` setting to `true` in the `system` section of the [config/local.config.php](/help/admin/config) file.
+To enable invitation based registration, you have to set the `invitation_only` setting to `true` in the `system` section of the [config/local.config.php](/help/Config) file.
 If you want to use this method, the registration policy has to be set to either *open* or *requires approval*.
 
 #### Check Display Names
@@ -111,7 +114,7 @@ If you use those, please refer to the documentation of those addons for further
 
 Default value is 'Database (legacy)': it's the legacy way used to store data directly in database.
 
-Existing data can be moved to the current active backend using the ['storage move' console command](help/admin/tools)
+Existing data can be moved to the current active backend using the ['storage move' console command](help/tools)
 
 If selected backend has configurable options, new fields are shown here.
 
@@ -349,12 +352,11 @@ If you want to enable those, you have to activate them in the ``config/local.con
 Use the following settings to redirect PHP errors to a file.
 
 Config:
-```
-error_reporting(E_ERROR | E_WARNING | E_PARSE );
-ini_set('error_log','php.out');
-ini_set('log_errors','1');
-ini_set('display_errors', '0');
-```
+
+	error_reporting(E_ERROR | E_WARNING | E_PARSE );
+	ini_set('error_log','php.out');
+	ini_set('log_errors','1');
+	ini_set('display_errors', '0');
 
 This will put all PHP errors in the file php.out (which must be writeable by the webserver).
 Undeclared variables are occasionally referenced in the program and therefore we do not recommend using `E_NOTICE` or `E_ALL`.
@@ -381,15 +383,14 @@ These are the data base settings, the admin account settings, the path of PHP an
 ## DB Settings
 
 With the following settings, you specify the data base server, the username and password for Friendica and the database to use.
-```
-'database' => [
-	'hostname' => 'localhost',
-	'username' => 'mysqlusername',
-	'password' => 'mysqlpassword',
-	'database' => 'mysqldatabasename',
-	'charset' => 'utf8mb4',
-],
-```
+
+	'database' => [
+		'hostname' => 'localhost',
+		'username' => 'mysqlusername',
+		'password' => 'mysqlpassword',
+		'database' => 'mysqldatabasename',
+		'charset' => 'utf8mb4',
+	],
 
 ## Admin users
 
@@ -397,33 +398,31 @@ You can set one, or more, accounts to be *Admin*.
 By default this will be the one account you create during the installation process.
 But you can expand the list of email addresses by any used email address you want.
 Registration of new accounts with a listed email address is not possible.
-```
-'config' => [
-	'admin_email' => 'you@example.com, buddy@example.com',
-],
-```
+
+	'config' => [
+		'admin_email' => 'you@example.com, buddy@example.com',
+	],
 
 ## PHP Path
 
 Some of Friendica's processes are running in the background.
 For this you need to specify the path to the PHP binary to be used.
-```
-'config' => [
-	'php_path' => '/usr/bin/php',
-],
-```
+
+	'config' => [
+		'php_path' => '/usr/bin/php',
+	],
 
 ## Subdirectory configuration
 
 It is possible to install Friendica into a subdirectory of your web server.
 We strongly discourage you from doing so, as this will break federation to other networks (e.g. Diaspora, GNU Social, Hubzilla)
 Say you have a subdirectory for tests and put Friendica into a further subdirectory, the config would be:
-```
-'system' => [
-	'url' => 'https://example.com/tests/friendica',
-],
-```
+
+	'system' => [
+		'url' => 'https://example.com/tests/friendica',
+	],
 
 ## Other exceptions
 
-Furthermore there are some experimental settings, you can read-up in the [Config values that can only be set in config/local.config.php](help/admin/config) section of the documentation.
+Furthermore there are some experimental settings, you can read-up in the [Config values that can only be set in config/local.config.php](help/Config) section of the documentation.
+

doc/StrategyHooks.md

@@ -1,4 +1,7 @@
-# Friendica strategy Hooks
+Friendica strategy Hooks
+===========================================
+
+* [Home](help)
 
 ## Strategy hooks
 

doc/Tags-and-Mentions.md

@@ -1,8 +1,13 @@
-# Tags and mentions
+Tags and Mentions
+=================
+
+
+* [Home](help)
+
 
 Like many other modern social networks, Friendica uses a special notation inside messages to indicate "tags" or contextual links to other entities.
 
-## Mentions
+**Mentions**
 
 People are tagged by preceding their name with the @ character.
 
@@ -34,9 +39,9 @@ If you select a group from the ACL a !-mention will be added automatically to yo
 
 If you sort your contacts into circles, you cannot @-mention these circles.
 But you can select the circle in the access control when creating a new posting, to allow (or disallow) a certain circle of people to see the posting.
-See [Circles and privacy](help/user/circles-and-privacy) for more details about grouping your contacts.
+See [Circles and Privacy](help/Circles-and-Privacy) for more details about grouping your contacts.
 
-## Topical tags
+**Topical Tags**
 
 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.

doc/Tests.md

@@ -1,4 +1,6 @@
-# Tests
+# Themes
+
+* [Home](help)
 
 You can run unit tests with [PHPUnit](https://phpunit.de/):
 

doc/Text_comment.md

@@ -0,0 +1,32 @@
+Comment, sort and delete posts
+==============
+
+* [Home](help)
+
+Here you can find an overview of the different ways to comment and sort existing posts. <span style="color: red;">Attention: we've used the <b>"diabook"</b> theme. If you're using another theme, some of the icons may be different.</span>
+
+<img src="doc/img/diabook.png" width="308" height="42" alt="diabook" >
+
+<i>The different icons</i>
+
+<img src="doc/img/post_thumbs_up.png" width="27" height="32" alt="post_thumbs_up.png" align="left" style="padding-bottom: 10px;"> This symbol is used to indicate that you like the post. Click it twice to undo your choice.<p style="clear:both;"></p>
+
+<img src="doc/img/post_thumbs_down.png" width="27" height="32" alt="post_thumbs_down.png" align="left" style="padding-bottom: 10px;"> This symbol is used to indicate that you <b>dislike</b> the post. Click it twice to undo your choice.
+<p style="clear:both;"></p>
+
+<img src="doc/img/post_share.png" width="27" height="32" alt="post_share.png" align="left" style="padding-bottom: 10px;"> This symbol is used to share a post. A copy of this post will automatically appear in your status editor and add a link to the original post.
+<p style="clear:both;"></p>
+
+<img src="doc/img/post_mark.png" width="27" height="32" alt="post_mark.png" align="left" style="padding-bottom: 10px;"> This symbol is used to mark a post. Marked posts will appear on your network page at the "starred" tab (from "star"). Click it twice to undo your choice.
+<p style="clear:both;"></p>
+
+<img src="doc/img/post_tag.png" width="27" height="41" alt="post_tag.png" align="left" style="padding-bottom: 10px;"> This symbol is used to tag a post with a self-chosen keyword. When you click at the word, you'll get a list of all posts with this tag. Attention: you can't delete the tag once you've set one.
+<p style="clear:both;"></p>
+
+<img src="doc/img/post_categorize.png" width="27" height="32" alt="post_categorize.png" align="left" style="padding-bottom: 20px;"> This symbol is used to categorize posts. Choose an existing folder or create a new one. You'll find the created folder on your network page under the "saved folders" tab.
+<p style="clear:both;"></p>
+
+<img src="doc/img/post_delete.png" width="27" height="32" alt="post_delete.png" align="left"> This symbol is used to delete your own post or to remove a post of another person from your stream. 
+<P style="clear: both;"></p>
+
+<img src="doc/img/post_choose.png" width="27" height="32" alt="post_choose.png" align="left"> This symbol is used to choose more than one post to delete in a single step. After selecting all posts, go to the end of the page and click "Delete Selected Items".<P style="clear: both;"></p>

doc/Text_editor.md

@@ -4,7 +4,10 @@ figure img { padding: 2px; }
 figure figcaption { background: #eeeeee; color: #444444; padding: 2px; font-style: italic;}
 </style>
 
-# Creating posts
+Creating posts
+===========
+
+* [Home](help)
 
 Here you can find an overview of the different ways to create and edit your post.
 
@@ -12,12 +15,12 @@ One click on the Pencil & Paper icon in the top right of your Home or Network pa
 Below are examples of the post editor in 3 of Friendica's common themes:
 
 <figure>
-<img src="doc/assets/img/editor_frio.png" alt="frio editor">
+<img src="doc/img/editor_frio.png" alt="frio editor">
 <figcaption>Post editor, with the <b>Frio</b> (popular default) theme.</figcaption>
 </figure>
 <p style="clear:both;"></p>
 <figure>
-<img src="doc/assets/img/editor_vier.png" alt="vier editor" width="675">
+<img src="doc/img/editor_vier.png" alt="vier editor" width="675">
 <figcaption>Post editor, with the <b>Vier</b> theme.</figcaption>
 </figure>
 <p style="clear:both;"></p>
@@ -30,29 +33,29 @@ The Big Empty Textarea is where you write your new post.
 You can simply enter your text there and click the "Share" button, and your new post will be public on your profile page and shared to your contact.
 
 If plain text is not so exciting to you, Friendica understands BBCode to spice up your posts: bold, italic, images, links, lists..
-See [BBCode tags reference](help/user/bbcode) page to see all what you can do.
+See [BBCode tags reference](help/BBCode) page to see all what you can do.
 
 The icons under the text area are there to help you to write posts quickly, but vary depending on the theme:
 
 With the Frio theme, the Underline, Italics and Bold buttons should be self-explanatory.
 
-<img src="doc/assets/img/camera.png" width="32" height="32" alt="editor" align="left"> Upload a picture from your computer. The image will be uploaded and correct bbcode tag will be added to your post.*  In the Frio theme, use the <b>Browser</b> tab instead to Upload and/or attach content to your post.
+<img src="doc/img/camera.png" width="32" height="32" alt="editor" align="left"> Upload a picture from your computer. The image will be uploaded and correct bbcode tag will be added to your post.*  In the Frio theme, use the <b>Browser</b> tab instead to Upload and/or attach content to your post.
 <p style="clear:both;"></p>
 
-<img src="doc/assets/img/paper_clip.png" width="32" height="32" alt="paper_clip" align="left"> This depends on the theme: For Frio, this is to attach remote content - put in a URL to embed in your post, including video or audio content.  For other themes: Add files from your computer. Same as picture, but for generic attachment to the post.*
+<img src="doc/img/paper_clip.png" width="32" height="32" alt="paper_clip" align="left"> This depends on the theme: For Frio, this is to attach remote content - put in a URL to embed in your post, including video or audio content.  For other themes: Add files from your computer. Same as picture, but for generic attachment to the post.*
 <p style="clear:both;"></p>
 
-<img src="doc/assets/img/chain.png" width="32" height="32" alt="chain" align="left"> Add a web address (url). Enter a URL and Friendica will add to your post a link to the url and an excerpt from the web site, if possible.
+<img src="doc/img/chain.png" width="32" height="32" alt="chain" align="left"> Add a web address (url). Enter a URL and Friendica will add to your post a link to the url and an excerpt from the web site, if possible.
 <p style="clear:both;"></p>
 
-<img src="doc/assets/img/video.png" width="32" height="32" alt="video" align="left"> Add a video. Enter the url to a video (ogg) or to a video page on youtube or vimeo, and it will be embedded in your post with a preview. (In the Frio theme, this is done with the paperclip as mentioned above.) Friendica is using [HTML5](http://en.wikipedia.org/wiki/HTML5_video) for embedding content. Therefore, the supported files are depending on your browser and operating system (OS). Some filetypes are WebM, MP4 and OGG.*
+<img src="doc/img/video.png" width="32" height="32" alt="video" align="left"> Add a video. Enter the url to a video (ogg) or to a video page on youtube or vimeo, and it will be embedded in your post with a preview. (In the Frio theme, this is done with the paperclip as mentioned above.) Friendica is using [HTML5](http://en.wikipedia.org/wiki/HTML5_video) for embedding content. Therefore, the supported files are depending on your browser and operating system (OS). Some filetypes are WebM, MP4 and OGG.*
 <p style="clear:both;"></p>
 
-<img src="doc/assets/img/mic.png" width="32" height="32" alt="mic" align="left"> Add an audio. Same as video, but for audio. Depending on your browser and operation system MP3, OGG and AAC are supported. Additionally, you are able to add URLs from audiohosters like Soundcloud.
+<img src="doc/img/mic.png" width="32" height="32" alt="mic" align="left"> Add an audio. Same as video, but for audio. Depending on your browser and operation system MP3, OGG and AAC are supported. Additionally, you are able to add URLs from audiohosters like Soundcloud.
 
 <p style="clear:both;"></p>
 
-<img src="doc/assets/img/globe.png" width="32" height="32" alt="globe" align="left"> <b>Or</b> <img src="doc/assets/img/frio_location.png" width="32" height="32" alt="location" align="none"> Set your geographic location. This location will be added into a Google Maps search. That's why a note like "New York" or "10004" is already enough.
+<img src="doc/img/globe.png" width="32" height="32" alt="globe" align="left"> <b>Or</b> <img src="doc/img/frio_location.png" width="32" height="32" alt="location" align="none"> Set your geographic location. This location will be added into a Google Maps search. That's why a note like "New York" or "10004" is already enough.
 <p style="clear:both;"></p>
 <br />
 
@@ -63,21 +66,21 @@ These icons can change depending on the theme. Some examples:
 <table>
 <tr>
     <td>Vier: </td>
-    <td><img src="doc/assets/img/vier_icons.png" alt="vier.png" style="vertical-align:middle;"></td>
+    <td><img src="doc/img/vier_icons.png" alt="vier.png" style="vertical-align:middle;"></td>
     <td>&nbsp;</td>
 </tr>
 </table>
-<i><b>*</b> how to [upload](help/user/faq#upload) files</i>
+<i><b>*</b> how to [upload](help/FAQ#upload) files</i>
 <p style="clear:both;">&nbsp;</p>
 
-**<img src="doc/assets/img/lock.png" width="32" height="32" alt="lock icon"  style="vertical-align:middle;"> The Lock / Permissions**
+**<img src="doc/img/lock.png" width="32" height="32" alt="lock icon"  style="vertical-align:middle;"> The Lock / Permissions**
 
 In Frio, the Permissions tab, or in other themes, the Lock button, is the most important feature in Friendica. If the lock is open, your post will be public, and will show up on your profile page when strangers visit it.
 
 Click on it and the *Permission settings* window (aka "*Access Control Selector*" or "*ACL Selector*") pops up. There you can select who can see the post.
 
 <figure>
-<img src="doc/assets/img/acl_win.png" alt="Permission settings window">
+<img src="doc/img/acl_win.png" alt="Permission settings window">
 <figcaption>Permission settings window with some contact selected</figcaption>
 </figure>
 
@@ -92,4 +95,4 @@ Click again on "show" or "don't show" to switch it off.
 
 You can search for contacts or circles with the search box.
 
-See also [Circles and privacy](help/user/circles-and-privacy)
+See also [Circles and Privacy](help/Circles-and-Privacy)

doc/Two-Factor-Authentication.md

@@ -1,5 +1,7 @@
 # Configuring two-factor authentication
 
+* [Home](help)
+
 You can configure two-factor authentication using a mobile app.
 A time-based one-time password (TOTP) application automatically generates an authentication code that changes after a certain period of time.
 
@@ -15,7 +17,7 @@ Nonetheless, we recommend:
 
  - For iOS, [Matt Rubin's MIT-licensed Authenticator app](https://mattrubin.me/authenticator).
  - For Android, [andOTP](https://github.com/andOTP/andOTP).
-
+ 
 ### 2. Record your one-use recovery codes
 
 From your [two-factor authentication user settings](/settings/2fa), enter your password and click on "Enable two-factor authentication".

doc/Update.md

@@ -1,4 +1,7 @@
-# Updating Friendica
+Updating Friendica
+===============
+
+* [Home](help)
 
 ## Using a Friendica archive
 
@@ -24,17 +27,15 @@ To update Addons from an archive, simply delete the ``path/to/friendica/addon``
 ## Using Git
 
 You can get the latest changes at any time with
-```sh
-cd path/to/friendica
-git pull
-bin/composer.phar run install:prod
-```
+
+    cd path/to/friendica
+    git pull
+    bin/composer.phar run install:prod
 
 The addon tree has to be updated separately like so:
-```sh
-cd path/to/friendica/addon
-git pull
-```
+
+    cd path/to/friendica/addon
+    git pull
 
 For both repositories:
 The default branch to use is the ``stable`` branch, which is the stable version of Friendica.
@@ -60,7 +61,7 @@ There are two main ways of doing it, either by manually removing the duplicates
 Manually removing the duplicates is usually faster if they're not too numerous.
 To manually remove the duplicates, you need to know the UNIQUE index columns available in `database.sql`.
 
-```sql
+```SQL
 SELECT GROUP_CONCAT(id), <index columns>, count(*) as count FROM users
 GROUP BY <index columns> HAVING count >= 2;
 
@@ -70,7 +71,7 @@ GROUP BY <index columns> HAVING count >= 2;
 If there are too many rows to handle manually, you can create a new table with the same structure as the table with duplicates and insert the existing content with INSERT IGNORE.
 To recreate the table you need to know the table structure available in `database.sql`.
 
-```sql
+```SQL
 CREATE TABLE <table_name>_new <rest of the CREATE TABLE>;
 INSERT IGNORE INTO <table_name>_new SELECT * FROM <table_name>;
 DROP TABLE <table_name>;
@@ -83,7 +84,7 @@ This method is slower overall, but it is better suited for large numbers of dupl
 
 #### Foreign Keys
 
-Some updates include the use of foreign keys now that will bump into issues with previous versions, which would sometimes shove bad data into tables, preventing, causing errors such as below.
+Some of the updates include the use of foreign keys now that will bump into issues with previous versions, which would sometimes shove bad data into tables, preventing, causing errors such as below.
 
 ```
 Error 1452 occurred during database update:
@@ -93,7 +94,7 @@ ALTER TABLE `thread` ADD FOREIGN KEY (`iid`) REFERENCES `item` (`id`) ON UPDATE
 
 All current known fixes for possible items that can go wrong are as below.
 
-```sql
+```SQL
 DELETE FROM `item` WHERE `owner-id` NOT IN (SELECT `id` FROM `contact`);
 DELETE FROM `item` WHERE `contact-id` NOT IN (SELECT `id` FROM `contact`);
 DELETE FROM `notify` WHERE `uri-id` NOT IN (SELECT `id` FROM `item-uri`);

doc/Vagrant.md

@@ -1,12 +1,16 @@
-# Vagrant for Friendica developers
+Vagrant for Friendica Developers
+===================
 
-## Getting started
+* [Home](help)
+
+Getting started
+---------------
 
 [Vagrant](https://www.vagrantup.com/) is a virtualization solution for developers.
 No need to setup up a webserver, database etc. before actually starting.
 Vagrant creates a virtual machine for you that you can just run inside VirtualBox and start to work directly on Friendica.
 
-It brings a Debian Bullseye with PHP 8.0 and MariaDB 10.5.11.
+It brings an Debian Bullseye with PHP 8.0 and MariaDB 10.5.11.
 
 What you need to do:
 
@@ -30,24 +34,22 @@ Find the Friendica log file `/vagrant/logfile.out` on the VM or in the `logfile.
 8. Commit and push your changes directly back to GitHub.
 
 If you want to stop vagrant after finishing your work, run the following command
-```sh
-vagrant halt
-```
+
+		$> vagrant halt
 
 in the development directory.
 This will not delete the virtual machine.
 9. To ultimately delete the virtual machine run
-```sh
-vagrant destroy
-rm /vagrant/config/local.config.php
-```
+
+        $> vagrant destroy
+        $> rm /vagrant/config/local.config.php
 
 to make sure that you can start from scratch with another "vagrant up".
 
 Default User Accounts
 ---------------------
 
-By default the provision script will set up two user accounts.
+By default the provision script will setup two user accounts.
 
   * admin, password admin
   * friendica, password friendica
@@ -55,11 +57,10 @@ By default the provision script will set up two user accounts.
 Trouble Shooting
 ----------------
 
-If you see a version mismatch for the _VirtualBox Guest Additions_ between host and guest during the initial setup of the Vagrant VM, you will need to install an addon to Vagrant (ref. [Stack Overflow](https://stackoverflow.com/a/38010683)).
+If you see a version mis-match for the _VirtualBox Guest Additions_ between host and guest during the initial setup of the Vagrant VM, you will need to install an addon to Vagrant (ref. [Stack Overflow](https://stackoverflow.com/a/38010683)).
 Stop the Vagrant VM and run the following command:
-```sh
-vagrant plugin install vagrant-vbguest
-```
+
+	$> vagrant plugin install vagrant-vbguest
 
 On the next Vagrant up, the version problem should be fixed.
 

doc/api.md

@@ -6,10 +6,10 @@
 
 Friendica offers multiple API endpoints to interface with third-party applications:
 
-- [Twitter](help/spec/api/twitter)
-- [Mastodon](help/spec/api/mastodon)
-- [Friendica-specific](help/spec/api/friendica)
-- [GNU Social](help/spec/api/gnu-social)
+- [Twitter](help/API-Twitter)
+- [Mastodon](help/API-Mastodon)
+- [Friendica-specific](help/API-Friendica)
+- [GNU Social](help/API-GNU-Social)
 
 ## Usage
 

doc/autoloader.md

@@ -1,14 +1,16 @@
-# Autoloader with Composer
+Autoloader with Composer
+==========
 
-* [Developer Intro](help/developer/index)
+* [Home](help)
+  * [Developer Intro](help/Developers-Intro)
 
 Friendica uses [Composer](https://getcomposer.org) to manage dependencies libraries and the class autoloader both for libraries and namespaced Friendica classes.
 
 It's a command-line tool that downloads required libraries into the `vendor` folder and makes any namespaced class in `src` available through the whole application.
 
-* [Using Composer](help/developer/composer)
+* [Using Composer](help/Composer)
 
-## A quick introduction to class auto-loading
+## A quick introduction to class autoloading
 
 The autoloader dynamically includes the file defining a class when it is first referenced, either by instantiating an object or simply making sure that it is available, without the need to explicitly use "require_once".
 
@@ -85,7 +87,7 @@ class ItemsManager extends BaseManager {
 ```
 
 Even though we didn't explicitly include the `src/BaseManager.php` file, the autoloader will when this class is first defined, because it is referenced as a parent class.
-It works with the "BaseManager" example here, and it works when we need to call static methods:
+It works with the "BaseManager" example here and it works when we need to call static methods:
 
 ```php
 // src/Dfrn.php
@@ -151,7 +153,7 @@ class Diaspora {
 }
 ```
 
-if you use that class in many places of the code, and you don't want to write the full path to the class every time, you can use the "use" PHP keyword
+if you use that class in many places of the code and you don't want to write the full path to the class every time, you can use the "use" PHP keyword
 
 ```php
 // src/Diaspora.php
@@ -196,5 +198,5 @@ So you can think of namespaces as folders in a Unix file system, with global sco
 
 ## Related
 
-* [Using Composer](help/developer/composer)
-* [How To Move Classes to `src`](help/developer/how-to-move-classes-to-src)
+* [Using Composer](help/Composer)
+* [How To Move Classes to `src`](help/Developer-How-To-Move-Classes-to-src)

doc/database.md

@@ -0,0 +1,97 @@
+Database Tables
+===============
+
+* [Home](help)
+
+| Table | Description |
+|-------|-------------|
+| [2fa_app_specific_password](help/database/db_2fa_app_specific_password) | Two-factor app-specific _password |
+| [2fa_recovery_codes](help/database/db_2fa_recovery_codes) | Two-factor authentication recovery codes |
+| [2fa_trusted_browser](help/database/db_2fa_trusted_browser) | Two-factor authentication trusted browsers |
+| [account-suggestion](help/database/db_account-suggestion) | Account suggestion |
+| [account-user](help/database/db_account-user) | Remote and local accounts |
+| [apcontact](help/database/db_apcontact) | ActivityPub compatible contacts - used in the ActivityPub implementation |
+| [application](help/database/db_application) | OAuth application |
+| [application-marker](help/database/db_application-marker) | Timeline marker |
+| [application-token](help/database/db_application-token) | OAuth user token |
+| [arrived-activity](help/database/db_arrived-activity) | Id of arrived activities |
+| [attach](help/database/db_attach) | file attachments |
+| [cache](help/database/db_cache) | Stores temporary data |
+| [channel](help/database/db_channel) | User defined Channels |
+| [check-full-text-search](help/database/db_check-full-text-search) | Check for a full text search match in user defined channels before storing the message in the system |
+| [config](help/database/db_config) | main configuration storage |
+| [contact](help/database/db_contact) | contact table |
+| [contact-relation](help/database/db_contact-relation) | Contact relations |
+| [conv](help/database/db_conv) | private messages |
+| [delayed-post](help/database/db_delayed-post) | Posts that are about to be distributed at a later time |
+| [delivery-queue](help/database/db_delivery-queue) | Delivery data for posts for the batch processing |
+| [diaspora-contact](help/database/db_diaspora-contact) | Diaspora compatible contacts - used in the Diaspora implementation |
+| [diaspora-interaction](help/database/db_diaspora-interaction) | Signed Diaspora Interaction |
+| [endpoint](help/database/db_endpoint) | ActivityPub endpoints - used in the ActivityPub implementation |
+| [event](help/database/db_event) | Events |
+| [fetch-entry](help/database/db_fetch-entry) |  |
+| [fetched-activity](help/database/db_fetched-activity) | Id of fetched activities |
+| [fsuggest](help/database/db_fsuggest) | friend suggestion stuff |
+| [group](help/database/db_group) | privacy circles, circle info |
+| [group_member](help/database/db_group_member) | privacy circles, member info |
+| [gserver](help/database/db_gserver) | Global servers |
+| [gserver-tag](help/database/db_gserver-tag) | Tags that the server has subscribed |
+| [hook](help/database/db_hook) | addon hook registry |
+| [inbox-entry](help/database/db_inbox-entry) | Incoming activity |
+| [inbox-entry-receiver](help/database/db_inbox-entry-receiver) | Receiver for the incoming activity |
+| [inbox-status](help/database/db_inbox-status) | Status of ActivityPub inboxes |
+| [intro](help/database/db_intro) |  |
+| [item-uri](help/database/db_item-uri) | URI and GUID for items |
+| [key-value](help/database/db_key-value) | A key value storage |
+| [locks](help/database/db_locks) |  |
+| [mail](help/database/db_mail) | private messages |
+| [mailacct](help/database/db_mailacct) | Mail account data for fetching mails |
+| [manage](help/database/db_manage) | table of accounts that can manage each other |
+| [notification](help/database/db_notification) | notifications |
+| [notify](help/database/db_notify) | [Deprecated] User notifications |
+| [notify-threads](help/database/db_notify-threads) |  |
+| [openwebauth-token](help/database/db_openwebauth-token) | Store OpenWebAuth token to verify contacts |
+| [parsed_url](help/database/db_parsed_url) | cache for 'parse_url' queries |
+| [pconfig](help/database/db_pconfig) | personal (per user) configuration storage |
+| [permissionset](help/database/db_permissionset) |  |
+| [photo](help/database/db_photo) | photo storage |
+| [post](help/database/db_post) | Structure for all posts |
+| [post-activity](help/database/db_post-activity) | Original remote activity |
+| [post-category](help/database/db_post-category) | post relation to categories |
+| [post-collection](help/database/db_post-collection) | Collection of posts |
+| [post-content](help/database/db_post-content) | Content for all posts |
+| [post-counts](help/database/db_post-counts) | Original remote activity |
+| [post-delivery](help/database/db_post-delivery) | Delivery data for posts for the batch processing |
+| [post-delivery-data](help/database/db_post-delivery-data) | Delivery data for items |
+| [post-engagement](help/database/db_post-engagement) | Engagement data per post |
+| [post-history](help/database/db_post-history) | Post history |
+| [post-link](help/database/db_post-link) | Post related external links |
+| [post-media](help/database/db_post-media) | Attached media |
+| [post-origin](help/database/db_post-origin) | Posts from local users |
+| [post-question](help/database/db_post-question) | Question |
+| [post-question-option](help/database/db_post-question-option) | Question option |
+| [post-searchindex](help/database/db_post-searchindex) | Content for all posts |
+| [post-tag](help/database/db_post-tag) | post relation to tags |
+| [post-thread](help/database/db_post-thread) | Thread related data |
+| [post-thread-user](help/database/db_post-thread-user) | Thread related data per user |
+| [post-user](help/database/db_post-user) | User specific post data |
+| [post-user-notification](help/database/db_post-user-notification) | User post notifications |
+| [process](help/database/db_process) | Currently running system processes |
+| [profile](help/database/db_profile) | user profiles data |
+| [profile_field](help/database/db_profile_field) | Custom profile fields |
+| [register](help/database/db_register) | registrations requiring admin approval |
+| [report](help/database/db_report) |  |
+| [report-post](help/database/db_report-post) | Individual posts attached to a moderation report |
+| [report-rule](help/database/db_report-rule) | Terms of service rule lines relevant to a moderation report |
+| [search](help/database/db_search) |  |
+| [session](help/database/db_session) | web session storage |
+| [storage](help/database/db_storage) | Data stored by Database storage backend |
+| [subscription](help/database/db_subscription) | Push Subscription for the API |
+| [tag](help/database/db_tag) | tags and mentions |
+| [user](help/database/db_user) | The local users |
+| [user-contact](help/database/db_user-contact) | User specific public contact data |
+| [user-gserver](help/database/db_user-gserver) | User settings about remote servers |
+| [userd](help/database/db_userd) | Deleted usernames |
+| [verb](help/database/db_verb) | Activity Verbs |
+| [worker-ipc](help/database/db_worker-ipc) | Inter process communication between the frontend and the worker |
+| [workerqueue](help/database/db_workerqueue) | Background tasks queue entries |

doc/database/db_2fa_app_specific_password.md

@@ -1,8 +1,10 @@
-# Table 2fa_app_specific_password
+Table 2fa_app_specific_password
+===========
 
 Two-factor app-specific _password
 
-## Fields
+Fields
+------
 
 | Field           | Description                              | Type               | Null | Key | Default | Extra          |
 | --------------- | ---------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |
@@ -13,17 +15,19 @@ Two-factor app-specific _password
 | generated       | Datetime the password was generated      | datetime           | NO   |     | NULL    |                |
 | last_used       | Datetime the password was last used      | datetime           | YES  |     | NULL    |                |
 
-## Indexes
+Indexes
+------------
 
 | Name            | Fields                |
 | --------------- | --------------------- |
 | PRIMARY         | id                    |
 | uid_description | uid, description(190) |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_2fa_recovery_codes.md

@@ -1,8 +1,10 @@
-# Table 2fa_recovery_codes
+Table 2fa_recovery_codes
+===========
 
 Two-factor authentication recovery codes
 
-## Fields
+Fields
+------
 
 | Field     | Description                     | Type               | Null | Key | Default | Extra |
 | --------- | ------------------------------- | ------------------ | ---- | --- | ------- | ----- |
@@ -11,16 +13,18 @@ Two-factor authentication recovery codes
 | generated | Datetime the code was generated | datetime           | NO   |     | NULL    |       |
 | used      | Datetime the code was used      | datetime           | YES  |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields    |
 | ------- | --------- |
 | PRIMARY | uid, code |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_2fa_trusted_browser.md

@@ -1,8 +1,10 @@
-# Table 2fa_trusted_browser
+Table 2fa_trusted_browser
+===========
 
 Two-factor authentication trusted browsers
 
-## Fields
+Fields
+------
 
 | Field       | Description                                    | Type               | Null | Key | Default | Extra |
 | ----------- | ---------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
@@ -13,17 +15,19 @@ Two-factor authentication trusted browsers
 | created     | Datetime the trusted browser was recorded      | datetime           | NO   |     | NULL    |       |
 | last_used   | Datetime the trusted browser was last used     | datetime           | YES  |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields      |
 | ------- | ----------- |
 | PRIMARY | cookie_hash |
 | uid     | uid         |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_account-suggestion.md

@@ -1,8 +1,10 @@
-# Table account-suggestion
+Table account-suggestion
+===========
 
 Account suggestion
 
-## Fields
+Fields
+------
 
 | Field  | Description                                                  | Type               | Null | Key | Default | Extra |
 | ------ | ------------------------------------------------------------ | ------------------ | ---- | --- | ------- | ----- |
@@ -11,18 +13,20 @@ Account suggestion
 | level  | level of closeness                                           | smallint unsigned  | YES  |     | NULL    |       |
 | ignore | If set, this account will not be suggested again             | boolean            | NO   |     | 0       |       |
 
-## Indexes
+Indexes
+------------
 
 | Name       | Fields      |
 | ---------- | ----------- |
 | PRIMARY    | uid, uri-id |
 | uri-id_uid | uri-id, uid |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| uid | [user](help/spec/database/db-user) | uid |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_account-user.md

@@ -1,8 +1,10 @@
-# Table account-user
+Table account-user
+===========
 
 Remote and local accounts
 
-## Fields
+Fields
+------
 
 | Field  | Description                                                  | Type               | Null | Key | Default | Extra          |
 | ------ | ------------------------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |
@@ -10,7 +12,8 @@ Remote and local accounts
 | uri-id | Id of the item-uri table entry that contains the account url | int unsigned       | NO   |     | NULL    |                |
 | uid    | User ID                                                      | mediumint unsigned | NO   |     | NULL    |                |
 
-## Indexes
+Indexes
+------------
 
 | Name       | Fields              |
 | ---------- | ------------------- |
@@ -18,11 +21,12 @@ Remote and local accounts
 | uri-id_uid | UNIQUE, uri-id, uid |
 | uid_uri-id | uid, uri-id         |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| uid | [user](help/spec/database/db-user) | uid |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_apcontact.md

@@ -1,8 +1,10 @@
-# Table apcontact
+Table apcontact
+===========
 
 ActivityPub compatible contacts - used in the ActivityPub implementation
 
-## Fields
+Fields
+------
 
 | Field              | Description                                                         | Type           | Null | Key | Default             | Extra |
 | ------------------ | ------------------------------------------------------------------- | -------------- | ---- | --- | ------------------- | ----- |
@@ -40,7 +42,8 @@ ActivityPub compatible contacts - used in the ActivityPub implementation
 | statuses_count     | Number of posts                                                     | int unsigned   | YES  |     | 0                   |       |
 | updated            |                                                                     | datetime       | NO   |     | 0001-01-01 00:00:00 |       |
 
-## Indexes
+Indexes
+------------
 
 | Name        | Fields           |
 | ----------- | ---------------- |
@@ -53,11 +56,12 @@ ActivityPub compatible contacts - used in the ActivityPub implementation
 | gsid        | gsid             |
 | uri-id      | UNIQUE, uri-id   |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| gsid | [gserver](help/spec/database/db-gserver) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| gsid | [gserver](help/database/db_gserver) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_application-marker.md

@@ -1,8 +1,10 @@
-# Table application-marker
+Table application-marker
+===========
 
 Timeline marker
 
-## Fields
+Fields
+------
 
 | Field          | Description                  | Type               | Null | Key | Default | Extra |
 | -------------- | ---------------------------- | ------------------ | ---- | --- | ------- | ----- |
@@ -13,18 +15,20 @@ Timeline marker
 | version        | Version number               | smallint unsigned  | YES  |     | NULL    |       |
 | updated_at     | creation time                | datetime           | YES  |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields                        |
 | ------- | ----------------------------- |
 | PRIMARY | application-id, uid, timeline |
 | uid_id  | uid                           |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| application-id | [application](help/spec/database/db-application) | id |
-| uid | [user](help/spec/database/db-user) | uid |
+| application-id | [application](help/database/db_application) | id |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_application-token.md

@@ -1,8 +1,10 @@
-# Table application-token
+Table application-token
+===========
 
 OAuth user token
 
-## Fields
+Fields
+------
 
 | Field          | Description   | Type               | Null | Key | Default | Extra |
 | -------------- | ------------- | ------------------ | ---- | --- | ------- | ----- |
@@ -17,18 +19,20 @@ OAuth user token
 | follow         | Follow scope  | boolean            | YES  |     | NULL    |       |
 | push           | Push scope    | boolean            | YES  |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields              |
 | ------- | ------------------- |
 | PRIMARY | application-id, uid |
 | uid_id  | uid, application-id |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| application-id | [application](help/spec/database/db-application) | id |
-| uid | [user](help/spec/database/db-user) | uid |
+| application-id | [application](help/database/db_application) | id |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_application.md

@@ -1,8 +1,10 @@
-# Table application
+Table application
+===========
 
 OAuth application
 
-## Fields
+Fields
+------
 
 | Field         | Description     | Type           | Null | Key | Default | Extra          |
 | ------------- | --------------- | -------------- | ---- | --- | ------- | -------------- |
@@ -18,7 +20,8 @@ OAuth application
 | follow        | Follow scope    | boolean        | YES  |     | NULL    |                |
 | push          | Push scope      | boolean        | YES  |     | NULL    |                |
 
-## Indexes
+Indexes
+------------
 
 | Name      | Fields            |
 | --------- | ----------------- |
@@ -26,4 +29,4 @@ OAuth application
 | client_id | UNIQUE, client_id |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_arrived-activity.md

@@ -1,19 +1,22 @@
-# Table arrived-activity
+Table arrived-activity
+===========
 
 Id of arrived activities
 
-## Fields
+Fields
+------
 
 | Field     | Description                        | Type           | Null | Key | Default | Extra |
 | --------- | ---------------------------------- | -------------- | ---- | --- | ------- | ----- |
 | object-id | object id of the incoming activity | varbinary(383) | NO   | PRI | NULL    |       |
 | received  | Receiving date                     | datetime       | YES  |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields    |
 | ------- | --------- |
 | PRIMARY | object-id |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_attach.md

@@ -1,8 +1,10 @@
-# Table attach
+Table attach
+===========
 
 file attachments
 
-## Fields
+Fields
+------
 
 | Field         | Description                                           | Type               | Null | Key | Default             | Extra          |
 | ------------- | ----------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
@@ -22,17 +24,19 @@ file attachments
 | backend-class | Storage backend class                                 | tinytext           | YES  |     | NULL                |                |
 | backend-ref   | Storage backend data reference                        | text               | YES  |     | NULL                |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields |
 | ------- | ------ |
 | PRIMARY | id     |
 | uid     | uid    |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_cache.md

@@ -1,8 +1,10 @@
-# Table cache
+Table cache
+===========
 
 Stores temporary data
 
-## Fields
+Fields
+------
 
 | Field   | Description                  | Type           | Null | Key | Default             | Extra |
 | ------- | ---------------------------- | -------------- | ---- | --- | ------------------- | ----- |
@@ -11,7 +13,8 @@ Stores temporary data
 | expires | datetime of cache expiration | datetime       | NO   |     | 0001-01-01 00:00:00 |       |
 | updated | datetime of cache insertion  | datetime       | NO   |     | 0001-01-01 00:00:00 |       |
 
-## Indexes
+Indexes
+------------
 
 | Name      | Fields     |
 | --------- | ---------- |
@@ -19,4 +22,4 @@ Stores temporary data
 | k_expires | k, expires |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_channel.md

@@ -1,8 +1,10 @@
-# Table channel
+Table channel
+===========
 
 User defined Channels
 
-## Fields
+Fields
+------
 
 | Field            | Description                                                                                       | Type               | Null | Key | Default | Extra          |
 | ---------------- | ------------------------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |
@@ -22,17 +24,19 @@ User defined Channels
 | publish          | publish channel content                                                                           | boolean            | YES  |     | NULL    |                |
 | valid            | Set, when the full-text-search is valid                                                           | boolean            | YES  |     | NULL    |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields |
 | ------- | ------ |
 | PRIMARY | id     |
 | uid     | uid    |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_check-full-text-search.md

@@ -1,15 +1,18 @@
-# Table check-full-text-search
+Table check-full-text-search
+===========
 
 Check for a full text search match in user defined channels before storing the message in the system
 
-## Fields
+Fields
+------
 
 | Field      | Description                              | Type         | Null | Key | Default | Extra |
 | ---------- | ---------------------------------------- | ------------ | ---- | --- | ------- | ----- |
 | pid        | The ID of the process                    | int unsigned | NO   | PRI | NULL    |       |
 | searchtext | Simplified text for the full text search | mediumtext   | YES  |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name       | Fields               |
 | ---------- | -------------------- |
@@ -17,4 +20,4 @@ Check for a full text search match in user defined channels before storing the m
 | searchtext | FULLTEXT, searchtext |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_config.md

@@ -1,8 +1,10 @@
-# Table config
+Table config
+===========
 
 main configuration storage
 
-## Fields
+Fields
+------
 
 | Field | Description               | Type          | Null | Key | Default | Extra          |
 | ----- | ------------------------- | ------------- | ---- | --- | ------- | -------------- |
@@ -11,7 +13,8 @@ main configuration storage
 | k     | The key of the entry      | varbinary(50) | NO   |     |         |                |
 | v     |                           | mediumtext    | YES  |     | NULL    |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields         |
 | ------- | -------------- |
@@ -19,4 +22,4 @@ main configuration storage
 | cat_k   | UNIQUE, cat, k |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_contact-relation.md

@@ -1,8 +1,10 @@
-# Table contact-relation
+Table contact-relation
+===========
 
 Contact relations
 
-## Fields
+Fields
+------
 
 | Field                 | Description                                                             | Type              | Null | Key | Default             | Extra |
 | --------------------- | ----------------------------------------------------------------------- | ----------------- | ---- | --- | ------------------- | ----- |
@@ -17,18 +19,20 @@ Contact relations
 | relation-thread-score | score for interactions of relation-cid on threads of cid                | smallint unsigned | YES  |     | NULL                |       |
 | post-score            | score for the amount of posts from cid that can be seen by relation-cid | smallint unsigned | YES  |     | NULL                |       |
 
-## Indexes
+Indexes
+------------
 
 | Name         | Fields            |
 | ------------ | ----------------- |
 | PRIMARY      | cid, relation-cid |
 | relation-cid | relation-cid      |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| cid | [contact](help/spec/database/db-contact) | id |
-| relation-cid | [contact](help/spec/database/db-contact) | id |
+| cid | [contact](help/database/db_contact) | id |
+| relation-cid | [contact](help/database/db_contact) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_contact.md

@@ -1,8 +1,10 @@
-# Table contact
+Table contact
+===========
 
 contact table
 
-## Fields
+Fields
+------
 
 | Field                     | Description                                                                                                    | Type               | Null | Key | Default             | Extra          |
 | ------------------------- | -------------------------------------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
@@ -92,7 +94,8 @@ contact table
 | closeness                 | Deprecated                                                                                                     | tinyint unsigned   | NO   |     | 99                  |                |
 | profile-id                | Deprecated                                                                                                     | int unsigned       | YES  |     | NULL                |                |
 
-## Indexes
+Indexes
+------------
 
 | Name                        | Fields                               |
 | --------------------------- | ------------------------------------ |
@@ -121,12 +124,13 @@ contact table
 | gsid_uid_failed             | gsid, uid, failed                    |
 | uri-id                      | uri-id                               |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| gsid | [gserver](help/spec/database/db-gserver) | id |
+| uid | [user](help/database/db_user) | uid |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| gsid | [gserver](help/database/db_gserver) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_conv.md

@@ -1,8 +1,10 @@
-# Table conv
+Table conv
+===========
 
 private messages
 
-## Fields
+Fields
+------
 
 | Field   | Description                               | Type               | Null | Key | Default             | Extra          |
 | ------- | ----------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
@@ -15,17 +17,19 @@ private messages
 | updated | edited timestamp                          | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 | subject | subject of initial message                | text               | YES  |     | NULL                |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields |
 | ------- | ------ |
 | PRIMARY | id     |
 | uid     | uid    |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_conversation.md

@@ -0,0 +1,30 @@
+Table conversation
+===========
+
+Raw data and structure information for messages
+
+Fields
+------
+
+| Field             | Description                                                          | Type             | Null | Key | Default             | Extra |
+| ----------------- | -------------------------------------------------------------------- | ---------------- | ---- | --- | ------------------- | ----- |
+| item-uri          | Original URI of the item - unrelated to the table with the same name | varbinary(255)   | NO   | PRI | NULL                |       |
+| reply-to-uri      | URI to which this item is a reply                                    | varbinary(255)   | NO   |     |                     |       |
+| conversation-uri  | GNU Social conversation URI                                          | varbinary(255)   | NO   |     |                     |       |
+| conversation-href | GNU Social conversation link                                         | varbinary(255)   | NO   |     |                     |       |
+| protocol          | The protocol of the item                                             | tinyint unsigned | NO   |     | 255                 |       |
+| direction         | How the message arrived here: 1=push, 2=pull                         | tinyint unsigned | NO   |     | 0                   |       |
+| source            | Original source                                                      | mediumtext       | YES  |     | NULL                |       |
+| received          | Receiving date                                                       | datetime         | NO   |     | 0001-01-01 00:00:00 |       |
+
+Indexes
+------------
+
+| Name             | Fields           |
+| ---------------- | ---------------- |
+| PRIMARY          | item-uri         |
+| conversation-uri | conversation-uri |
+| received         | received         |
+
+
+Return to [database documentation](help/database)

doc/database/db_delayed-post.md

@@ -1,8 +1,10 @@
-# Table delayed-post
+Table delayed-post
+===========
 
 Posts that are about to be distributed at a later time
 
-## Fields
+Fields
+------
 
 | Field   | Description                                    | Type               | Null | Key | Default | Extra          |
 | ------- | ---------------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |
@@ -12,7 +14,8 @@ Posts that are about to be distributed at a later time
 | delayed | delay time                                     | datetime           | YES  |     | NULL    |                |
 | wid     | Workerqueue id                                 | int unsigned       | YES  |     | NULL    |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields                |
 | ------- | --------------------- |
@@ -20,11 +23,12 @@ Posts that are about to be distributed at a later time
 | uid_uri | UNIQUE, uid, uri(190) |
 | wid     | wid                   |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
-| wid | [workerqueue](help/spec/database/db-workerqueue) | id |
+| uid | [user](help/database/db_user) | uid |
+| wid | [workerqueue](help/database/db_workerqueue) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_delivery-queue.md

@@ -1,8 +1,10 @@
-# Table delivery-queue
+Table delivery-queue
+===========
 
 Delivery data for posts for the batch processing
 
-## Fields
+Fields
+------
 
 | Field   | Description                             | Type               | Null | Key | Default | Extra |
 | ------- | --------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
@@ -14,7 +16,8 @@ Delivery data for posts for the batch processing
 | uid     | Delivering user                         | mediumint unsigned | YES  |     | NULL    |       |
 | failed  | Number of times the delivery has failed | tinyint            | YES  |     | 0       |       |
 
-## Indexes
+Indexes
+------------
 
 | Name         | Fields        |
 | ------------ | ------------- |
@@ -23,13 +26,14 @@ Delivery data for posts for the batch processing
 | uid          | uid           |
 | cid          | cid           |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| gsid | [gserver](help/spec/database/db-gserver) | id |
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| cid | [contact](help/spec/database/db-contact) | id |
-| uid | [user](help/spec/database/db-user) | uid |
+| gsid | [gserver](help/database/db_gserver) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| cid | [contact](help/database/db_contact) | id |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_diaspora-contact.md

@@ -1,8 +1,10 @@
-# Table diaspora-contact
+Table diaspora-contact
+===========
 
 Diaspora compatible contacts - used in the Diaspora implementation
 
-## Fields
+Fields
+------
 
 | Field             | Description                                                  | Type         | Null | Key | Default             | Extra |
 | ----------------- | ------------------------------------------------------------ | ------------ | ---- | --- | ------------------- | ----- |
@@ -29,7 +31,8 @@ Diaspora compatible contacts - used in the Diaspora implementation
 | interacted_count  | Number of contacts that interacted with this contact         | int unsigned | YES  |     | 0                   |       |
 | post_count        | Number of posts and comments                                 | int unsigned | YES  |     | 0                   |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields       |
 | ------- | ------------ |
@@ -38,11 +41,12 @@ Diaspora compatible contacts - used in the Diaspora implementation
 | alias   | alias        |
 | gsid    | gsid         |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| gsid | [gserver](help/spec/database/db-gserver) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| gsid | [gserver](help/database/db_gserver) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_diaspora-interaction.md

@@ -1,24 +1,28 @@
-# Table diaspora-interaction
+Table diaspora-interaction
+===========
 
 Signed Diaspora Interaction
 
-## Fields
+Fields
+------
 
 | Field       | Description                                               | Type         | Null | Key | Default | Extra |
 | ----------- | --------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |
 | uri-id      | Id of the item-uri table entry that contains the item uri | int unsigned | NO   | PRI | NULL    |       |
 | interaction | The Diaspora interaction                                  | mediumtext   | YES  |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields |
 | ------- | ------ |
 | PRIMARY | uri-id |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_endpoint.md

@@ -1,8 +1,10 @@
-# Table endpoint
+Table endpoint
+===========
 
 ActivityPub endpoints - used in the ActivityPub implementation
 
-## Fields
+Fields
+------
 
 | Field        | Description                                                    | Type           | Null | Key | Default | Extra |
 | ------------ | -------------------------------------------------------------- | -------------- | ---- | --- | ------- | ----- |
@@ -10,17 +12,19 @@ ActivityPub endpoints - used in the ActivityPub implementation
 | type         |                                                                | varchar(20)    | NO   |     | NULL    |       |
 | owner-uri-id | Id of the item-uri table entry that contains the apcontact url | int unsigned   | YES  |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name              | Fields                     |
 | ----------------- | -------------------------- |
 | PRIMARY           | url                        |
 | owner-uri-id_type | UNIQUE, owner-uri-id, type |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| owner-uri-id | [item-uri](help/spec/database/db-item-uri) | id |
+| owner-uri-id | [item-uri](help/database/db_item-uri) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_event.md

@@ -1,8 +1,10 @@
-# Table event
+Table event
+===========
 
 Events
 
-## Fields
+Fields
+------
 
 | Field     | Description                                                | Type               | Null | Key | Default             | Extra          |
 | --------- | ---------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
@@ -27,7 +29,8 @@ Events
 | deny_cid  | Access Control - list of denied contact.id                 | mediumtext         | YES  |     | NULL                |                |
 | deny_gid  | Access Control - list of denied circles                    | mediumtext         | YES  |     | NULL                |                |
 
-## Indexes
+Indexes
+------------
 
 | Name      | Fields     |
 | --------- | ---------- |
@@ -36,12 +39,13 @@ Events
 | cid       | cid        |
 | uri-id    | uri-id     |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
-| cid | [contact](help/spec/database/db-contact) | id |
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
+| uid | [user](help/database/db_user) | uid |
+| cid | [contact](help/database/db_contact) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_fetch-entry.md

@@ -1,8 +1,10 @@
-# Table fetch-entry
+Table fetch-entry
+===========
 
 
 
-## Fields
+Fields
+------
 
 | Field   | Description                        | Type           | Null | Key | Default             | Extra          |
 | ------- | ---------------------------------- | -------------- | ---- | --- | ------------------- | -------------- |
@@ -11,7 +13,8 @@
 | created | Creation date of the fetch request | datetime       | NO   |     | 0001-01-01 00:00:00 |                |
 | wid     | Workerqueue id                     | int unsigned   | YES  |     | NULL                |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields      |
 | ------- | ----------- |
@@ -20,10 +23,11 @@
 | created | created     |
 | wid     | wid         |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| wid | [workerqueue](help/spec/database/db-workerqueue) | id |
+| wid | [workerqueue](help/database/db_workerqueue) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_fetched-activity.md

@@ -1,19 +1,22 @@
-# Table fetched-activity
+Table fetched-activity
+===========
 
 Id of fetched activities
 
-## Fields
+Fields
+------
 
 | Field     | Description                   | Type           | Null | Key | Default | Extra |
 | --------- | ----------------------------- | -------------- | ---- | --- | ------- | ----- |
 | object-id | object id of fetched activity | varbinary(383) | NO   | PRI | NULL    |       |
 | received  | Receiving date                | datetime       | YES  |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields    |
 | ------- | --------- |
 | PRIMARY | object-id |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_fsuggest.md

@@ -1,8 +1,10 @@
-# Table fsuggest
+Table fsuggest
+===========
 
 friend suggestion stuff
 
-## Fields
+Fields
+------
 
 | Field   | Description | Type               | Null | Key | Default             | Extra          |
 | ------- | ----------- | ------------------ | ---- | --- | ------------------- | -------------- |
@@ -16,7 +18,8 @@ friend suggestion stuff
 | note    |             | text               | YES  |     | NULL                |                |
 | created |             | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields |
 | ------- | ------ |
@@ -24,11 +27,12 @@ friend suggestion stuff
 | cid     | cid    |
 | uid     | uid    |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
-| cid | [contact](help/spec/database/db-contact) | id |
+| uid | [user](help/database/db_user) | uid |
+| cid | [contact](help/database/db_contact) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_group.md

@@ -1,8 +1,10 @@
-# Table group
+Table group
+===========
 
 privacy circles, circle info
 
-## Fields
+Fields
+------
 
 | Field   | Description                                                                               | Type               | Null | Key | Default | Extra          |
 | ------- | ----------------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |
@@ -13,7 +15,8 @@ privacy circles, circle info
 | cid     | Contact id of group. When this field is filled then the members are synced automatically. | int unsigned       | YES  |     | NULL    |                |
 | name    | human readable name of circle                                                             | varchar(255)       | NO   |     |         |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields |
 | ------- | ------ |
@@ -21,11 +24,12 @@ privacy circles, circle info
 | uid     | uid    |
 | cid     | cid    |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
-| cid | [contact](help/spec/database/db-contact) | id |
+| uid | [user](help/database/db_user) | uid |
+| cid | [contact](help/database/db_contact) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_group_member.md

@@ -1,8 +1,10 @@
-# Table group_member
+Table group_member
+===========
 
 privacy circles, member info
 
-## Fields
+Fields
+------
 
 | Field      | Description                                                | Type         | Null | Key | Default | Extra          |
 | ---------- | ---------------------------------------------------------- | ------------ | ---- | --- | ------- | -------------- |
@@ -10,7 +12,8 @@ privacy circles, member info
 | gid        | group.id of the associated circle                          | int unsigned | NO   |     | 0       |                |
 | contact-id | contact.id of the member assigned to the associated circle | int unsigned | NO   |     | 0       |                |
 
-## Indexes
+Indexes
+------------
 
 | Name          | Fields                  |
 | ------------- | ----------------------- |
@@ -18,11 +21,12 @@ privacy circles, member info
 | contactid     | contact-id              |
 | gid_contactid | UNIQUE, gid, contact-id |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| gid | [group](help/spec/database/db-group) | id |
-| contact-id | [contact](help/spec/database/db-contact) | id |
+| gid | [group](help/database/db_group) | id |
+| contact-id | [contact](help/database/db_contact) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_gserver-tag.md

@@ -1,25 +1,29 @@
-# Table gserver-tag
+Table gserver-tag
+===========
 
 Tags that the server has subscribed
 
-## Fields
+Fields
+------
 
 | Field      | Description                        | Type         | Null | Key | Default | Extra |
 | ---------- | ---------------------------------- | ------------ | ---- | --- | ------- | ----- |
 | gserver-id | The id of the gserver              | int unsigned | NO   | PRI | 0       |       |
 | tag        | Tag that the server has subscribed | varchar(100) | NO   | PRI |         |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields          |
 | ------- | --------------- |
 | PRIMARY | gserver-id, tag |
 | tag     | tag             |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| gserver-id | [gserver](help/spec/database/db-gserver) | id |
+| gserver-id | [gserver](help/database/db_gserver) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_gserver.md

@@ -1,8 +1,10 @@
-# Table gserver
+Table gserver
+===========
 
 Global servers
 
-## Fields
+Fields
+------
 
 | Field                 | Description                                                    | Type             | Null | Key | Default             | Extra          |
 | --------------------- | -------------------------------------------------------------- | ---------------- | ---- | --- | ------------------- | -------------- |
@@ -41,7 +43,8 @@ Global servers
 | next_contact          | Next connection request                                        | datetime         | YES  |     | 0001-01-01 00:00:00 |                |
 | redirect-gsid         | Target Gserver id in case of a redirect                        | int unsigned     | YES  |     | NULL                |                |
 
-## Indexes
+Indexes
+------------
 
 | Name          | Fields            |
 | ------------- | ----------------- |
@@ -51,10 +54,11 @@ Global servers
 | network       | network           |
 | redirect-gsid | redirect-gsid     |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| redirect-gsid | [gserver](help/spec/database/db-gserver) | id |
+| redirect-gsid | [gserver](help/database/db_gserver) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_hook.md

@@ -1,8 +1,10 @@
-# Table hook
+Table hook
+===========
 
 addon hook registry
 
-## Fields
+Fields
+------
 
 | Field    | Description                                                                                                | Type              | Null | Key | Default | Extra          |
 | -------- | ---------------------------------------------------------------------------------------------------------- | ----------------- | ---- | --- | ------- | -------------- |
@@ -12,7 +14,8 @@ addon hook registry
 | function | function name of hook handler                                                                              | varbinary(200)    | NO   |     |         |                |
 | priority | not yet implemented - can be used to sort conflicts in hook handling by calling handlers in priority order | smallint unsigned | NO   |     | 0       |                |
 
-## Indexes
+Indexes
+------------
 
 | Name               | Fields                       |
 | ------------------ | ---------------------------- |
@@ -21,4 +24,4 @@ addon hook registry
 | hook_file_function | UNIQUE, hook, file, function |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_host.md

@@ -0,0 +1,23 @@
+Table host
+===========
+
+Hostname
+
+Fields
+------
+
+| Field | Description   | Type             | Null | Key | Default | Extra          |
+| ----- | ------------- | ---------------- | ---- | --- | ------- | -------------- |
+| id    | sequential ID | tinyint unsigned | NO   | PRI | NULL    | auto_increment |
+| name  | The hostname  | varchar(128)     | NO   |     |         |                |
+
+Indexes
+------------
+
+| Name    | Fields       |
+| ------- | ------------ |
+| PRIMARY | id           |
+| name    | UNIQUE, name |
+
+
+Return to [database documentation](help/database)

doc/database/db_inbox-entry-receiver.md

@@ -1,26 +1,30 @@
-# Table inbox-entry-receiver
+Table inbox-entry-receiver
+===========
 
 Receiver for the incoming activity
 
-## Fields
+Fields
+------
 
 | Field    | Description | Type               | Null | Key | Default | Extra |
 | -------- | ----------- | ------------------ | ---- | --- | ------- | ----- |
 | queue-id |             | int unsigned       | NO   | PRI | NULL    |       |
 | uid      | User id     | mediumint unsigned | NO   | PRI | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields        |
 | ------- | ------------- |
 | PRIMARY | queue-id, uid |
 | uid     | uid           |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| queue-id | [inbox-entry](help/spec/database/db-inbox-entry) | id |
-| uid | [user](help/spec/database/db-user) | uid |
+| queue-id | [inbox-entry](help/database/db_inbox-entry) | id |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_inbox-entry.md

@@ -1,8 +1,10 @@
-# Table inbox-entry
+Table inbox-entry
+===========
 
 Incoming activity
 
-## Fields
+Fields
+------
 
 | Field              | Description                            | Type             | Null | Key | Default | Extra          |
 | ------------------ | -------------------------------------- | ---------------- | ---- | --- | ------- | -------------- |
@@ -23,7 +25,8 @@ Incoming activity
 | wid                | Workerqueue id                         | int unsigned     | YES  |     | NULL    |                |
 | retrial            | Retrial counter                        | tinyint unsigned | YES  |     | 0       |                |
 
-## Indexes
+Indexes
+------------
 
 | Name        | Fields              |
 | ----------- | ------------------- |
@@ -33,10 +36,11 @@ Incoming activity
 | received    | received            |
 | wid         | wid                 |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| wid | [workerqueue](help/spec/database/db-workerqueue) | id |
+| wid | [workerqueue](help/database/db_workerqueue) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_inbox-status.md

@@ -1,8 +1,10 @@
-# Table inbox-status
+Table inbox-status
+===========
 
 Status of ActivityPub inboxes
 
-## Fields
+Fields
+------
 
 | Field    | Description                          | Type           | Null | Key | Default             | Extra |
 | -------- | ------------------------------------ | -------------- | ---- | --- | ------------------- | ----- |
@@ -16,7 +18,8 @@ Status of ActivityPub inboxes
 | archive  | Is the inbox archived?               | boolean        | NO   |     | 0                   |       |
 | shared   | Is it a shared inbox?                | boolean        | NO   |     | 0                   |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields |
 | ------- | ------ |
@@ -24,11 +27,12 @@ Status of ActivityPub inboxes
 | uri-id  | uri-id |
 | gsid    | gsid   |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| gsid | [gserver](help/spec/database/db-gserver) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| gsid | [gserver](help/database/db_gserver) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_intro.md

@@ -1,8 +1,10 @@
-# Table intro
+Table intro
+===========
 
 
 
-## Fields
+Fields
+------
 
 | Field       | Description       | Type               | Null | Key | Default             | Extra          |
 | ----------- | ----------------- | ------------------ | ---- | --- | ------------------- | -------------- |
@@ -19,7 +21,8 @@
 | blocked     | deprecated        | boolean            | NO   |     | 0                   |                |
 | ignore      |                   | boolean            | NO   |     | 0                   |                |
 
-## Indexes
+Indexes
+------------
 
 | Name        | Fields      |
 | ----------- | ----------- |
@@ -28,12 +31,13 @@
 | suggest-cid | suggest-cid |
 | uid         | uid         |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
-| contact-id | [contact](help/spec/database/db-contact) | id |
-| suggest-cid | [contact](help/spec/database/db-contact) | id |
+| uid | [user](help/database/db_user) | uid |
+| contact-id | [contact](help/database/db_contact) | id |
+| suggest-cid | [contact](help/database/db_contact) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_item-uri.md

@@ -1,8 +1,10 @@
-# Table item-uri
+Table item-uri
+===========
 
 URI and GUID for items
 
-## Fields
+Fields
+------
 
 | Field | Description                     | Type           | Null | Key | Default | Extra          |
 | ----- | ------------------------------- | -------------- | ---- | --- | ------- | -------------- |
@@ -10,7 +12,8 @@ URI and GUID for items
 | uri   | URI of an item                  | varbinary(383) | NO   |     | NULL    |                |
 | guid  | A unique identifier for an item | varbinary(255) | YES  |     | NULL    |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields      |
 | ------- | ----------- |
@@ -19,4 +22,4 @@ URI and GUID for items
 | guid    | guid        |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_key-value.md

@@ -1,8 +1,10 @@
-# Table key-value
+Table key-value
+===========
 
 A key value storage
 
-## Fields
+Fields
+------
 
 | Field      | Description                  | Type          | Null | Key | Default | Extra |
 | ---------- | ---------------------------- | ------------- | ---- | --- | ------- | ----- |
@@ -10,11 +12,12 @@ A key value storage
 | v          |                              | mediumtext    | YES  |     | NULL    |       |
 | updated_at | timestamp of the last update | int unsigned  | NO   |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields |
 | ------- | ------ |
 | PRIMARY | k      |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_locks.md

@@ -1,8 +1,10 @@
-# Table locks
+Table locks
+===========
 
 
 
-## Fields
+Fields
+------
 
 | Field   | Description                  | Type         | Null | Key | Default             | Extra          |
 | ------- | ---------------------------- | ------------ | ---- | --- | ------------------- | -------------- |
@@ -12,7 +14,8 @@
 | pid     | Process ID                   | int unsigned | NO   |     | 0                   |                |
 | expires | datetime of cache expiration | datetime     | NO   |     | 0001-01-01 00:00:00 |                |
 
-## Indexes
+Indexes
+------------
 
 | Name         | Fields        |
 | ------------ | ------------- |
@@ -20,4 +23,4 @@
 | name_expires | name, expires |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_mail.md

@@ -1,8 +1,10 @@
-# Table mail
+Table mail
+===========
 
 private messages
 
-## Fields
+Fields
+------
 
 | Field         | Description                                                    | Type               | Null | Key | Default             | Extra          |
 | ------------- | -------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
@@ -29,7 +31,8 @@ private messages
 | thr-parent-id | Id of the item-uri table that contains the thread parent uri   | int unsigned       | YES  |     | NULL                |                |
 | created       | creation time of the private message                           | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
-## Indexes
+Indexes
+------------
 
 | Name          | Fields         |
 | ------------- | -------------- |
@@ -44,14 +47,15 @@ private messages
 | parent-uri-id | parent-uri-id  |
 | thr-parent-id | thr-parent-id  |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
-| author-id | [contact](help/spec/database/db-contact) | id |
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| parent-uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| thr-parent-id | [item-uri](help/spec/database/db-item-uri) | id |
+| uid | [user](help/database/db_user) | uid |
+| author-id | [contact](help/database/db_contact) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| parent-uri-id | [item-uri](help/database/db_item-uri) | id |
+| thr-parent-id | [item-uri](help/database/db_item-uri) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_mailacct.md

@@ -1,8 +1,10 @@
-# Table mailacct
+Table mailacct
+===========
 
 Mail account data for fetching mails
 
-## Fields
+Fields
+------
 
 | Field        | Description   | Type               | Null | Key | Default             | Extra          |
 | ------------ | ------------- | ------------------ | ---- | --- | ------------------- | -------------- |
@@ -20,17 +22,19 @@ Mail account data for fetching mails
 | pubmail      |               | boolean            | NO   |     | 0                   |                |
 | last_check   |               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields |
 | ------- | ------ |
 | PRIMARY | id     |
 | uid     | uid    |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_manage.md

@@ -1,8 +1,10 @@
-# Table manage
+Table manage
+===========
 
 table of accounts that can manage each other
 
-## Fields
+Fields
+------
 
 | Field | Description   | Type               | Null | Key | Default | Extra          |
 | ----- | ------------- | ------------------ | ---- | --- | ------- | -------------- |
@@ -10,7 +12,8 @@ table of accounts that can manage each other
 | uid   | User id       | mediumint unsigned | NO   |     | 0       |                |
 | mid   | User id       | mediumint unsigned | NO   |     | 0       |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields           |
 | ------- | ---------------- |
@@ -18,11 +21,12 @@ table of accounts that can manage each other
 | uid_mid | UNIQUE, uid, mid |
 | mid     | mid              |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
-| mid | [user](help/spec/database/db-user) | uid |
+| uid | [user](help/database/db_user) | uid |
+| mid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_notification.md

@@ -1,8 +1,10 @@
-# Table notification
+Table notification
+===========
 
 notifications
 
-## Fields
+Fields
+------
 
 | Field         | Description                                                                    | Type               | Null | Key | Default | Extra          |
 | ------------- | ------------------------------------------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |
@@ -17,7 +19,8 @@ notifications
 | seen          | Seen on the desktop                                                            | boolean            | YES  |     | 0       |                |
 | dismissed     | Dismissed via the API                                                          | boolean            | YES  |     | 0       |                |
 
-## Indexes
+Indexes
+------------
 
 | Name                                | Fields                                          |
 | ----------------------------------- | ----------------------------------------------- |
@@ -30,14 +33,15 @@ notifications
 | seen_uid                            | seen, uid                                       |
 | uid_type_parent-uri-id_actor-id     | uid, type, parent-uri-id, actor-id              |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
-| vid | [verb](help/spec/database/db-verb) | id |
-| actor-id | [contact](help/spec/database/db-contact) | id |
-| target-uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| parent-uri-id | [item-uri](help/spec/database/db-item-uri) | id |
+| uid | [user](help/database/db_user) | uid |
+| vid | [verb](help/database/db_verb) | id |
+| actor-id | [contact](help/database/db_contact) | id |
+| target-uri-id | [item-uri](help/database/db_item-uri) | id |
+| parent-uri-id | [item-uri](help/database/db_item-uri) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_notify-threads.md

@@ -1,8 +1,10 @@
-# Table notify-threads
+Table notify-threads
+===========
 
 
 
-## Fields
+Fields
+------
 
 | Field                | Description                                   | Type               | Null | Key | Default | Extra          |
 | -------------------- | --------------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |
@@ -13,7 +15,8 @@
 | parent-item          |                                               | int unsigned       | NO   |     | 0       |                |
 | receiver-uid         | User id                                       | mediumint unsigned | NO   |     | 0       |                |
 
-## Indexes
+Indexes
+------------
 
 | Name                 | Fields               |
 | -------------------- | -------------------- |
@@ -22,12 +25,13 @@
 | receiver-uid         | receiver-uid         |
 | notify-id            | notify-id            |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| notify-id | [notify](help/spec/database/db-notify) | id |
-| master-parent-uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| receiver-uid | [user](help/spec/database/db-user) | uid |
+| notify-id | [notify](help/database/db_notify) | id |
+| master-parent-uri-id | [item-uri](help/database/db_item-uri) | id |
+| receiver-uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_notify.md

@@ -1,8 +1,10 @@
-# Table notify
+Table notify
+===========
 
 [Deprecated] User notifications
 
-## Fields
+Fields
+------
 
 | Field         | Description                                   | Type               | Null | Key | Default             | Extra          |
 | ------------- | --------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
@@ -25,7 +27,8 @@
 | name_cache    | Cached bbcode parsing of name                 | tinytext           | YES  |     | NULL                |                |
 | msg_cache     | Cached bbcode parsing of msg                  | mediumtext         | YES  |     | NULL                |                |
 
-## Indexes
+Indexes
+------------
 
 | Name          | Fields               |
 | ------------- | -------------------- |
@@ -36,12 +39,13 @@
 | uri-id        | uri-id               |
 | parent-uri-id | parent-uri-id        |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| parent-uri-id | [item-uri](help/spec/database/db-item-uri) | id |
+| uid | [user](help/database/db_user) | uid |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| parent-uri-id | [item-uri](help/database/db_item-uri) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_openwebauth-token.md

@@ -1,8 +1,10 @@
-# Table openwebauth-token
+Table openwebauth-token
+===========
 
 Store OpenWebAuth token to verify contacts
 
-## Fields
+Fields
+------
 
 | Field   | Description                | Type               | Null | Key | Default             | Extra          |
 | ------- | -------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
@@ -13,17 +15,19 @@ Store OpenWebAuth token to verify contacts
 | meta    |                            | varchar(255)       | NO   |     |                     |                |
 | created | datetime of creation       | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields |
 | ------- | ------ |
 | PRIMARY | id     |
 | uid     | uid    |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_parsed_url.md

@@ -1,8 +1,10 @@
-# Table parsed_url
+Table parsed_url
+===========
 
 cache for 'parse_url' queries
 
-## Fields
+Fields
+------
 
 | Field    | Description                                         | Type       | Null | Key | Default             | Extra |
 | -------- | --------------------------------------------------- | ---------- | ---- | --- | ------------------- | ----- |
@@ -14,7 +16,8 @@ cache for 'parse_url' queries
 | created  | datetime of creation                                | datetime   | NO   |     | 0001-01-01 00:00:00 |       |
 | expires  | datetime of expiration                              | datetime   | NO   |     | 0001-01-01 00:00:00 |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields                     |
 | ------- | -------------------------- |
@@ -23,4 +26,4 @@ cache for 'parse_url' queries
 | expires | expires                    |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_pconfig.md

@@ -1,8 +1,10 @@
-# Table pconfig
+Table pconfig
+===========
 
 personal (per user) configuration storage
 
-## Fields
+Fields
+------
 
 | Field | Description | Type               | Null | Key | Default | Extra          |
 | ----- | ----------- | ------------------ | ---- | --- | ------- | -------------- |
@@ -12,17 +14,19 @@ personal (per user) configuration storage
 | k     | Key         | varchar(100)       | NO   |     |         |                |
 | v     | Value       | mediumtext         | YES  |     | NULL    |                |
 
-## Indexes
+Indexes
+------------
 
 | Name      | Fields              |
 | --------- | ------------------- |
 | PRIMARY   | id                  |
 | uid_cat_k | UNIQUE, uid, cat, k |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_permissionset.md

@@ -1,8 +1,10 @@
-# Table permissionset
+Table permissionset
+===========
 
 
 
-## Fields
+Fields
+------
 
 | Field     | Description                                            | Type               | Null | Key | Default | Extra          |
 | --------- | ------------------------------------------------------ | ------------------ | ---- | --- | ------- | -------------- |
@@ -13,17 +15,19 @@
 | deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL    |                |
 | deny_gid  | Access Control - list of denied circles                | mediumtext         | YES  |     | NULL    |                |
 
-## Indexes
+Indexes
+------------
 
 | Name                                      | Fields                                                        |
 | ----------------------------------------- | ------------------------------------------------------------- |
 | PRIMARY                                   | id                                                            |
 | uid_allow_cid_allow_gid_deny_cid_deny_gid | uid, allow_cid(50), allow_gid(30), deny_cid(50), deny_gid(30) |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_photo.md

@@ -1,8 +1,10 @@
-# Table photo
+Table photo
+===========
 
 photo storage
 
-## Fields
+Fields
+------
 
 | Field         | Description                                                         | Type               | Null | Key | Default             | Extra          |
 | ------------- | ------------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
@@ -36,7 +38,8 @@ photo storage
 | backend-ref   | Storage backend data reference                                      | text               | YES  |     | NULL                |                |
 | updated       |                                                                     | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
-## Indexes
+Indexes
+------------
 
 | Name                          | Fields                               |
 | ----------------------------- | ------------------------------------ |
@@ -49,11 +52,12 @@ photo storage
 | resource-id                   | resource-id                          |
 | uid_photo-type                | uid, photo-type                      |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
-| contact-id | [contact](help/spec/database/db-contact) | id |
+| uid | [user](help/database/db_user) | uid |
+| contact-id | [contact](help/database/db_contact) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-activity.md

@@ -1,8 +1,10 @@
-# Table post-activity
+Table post-activity
+===========
 
 Original remote activity
 
-## Fields
+Fields
+------
 
 | Field    | Description                                               | Type         | Null | Key | Default | Extra |
 | -------- | --------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |
@@ -10,16 +12,18 @@ Original remote activity
 | activity | Original activity                                         | mediumtext   | YES  |     | NULL    |       |
 | received |                                                           | datetime     | YES  |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields |
 | ------- | ------ |
 | PRIMARY | uri-id |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-category.md

@@ -1,8 +1,10 @@
-# Table post-category
+Table post-category
+===========
 
 post relation to categories
 
-## Fields
+Fields
+------
 
 | Field  | Description                                               | Type               | Null | Key | Default | Extra |
 | ------ | --------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
@@ -11,7 +13,8 @@ post relation to categories
 | type   |                                                           | tinyint unsigned   | NO   | PRI | 0       |       |
 | tid    |                                                           | int unsigned       | NO   | PRI | 0       |       |
 
-## Indexes
+Indexes
+------------
 
 | Name       | Fields                 |
 | ---------- | ---------------------- |
@@ -19,12 +22,13 @@ post relation to categories
 | tid        | tid                    |
 | uid_uri-id | uid, uri-id            |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| uid | [user](help/spec/database/db-user) | uid |
-| tid | [tag](help/spec/database/db-tag) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| uid | [user](help/database/db_user) | uid |
+| tid | [tag](help/database/db_tag) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-collection.md

@@ -1,8 +1,10 @@
-# Table post-collection
+Table post-collection
+===========
 
 Collection of posts
 
-## Fields
+Fields
+------
 
 | Field     | Description                                               | Type             | Null | Key | Default | Extra |
 | --------- | --------------------------------------------------------- | ---------------- | ---- | --- | ------- | ----- |
@@ -10,7 +12,8 @@ Collection of posts
 | type      | 0 - Featured                                              | tinyint unsigned | NO   | PRI | 0       |       |
 | author-id | Author of the featured post                               | int unsigned     | YES  |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name      | Fields       |
 | --------- | ------------ |
@@ -18,11 +21,12 @@ Collection of posts
 | type      | type         |
 | author-id | author-id    |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| author-id | [contact](help/spec/database/db-contact) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| author-id | [contact](help/database/db_contact) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-content.md

@@ -1,14 +1,16 @@
-# Table post-content
+Table post-content
+===========
 
 Content for all posts
 
-## Fields
+Fields
+------
 
 | Field           | Description                                                                                                               | Type           | Null | Key | Default | Extra |
 | --------------- | ------------------------------------------------------------------------------------------------------------------------- | -------------- | ---- | --- | ------- | ----- |
 | uri-id          | Id of the item-uri table entry that contains the item uri                                                                 | int unsigned   | NO   | PRI | NULL    |       |
 | title           | item title                                                                                                                | varchar(255)   | NO   |     |         |       |
-| content-warning |                                                                                                                           | varchar(500)   | NO   |     |         |       |
+| content-warning |                                                                                                                           | varchar(255)   | NO   |     |         |       |
 | body            | item body content                                                                                                         | mediumtext     | YES  |     | NULL    |       |
 | raw-body        | Body without embedded media links                                                                                         | mediumtext     | YES  |     | NULL    |       |
 | quote-uri-id    | Id of the item-uri table that contains the quoted uri                                                                     | int unsigned   | YES  |     | NULL    |       |
@@ -26,7 +28,8 @@ Content for all posts
 | resource-id     | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32)    | NO   |     |         |       |
 | plink           | permalink or URL to a displayable copy of the message at its source                                                       | varbinary(383) | NO   |     |         |       |
 
-## Indexes
+Indexes
+------------
 
 | Name         | Fields       |
 | ------------ | ------------ |
@@ -35,11 +38,12 @@ Content for all posts
 | resource-id  | resource-id  |
 | quote-uri-id | quote-uri-id |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| quote-uri-id | [item-uri](help/spec/database/db-item-uri) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| quote-uri-id | [item-uri](help/database/db_item-uri) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-counts.md

@@ -1,8 +1,10 @@
-# Table post-counts
+Table post-counts
+===========
 
 Original remote activity
 
-## Fields
+Fields
+------
 
 | Field         | Description                                                 | Type              | Null | Key | Default | Extra |
 | ------------- | ----------------------------------------------------------- | ----------------- | ---- | --- | ------- | ----- |
@@ -12,7 +14,8 @@ Original remote activity
 | parent-uri-id | Id of the item-uri table that contains the parent uri       | int unsigned      | YES  |     | NULL    |       |
 | count         | Number of activities                                        | int unsigned      | YES  |     | 0       |       |
 
-## Indexes
+Indexes
+------------
 
 | Name          | Fields                |
 | ------------- | --------------------- |
@@ -20,12 +23,13 @@ Original remote activity
 | vid           | vid                   |
 | parent-uri-id | parent-uri-id         |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| vid | [verb](help/spec/database/db-verb) | id |
-| parent-uri-id | [item-uri](help/spec/database/db-item-uri) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| vid | [verb](help/database/db_verb) | id |
+| parent-uri-id | [item-uri](help/database/db_item-uri) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-delivery-data.md

@@ -1,8 +1,10 @@
-# Table post-delivery-data
+Table post-delivery-data
+===========
 
 Delivery data for items
 
-## Fields
+Fields
+------
 
 | Field        | Description                                                                                                                                                | Type         | Null | Key | Default | Extra |
 | ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |
@@ -17,16 +19,18 @@ Delivery data for items
 | legacy_dfrn  | Number of successful deliveries via legacy DFRN                                                                                                            | mediumint    | NO   |     | 0       |       |
 | diaspora     | Number of successful deliveries via Diaspora                                                                                                               | mediumint    | NO   |     | 0       |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields |
 | ------- | ------ |
 | PRIMARY | uri-id |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-delivery.md

@@ -1,8 +1,10 @@
-# Table post-delivery
+Table post-delivery
+===========
 
 Delivery data for posts for the batch processing
 
-## Fields
+Fields
+------
 
 | Field     | Description                                               | Type               | Null | Key | Default             | Extra |
 | --------- | --------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | ----- |
@@ -14,7 +16,8 @@ Delivery data for posts for the batch processing
 | failed    | Number of times the delivery has failed                   | tinyint            | YES  |     | 0                   |       |
 | receivers | JSON encoded array with the receiving contacts            | mediumtext         | YES  |     | NULL                |       |
 
-## Indexes
+Indexes
+------------
 
 | Name             | Fields            |
 | ---------------- | ----------------- |
@@ -22,12 +25,13 @@ Delivery data for posts for the batch processing
 | inbox-id_created | inbox-id, created |
 | uid              | uid               |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| inbox-id | [item-uri](help/spec/database/db-item-uri) | id |
-| uid | [user](help/spec/database/db-user) | uid |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| inbox-id | [item-uri](help/database/db_item-uri) | id |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-engagement.md

@@ -1,8 +1,10 @@
-# Table post-engagement
+Table post-engagement
+===========
 
 Engagement data per post
 
-## Fields
+Fields
+------
 
 | Field        | Description                                                           | Type               | Null | Key | Default | Extra |
 | ------------ | --------------------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
@@ -19,7 +21,8 @@ Engagement data per post
 | comments     | Number of comments                                                    | mediumint unsigned | YES  |     | NULL    |       |
 | activities   | Number of activities (like, dislike, ...)                             | mediumint unsigned | YES  |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name       | Fields               |
 | ---------- | -------------------- |
@@ -28,11 +31,12 @@ Engagement data per post
 | created    | created              |
 | searchtext | FULLTEXT, searchtext |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| owner-id | [contact](help/spec/database/db-contact) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| owner-id | [contact](help/database/db_contact) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-history.md

@@ -1,22 +1,22 @@
-# Table post-history
+Table post-history
+===========
 
 Post history
 
-## Fields
+Fields
+------
 
 | Field           | Description                                                                                                               | Type           | Null | Key | Default             | Extra |
 | --------------- | ------------------------------------------------------------------------------------------------------------------------- | -------------- | ---- | --- | ------------------- | ----- |
 | uri-id          | Id of the item-uri table entry that contains the item uri                                                                 | int unsigned   | NO   | PRI | NULL                |       |
 | edited          | Date of edit                                                                                                              | datetime       | NO   | PRI | 0001-01-01 00:00:00 |       |
 | title           | item title                                                                                                                | varchar(255)   | NO   |     |                     |       |
-| content-warning |                                                                                                                           | varchar(500)   | NO   |     |                     |       |
+| content-warning |                                                                                                                           | varchar(255)   | NO   |     |                     |       |
 | body            | item body content                                                                                                         | mediumtext     | YES  |     | NULL                |       |
 | raw-body        | Body without embedded media links                                                                                         | mediumtext     | YES  |     | NULL                |       |
-| quote-uri-id    | Id of the item-uri table that contains the quoted uri                                                                     | int unsigned   | YES  |     | NULL                |       |
 | location        | text location where this item originated                                                                                  | varchar(255)   | NO   |     |                     |       |
 | coord           | longitude/latitude pair representing location where this item originated                                                  | varchar(255)   | NO   |     |                     |       |
 | language        | Language information about this post                                                                                      | text           | YES  |     | NULL                |       |
-| sensitive       | If true, this post contains sensitive content                                                                             | boolean        | YES  |     | NULL                |       |
 | app             | application which generated this item                                                                                     | varchar(255)   | NO   |     |                     |       |
 | rendered-hash   |                                                                                                                           | varchar(32)    | NO   |     |                     |       |
 | rendered-html   | item.body converted to html                                                                                               | mediumtext     | YES  |     | NULL                |       |
@@ -27,18 +27,18 @@ Post history
 | resource-id     | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32)    | NO   |     |                     |       |
 | plink           | permalink or URL to a displayable copy of the message at its source                                                       | varbinary(383) | NO   |     |                     |       |
 
-## Indexes
+Indexes
+------------
 
-| Name         | Fields         |
-| ------------ | -------------- |
-| PRIMARY      | uri-id, edited |
-| quote-uri-id | quote-uri-id   |
+| Name    | Fields         |
+| ------- | -------------- |
+| PRIMARY | uri-id, edited |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| quote-uri-id | [item-uri](help/spec/database/db-item-uri) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-link.md

@@ -1,8 +1,10 @@
-# Table post-link
+Table post-link
+===========
 
 Post related external links
 
-## Fields
+Fields
+------
 
 | Field    | Description                                               | Type              | Null | Key | Default | Extra          |
 | -------- | --------------------------------------------------------- | ----------------- | ---- | --- | ------- | -------------- |
@@ -14,17 +16,19 @@ Post related external links
 | width    | Width of the media                                        | smallint unsigned | YES  |     | NULL    |                |
 | blurhash | BlurHash representation of the link                       | varbinary(255)    | YES  |     | NULL    |                |
 
-## Indexes
+Indexes
+------------
 
 | Name       | Fields              |
 | ---------- | ------------------- |
 | PRIMARY    | id                  |
 | uri-id-url | UNIQUE, uri-id, url |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-media.md

@@ -1,8 +1,10 @@
-# Table post-media
+Table post-media
+===========
 
 Attached media
 
-## Fields
+Fields
+------
 
 | Field           | Description                                                                         | Type              | Null | Key | Default | Extra          |
 | --------------- | ----------------------------------------------------------------------------------- | ----------------- | ---- | --- | ------- | -------------- |
@@ -35,13 +37,12 @@ Attached media
 | embed-html      | HTML embed code for this media                                                      | text              | YES  |     | NULL    |                |
 | embed-height    | Height of the embed                                                                 | smallint unsigned | YES  |     | NULL    |                |
 | embed-width     | Width of the embed                                                                  | smallint unsigned | YES  |     | NULL    |                |
-| page-type       | Type of the page (e.g. article, website)                                            | varchar(30)       | YES  |     | NULL    |                |
-| schematypes     | Schema types of the page as JSON string                                             | varchar(255)      | YES  |     | NULL    |                |
 | language        | Language information about this media in the ISO 639 format                         | char(3)           | YES  |     | NULL    |                |
 | published       | Publification date of this media                                                    | datetime          | YES  |     | NULL    |                |
 | modified        | Modification date of this media                                                     | datetime          | YES  |     | NULL    |                |
 
-## Indexes
+Indexes
+------------
 
 | Name         | Fields                   |
 | ------------ | ------------------------ |
@@ -51,12 +52,13 @@ Attached media
 | media-uri-id | media-uri-id             |
 | attach-id    | attach-id                |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| media-uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| attach-id | [attach](help/spec/database/db-attach) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| media-uri-id | [item-uri](help/database/db_item-uri) | id |
+| attach-id | [attach](help/database/db_attach) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-origin.md

@@ -1,8 +1,10 @@
-# Table post-origin
+Table post-origin
+===========
 
 Posts from local users
 
-## Fields
+Fields
+------
 
 | Field         | Description                                                  | Type               | Null | Key | Default             | Extra |
 | ------------- | ------------------------------------------------------------ | ------------------ | ---- | --- | ------------------- | ----- |
@@ -18,7 +20,8 @@ Posts from local users
 | private       | 0=public, 1=private, 2=unlisted                              | tinyint unsigned   | NO   |     | 0                   |       |
 | wall          | This item was posted to the wall of uid                      | boolean            | NO   |     | 0                   |       |
 
-## Indexes
+Indexes
+------------
 
 | Name              | Fields              |
 | ----------------- | ------------------- |
@@ -31,14 +34,15 @@ Posts from local users
 | parent-uri-id_uid | parent-uri-id, uid  |
 | uid_wall_received | uid, wall, received |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| uid | [user](help/spec/database/db-user) | uid |
-| parent-uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| thr-parent-id | [item-uri](help/spec/database/db-item-uri) | id |
-| vid | [verb](help/spec/database/db-verb) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| uid | [user](help/database/db_user) | uid |
+| parent-uri-id | [item-uri](help/database/db_item-uri) | id |
+| thr-parent-id | [item-uri](help/database/db_item-uri) | id |
+| vid | [verb](help/database/db_verb) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-question-option.md

@@ -1,8 +1,10 @@
-# Table post-question-option
+Table post-question-option
+===========
 
 Question option
 
-## Fields
+Fields
+------
 
 | Field   | Description                                               | Type         | Null | Key | Default | Extra |
 | ------- | --------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |
@@ -11,16 +13,18 @@ Question option
 | name    | Name of the option                                        | varchar(255) | YES  |     | NULL    |       |
 | replies | Number of replies for this question option                | int unsigned | YES  |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields     |
 | ------- | ---------- |
 | PRIMARY | uri-id, id |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-question.md

@@ -1,8 +1,10 @@
-# Table post-question
+Table post-question
+===========
 
 Question
 
-## Fields
+Fields
+------
 
 | Field    | Description                                               | Type         | Null | Key | Default             | Extra          |
 | -------- | --------------------------------------------------------- | ------------ | ---- | --- | ------------------- | -------------- |
@@ -12,17 +14,19 @@ Question
 | voters   | Number of voters for this question                        | int unsigned | YES  |     | NULL                |                |
 | end-time | Question end time                                         | datetime     | YES  |     | 0001-01-01 00:00:00 |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields         |
 | ------- | -------------- |
 | PRIMARY | id             |
 | uri-id  | UNIQUE, uri-id |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-searchindex.md

@@ -1,8 +1,10 @@
-# Table post-searchindex
+Table post-searchindex
+===========
 
 Content for all posts
 
-## Fields
+Fields
+------
 
 | Field      | Description                                                           | Type         | Null | Key | Default | Extra |
 | ---------- | --------------------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |
@@ -15,7 +17,8 @@ Content for all posts
 | created    |                                                                       | datetime     | YES  |     | NULL    |       |
 | restricted | If true, this post is either unlisted or not from a federated network | boolean      | NO   |     | 0       |       |
 
-## Indexes
+Indexes
+------------
 
 | Name       | Fields               |
 | ---------- | -------------------- |
@@ -24,11 +27,12 @@ Content for all posts
 | created    | created              |
 | searchtext | FULLTEXT, searchtext |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| owner-id | [contact](help/spec/database/db-contact) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| owner-id | [contact](help/database/db_contact) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-tag.md

@@ -1,8 +1,10 @@
-# Table post-tag
+Table post-tag
+===========
 
 post relation to tags
 
-## Fields
+Fields
+------
 
 | Field  | Description                                               | Type             | Null | Key | Default | Extra |
 | ------ | --------------------------------------------------------- | ---------------- | ---- | --- | ------- | ----- |
@@ -11,7 +13,8 @@ post relation to tags
 | tid    |                                                           | int unsigned     | NO   | PRI | 0       |       |
 | cid    | Contact id of the mentioned public contact                | int unsigned     | NO   | PRI | 0       |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields                 |
 | ------- | ---------------------- |
@@ -19,12 +22,13 @@ post relation to tags
 | tid     | tid                    |
 | cid     | cid                    |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| tid | [tag](help/spec/database/db-tag) | id |
-| cid | [contact](help/spec/database/db-contact) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| tid | [tag](help/database/db_tag) | id |
+| cid | [contact](help/database/db_contact) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-thread-user.md

@@ -1,8 +1,10 @@
-# Table post-thread-user
+Table post-thread-user
+===========
 
 Thread related data per user
 
-## Fields
+Fields
+------
 
 | Field           | Description                                                                                             | Type               | Null | Key | Default             | Extra |
 | --------------- | ------------------------------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | ----- |
@@ -32,7 +34,8 @@ Thread related data per user
 | psid            | ID of the permission set of this post                                                                   | int unsigned       | YES  |     | NULL                |       |
 | post-user-id    | Id of the post-user table                                                                               | int unsigned       | YES  |     | NULL                |       |
 
-## Indexes
+Indexes
+------------
 
 | Name                 | Fields                |
 | -------------------- | --------------------- |
@@ -61,19 +64,20 @@ Thread related data per user
 | contact-id_received  | contact-id, received  |
 | contact-id_created   | contact-id, created   |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| context-id | [item-uri](help/spec/database/db-item-uri) | id |
-| conversation-id | [item-uri](help/spec/database/db-item-uri) | id |
-| owner-id | [contact](help/spec/database/db-contact) | id |
-| author-id | [contact](help/spec/database/db-contact) | id |
-| causer-id | [contact](help/spec/database/db-contact) | id |
-| uid | [user](help/spec/database/db-user) | uid |
-| contact-id | [contact](help/spec/database/db-contact) | id |
-| psid | [permissionset](help/spec/database/db-permissionset) | id |
-| post-user-id | [post-user](help/spec/database/db-post-user) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| context-id | [item-uri](help/database/db_item-uri) | id |
+| conversation-id | [item-uri](help/database/db_item-uri) | id |
+| owner-id | [contact](help/database/db_contact) | id |
+| author-id | [contact](help/database/db_contact) | id |
+| causer-id | [contact](help/database/db_contact) | id |
+| uid | [user](help/database/db_user) | uid |
+| contact-id | [contact](help/database/db_contact) | id |
+| psid | [permissionset](help/database/db_permissionset) | id |
+| post-user-id | [post-user](help/database/db_post-user) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-thread.md

@@ -1,8 +1,10 @@
-# Table post-thread
+Table post-thread
+===========
 
 Thread related data
 
-## Fields
+Fields
+------
 
 | Field           | Description                                                                                             | Type         | Null | Key | Default             | Extra |
 | --------------- | ------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------------------- | ----- |
@@ -18,7 +20,8 @@ Thread related data
 | changed         | Date that something in the conversation changed, indicating clients should fetch the conversation again | datetime     | NO   |     | 0001-01-01 00:00:00 |       |
 | commented       |                                                                                                         | datetime     | NO   |     | 0001-01-01 00:00:00 |       |
 
-## Indexes
+Indexes
+------------
 
 | Name            | Fields          |
 | --------------- | --------------- |
@@ -31,15 +34,16 @@ Thread related data
 | received        | received        |
 | commented       | commented       |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| context-id | [item-uri](help/spec/database/db-item-uri) | id |
-| conversation-id | [item-uri](help/spec/database/db-item-uri) | id |
-| owner-id | [contact](help/spec/database/db-contact) | id |
-| author-id | [contact](help/spec/database/db-contact) | id |
-| causer-id | [contact](help/spec/database/db-contact) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| context-id | [item-uri](help/database/db_item-uri) | id |
+| conversation-id | [item-uri](help/database/db_item-uri) | id |
+| owner-id | [contact](help/database/db_contact) | id |
+| author-id | [contact](help/database/db_contact) | id |
+| causer-id | [contact](help/database/db_contact) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-user-notification.md

@@ -1,8 +1,10 @@
-# Table post-user-notification
+Table post-user-notification
+===========
 
 User post notifications
 
-## Fields
+Fields
+------
 
 | Field             | Description                                               | Type               | Null | Key | Default | Extra |
 | ----------------- | --------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
@@ -10,18 +12,20 @@ User post notifications
 | uid               | Owner id which owns this copy of the item                 | mediumint unsigned | NO   | PRI | NULL    |       |
 | notification-type |                                                           | smallint unsigned  | NO   |     | 0       |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields      |
 | ------- | ----------- |
 | PRIMARY | uid, uri-id |
 | uri-id  | uri-id      |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| uid | [user](help/spec/database/db-user) | uid |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post-user.md

@@ -1,8 +1,10 @@
-# Table post-user
+Table post-user
+===========
 
 User specific post data
 
-## Fields
+Fields
+------
 
 | Field             | Description                                                                          | Type               | Null | Key | Default             | Extra          |
 | ----------------- | ------------------------------------------------------------------------------------ | ------------------ | ---- | --- | ------------------- | -------------- |
@@ -39,7 +41,8 @@ User specific post data
 | origin            | item originated at this site                                                         | boolean            | NO   |     | 0                   |                |
 | psid              | ID of the permission set of this post                                                | int unsigned       | YES  |     | NULL                |                |
 
-## Indexes
+Indexes
+------------
 
 | Name                  | Fields                  |
 | --------------------- | ----------------------- |
@@ -67,22 +70,23 @@ User specific post data
 | uid_unseen            | uid, unseen             |
 | uid_hidden_uri-id     | uid, hidden, uri-id     |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| parent-uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| thr-parent-id | [item-uri](help/spec/database/db-item-uri) | id |
-| external-id | [item-uri](help/spec/database/db-item-uri) | id |
-| replies-id | [item-uri](help/spec/database/db-item-uri) | id |
-| owner-id | [contact](help/spec/database/db-contact) | id |
-| author-id | [contact](help/spec/database/db-contact) | id |
-| causer-id | [contact](help/spec/database/db-contact) | id |
-| vid | [verb](help/spec/database/db-verb) | id |
-| uid | [user](help/spec/database/db-user) | uid |
-| contact-id | [contact](help/spec/database/db-contact) | id |
-| event-id | [event](help/spec/database/db-event) | id |
-| psid | [permissionset](help/spec/database/db-permissionset) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| parent-uri-id | [item-uri](help/database/db_item-uri) | id |
+| thr-parent-id | [item-uri](help/database/db_item-uri) | id |
+| external-id | [item-uri](help/database/db_item-uri) | id |
+| replies-id | [item-uri](help/database/db_item-uri) | id |
+| owner-id | [contact](help/database/db_contact) | id |
+| author-id | [contact](help/database/db_contact) | id |
+| causer-id | [contact](help/database/db_contact) | id |
+| vid | [verb](help/database/db_verb) | id |
+| uid | [user](help/database/db_user) | uid |
+| contact-id | [contact](help/database/db_contact) | id |
+| event-id | [event](help/database/db_event) | id |
+| psid | [permissionset](help/database/db_permissionset) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_post.md

@@ -1,8 +1,10 @@
-# Table post
+Table post
+===========
 
 Structure for all posts
 
-## Fields
+Fields
+------
 
 | Field         | Description                                                                          | Type              | Null | Key | Default             | Extra |
 | ------------- | ------------------------------------------------------------------------------------ | ----------------- | ---- | --- | ------------------- | ----- |
@@ -26,7 +28,8 @@ Structure for all posts
 | visible       |                                                                                      | boolean           | NO   |     | 0                   |       |
 | deleted       | item has been marked for deletion                                                    | boolean           | NO   |     | 0                   |       |
 
-## Indexes
+Indexes
+------------
 
 | Name          | Fields        |
 | ------------- | ------------- |
@@ -40,18 +43,19 @@ Structure for all posts
 | causer-id     | causer-id     |
 | vid           | vid           |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| parent-uri-id | [item-uri](help/spec/database/db-item-uri) | id |
-| thr-parent-id | [item-uri](help/spec/database/db-item-uri) | id |
-| external-id | [item-uri](help/spec/database/db-item-uri) | id |
-| replies-id | [item-uri](help/spec/database/db-item-uri) | id |
-| owner-id | [contact](help/spec/database/db-contact) | id |
-| author-id | [contact](help/spec/database/db-contact) | id |
-| causer-id | [contact](help/spec/database/db-contact) | id |
-| vid | [verb](help/spec/database/db-verb) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| parent-uri-id | [item-uri](help/database/db_item-uri) | id |
+| thr-parent-id | [item-uri](help/database/db_item-uri) | id |
+| external-id | [item-uri](help/database/db_item-uri) | id |
+| replies-id | [item-uri](help/database/db_item-uri) | id |
+| owner-id | [contact](help/database/db_contact) | id |
+| author-id | [contact](help/database/db_contact) | id |
+| causer-id | [contact](help/database/db_contact) | id |
+| vid | [verb](help/database/db_verb) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_process.md

@@ -1,8 +1,10 @@
-# Table process
+Table process
+===========
 
 Currently running system processes
 
-## Fields
+Fields
+------
 
 | Field    | Description                                | Type          | Null | Key | Default             | Extra |
 | -------- | ------------------------------------------ | ------------- | ---- | --- | ------------------- | ----- |
@@ -11,7 +13,8 @@ Currently running system processes
 | command  |                                            | varbinary(32) | NO   |     |                     |       |
 | created  |                                            | datetime      | NO   |     | 0001-01-01 00:00:00 |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields        |
 | ------- | ------------- |
@@ -19,4 +22,4 @@ Currently running system processes
 | command | command       |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_profile.md

@@ -1,8 +1,10 @@
-# Table profile
+Table profile
+===========
 
 user profiles data
 
-## Fields
+Fields
+------
 
 | Field             | Description                                                    | Type               | Null | Key | Default    | Extra          |
 | ----------------- | -------------------------------------------------------------- | ------------------ | ---- | --- | ---------- | -------------- |
@@ -51,17 +53,19 @@ user profiles data
 | publish           | publish default profile in local directory                     | boolean            | NO   |     | 0          |                |
 | net-publish       | publish profile in global directory                            | boolean            | NO   |     | 0          |                |
 
-## Indexes
+Indexes
+------------
 
 | Name           | Fields          |
 | -------------- | --------------- |
 | PRIMARY        | id              |
 | uid_is-default | uid, is-default |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_profile_field.md

@@ -1,8 +1,10 @@
-# Table profile_field
+Table profile_field
+===========
 
 Custom profile fields
 
-## Fields
+Fields
+------
 
 | Field   | Description                                                 | Type               | Null | Key | Default             | Extra          |
 | ------- | ----------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
@@ -15,7 +17,8 @@ Custom profile fields
 | created | creation time                                               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 | edited  | last edit time                                              | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields |
 | ------- | ------ |
@@ -24,11 +27,12 @@ Custom profile fields
 | order   | order  |
 | psid    | psid   |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
-| psid | [permissionset](help/spec/database/db-permissionset) | id |
+| uid | [user](help/database/db_user) | uid |
+| psid | [permissionset](help/database/db_permissionset) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_register.md

@@ -1,8 +1,10 @@
-# Table register
+Table register
+===========
 
 registrations requiring admin approval
 
-## Fields
+Fields
+------
 
 | Field    | Description   | Type               | Null | Key | Default             | Extra          |
 | -------- | ------------- | ------------------ | ---- | --- | ------------------- | -------------- |
@@ -14,17 +16,19 @@ registrations requiring admin approval
 | language |               | varchar(16)        | NO   |     |                     |                |
 | note     |               | text               | YES  |     | NULL                |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields |
 | ------- | ------ |
 | PRIMARY | id     |
 | uid     | uid    |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_report-post.md

@@ -1,8 +1,10 @@
-# Table report-post
+Table report-post
+===========
 
 Individual posts attached to a moderation report
 
-## Fields
+Fields
+------
 
 | Field  | Description                 | Type             | Null | Key | Default | Extra |
 | ------ | --------------------------- | ---------------- | ---- | --- | ------- | ----- |
@@ -10,18 +12,20 @@ Individual posts attached to a moderation report
 | uri-id | Uri-id of the reported post | int unsigned     | NO   | PRI | NULL    |       |
 | status | Status of the reported post | tinyint unsigned | YES  |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields      |
 | ------- | ----------- |
 | PRIMARY | rid, uri-id |
 | uri-id  | uri-id      |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| rid | [report](help/spec/database/db-report) | id |
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
+| rid | [report](help/database/db_report) | id |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_report-rule.md

@@ -1,8 +1,10 @@
-# Table report-rule
+Table report-rule
+===========
 
 Terms of service rule lines relevant to a moderation report
 
-## Fields
+Fields
+------
 
 | Field   | Description                                                               | Type         | Null | Key | Default | Extra |
 | ------- | ------------------------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |
@@ -10,16 +12,18 @@ Terms of service rule lines relevant to a moderation report
 | line-id | Terms of service rule line number, may become invalid after a TOS change. | int unsigned | NO   | PRI | NULL    |       |
 | text    | Terms of service rule text recorded at the time of the report             | text         | NO   |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields       |
 | ------- | ------------ |
 | PRIMARY | rid, line-id |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| rid | [report](help/spec/database/db-report) | id |
+| rid | [report](help/database/db_report) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_report.md

@@ -1,8 +1,10 @@
-# Table report
+Table report
+===========
 
 
 
-## Fields
+Fields
+------
 
 | Field           | Description                                                  | Type               | Null | Key | Default                    | Extra          |
 | --------------- | ------------------------------------------------------------ | ------------------ | ---- | --- | -------------------------- | -------------- |
@@ -23,7 +25,8 @@
 | created         |                                                              | datetime(6)        | NO   |     | 0001-01-01 00:00:00.000000 |                |
 | edited          | Last time the report has been edited                         | datetime(6)        | YES  |     | NULL                       |                |
 
-## Indexes
+Indexes
+------------
 
 | Name              | Fields             |
 | ----------------- | ------------------ |
@@ -38,15 +41,16 @@
 | created           | created            |
 | edited            | edited             |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
-| reporter-id | [contact](help/spec/database/db-contact) | id |
-| cid | [contact](help/spec/database/db-contact) | id |
-| gsid | [gserver](help/spec/database/db-gserver) | id |
-| last-editor-uid | [user](help/spec/database/db-user) | uid |
-| assigned-uid | [user](help/spec/database/db-user) | uid |
+| uid | [user](help/database/db_user) | uid |
+| reporter-id | [contact](help/database/db_contact) | id |
+| cid | [contact](help/database/db_contact) | id |
+| gsid | [gserver](help/database/db_gserver) | id |
+| last-editor-uid | [user](help/database/db_user) | uid |
+| assigned-uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_search.md

@@ -1,8 +1,10 @@
-# Table search
+Table search
+===========
 
 
 
-## Fields
+Fields
+------
 
 | Field | Description   | Type               | Null | Key | Default | Extra          |
 | ----- | ------------- | ------------------ | ---- | --- | ------- | -------------- |
@@ -10,7 +12,8 @@
 | uid   | User id       | mediumint unsigned | NO   |     | 0       |                |
 | term  |               | varchar(255)       | NO   |     |         |                |
 
-## Indexes
+Indexes
+------------
 
 | Name     | Fields        |
 | -------- | ------------- |
@@ -18,10 +21,11 @@
 | uid_term | uid, term(64) |
 | term     | term(64)      |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_session.md

@@ -1,8 +1,10 @@
-# Table session
+Table session
+===========
 
 web session storage
 
-## Fields
+Fields
+------
 
 | Field  | Description   | Type            | Null | Key | Default | Extra          |
 | ------ | ------------- | --------------- | ---- | --- | ------- | -------------- |
@@ -11,7 +13,8 @@ web session storage
 | data   |               | text            | YES  |     | NULL    |                |
 | expire |               | int unsigned    | NO   |     | 0       |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields  |
 | ------- | ------- |
@@ -20,4 +23,4 @@ web session storage
 | expire  | expire  |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_storage.md

@@ -1,19 +1,22 @@
-# Table storage
+Table storage
+===========
 
 Data stored by Database storage backend
 
-## Fields
+Fields
+------
 
 | Field | Description                    | Type         | Null | Key | Default | Extra          |
 | ----- | ------------------------------ | ------------ | ---- | --- | ------- | -------------- |
 | id    | Auto incremented image data id | int unsigned | NO   | PRI | NULL    | auto_increment |
 | data  | file data                      | longblob     | NO   |     | NULL    |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields |
 | ------- | ------ |
 | PRIMARY | id     |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_subscription.md

@@ -1,8 +1,10 @@
-# Table subscription
+Table subscription
+===========
 
 Push Subscription for the API
 
-## Fields
+Fields
+------
 
 | Field          | Description                    | Type               | Null | Key | Default | Extra          |
 | -------------- | ------------------------------ | ------------------ | ---- | --- | ------- | -------------- |
@@ -20,7 +22,8 @@ Push Subscription for the API
 | follow_request |                                | boolean            | YES  |     | NULL    |                |
 | status         |                                | boolean            | YES  |     | NULL    |                |
 
-## Indexes
+Indexes
+------------
 
 | Name               | Fields                      |
 | ------------------ | --------------------------- |
@@ -28,11 +31,12 @@ Push Subscription for the API
 | application-id_uid | UNIQUE, application-id, uid |
 | uid_application-id | uid, application-id         |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| application-id | [application](help/spec/database/db-application) | id |
-| uid | [user](help/spec/database/db-user) | uid |
+| application-id | [application](help/database/db_application) | id |
+| uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_tag.md

@@ -1,8 +1,10 @@
-# Table tag
+Table tag
+===========
 
 tags and mentions
 
-## Fields
+Fields
+------
 
 | Field | Description                                                                   | Type             | Null | Key | Default | Extra          |
 | ----- | ----------------------------------------------------------------------------- | ---------------- | ---- | --- | ------- | -------------- |
@@ -11,7 +13,8 @@ tags and mentions
 | url   |                                                                               | varbinary(383)   | NO   |     |         |                |
 | type  | Type of the tag (Unknown, General Collection, Follower Collection or Account) | tinyint unsigned | YES  |     | NULL    |                |
 
-## Indexes
+Indexes
+------------
 
 | Name          | Fields            |
 | ------------- | ----------------- |
@@ -20,4 +23,4 @@ tags and mentions
 | url           | url               |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_user-contact.md

@@ -1,8 +1,10 @@
-# Table user-contact
+Table user-contact
+===========
 
 User specific public contact data
 
-## Fields
+Fields
+------
 
 | Field                     | Description                                                                | Type               | Null | Key | Default | Extra |
 | ------------------------- | -------------------------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
@@ -28,7 +30,8 @@ User specific public contact data
 | rating                    | Automatically detected feed poll frequency                                 | tinyint            | YES  |     | NULL    |       |
 | priority                  | Feed poll priority                                                         | tinyint unsigned   | YES  |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name       | Fields              |
 | ---------- | ------------------- |
@@ -36,12 +39,13 @@ User specific public contact data
 | cid        | cid                 |
 | uri-id_uid | UNIQUE, uri-id, uid |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| cid | [contact](help/spec/database/db-contact) | id |
-| uid | [user](help/spec/database/db-user) | uid |
-| uri-id | [item-uri](help/spec/database/db-item-uri) | id |
+| cid | [contact](help/database/db_contact) | id |
+| uid | [user](help/database/db_user) | uid |
+| uri-id | [item-uri](help/database/db_item-uri) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_user-gserver.md

@@ -1,8 +1,10 @@
-# Table user-gserver
+Table user-gserver
+===========
 
 User settings about remote servers
 
-## Fields
+Fields
+------
 
 | Field   | Description                              | Type               | Null | Key | Default | Extra |
 | ------- | ---------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
@@ -10,18 +12,20 @@ User settings about remote servers
 | gsid    | Gserver id                               | int unsigned       | NO   | PRI | 0       |       |
 | ignored | server accounts are ignored for the user | boolean            | NO   |     | 0       |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields    |
 | ------- | --------- |
 | PRIMARY | uid, gsid |
 | gsid    | gsid      |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| uid | [user](help/spec/database/db-user) | uid |
-| gsid | [gserver](help/spec/database/db-gserver) | id |
+| uid | [user](help/database/db_user) | uid |
+| gsid | [gserver](help/database/db_gserver) | id |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_user.md

@@ -1,8 +1,10 @@
-# Table user
+Table user
+===========
 
 The local users
 
-## Fields
+Fields
+------
 
 | Field                    | Description                                                                       | Type               | Null | Key | Default             | Extra          |
 | ------------------------ | --------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
@@ -49,7 +51,8 @@ The local users
 | deny_gid                 | default permission for this user                                                  | mediumtext         | YES  |     | NULL                |                |
 | openidserver             |                                                                                   | text               | YES  |     | NULL                |                |
 
-## Indexes
+Indexes
+------------
 
 | Name       | Fields       |
 | ---------- | ------------ |
@@ -59,10 +62,11 @@ The local users
 | guid       | guid         |
 | email      | email(64)    |
 
-## Foreign keys
+Foreign Keys
+------------
 
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
-| parent-uid | [user](help/spec/database/db-user) | uid |
+| parent-uid | [user](help/database/db_user) | uid |
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_userd.md

@@ -1,15 +1,18 @@
-# Table userd
+Table userd
+===========
 
 Deleted usernames
 
-## Fields
+Fields
+------
 
 | Field    | Description   | Type         | Null | Key | Default | Extra          |
 | -------- | ------------- | ------------ | ---- | --- | ------- | -------------- |
 | id       | sequential ID | int unsigned | NO   | PRI | NULL    | auto_increment |
 | username |               | varchar(255) | NO   |     | NULL    |                |
 
-## Indexes
+Indexes
+------------
 
 | Name     | Fields       |
 | -------- | ------------ |
@@ -17,4 +20,4 @@ Deleted usernames
 | username | username(32) |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_verb.md

@@ -1,15 +1,18 @@
-# Table verb
+Table verb
+===========
 
 Activity Verbs
 
-## Fields
+Fields
+------
 
 | Field | Description | Type              | Null | Key | Default | Extra          |
 | ----- | ----------- | ----------------- | ---- | --- | ------- | -------------- |
 | id    |             | smallint unsigned | NO   | PRI | NULL    | auto_increment |
 | name  |             | varchar(100)      | NO   |     |         |                |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields |
 | ------- | ------ |
@@ -17,4 +20,4 @@ Activity Verbs
 | name    | name   |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_worker-ipc.md

@@ -1,19 +1,22 @@
-# Table worker-ipc
+Table worker-ipc
+===========
 
 Inter process communication between the frontend and the worker
 
-## Fields
+Fields
+------
 
 | Field | Description               | Type    | Null | Key | Default | Extra |
 | ----- | ------------------------- | ------- | ---- | --- | ------- | ----- |
 | key   |                           | int     | NO   | PRI | NULL    |       |
 | jobs  | Flag for outstanding jobs | boolean | YES  |     | NULL    |       |
 
-## Indexes
+Indexes
+------------
 
 | Name    | Fields |
 | ------- | ------ |
 | PRIMARY | key    |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/database/db_workerqueue.md

@@ -1,8 +1,10 @@
-# Table workerqueue
+Table workerqueue
+===========
 
 Background tasks queue entries
 
-## Fields
+Fields
+------
 
 | Field     | Description                                             | Type             | Null | Key | Default             | Extra          |
 | --------- | ------------------------------------------------------- | ---------------- | ---- | --- | ------------------- | -------------- |
@@ -17,7 +19,8 @@ Background tasks queue entries
 | retrial   | Retrial counter                                         | tinyint          | NO   |     | 0                   |                |
 | done      | Marked 1 when the task was done - will be deleted later | boolean          | NO   |     | 0                   |                |
 
-## Indexes
+Indexes
+------------
 
 | Name                          | Fields                           |
 | ----------------------------- | -------------------------------- |
@@ -32,4 +35,4 @@ Background tasks queue entries
 | done_pid_priority_created     | done, pid, priority, created     |
 
 
-Return to [database documentation](help/spec/database/index)
+Return to [database documentation](help/database)

doc/de/Account-Basics.md

@@ -1,4 +1,8 @@
-# Account - Basics
+Account - Basics
+==============
+
+* [Zur Startseite der Hilfe](help)
+
 
 ## Registrierung
 
@@ -15,12 +19,15 @@ Falls du keine [OpenID-Adresse](https://de.wikipedia.org/wiki/OpenID">OpenID-Adr
 Solltest du eine OpenID Adresse haben, kannst Du sie im ersten Feld eintragen und "Registrieren" klicken.
 Friendica wird versuchen, so viele Informationen wie möglich von Deinem OpenID-Provider zu übernehmen, um diese in Dein Profil auf dieser Seite einzutragen.
 
+
 ### Dein vollständiger Name
 
 Bitte trage bei "vollständiger Name" Deinen **gewünschten Namen** ein, wie er über deinen Beiträgen angezeigt werden soll.
-Du kannst deinen echten Namen eintragen, kannst dir aber auch einen Namen ausdenken. Einen Zwang zu dem sogenannten Klarnamen gibt es nicht.
+Du kannst deinen echten Namen eintragen, kannst Dir aber auch einen Namen ausdenken. Einen Zwang zu dem sogenannten Klarnamen gibt es nicht.
 
-### E-Mail-Adresse
+
+
+### Email-Adresse
 
 Bitte trage eine richtige Email-Adresse ein.
 Dies ist die einzige persönliche Information, die korrekt sein muss.
@@ -44,40 +51,45 @@ Durch die Art, wie der Spitzname genutzt wird, gibt es bestimmte Einschränkunge
 
 Dieser Spitzname wird an vielen Stellen genutzt, um Deinen Account zu identifizieren, daher ist es nicht möglich ihn später zu ändern.
 
+
 ### Verzeichnis-Eintrag
 
 Das Registrierungsformular erlaubt es dir, direkt auszuwählen, ob Du im [Onlineverzeichnis](https://dir.friendica.social/) (Friendica Directory) aufgelistet wirst oder nicht.
-Das ist wie ein Telefonbuch und du entscheidest, ob du darin eingetragen werden möchtest, oder nicht.
+Das ist wie ein Telefonbuch und Du entscheidest, ob du darin eingetragen werden möchtest, oder nicht.
 
-* Wir bitten dich, "Ja" zu wählen, damit Andere dich finden können, so wie Du sie finden kannst
+* Wir bitten dich, "Ja" zu wählen, damit Andere Dich finden können, so wie Du sie finden kannst
 * Wählst Du "Nein", bist Du für Andere *nicht einfach auffindbar*
 
 Was auch immer Du wählst, kann jederzeit nach dem Login in Deinen Account-Einstellungen geändert werden.
 
+
 ### Registrierung
 
 Sobald Du die nötigen Informationen eingegeben hast, klicke auf "Registrieren".
 Eine Email mit den Registrierungsdetails und Deinem Initialpasswort wird an die hinterlegte Email-Adresse geschickt.
-Bitte prüfe den Posteingang (inklusive dem Spam-Ordner).
+Bitte prüfe den Posteingang (inkl. dem Spam-Ordner).
+
 
 ## Login-Seite
 
 Gib auf der "Login"-Seite die Informationen ein, die Du mit der oben genannten Email erhalten hast.
 Du kannst entweder Deinen Spitznamen oder die Email-Adresse als Login-Namen nutzen.
 
-Wenn Du Deinen Account nutzt, um unterschiedliche '[accounts (Gruppen/Seiten)](help/accounts-groups-pages)' zu verwalten, die die gleiche Email-Adresse verwenden, dann nutze bitte den Spitznamen des Accounts, der verwaltet werden soll.
+Wenn Du Deinen Account nutzt, um unterschiedliche '[Seiten](help/Pages)' zu verwalten, die die gleiche Email-Adresse verwenden, dann nutze bitte den Spitznamen des Accounts, der verwaltet werden soll.
 
 *Wenn* Dein Account OpenID nutzt, dann kannst Du Deine OpenID-Adresse als Login-Name nutzen und das Passwort-Feld frei lassen.
-Du wirst zu deinem OpenID-Anbieter weitergeleitet, wo Du Deine Anmeldung abschließt.
+Du wirst zu Deinem OpenID-Anbieter weitergeleitet, wo Du Deine Anmeldung abschließt.
 
 Wenn Du OpenID nicht nutzt, dann gib Dein Passwort ein, das Du mit der Registrierungsmail erhalten hast.
 Das Passwort muss genau so geschrieben werden, wie es in der Email steht; Groß- und Kleinschreibung wird beachtet.
 Falls Du Schwierigkeiten beim Login hast, prüfe bitte, ob z. B. Deine Feststelltaste aktiv ist.
 
+
 ### Passwort ändern
 
 Besuche nach Deinem ersten Login bitte die Einstellungsseite und wechsle das Passwort in eines, dass Du Dir merken kannst.
 
+
 ## Die ersten Schritte
 
 ### Persönliche Daten exportieren
@@ -94,14 +106,17 @@ Dies ist z.B. dann nützlich wenn du mit deinem Account auf einen anderen Friend
 
 Ein ['Tipp für neue Mitglieder'](newmember)-Link zeigt sich in den ersten beiden Wochen auf Deiner Startseite, um Dir erste Informationen zum Start zu bieten.
 
+
 ## Schau Dir ebenfalls folgende Seiten an
 
-* [Circles und Privatssphäre](help/user/circles-and-privacy)
+* [Circles und Privatssphäre](help/Circles-and-Privacy)
 
-* [Account löschen](help/user/delete-account)
+* [Account löschen](help/Remove-Account)
 
 ### Der eigene Friendica-Knoten
-
 Wenn Du Deinen eigenen Friendica-Knoten auf einem Server aufsetzen willst, kannst Du das ebenfalls machen.
 Besuche die [Friendica-Webseite](https://friendi.ca), um den Code mit den Installationsanleitungen herunterzuladen.
 Es ist ein einfacher Installationsprozess, den jeder mit ein wenig technischen Erfahrungen im Webseiten-Hosting oder mit grundlegenden Linux-Erfahrungen handhaben kann.
+
+
+

doc/de/Addons.md

@@ -1,4 +1,7 @@
-# Friendica Addon/Entwicklung
+Friendica Addon/Entwicklung
+==============
+
+* [Zur Startseite der Hilfe](help)
 
 Bitte schau dir das Beispiel-Addon "randplace" für ein funktionierendes Beispiel für manche der hier aufgeführten Funktionen an.
 Das Facebook-Addon bietet ein Beispiel dafür, die "addon"- und "module"-Funktion gemeinsam zu integrieren.
@@ -25,14 +28,15 @@ Registriere deine Addon-Hooks während der Installation.
 
     \Friendica\Core\Hook::register($hookname, $file, $function);
 
-`$hookname` ist ein String und entspricht einem bekannten Friendica-Hook.
+$hookname ist ein String und entspricht einem bekannten Friendica-Hook.
 
-$file steht für den Pfadnamen, der relativ zum Top-Level-Friendica-Verzeichnis liegt.
-Das *sollte* `addon/addon_name/addon_name.php` sein.
+$file steht für den Pfadnamen, der relativ zum Top-Level-Friendicaverzeichnis liegt.
+Das *sollte* "addon/addon_name/addon_name.php' sein.
 
 $function ist ein String und der Name der Funktion, die ausgeführt wird, wenn der Hook aufgerufen wird.
 
-## Argumente
+Argumente
+---
 
 Deine Hook-Callback-Funktion wird mit höchstens einem Argumenten aufgerufen
 
@@ -47,7 +51,8 @@ Diese Information ist speziell auf den Hook bezogen, der aktuell bearbeitet wird
 Achte darauf, diese mit "&" zu deklarieren, wenn du sie bearbeiten willst.
 
 
-## Module
+Module
+---
 
 Addons können auch als "Module" agieren und alle Seitenanfragen für eine bestimte URL abfangen.
 Um ein Addon als Modul zu nutzen, ist es nötig, die Funktion "addon_name_module()" zu definieren, die keine Argumente benötigt und nichts weiter machen muss.
@@ -67,7 +72,8 @@ Sie können auch `addon_name_post()` umfassen, welches vor der content-Funktion
 Du kannst ebenso `addon_name_init()` nutzen, was oft frühzeitig aufgerufen wird und das Modul initialisert.
 
 
-## Derzeitige Hooks
+Derzeitige Hooks
+---
 
 **'authenticate'** - wird aufgerufen, wenn sich der User einloggt.
     $b ist ein Array
@@ -183,7 +189,8 @@ Dieser Hook kann dafür verwendet werden, alternative Erkennungsfunktionen einzu
  - wird aufgerufen nachdem in include/nav,php der Inhalt des Navigations Menüs erzeugt wurde.
  - $b ist ein Array, das $nav wiederspiegelt.
 
-## Komplette Liste der Hook-Callbacks
+Komplette Liste der Hook-Callbacks
+---
 
 Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Apr-2018 generiert): Bitte schau in die Quellcodes für Details zu Hooks, die oben nicht dokumentiert sind.
 

doc/de/BBCode.md

@@ -1,4 +1,7 @@
-# Referenz der Friendica BBCode Tags
+Referenz der Friendica BBCode Tags
+========================
+
+* [Zur Startseite der Hilfe](help)
 
 ## Inline
 
@@ -58,8 +61,8 @@ table.bbcodes > * > tr > th {
   <td><span style="color:  red;">rot</span></td>
 </tr>
 <tr>
-  <td>[url=https://friendi.ca]Friendica[/url]</td>
-  <td><a href="https://friendi.ca" target="external-link">Friendica</a></td>
+  <td>[url=http://friendi.ca]Friendica[/url]</td>
+  <td><a href="http://friendi.ca" target="external-link">Friendica</a></td>
 </tr>
 <tr>
   <td>[img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png[/img]</td>
@@ -100,23 +103,23 @@ table.bbcodes > * > tr > th {
   <th>Ergebnis</th>
 </tr>
 <tr>
-  <td>[url]https://friendi.ca[/url]</td>
-  <td><a href="https://friendi.ca">https://friendi.ca</a></td>
+  <td>[url]http://friendi.ca[/url]</td>
+  <td><a href="http://friendi.ca">http://friendi.ca</a></td>
 </tr>
 <tr>
-  <td>[url=https://friendi.ca.com]Friendica[/url]</td>
-  <td><a href="https://friendi.ca.com">Friendica</a></td>
+  <td>[url=http://friendi.ca.com]Friendica[/url]</td>
+  <td><a href="http://friendi.ca.com">Friendica</a></td>
 </tr>
 <tr>
-  <td>[bookmark]https://friendi.ca[/bookmark]<br><br>
-#^[url]https://friendi.ca[/url]</td>
-  <td><span class="oembed link"><h4>Friendica: <a href="https://friendi.ca" rel="oembed"></a><a href="https://friendi.ca" target="_blank" rel="noopener noreferrer">https://friendi.ca</a></h4></span></td>
+  <td>[bookmark]http://friendi.ca[/bookmark]<br><br>
+#^[url]http://friendi.ca[/url]</td>
+  <td><span class="oembed link"><h4>Friendica: <a href="http://friendi.ca" rel="oembed"></a><a href="http://friendi.ca" target="_blank" rel="noopener noreferrer">http://friendi.ca</a></h4></span></td>
 </tr>
 <tr>
-  <td>[bookmark=https://friendi.ca]Lesezeichen[/bookmark]<br><br>
-#^[url=https://friendi.ca]Lesezeichen[/url]<br><br>
-#[url=https://friendi.ca]^[/url][url=https://friendi.ca]Lesezeichen[/url]</td>
-  <td><span class="oembed link"><h4>Friendica: <a href="https://friendi.ca" rel="oembed"></a><a href="https://friendi.ca" target="_blank" rel="noopener noreferrer">Lesezeichen</a></h4></span></td>
+  <td>[bookmark=http://friendi.ca]Lesezeichen[/bookmark]<br><br>
+#^[url=http://friendi.ca]Lesezeichen[/url]<br><br>
+#[url=http://friendi.ca]^[/url][url=http://friendi.ca]Lesezeichen[/url]</td>
+  <td><span class="oembed link"><h4>Friendica: <a href="http://friendi.ca" rel="oembed"></a><a href="http://friendi.ca" target="_blank" rel="noopener noreferrer">Lesezeichen</a></h4></span></td>
 </tr>
 <tr>
   <td>[url=/posts/f16d77b0630f0134740c0cc47a0ea02a]Diaspora Beitrag mit GUID[/url]</td>
@@ -168,7 +171,7 @@ Zeilen</code></td>
 </tr>
 <tr>
   <td>[code=php]function text_highlight($s,$lang)[/code]</td>
-  <td><code><div class="hl-main"><ol class="hl-main"><li><span class="hl-code"> </span><span class="hl-reserved">function</span><span class="hl-code"> </span><span class="hl-identifier">text_highlight</span><span class="hl-brackets">(</span><span class="hl-var">$s</span><span class="hl-code">,</span><span class="hl-var">$lang</span><span class="hl-brackets">)</span></li></ol></div></code></td>
+  <td><code><div class="hl-main"><ol class="hl-main"><li><span class="hl-code">&nbsp;</span><span class="hl-reserved">function</span><span class="hl-code"> </span><span class="hl-identifier">text_highlight</span><span class="hl-brackets">(</span><span class="hl-var">$s</span><span class="hl-code">,</span><span class="hl-var">$lang</span><span class="hl-brackets">)</span></li></ol></div></code></td>
 </tr>
 <tr>
   <td>[quote]Zitat[/quote]</td>
@@ -252,21 +255,21 @@ Zeilen</code></td>
 </tr>
 <tr>
   <td>[table]<br>
-  [tr]<br>
-    [th]Kopfzeile 1[/th]<br>
-    [th]Kopfzeile 2[/th]<br>
-    [th]Kopfzeile 2[/th]<br>
-  [/tr]<br>
-  [tr]<br>
-    [td]Zelle 1[/td]<br>
-    [td]Zelle 2[/td]<br>
-    [td]Zelle 3[/td]<br>
-  [/tr]<br>
-  [tr]<br>
-    [td]Zelle 4[/td]<br>
-    [td]Zelle 5[/td]<br>
-    [td]Zelle 6[/td]<br>
-  [/tr]<br>
+&nbsp;&nbsp;[tr]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[th]Kopfzeile 1[/th]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[th]Kopfzeile 2[/th]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[th]Kopfzeile 2[/th]<br>
+&nbsp;&nbsp;[/tr]<br>
+&nbsp;&nbsp;[tr]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[td]Zelle 1[/td]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[td]Zelle 2[/td]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[td]Zelle 3[/td]<br>
+&nbsp;&nbsp;[/tr]<br>
+&nbsp;&nbsp;[tr]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[td]Zelle 4[/td]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[td]Zelle 5[/td]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;[td]Zelle 6[/td]<br>
+&nbsp;&nbsp;[/tr]<br>
 [/table]</td>
   <td>
 	<table>
@@ -349,12 +352,12 @@ Zeilen</code></td>
 </tr>
 <tr>
   <td>[ul]<br>
-  [li] Erstes Listenelement<br>
-  [li] Zweites Listenelement<br>
+&nbsp;&nbsp;[li] Erstes Listenelement<br>
+&nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/ul]<br>
 [list]<br>
-  [li] Erstes Listenelement<br>
-  [li] Zweites Listenelement<br>
+&nbsp;&nbsp;[li] Erstes Listenelement<br>
+&nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/list]</td>
   <td>
 	<ul class="listbullet" style="list-style-type: circle;">
@@ -365,12 +368,12 @@ Zeilen</code></td>
 </tr>
 <tr>
   <td>[ol]<br>
-  [li] Erstes Listenelement<br>
-  [li] Zweites Listenelement<br>
+&nbsp;&nbsp;[li] Erstes Listenelement<br>
+&nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/ol]<br>
 [list=1]<br>
-  [li] Erstes Listenelement<br>
-  [li] Zweites Listenelement<br>
+&nbsp;&nbsp;[li] Erstes Listenelement<br>
+&nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/list]</td>
   <td>
     <ul class="listdecimal" style="list-style-type: decimal;">
@@ -381,8 +384,8 @@ Zeilen</code></td>
 </tr>
 <tr>
   <td>[list=]<br>
-  [li] Erstes Listenelement<br>
-  [li] Zweites Listenelement<br>
+&nbsp;&nbsp;[li] Erstes Listenelement<br>
+&nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/list]</td>
   <td>
     <ul class="listnone" style="list-style-type: none;">
@@ -393,8 +396,8 @@ Zeilen</code></td>
 </tr>
 <tr>
   <td>[list=i]<br>
-  [li] Erstes Listenelement<br>
-  [li] Zweites Listenelement<br>
+&nbsp;&nbsp;[li] Erstes Listenelement<br>
+&nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/list]</td>
   <td>
     <ul class="listlowerroman" style="list-style-type: lower-roman;">
@@ -405,8 +408,8 @@ Zeilen</code></td>
 </tr>
 <tr>
   <td>[list=I]<br>
-  [li] Erstes Listenelement<br>
-  [li] Zweites Listenelement<br>
+&nbsp;&nbsp;[li] Erstes Listenelement<br>
+&nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/list]</td>
   <td>
     <ul class="listupperroman" style="list-style-type: upper-roman;">
@@ -417,8 +420,8 @@ Zeilen</code></td>
 </tr>
 <tr>
   <td>[list=a]<br>
-  [li] Erstes Listenelement<br>
-  [li] Zweites Listenelement<br>
+&nbsp;&nbsp;[li] Erstes Listenelement<br>
+&nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/list]</td>
   <td>
     <ul class="listloweralpha" style="list-style-type: lower-alpha;">
@@ -429,8 +432,8 @@ Zeilen</code></td>
 </tr>
 <tr>
   <td>[list=A]<br>
-  [li] Erstes Listenelement<br>
-  [li] Zweites Listenelement<br>
+&nbsp;&nbsp;[li] Erstes Listenelement<br>
+&nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/list]</td>
   <td>
     <ul class="listupperalpha" style="list-style-type: upper-alpha;">
@@ -548,7 +551,7 @@ Als ich die Bilder im Wald aufgenommen habe, hatte ich eine wirklich ungew&ouml;
 </tr>
 </table>
 
-F&uuml;r Verbindungen zu Netzwerken, zu denen Friendica den HTML Code postet, wie Tumblr, WordPress oder Pump.io wird das [abstract] Element nicht verwendet.
+F&uuml;r Verbindungen zu Netzwerken, zu denen Friendica den HTML Code postet, wie Tumblr, Wordpress oder Pump.io wird das [abstract] Element nicht verwendet.
 Bei nativen Verbindungen; das hei&szlig;t zu z.B. Friendica, Hubzilla, Diaspora oder GNU Social Kontakten; wird der ungek&uuml;rzte Beitrag &uuml;bertragen.
 Die Instanz des Kontakts k&uuml;mmert sich um die Darstellung.
 
@@ -592,3 +595,4 @@ Du kannst alle [style=text-shadow: 0 0 4px #CC0000;]CSS-Eigenschaften[/style] di
   <td>Du kannst alle <span style="text-shadow: 0 0 4px #cc0000;;">CSS-Eigenschaften</span> dieses Inline-Textes &auml;ndern-</td>
 </tr>
 </table>
+

doc/de/Bugs-and-Issues.md

@@ -1,13 +1,16 @@
-# Bugs und Probleme
+Bugs und Probleme
+===============
 
-Du solltest jeden Bug und jedes Problem, den/das Du findest, zunächst dem Administrator (oder gegebenenfalls der Support-Seite) Deines Servers melden, statt auf der allgemeinen Bug-Seite.
+* [Zur Startseite der Hilfe](help)
+
+Du solltest jeden Bug und jedes Problem, den/das Du findest, zunächst dem Administrator (oder gegebenenfalls der Support-Seite) Deines Servers melden, statt auf der allgemeinen Bug-Seite. 
 Das erleichtert den Entwicklern ihre Arbeit (z. B. neue Features zu entwickeln), da sie sich nicht mit Fehlern beschäftigen müssen, mit denen sie nichts zu tun haben.
 
-Wenn Du technisch versiert bist oder Dein Knoten keine Support-Seite hat, dann kannst Du den <a href="https://github.com/friendica/friendica/issues">Bug Tracker</a> nutzen.
-Bitte durchsuche zunächst die Seite, ob es bereits einen offenen Bug gibt, der Deiner Anfrage entspricht.
+Wenn Du technisch versiert bist oder Dein Knoten keine Support-Seite hat, dann kannst Du den <a href="https://github.com/friendica/friendica/issues">Bug Tracker</a> nutzen. 
+Bitte durchsuche zunächst die Seite, ob es bereits einen offenen Bug gibt, der Deiner Anfrage entspricht. 
 
-Liefere so viele Informationen wie möglich zu dem Bug.
-Hierzu gehört auch die **komplette** Fehlermeldung oder Notiz und alle Schritte, die zu dem Fehler geführt haben.
-Es ist generell besser, zu viele Informationen zu liefern, als zu wenige.
+Liefere so viele Informationen wie möglich zu dem Bug. 
+Hierzu gehört auch die **komplette** Fehlermeldung oder Notiz und alle Schritte, die zu dem Fehler geführt haben. 
+Es ist generell besser, zu viele Informationen zu liefern, als zu wenige. 
 
 Lies Dir diesen <a href="http://www.chiark.greenend.org.uk/~sgtatham/bugs-de.html">Artikel (mehrsprachig)</a> durch, um mehr über **gute** Bug-Reports zu erfahren.

doc/de/Channels.md

@@ -1,4 +1,7 @@
-# Kanäle (Channels)
+Kanäle (Channels)
+=====
+
+* [Home](help)
 
 Kanäle sind eine Möglichkeit neue Inhalte zu finden, oder Inhalte anzuzeigen, die du sonst möglicherweise verpasst hättest.
 Es gibt mehrere vordefinierte Kanäle und zusätzlich kannst du deine eigenen, basierend auf ein paar Regeln, erstellen.
@@ -15,7 +18,8 @@ Auf der Profilseite kannst du die Kanal-Frequenz für jeden Kontakt definieren.
 * Zeige nur einige Beiträge an: Wenn ein Kontakt viele Beiträge in einem kurzen Zeitraum erstellt, reduziert diese Einstellung die Anzahl der angezeigten Beiträge in jedem Kanal.
 * Zeige keine Beiträge an: Beiträge von diesem Kontakt werden in keinem Kanal angezeigt.
 
-## Voreingestellte Kanäle
+Voreingestellte Kanäle
+---
 
 * Für Dich: Beiträge von Kontakten mit denen du interagierst und die mit dir interagieren. Im Detail bestehend aus:
     * Beiträge von Leuten, mit denen du überdurchschnittlich viel interagierst.
@@ -34,7 +38,8 @@ Auf der Profilseite kannst du die Kanal-Frequenz für jeden Kontakt definieren.
 * Audio: Beiträge mit Audio.
 * Videos: Beiträge mit Videos.
 
-## Vom Benutzer eingestellte Kanäle
+Vom Benutzer eingestellte Kanäle
+---
 
 In den Einstellungen, unter "Kanäle", kannst du deine eigenen Kanäle erstellen.
 
@@ -49,7 +54,8 @@ Jeder Kanal wird durch diese Werte definiert:
 * Volltextsuche: Dies kann genutzt werden um Inhalte, basierend auf dem Inhalt und ein paar zusätzlichen Schlüsselwörtern, ein- oder auszuschließen. Es nutzt die "boolean mode"-Operatoren von MariaDB: https://mariadb.com/kb/en/full-text-index-overview/#in-boolean-mode
 * Bilder, Videos, Audio: Wenn ausgewählt, wirst du Inhalte mit dem gewählten Medientyp sehen. Diese Optionen können kombiniert werden. Wenn keines dieser Felder ausgewählt wurde, wirst du alle Inhalte, mit oder ohne angefügten Medien, sehen.
 
-## Zusätzliche Schlüsselwörter für die Volltextsuche
+Zusätzliche Schlüsselwörter für die Volltextsuche
+---
 
 Zusätzlich zu der Suche nach Inhalten, gibt es Schlüsselwörter, die in der Volltextsuche genutzt werden können.
 Alternativen werden durch "|" dargestellt.

doc/de/Chats.md

@@ -1,4 +1,7 @@
-# Chats
+Chats
+=====
+
+* [Zur Startseite der Hilfe](help)
 
 Du hast derzeit zwei Möglichkeiten, einen Chat auf Deiner Friendica-Seite zu betreiben
 

doc/de/Circles-and-Privacy.md

@@ -1,4 +1,7 @@
-# Circles und Privatsphäre
+Circles und Privatsphäre
+==================
+
+* [Zur Startseite der Hilfe](help)
 
 Circles sind nur eine Ansammlung von Freunden.
 Aber Friendica nutzt diese, um sehr mächtige Features zur Verfügung zu stellen.
@@ -42,9 +45,9 @@ Standardmäßig geht Friendica davon aus, dass alle deine Beiträge privat sein
 Aus diesem Grund erstellt Friendica nach der Anmeldung eine Circle, in die automatisch alle deine Kontakte hinzugefügt werden.
 Alle deine Beiträge sind nur auf diese Circle beschränkt.
 
-Beachte, dass diese Einstellung von deinem Seiten-Administrator überschrieben werden kann, was bedeutet, dass alle deine Beiträge standardmäßig "öffentlich" sind (beispielweise für das gesamte Internet).
+Beachte, dass diese Einstellung von deinem Seiten-Administrator überschrieben werden kann, was bedeutet, dass alle deine Beiträge standardmäßig "öffentlich" sind (bspw. für das gesamte Internet).
 
-Wenn du deine Beiträge standardmäßig "öffentlich" haben willst, dann kannst du deine Standardzugriffsrechte auf deiner Einstellungsseite ändern.
+Wenn du deine Beiträge standardmäßig "öffentlich" haben willst, dann kannst du deine Standardzugriffsrechte auf deiner Einstellungseite ändern.
 Dort kannst du außerdem festlegen, welchen Circles standardmäßig deine Beiträge erhalten oder in welche Circle deine neuen Kontakte standardmäßig eingeordnet werden.
 
 **Fragen der Privatssphäre, die zu beachten sind**
@@ -61,18 +64,19 @@ Du musst **sehr** vorsichtig sein, wenn du Mitglieder anderer Netzwerke in einer
 Wenn du auf die "Kontakt bearbeiten"-Seite einer Person gehst, zeigen wir dir, ob sie Mitglied eines unsicheren Netzwerks ist oder nicht.
 
 Sobald du einen Post erstellt hast, kannst du die Zugriffsrechte nicht mehr ändern.
-Innerhalb von Sekunden ist dieser an viele verschiedene Personen verschickt worden - möglicherweise bereits an alle Adressierten.
+Innerhalb von Sekunden ist dieser an viele verschiedene Personen verschickt worden - möglicherweise bereits an alle Addressierten.
 Wenn du versehentlich eine Nachricht erstellt hast und sie zurücknehmen willst, dann ist es das beste, diese zu löschen.
 Wir senden eine Löschmitteilung an jeden, der deine Nachricht erhalten hat - und das sollte die Nachricht genauso schnell löschen, wie sie zunächst erstellt wurde.
 In vielen Fällen wird sie in weniger als einer Minute aus dem Internet gelöscht.
 Nochmals: das gilt für Friendica-Netzwerke.
 Sobald eine Nachricht an ein anderes Netzwerk geschickt wurde, kann es nicht mehr so schnell gelöscht werden und in manchen Fällen auch gar nicht mehr.
 
-Wenn du das bisher noch nicht wusstest, dann empfehlen wir dir, deine Freunde dazu zu ermutigen, auch Friendica zu nutzen, da alle diese Privatsphären-Einstellungen innerhalb eines privatsphärenbewussten Netzwerks viel besser funktionieren.
+Wenn du das bisher noch nicht wusstest, dann empfehlen wir dir, deine Freunde dazu zu ermutigen, auch Friendica zu nutzen, da alle diese Privatsphären-Einstellungen innerhalb eines privatsphärenbewussten Netzwerk viel besser funktionieren.
 Viele andere Netzwerke, mit denen sich Friendica verbinden kann, bieten keine Kontrolle über die Privatsphäre.
 
 
-# Profile, Fotos und die Privatsphäre
+Profile, Fotos und die Privatsphäre
+=============================
 
 Die dezentralisierte Natur von Friendica (statt eine Webseite zu haben, die alles kontrolliert, gibt es viele Webseiten, die Information austauschen) hat in der Kommunikation mit anderen Seiten einige Konsequenzen.
 Du solltest dir über einige Dinge bewusst sein, um am besten entscheiden zu können, wie du mit deiner Privatsphäre umgehst.
@@ -86,7 +90,7 @@ Wir können die Identität von Friendica-Nutzern prüfen, da es hierfür einen M
 Deine Freunde anderer Netzwerke werden deine privaten Fotos nicht sehen können, da wir deren Identität nicht überprüfen können.
 
 Unsere Entwickler arbeiten an einer Lösung, um deinen Freunden den Zugriff zu ermöglichen - unabhängig, zu welchem Netzwerk sie gehören.
-Wir nehmen hingegen Privatsphäre ernst und agieren nicht wie andere Netzwerke, die __nur so tun__, als ob deine Fotos privat sind, sie aber trotzdem anderen ohne Identitätsprüfung zeigen.
+Wir nehmen hingegen Privatsphäre ernst und agieren nicht wie andere Netzwerke, die __nur so tun__ als ob deine Fotos privat sind, sie aber trotzdem anderen ohne Identitätsprüfung zeigen.
 
 **Profile**
 

doc/de/Connectors.md

@@ -1,33 +1,38 @@
-# Konnektoren (Connectors)
+Konnektoren (Connectors) 
+==========
 
-Konnektoren erlauben es Dir, Dich mit anderen sozialen Netzwerken zu verbinden.
+* [Zur Startseite der Hilfe](help)
+
+Konnektoren erlauben es Dir, Dich mit anderen sozialen Netzwerken zu verbinden. 
 Mit diesen Konnektoren kannst Du z.B. zu Bluesky, Tumblr oder Twitter posten.
-Für Bluesky und Tumblr gibt es eine bidirektionale Verbindung, d.h. du kannst Friendica nutzen, um deine Timeline von diesen Diensten zu lesen.
+Für Bluesky und Tumblr gibt es eine bidirektionale Verbindung, d.h. du kannst Friendica nutzen, um deine Timeline von diesen Diensten zu lesen.  
 Außerdem gibt es einen Konnektor, um Deinen Email-Posteingang zu nutzen.
 Wenn Du keinen eigenen Knoten betreibst und wissen willst, ob der Server Deiner Wahl diese Konnektoren installiert hat, kannst Du Dich darüber auf der Seite '<domain_des_friendica-servers>/friendica' informieren.
 
-# Anleitung, um sich mit Personen in bestimmten Netzwerken zu verbinden
+Anleitung, um sich mit Personen in bestimmten Netzwerken zu verbinden
+==========================================================
 
-## Friendica
+**Friendica**
 
-Du kannst Dich verbinden, indem Du die Adresse Deiner Identität (<dein_nick>@<dein_friendica-host>) auf der "Verbinden"-Seite des Friendica-Nutzers eingibst.
-Ebenso kannst Du deren Identitäts-Adresse in der "Verbinden"-Box auf Deiner ["Kontakt"-Seite](contact) eingeben.
+Du kannst Dich verbinden, indem Du die Adresse Deiner Identität (<dein_nick>@<dein_friendica-host>) auf der "Verbinden"-Seite des Friendica-Nutzers eingibst. 
+Ebenso kannst Du deren Identitäts-Adresse in der "Verbinden"-Box auf Deiner ["Kontakt"-Seite](contacts) eingeben.
 
-## Diaspora
 
-Füge die Diaspora-Identitäts-Adresse (z.B. name@diasporapod.com)auf Deiner ["Kontakte"-Seite](contact) in das Feld "Neuen Kontakt hinzufügen" ein.
+**Diaspora**
 
-## Blogger, WordPress, RSS feeds, andere Webseiten
+Füge die Diaspora-Identitäts-Adresse (z.B. name@diasporapod.com)auf Deiner ["Kontakte"-Seite](contacts) in das Feld "Neuen Kontakt hinzufügen" ein. 
 
-Trage die URL auf Deiner ["Kontakte"-Seite](contact) in das Feld "Neuen Kontakt hinzufügen" ein.
+**Blogger, Wordpress, RSS feeds, andere Webseiten**
+
+Trage die URL auf Deiner ["Kontakte"-Seite](contacts) in das Feld "Neuen Kontakt hinzufügen" ein. 
 Du hast keine Möglichkeit, diesen Kontakten zu antworten.
 
-Das erlaubt Dir, Dich mit Millionen von Seiten im Internet zu _verbinden_.
-Alles, was dafür nötig ist, ist dass die Seite einen Feed im RSS- oder Atom Syndication-Format nutzt und welches einen Autoren und ein Bild zur Seite liefert.
+Das erlaubt Dir, Dich mit Millionen von Seiten im Internet zu _verbinden_. 
+Alles, was dafür nötig ist, ist dass die Seite einen Feed im RSS- oder Atom Syndication-Format nutzt und welches einen Autoren und ein Bild zur Seite liefert. 
 
-## Email
+**Email**
 
-Konfiguriere den Email-Konnektor auf Deiner [Einstellungsseite](settings).
-Wenn Du das gemacht hast, kannst Du auf Deiner ["Kontakte"-Seite](contact) die Email-Adresse in das Feld "Neuen Kontakt hinzufügen" eintragen.
-Diese Email-Adresse muss jedoch bereits mit einer Nachricht in Deinem Email-Posteingang auf dem Server liegen.
+Konfiguriere den Email-Konnektor auf Deiner [Einstellungsseite](settings). 
+Wenn Du das gemacht hast, kannst Du auf Deiner ["Kontakte"-Seite](contacts) die Email-Adresse in das Feld "Neuen Kontakt hinzufügen" eintragen. 
+Diese Email-Adresse muss jedoch bereits mit einer Nachricht in Deinem Email-Posteingang auf dem Server liegen. 
 Du hast die Möglichkeit, Email-Kontakte in Deine privaten Unterhaltungen einzubeziehen.

doc/de/Developers.md

@@ -1,4 +1,7 @@
-# Friendica - Entwickler-Guide
+Friendica - Entwickler-Guide
+==========
+
+* [Zur Startseite der Hilfe](help)
 
 Hier erfährst Du, wie Du bei uns mitmachen kannst:
 
@@ -6,19 +9,19 @@ Zunächst erstelle Dir per 'git clone https://github.com/friendica/friendica.git
 
 Erstelle Deine eigene Kopie (fork) der Ursprungsdaten auf Github, an der Du dann entspannt arbeiten kannst.
 Deine Arbeiten sollten mit einem neuen Arbeitszweig (branch) beginnen, den du vom develop Zweig des Repositories beginnst.
-Die Anleitung unter [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) erklärt dir genau, wie du das tun musst.
+Die Anleitung unter [http://help.github.com/fork-a-repo/](http://help.github.com/fork-a-repo/) erklärt Dir genau, wie Du das tun musst.
 
 Gehe dann nach getaner Arbeit zu Deiner Github-Seite und erstelle eine "Pull request", um Deine Änderungen in das Hauptprojekt einzugliedern (merge).
 
-Solltest du keine Idee haben, an welcher Stelle du einsteigen könntest?
+Solltest du keine Idee haben, an welcher Stelle du einsteigen könntest.
 Wir haben einige Aufgaben auf github mit dem Schlagwort *Junior Job* versehen.
 Bei diesen Aufgaben gehen wir davon aus, dass sie geeignete Einstiegsstellen sind.
-Du musst dich aber natürlich nicht mit diesen Aufgaben beschäftigen um den Friendica Code zu verbessern.
+Du musst dich aber natürlich nicht mit diesen Aufgaben beschäftigen um den Friendica Code zu verbeesern.
 
 **Wichtig**
 
 Bitte hole Dir alle Änderungen aus dem Projektverzeichnis und führe sie mit Deiner Arbeit zusammen, **bevor** Du Deine "pull request" erstellst. Wir behalten es uns vor, Patches abzulehnen, die eine große Anzahl an Fehlern hervorrufen.
-Dies gilt vor allem für Übersetzungen, da wir hier möglicherweise nicht alle feinen Unterschiede in konfliktähren Versionen erkennen können.
+Dies gilt vor allem für Übersetzungen, da wir hier möglicherweise nicht alle feinen Unterschiede in konfliktären Versionen erkennen können.
 
 Außerdem: **teste Deine Änderungen!** Vergiss nicht, dass eine simple Fehlerlösung einen anderen Fehler auslösen kann.
 Lass Deine Änderungen von einem erfahrenen Friendica-Entwickler gegenprüfen.

doc/de/Export-Import-Contacts.md

@@ -1,11 +1,13 @@
 # Export / Import von gefolgten Kontakte
 
-Zusätzlich zum [Umziehen des Accounts](help/user/move-account) kannst du die Liste der von dir gefolgten Kontakte exportieren und importieren.
+* [Home](help)
+
+Zusätzlich zum [Umziehen des Accounts](help/Move-Account) kannst du die Liste der von dir gefolgten Kontakte exportieren und importieren.
 Die exportierte Liste wird als CSV Datei in einem zu anderen Plattformen, z.B. Mastodon, Misskey oder Pleroma, kompatiblen Format gespeichert.
 
 ## Export der gefolgten Kontakte
 
-Um die Liste der Kontakte *denen du folgst* zu exportieren, geht die [Einstellungen persönliche Daten exportieren](settings/userexport) und klicke den [Exportiere Kontakte als CSV](settings/userexport/contact) an.
+Um die Liste der Kontakte *denen du folgst* zu exportieren, geht die [Einstellungen Persönliche Daten exportieren](settings/userexport) und klicke den [Exportiere Kontakte als CSV](settings/userexport/contact) an.
 
 ## Import der gefolgten Kontakte
 
@@ -15,6 +17,6 @@ Hier kannst du die CSV Datei auswählen und hoch laden.
 ### Unterstütztes Datei Format
 
 Die CSV Datei *muss* mindestens eine Spalte beinhalten.
-In der ersten Spalte der Tabelle *sollte* entweder das Handle oder die URL des gefolgten Kontakts.
+In der ersten Spalte der Tabelle sollte *sollte* entweder das Handle oder die URL des gefolgten Kontakts.
 (Ein Kontakt pro Zeile.)
 Alle anderen Spalten der CSV Datei werden beim Importieren ignoriert.

doc/de/FAQ-admin.md

@@ -1,13 +1,25 @@
-# Häufig gestellte Fragen (Admin) - FAQ
+Häufig gestellte Fragen (Admin) - FAQ
+==============
 
-## Kann ich mehrere Domains mit den selben Dateien aufsetzen?
+* [Zur Startseite der Hilfe](help)
+
+* **[Kann ich mehrere Domains mit den selben Dateien aufsetzen?](help/FAQ-admin#multiple)**
+* **[Wo kann ich den Quellcode von Friendica, Addons und Themes finden?](help/FAQ-admin#sources)**
+* **[Ich habe meine E-Mail Adresse geändern und jetzt ist das Admin Panel verschwunden?](help/FAQ-admin#adminaccount1)**
+* **[Kann es mehr als einen Admin auf einer Friendica Instanz geben?](help/FAQ-admin#adminaccount2)**
+* **[Die Datenbank Struktur schein nicht aktuell zu sein. Was kann ich tun?](help/FAQ-admin#dbupdate)**
+
+
+<a name="multiple"></a>
+### Kann ich mehrere Domains mit den selben Dateien aufsetzen?
 
 Ja, das ist möglich.
 Es ist allerdings nicht möglich, eine Datenbank durch zwei Domains zu nutzen.
 Solange Du Deine config/local.config.php allerdings so einrichtest, dass das System nicht versucht, eine Installation durchzuführen, kannst Du die richtige Config-Datei in include/$hostname/config/local.config.php hinterlegen.
 Alle Cache-Aspekte und der Zugriffsschutz können pro Instanz konfiguriert werden.
 
-## Wo kann ich den Quellcode von Friendica, Addons und Themes finden?
+<a name="sources"></a>
+### Wo kann ich den Quellcode von Friendica, Addons und Themes finden?
 
 Du kannst den Friendica-Quellcode [hier](https://github.com/friendica/friendica) finden.
 Dort findest Du immer die aktuellste stabile Version von Friendica.
@@ -17,11 +29,13 @@ Addons findest Du auf [dieser Seite](https://github.com/friendica/friendica-addo
 
 Wenn Du neue Themen suchst, findest Du sie auf [github.com/bkil/friendica-themes](https://github.com/bkil/friendica-themes).
 
-## Ich habe meine E-Mail Adresse geändern und jetzt ist das Admin Panel verschwunden?
+<a name="adminaccount1"></a>
+### Ich habe meine E-Mail Adresse geändern und jetzt ist das Admin Panel verschwunden?
 
 Bitte aktualisiere deine E-Mail Adresse in der <tt>config/local.config.php</tt> Datei.
 
-## Kann es mehr als einen Admin auf einer Friendica Instanz geben?
+<a name="adminaccount2"></a>
+### Kann es mehr als einen Admin auf einer Friendica Instanz geben?
 
 Ja.
 Du kannst in der <tt>config/local.config.php</tt> Datei mehrere E-Mail Adressen auflisten.
@@ -31,7 +45,8 @@ Die aufgelisteten Adressen werden wie folgt durch Kommas voneinander getrennt:
 'admin_email' => 'mail1@example.com,mail2@example.com',
 ```
 
-## Die Datenbank Struktur schein nicht aktuell zu sein. Was kann ich tun?
+<a name="dbupdate"></a>
+### Die Datenbank Struktur schein nicht aktuell zu sein. Was kann ich tun?
 
 Rufe bitte im Admin Panel den Punkt [DB Updates](/admin/dbsync/) auf und folge dem Link *Datenbank Struktur überprüfen*.
 Damit wird ein Hintergrundprozess gestartet der die Struktur deiner Datenbank überprüft und gegebenenfalls aktualisiert.

doc/de/FAQ.md

@@ -1,6 +1,22 @@
-# Häufig gestellte Fragen - FAQ
+Häufig gestellte Fragen - FAQ
+==============
 
-## Wo finde ich Hilfe?
+* [Zur Startseite der Hilfe](help)
+
+* **[Wo finde ich Hilfe?](help/FAQ#help)**
+* **[Warum erhalte ich Warnungen über fehlende Zertifikate?](help/FAQ#ssl)**
+* **[Wie kann ich Bilder, Dateien, Links, Video und Audio in Beiträge einfügen?](help/FAQ#upload)**
+* **[Ist es möglich, bei mehreren Profilen verschiedene Avatare (Nutzerbilder) zu haben?](help/FAQ#avatars)**
+* **[Wie kann ich Friendica in einer bestimmten Sprache ansehen?](help/FAQ#language)**
+* **[Was ist der Unterschied zwischen blockierten|ignorierten|archivierten|versteckten Kontakten?](help/FAQ#contacts)**
+* **[Was passiert, wenn ein Account gelöscht ist? Ist dieser richtig gelöscht?](help/FAQ#removed)**
+* **[Kann ich einem Hashtag folgen?](help/FAQ#hashtag)**
+* **[Wie kann ich einen RSS-Feed meiner Netzwerkseite (Stream) erstellen?](help/FAQ#rss)**
+* **[Gibt es Clients für Friendica?](help/FAQ#clients)**
+
+
+<a name="help"></a>
+### Wo finde ich Hilfe?
 
 Wenn Du Probleme mit Deiner Friendica-Seite hast, dann kannst Du die Community in der [Friendica-Support-Gruppe](https://forum.friendi.ca/profile/helpers) fragen.
 Wenn Du Deinen Account nicht nutzen kannst, kannst Du einen Account auf einer öffentlichen Seite ([Liste](https://dir.friendica.social/servers)) nutzen.
@@ -19,7 +35,8 @@ Wenn du dir keinen weiteren Friendica Account einrichten willst, kannst du auch
 	https://github.com/github/opensource.guide/pull/807
   --->
 
-## Warum erhalte ich Warnungen über fehlende Zertifikate?
+<a name="ssl"></a>
+### Warum erhalte ich Warnungen über fehlende Zertifikate?
 
 Manchmal erhältst Du eine Browser-Warnung über fehlende Zertifikate.
 Diese Warnungen können drei Gründe haben:
@@ -32,8 +49,8 @@ Diese Warnungen können drei Gründe haben:
 
 *(SSL (Secure Socket Layer) ist eine Technologie, die Daten auf ihrem Weg zwischen zwei Computern verschlüsselt.)*
 
-Wenn Du noch kein SSL-Zertifikat hast, dann gibt es drei Wege, eines zu erhalten: kauf Dir eines, hole Dir ein kostenloses (z.B. bei StartSSL, WoSign, hoffentlich bald auch LetsEncrypt) oder kreiere Dein eigenes (nicht empfohlen).
-[Weitere Informationen über die Einrichtung von SSL und warum es schlecht ist, selbst-signierte Zertifikate zu nutzen, findest Du hier.](help/admin/ssl)
+Wenn Du noch kein SSL-Zertifikat hast, dann gibt es drei Wege, eines zu erhalten: kauf Dir eines, hole Dir ein kostenloses (z.B. bei StartSSL, WoSign, hoffentlich bald auch letsencrypt) oder kreiere Dein eigenes (nicht empfohlen).
+[Weitere Informationen über die Einrichtung von SSL und warum es schlecht ist, selbst-signierte Zertifikate zu nutzen, findest Du hier.](help/SSL)
 
 Sei Dir bewusst, dass Browser-Warnungen über Sicherheitslücken etwas sind, wodurch neue Nutzer schnell das Vertrauen in das gesamte Friendica-Projekt verlieren können.
 Aus diesem Grund wird Friendica Red nur SSL-Zertifikate eines anerkannten Anbieters (CA, certificate authority) akzeptieren und nicht zu Seiten verbinden, die kein SSL nutzen.
@@ -48,9 +65,10 @@ Wenn Du zum jetzigen Zeitpunkt noch keinen Server aufgesetzt hast, ist es sinnvo
 Einige erlauben die Nutzung von freien Zertifikaten oder lassen Dich ihre eigenen Zertifikate mitnutzen.
 Andere erlauben nur kostenpflichtige Zertifikate als eigenes Angebot bzw. von anderen Anbietern.
 
-## Wie kann ich Bilder, Dateien, Links, Video und Audio in Beiträge einfügen?
+<a name="upload"></a>
+### Wie kann ich Bilder, Dateien, Links, Video und Audio in Beiträge einfügen?
 
-Bilder können direkt im [Beitragseditor](help/text-editor) vom Computer hochgeladen werden.
+Bilder können direkt im [Beitragseditor](help/Text_editor) vom Computer hochgeladen werden.
 Eine Übersicht aller Bilder, die auf Deinem Server liegen, findest Du unter <i>deineSeite.de/profile/profilname/photos</i>.
 Dort kannst Du auch direkt Bilder hochladen und festlegen, ob Deine Kontakte eine Nachricht über das neue Bild bekommen.
 
@@ -61,7 +79,7 @@ Deshalb eignet sich diese Methode vor allem für Office-Dateien oder gepackte Da
 Wer hingegen Dateien über Dropbox, über eine auf dem eigenen Server installierte Owncloud oder über einen anderen [Filehoster](http://en.wikipedia.org/wiki/Comparison_of_file_hosting_services) einfügen will, verwendet den Link-Button.
 
 Wenn Du mit dem Link-Button (Ketten-Symbol) URLs zu anderen Seiten einfügst, versucht Friendica eine kurze Zusammenfassung als Vorschau abzurufen.
-Manchmal klappt das nicht ... dann verlinke den Beitrag einfach per [url=http://example.com]<i>freigewählter Name</i>[/url] im Editor.
+Manchmal klappts das nicht ... dann verlinke den Beitrag einfach per [url=http://example.com]<i>freigewählter Name</i>[/url] im Editor.
 
 Video- und Audiodateien können zwar in Beiträge eingebunden werden, allerdings geht das nicht über einen direkten Upload im Editor wie bei Fotos.
 Du hast zwei Möglichkeiten:
@@ -70,17 +88,19 @@ Du hast zwei Möglichkeiten:
 2. Wenn Du Zugang zu einem eigenen Server hast, kannst Deine Multimediadatei per FTP dort hochladen und beim Video-/Audiobutton diese URL angeben. Dann wird das Video oder die Audiodatei direkt mit einem Player in Deinem Beitrag angezeigt.
 Friendica verwendet zur Einbettung HTML5. Das bedeutet, dass je nach Browser und Betriebssystem andere Formate unterstützt werden, darunter WebM, MP4, MP3 und Ogg. Eine Tabelle findest Du bei Wikipedia ([Video](http://en.wikipedia.org/wiki/HTML5_video), [Audio](http://en.wikipedia.org/wiki/HTML5_audio)).
 
-Zum Konvertieren von Videos in das lizenzfreie Videoformat WebM gibt es unter Windows das kostenlose Programm [Xmedia-Recode](http://www.xmedia-recode.de/).
+Zum Konvertieren von Videos in das lizenfreie Videoformat WebM gibt es unter Windows das kostenlose Programm [Xmedia-Recode](http://www.xmedia-recode.de/).
 
-## Ist es möglich, bei mehreren Profilen verschiedene Avatare (Nutzerbilder) zu haben?
+<a name="avatars"></a>
+### Ist es möglich, bei mehreren Profilen verschiedene Avatare (Nutzerbilder) zu haben?
 
 Ja.
 Auf Deiner ["Profile verwalten/editieren"-Seite](../profiles) wählst Du zunächst das gewünschte Profil aus.
-Anschließend siehst Du eine Seite mit allen Informationen zu diesem Profil.
+Anschließend siehst Du eine Seite mit allen Infos zu diesem Profil.
 Klicke nun oben auf den Link "Profilbild ändern" und lade im nächsten Fenster ein Bild von Deinem PC hoch.
 Um Deine privaten Daten zu schützen, wird in Beiträgen nur das Bild aus Deinem öffentlichen Profil angezeigt.
 
-## Wie kann ich Friendica in einer bestimmten Sprache ansehen?
+<a name="language"></a>
+### Wie kann ich Friendica in einer bestimmten Sprache ansehen?
 
 Die Sprache des Friendica Interfaces kann durch den `lang` Parameter un der URL beeinflusst werden.
 Das Argument des Parameters ist ein  [ISO 639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)  Code.
@@ -94,7 +114,8 @@ auf Deutsch:
 
      https://social.example.com/profile/example?lang=de.
 
-## Was ist der Unterschied zwischen blockierten|ignorierten|archivierten|versteckten Kontakten?
+<a name="contacts"></a>
+### Was ist der Unterschied zwischen blockierten|ignorierten|archivierten|versteckten Kontakten?
 
 Wir verhindern direkte Kommunikation mit blockierten Kontakten.
 Sie gehören nicht zu den Empfängern beim Versand von Beiträgen und deren Beiträge werden auch nicht importiert.
@@ -113,27 +134,30 @@ Dabei werden auch Kommentare dieser Person in Beiträgen Deiner Freunde blockier
 Ein archivierter Kontakt bedeutet, dass Kommunikation nicht möglich ist und auch nicht versucht wird (das ist z.B. sinnvoll, wenn eine Person zu einem neuen Server gewechselt ist und das alte Profil gelöscht hat).
 Anders als beim Blockieren werden existierende Beiträge, die vor der Archivierung erstellt wurden, weiterhin angezeigt.
 
-Ein versteckter Kontakt wird in keiner "Freundesliste" erscheinen (außer für dich).
-Trotzdem wird ein versteckter Kontakt normal in Unterhaltungen angezeigt - was für andere Kontakte ein Hinweis sein kann, dass diese Person als versteckter Kontakt in deiner Liste ist.
+Ein versteckter Kontakt wird in keiner "Freundeliste" erscheinen (außer für dich).
+Trotzdem wird ein versteckter Kontakt normal in Unterhaltungen angezeigt - was für andere Kontakte ein Hinweis sein kann, dass diese Person als versteckter Kontakt in Deiner Liste ist.
 
-## Was passiert, wenn ein Account gelöscht ist? Ist dieser richtig gelöscht?
+<a name="removed"></a>
+### Was passiert, wenn ein Account gelöscht ist? Ist dieser richtig gelöscht?
 
 Wenn Du Deinen Account löschst, wird sofort der gesamte Inhalt auf Deinem Server gelöscht und ein Löschbefehl an alle Deine Kontakte verschickt.
 Dadurch wirst Du ebenfalls aus dem globalen Verzeichnis gelöscht.
 Dieses Vorgehen setzt voraus, dass Dein Profil für 24 Stunden weiterhin "teilweise" verfügbar sein wird, um eine Verbindung zu allen Deinen Kontakten ermöglicht.
 Wir können also Dein Profil blockieren und es so erscheinen lassen, als wären alle Daten sofort gelöscht, allerdings warten wir 24 Stunden (bzw. bis alle Deine Kontakte informiert wurden), bevor wir die Daten auch physikalisch löschen.
 
-## Kann ich einem Hashtag folgen?
+<a name="hashtag"></a>
+### Kann ich einem Hashtag folgen?
 
 Ja.
 Füge die Tags zu Deinen gespeicherten Suchen hinzu, sie werden automatisch auf der Netzwerk-Seite auftauchen.
 Bitte beachte, dass Deine Antworten auf solche Posts aus technischen Gründen nicht unter dem "Persönlich"-Reiter auf der Netzwerk-Seite und der gesamte Thread nicht per API zu sehen sind.
 
-## Wie kann ich einen RSS-Feed meiner Netzwerkseite (Stream) erstellen?
+<a name="rss"></a>
+### Wie kann ich einen RSS-Feed meiner Netzwerkseite (Stream) erstellen?
 
 Wenn Du die Beiträge Deines Accounts mit RSS teilen willst, dann kannst Du einen der folgenden Links nutzen:
 
-### RSS-Feed Deiner Beiträge
+#### RSS-Feed Deiner Beiträge
 
 	deineSeite.de/feed/[profilname]/posts
 
@@ -141,7 +165,7 @@ Beispiel: Friendica Support
 
 	https://forum.friendi.ca/feed/helpers/posts
 
-### RSS-Feed all deiner Beiträge und Antworten
+#### RSS-Feed all deiner Beiträge und Antworten
 
     deineSeite.de/dfrn_poll/feed/[profilname]/comments
 
@@ -149,17 +173,18 @@ Beispiel: Friendica Support
 
     https://forum.friendi.ca/feeds/helpers/comments
 
-### RSS-Feed all deiner Aktivitäten
+#### RSS-Feed all deiner Aktivitäten
 
     deineSeite.de/feed/[profilname]/
 
-## Gibt es Clients für Friendica?
+<a name="clients">
+### Gibt es Clients für Friendica?
 
-Friendica unterstützt [Mastodon API](help/spec/api/mastodon) und [Twitter API | gnusocial](help/spec/api/index).
+Friendica unterstützt [Mastodon API](help/API-Mastodon) und [Twitter API | gnusocial](help/api).
 Das bedeutet, du kannst einge der Mastodon und Twitter Clients für Friendica verwenden.
 Die verfügbaren Features sind Abhängig vom Client, so dass diese teils unterschiedlich sein können.
 
-### Android
+#### Android
 
 * [AndStatus](http://andstatus.org) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.andstatus.app), [Google Play](https://play.google.com/store/apps/details?id=org.andstatus.app))
 * [B4X for Pleroma & Mastodon](https://github.com/AnywhereSoftware/B4X-Pleroma)
@@ -177,21 +202,21 @@ Die verfügbaren Features sind Abhängig vom Client, so dass diese teils untersc
 * [twitlatte](https://github.com/moko256/twitlatte)
 * [Yuito](https://github.com/accelforce/Yuito)
 
-### SailfishOS
+#### SailfishOS
 
 * [Friendly](https://openrepos.net/content/fabrixxm/friendly#comment-form)
 
-### iOS
+#### iOS
 
-* [B4X for Pleroma & Mastodon](https://www.b4x.com/) ([App Store](https://apps.apple.com/app/b4x-pleroma/id1538396871), [GitHub](https://github.com/AnywhereSoftware/B4X-Pleroma))
-* [Fedi](https://fediapp.com) ([App Store](https://apps.apple.com/de/app/fedi-for-pleroma-and-mastodon/id1478806281))
-* [Mastodon](https://joinmastodon.org/apps)([App Store](https://apps.apple.com/us/app/mastodon-for-iphone/id1571998974))
-* [Roma](https://www.roma.rocks/)([App Store](https://apps.apple.com/de/app/roma-for-pleroma-and-mastodon/id1445328699))
-* [Stella*](https://www.stella-app.net/) ([App Store](https://apps.apple.com/us/app/stella-for-mastodon-twitter/id921372048))
-* [Tooot](https://tooot.app/) ([App Store](https://apps.apple.com/app/id1549772269), [GitHub](https://github.com/tooot-app)), Datensammlung (nicht mit Identität verknüpft)
-* [Tootle](https://mastodon.cloud/@tootleapp) ([App Store](https://apps.apple.com/de/app/tootle-for-mastodon/id1236013466)), letztes update: 2020
+* [B4X for Pleroma & Mastodon](https://www.b4x.com/) ([AppStore](https://apps.apple.com/app/b4x-pleroma/id1538396871), [GitHub](https://github.com/AnywhereSoftware/B4X-Pleroma))
+* [Fedi](https://fediapp.com) ([AppStore](https://apps.apple.com/de/app/fedi-for-pleroma-and-mastodon/id1478806281))
+* [Mastodon](https://joinmastodon.org/apps)([AppStore](https://apps.apple.com/us/app/mastodon-for-iphone/id1571998974))
+* [Roma](https://www.roma.rocks/)([AppStore](https://apps.apple.com/de/app/roma-for-pleroma-and-mastodon/id1445328699))
+* [Stella*](https://www.stella-app.net/) ([AppStore](https://apps.apple.com/us/app/stella-for-mastodon-twitter/id921372048))
+* [Tooot](https://tooot.app/) ([AppStore](https://apps.apple.com/app/id1549772269), [GitHub](https://github.com/tooot-app)), Datensammlung (nicht mit Identität verknüpft)
+* [Tootle](https://mastodon.cloud/@tootleapp) ([AppStore](https://apps.apple.com/de/app/tootle-for-mastodon/id1236013466)), letztes update: 2020
 
-### Linux
+#### Linux
 
 * [Choqok](https://choqok.kde.org)
 * [Whalebird](https://whalebird.social)
@@ -199,12 +224,12 @@ Die verfügbaren Features sind Abhängig vom Client, so dass diese teils untersc
 * [Toot](https://toot.readthedocs.io/en/latest/)
 * [Tootle](https://github.com/bleakgrey/tootle)
 
-### macOS
+#### macOS
 
-* [Mastonaut](https://mastonaut.app/) ([App Store](https://apps.apple.com/us/app/mastonaut/id1450757574)), kostet ~8€
-* [Whalebird](https://whalebird.social/en/desktop/contents) ([App Store](https://apps.apple.com/de/app/whalebird/id1378283354), [GitHub](https://github.com/h3poteto/whalebird-desktop))
+* [Mastonaut](https://mastonaut.app/) ([AppStore](https://apps.apple.com/us/app/mastonaut/id1450757574)), kostet ~8€
+* [Whalebird](https://whalebird.social/en/desktop/contents) ([AppStore](https://apps.apple.com/de/app/whalebird/id1378283354), [GitHub](https://github.com/h3poteto/whalebird-desktop))
 
-### Web
+#### Web
 
 * [Halcyon](https://www.halcyon.social/)
 * [Pinafore](https://github.com/nolanlawson/pinafore)

doc/de/Groups.md

@@ -1,4 +1,8 @@
-# Accounttypen: Gruppen und Seiten
+Gruppen
+=====
+
+* [Zur Startseite der Hilfe](help)
+
 
 In Friendica kannst Du auch Gruppen und/oder Prominenten-Seiten erstellen.
 

doc/de/Home.md

@@ -0,0 +1,76 @@
+Hilfe
+=====
+
+**Dokumentation für Benutzer**
+
+* Allgemeine Funktionen - Erste Schritte
+	* [Account - Basics](help/Account-Basics)
+	* [Schnellstart für neue Benutzer](help/Quick-Start-guide)
+	* [Beiträge erstellen](help/Text_editor)
+	* [Referenz der BBCode Elemente](help/BBCode)
+	* [Beiträge kommentieren, einordnen und löschen](help/Text_comment)
+	* [Referenz der Accesskeys](help/Accesskeys)
+    * [Veranstaltungen](help/events)
+* Du und andere Nutzer
+	* [Konnektoren (Connectors)](help/Connectors)
+	* [Freunde finden](help/Making-Friends)
+	* [Circles und Privatsphäre](help/Circles-and-Privacy)
+	* [Tags und Erwähnungen](help/Tags-and-Mentions)
+	* [Community-Gruppen](help/Groups)
+	* [Kanäle (Channels)](help/Channels)
+	* [Chats](help/Chats)
+* Weiterführende Informationen
+	* [Account umziehen](help/Move-Account)
+	* [Export / Import gefolgter Kontakte](help/Export-Import-Contacts)
+	* [Account löschen](help/Remove-Account)
+	* [Bugs und Probleme](help/Bugs-and-Issues)
+	* [Häufig gestellte Fragen (FAQ)](help/FAQ)
+
+**Dokumentation für Administratoren**
+
+* [Installation](help/Install)
+* [Update](help/Update) (EN)
+* [Konfigurationen & Admin-Panel](help/Settings)
+* [Addons](help/Addons)
+* [Konnektoren (Connectors) installieren](help/Installing-Connectors)
+* [Installation eines ejabberd Servers (XMPP-Chat) mit synchronisierten Anmeldedaten](help/install-ejabberd) (EN)
+* [Betreibe deine Seite mit einem SSL-Zertifikat](help/SSL)
+* [Konfigurationswerte, die nur in der config/local.config.php gesetzt werden können](help/Config) (EN)
+* [Performance verbessern](help/Improve-Performance)
+* [Administration Werkzeuge](help/tools) (EN)
+* [Admin FAQ](help/FAQ-admin)
+
+**Dokumentation für Entwickler**
+
+* [Entwickler](help/Developers)
+* [Where to get started?](help/Developers-Intro) (EN)
+* [Help on Github](help/Github)
+* [Help on Vagrant](help/Vagrant)
+* [How to translate Friendica](help/translations) (EN)
+* [Bugs and Issues](help/Bugs-and-Issues)
+* [Addon Development](help/Addons)
+* [Theme Development](help/themes)
+* [Smarty 3 Templates](help/smarty3-templates)
+* [Protokoll Dokumentation](help/Protocol) (EN)
+* [Datenbank-Schema](help/database)
+* [Class Autoloading](help/autoloader) (EN)
+* [Using Composer](help/Composer) (EN)
+* [Code-Referenz (mit doxygen generiert - setzt Cookies)](doc/html/)
+* [API Dokumentation](help/api) (EN)
+* [Translation of Friendica](help/translations) (EN)
+* [Run tests](help/Tests) (EN)
+
+**Links**
+
+* Website: [https://friendi.ca](https://friendi.ca)
+* Help Group: [@helpers@forum.friendi.ca](https://forum.friendi.ca/~helpers)
+* XMPP: [support@forum.friendi.ca](xmpp:support@forum.friendi.ca?join)
+* IRC: [https://web.libera.chat/?channels=#friendica](https://web.libera.chat/?channels=#friendica)
+* Matrix: [https://matrix.to/#/#friendi.ca:matrix.org](https://matrix.to/#/#friendi.ca:matrix.org)
+* Mailing List: [https://mailman.friendi.ca/mailman/listinfo/support-friendi.ca](http://mailman.friendi.ca/mailman/listinfo/support-friendi.ca)
+
+**Über**
+
+* [Server Information](friendica)
+* [Nutzungsbedingungen](tos)
+* [Mitwirkende](credits)

doc/de/Improve-Performance.md

@@ -1,4 +1,7 @@
-# How-to: Performance verbessern
+How-to: Performance verbessern
+==========
+
+* [Zur Startseite der Hilfe](help)
 
 Eine kleine Anleitung, um die Performance einer Friendica-Seite zu verbessern.
 
@@ -6,25 +9,27 @@ Eine kleine Anleitung, um die Performance einer Friendica-Seite zu verbessern.
 
 Wenn du Fragen zu den folgenden Anweisungen oder zu anderen Themen hast, dann kannst du jederzeit beim Friendica-Support unter https://forum.friendi.ca/profile/helpers nachfragen.
 
-## Systemeinstellungen
+Systemeinstellungen
+---------------
 
-Geh auf `/admin/site` in deinem System und ändere die folgenden Werte:
+Geh auf /admin/site in deinem System und ändere die folgenden Werte:
 
     setze "Qualität des JPEG Bildes" auf 50.
 
-Dieser Wert reduziert die Daten, die vom Server an den Client geschickt werden.
+Dieser Wert reduziert die Daten, die vom Server an den Client geschickt werden. 
 50 ist ein Wert, der die Bildqualität nicht zu stark beeinflusst.
 
     setze "Intervall zum Vervollständigen von OStatus Unterhaltungen" auf "niemals"
 
-Wenn du viele OStatus-Kontakte hast, dann kann die Vervollständigung von Unterhaltungen sehr zeitraubend sein.
+Wenn du viele OStatus-Kontakte hast, dann kann die Vervollständigung von Unterhaltungen sehr zeitraubend sein. 
 Der Nachteil: Du siehst nicht jede Antwort einer OStatus-Unterhaltung. Aus diesem Grund ist die Option "Beim Empfang von Nachrichten" in der Regel ein guter Kompromiss.
 
     setze "Nutze MySQL full text engine".
 
 Wenn du MyISAM (Standardeinstellung) oder InnoDB mit MariaDB 10 nutzt, dann beschleunigt dies die Suche.
 
-## Addons
+Addons
+--------
 
 Aktiviere die folgenden Addons:
 
@@ -50,7 +55,8 @@ Wenn es aktiviert ist, dann siehst du Werte wie die folgenden auf jeder deiner S
 
 Diese Werte zeigen deine Performance-Probleme.
 
-## Webserver
+Webserver
+----------
 
 Wenn du einen Apache-Webserver nutzt, aktiviere bitte die folgenden Module:
 
@@ -74,7 +80,7 @@ Weitere Informationen findest du hier: http://httpd.apache.org/docs/2.2/mod/mod_
 
 Dieses Modul komprimiert den Datenverkehr (Traffic) zwischen dem Webserver und dem Client.
 
-Aktiviere das Modul `mod_deflate` durch die Eingabe `a2enmod deflate` als root.
+Aktiviere das Modul "mod_deflate" durch die Eingabe "a2enmod deflate" als root.
 
 Weitere Informationen findest du hier: http://httpd.apache.org/docs/2.2/mod/mod_deflate.html
 
@@ -83,9 +89,9 @@ Weitere Informationen findest du hier: http://httpd.apache.org/docs/2.2/mod/mod_
 
 **FCGI**
 
-Wenn du Apache nutzt, dann denk darüber nach, FCGI zu nutzen.
+Wenn du Apache nutzt, dann denk darüber nach, FCGI zu nutzen. 
 Wenn du eine Debian-basierte Distribution nutzt, dann wirst du die Pakete "php5-cgi" und "libapache2-mod-fcgid" benötigen.
-Nutze externe Dokumente, um eine detailliertere Erklärung für die Einrichtung eines Systems auf FCGI-Basis zu erhalten.
+Nutze externe Dokumente, um eine detailiertere Erklärung für die Einrichtung eines Systems auf FCGI-Basis zu erhalten.
 
 ### Database
 

doc/de/Install.md

@@ -1,6 +1,9 @@
-# Friendica Installation
+Friendica Installation
+==========
 
-Wir haben hart daran gearbeitet, um Friendica auf vorgefertigten Hosting-Plattformen zum Laufen zu bringen - solche, auf denen auch WordPress Blogs und Drupal-Installationen laufen.
+* [Zur Startseite der Hilfe](help)
+
+Wir haben hart daran gearbeitet, um Friendica auf vorgefertigten Hosting-Plattformen zum Laufen zu bringen - solche, auf denen auch Wordpress Blogs und Drupal-Installationen laufen.
 Wir bieten eine manuelle und eine automatische Installation an.
 Aber bedenke, dass Friendica mehr als eine einfache Webanwendung ist.
 Es handelt sich um ein komplexes Kommunikationssystem, das eher an einen Email-Server erinnert als an einen Webserver.
@@ -9,7 +12,7 @@ Diese Funktionalität benötigt ein wenig mehr als die normalen Blogs.
 Nicht jeder PHP/MySQL-Hosting-Anbieter kann Friendica unterstützen.
 Viele hingegen können es. Aber **bitte** prüfe die Voraussetzungen deines Servers vor der Installation.
 
-Wenn dir Fehler während der Installation auffallen, sag uns bitte über [Helper](https://forum.friendi.ca/profile/helpers) oder die [Entwickler Gruppe](https://forum.friendi.ca/profile/developers) Bescheid oder [erstelle ein Issue](https://github.com/friendica/friendica/issues).
+Wenn dir Fehler während der Installation auffallen, sag uns bitte über [Helper](http://forum.friendi.ca/profile/helpers) oder die [Entwickler Gruppe](https://forum.friendi.ca/profile/developers) Bescheid oder [erstelle ein Issue](https://github.com/friendica/friendica/issues).
 Gib uns bitte so viele Infos zu deinem System, wie du kannst, und beschreibe den Fehler mit allen Details und Fehlermeldungen, so dass wir den Fehler zukünftig verhindern können.
 Aufgrund der großen Anzahl an verschiedenen Betriebssystemen und PHP-Plattformen haben wir nur geringe Kapazitäten, um deine PHP-Installation zu debuggen oder fehlende Module zu ersetzen, aber wir tun unser Bestes, um allgemeine Code-Fehler zu beheben.
 
@@ -18,9 +21,10 @@ Dinge verändern sich und einige deiner Freunde haben möglicherweise Probleme,
 Wir planen, diese Einschränkung in einer zukünftigen Version zu beheben.
 
 
-## Requirements
+Requirements
+---
 
-* Apache mit einer aktiverten mod-rewrite-Funktion und dem Eintrag "Options All", so dass du die lokale `.htaccess`-Datei nutzen kannst
+* Apache mit einer aktiverten mod-rewrite-Funktion und dem Eintrag "Options All", so dass du die lokale .htaccess-Datei nutzen kannst
 * PHP  7.4+
   * PHP *Kommandozeilen*-Zugang mit register_argc_argv auf "true" gesetzt in der php.ini-Datei
   * Curl, GD, GMP, PDO, mbstrings, MySQLi, hash, xml, zip, IntlChar, IDN und OpenSSL-Erweiterung
@@ -31,7 +35,8 @@ Wir planen, diese Einschränkung in einer zukünftigen Version zu beheben.
 * die Möglichkeit, wiederkehrende Aufgaben mit cron (Linux/Mac) oder "Scheduled Tasks" einzustellen (Windows) [Beachte: andere Optionen sind in Abschnitt 7 dieser Dokumentation zu finden]
 * Installation in einer Top-Level-Domain oder Subdomain (ohne eine Verzeichnis/Pfad-Komponente in der URL) wird bevorzugt. Verzeichnispfade sind für diesen Zweck nicht so günstig und wurden auch nicht ausführlich getestet.
 
-## Installation
+Installation
+---
 
 ### Alternative Wege um Friendica zu Installieren
 
@@ -51,44 +56,38 @@ Entpacke die Friendica-Daten in das Quellverzeichnis (root) des Dokumentenbereic
 Wenn du die Möglichkeit hierzu hast, empfehlen wir dir "git" zu nutzen, um die Daten direkt von der Quelle zu klonen, statt die gepackte .tar- oder .zip-Datei zu nutzen.
 Das macht die Aktualisierung wesentlich einfacher.
 Der Linux-Code, mit dem man die Dateien direkt in ein Verzeichnis wie "meinewebseite" kopiert, ist
-```sh
-git clone https://github.com/friendica/friendica.git -b stable mywebsite
-cd mywebsite
-bin/composer.phar run install:prod
-```
+
+    git clone https://github.com/friendica/friendica.git -b stable mywebsite
+    cd mywebsite
+    bin/composer.phar run install:prod
 
 Stelle sicher, dass der Ordner *view/smarty3* existiert and von dem Webserver-Benutzer beschreibbar ist
-```sh
-mkdir view/smarty3
-chmod 775 view/smarty3
-```
+
+    mkdir view/smarty3
+    chmod 775 view/smarty3
 
 Falls Addons installiert werden sollen: Gehe in den Friendica-Ordner
-```sh
-cd mywebsite
-```
+
+    cd mywebsite
 
 Und die Addon Repository klonst:
-```sh
-git clone https://github.com/friendica/friendica-addons.git -b stable addon
-```
+
+    git clone https://github.com/friendica/friendica-addons.git -b stable addon
 
 Um das Addon-Verzeichnis aktuell zu halten, solltest du in diesem Pfad ein "git pull"-Befehl eintragen
-```sh
-cd meinewebseite/addon
-git pull
-```
 
-Wenn du den Verzeichnispfad auf deinen Webserver kopierst, dann stelle sicher, dass du auch die `.htaccess` kopierst, da "Punkt"-Dateien oft versteckt sind und normalerweise nicht direkt kopiert werden.
+    cd meinewebseite/addon
+    git pull
+
+Wenn du den Verzeichnispfad auf deinen Webserver kopierst, dann stelle sicher, dass du auch die .htaccess kopierst, da "Punkt"-Dateien oft versteckt sind und normalerweise nicht direkt kopiert werden.
 
 Wenn du die Entwickler Version von Friendica verwenden möchtest kannst du auf den develop Branch im git Repository wechseln.
 Dies tust du mit den folgenden Befehlen
-```sh
-git checkout develop
-bin/composer.phar run install:prod
-cd addon
-git checkout develop
-```
+
+    git checkout develop
+    bin/composer.phar run install:prod
+    cd addon
+    git checkout develop
 
 Die Entwickler Version kann nach einem fehlerhaften Commit vorübergehend Probleme haben oder gar nicht mehr funktionieren.
 Sollte dir so etwas passieren, lass es uns bitte wissen, damit der Fehler behoben werden kann.
@@ -102,9 +101,8 @@ Friendica benötigt die Berechtigungen um neue Felder in dieser Datenbank zu ert
 Mit neueren Versionen von MySQL (5.7.17+) musst du den `sql_mode` zu `''` (blank) setzen.
 Benutze diese Einstellung, wenn der Installer nicht in der Lage ist, die Tabellen aufgrund eines Timestamp-Format Problems zu erstellen.
 Falls dem so ist, finde den `[mysqld]` Bereich in deiner `my.conf` Datei und füge diese Zeile hinzu:
-```
-sql_mode = ''
-```
+
+    sql_mode = ''
 
 Starte MySQL dann neu und es sollte klappen.
 
@@ -128,42 +126,39 @@ Du kannst bei Bedarf die Datei config/local.config.php verschieben/umbenennen un
 ### Option B: Starte das automatische Installationsscript
 
 Es existieren folgende Varianten zur automatischen Installation von Friendica:
-- Eine vorgefertigte Konfigurationsdatei erstellen (z.B. `prepared.config.php`)
-- Verwendung von Umgebungsvariablen (z.B. `MYSQL_HOST`)
-- Verwendung von Optionen (z.B. `--dbhost <host>`)
+-	Eine vorgefertigte Konfigurationsdatei erstellen (z.B. `prepared.config.php`)
+-	Verwendung von Umgebungsvariablen (z.B. `MYSQL_HOST`)
+-	Verwendung von Optionen (z.B. `--dbhost <host>`)
 
 Umgebungsvariablen und Optionen können auch kombiniert werden.
 Dabei ist jedoch darauf zu achten, dass etwaige Optionen immer die zugehörigen Umgebungsvariablen überschreiben.
 
 Für mehr Informationen kannst du diese Option verwenden:
-```sh
-bin/console autoinstall -v
-```
+
+    bin/console autoinstall -v
 
 Falls du alle optionalen Checks ausfürehn lassen möchtest, benutze diese Option:
-```sh
-bin/console autoinstall -a
-```
+
+    bin/console autoinstall -a
 
 *Wenn* die automatisierte Installation aus irgendeinem Grund fehlschlägt, dann prüfe das Folgende:
-* Existiert die `config/local.config.php`? Falls ja, wird die automatisierte Installation nicht gestartet.
-* Sind Einstellungen in der `config/local.config.php` korrekt? Falls nicht, bitte bearbeite diese Datei erneut.
-* Ist die leere MySQL-Datenbank erstellt? Falls nicht, erstelle diese.
+*	Existiert die `config/local.config.php`? Falls ja, wird die automatisierte Installation nicht gestartet.
+*	Sind Einstellungen in der `config/local.config.php` korrekt? Falls nicht, bitte bearbeite diese Datei erneut.
+*	Ist die leere MySQL-Datenbank erstellt? Falls nicht, erstelle diese.
 
 #### B.1: Konfigurationsdatei
 
 Für diese Variante muss ein Konfigurationsdatei bereits vor der Installation fertig definiert sein (z.B. [local-sample.config.php](config/local-sample.config.php).
 
 Gehe im Anschluss in den Friendica-Hauptordner und führe den Kommandozeilen Befehl aus:
-```sh
-bin/console autoinstall -f <prepared.config.php>
-```
+
+    bin/console autoinstall -f <prepared.config.php>
 
 #### B.2: Umgebungsvariablen
 
 Es existieren Zwei Arten von Umgebungsvariablen in Friendica:
-- Jene, die auch im normalen Betrieb verwendet werden können (derzeit ausschließlich **Datenbank Einstellungen**)
-- Jene, die nur während der Installation verwedent werden können (im normalen Betrieb werden sie ignoriert)
+-	Jene, die auch im normalen Betrieb verwendet werden können (derzeit ausschließlich **Datenbank Einstellungen**)
+-	Jene, die nur während der Installation verwedent werden können (im normalen Betrieb werden sie ignoriert)
 
 Umgebungsvariablen können auch durch adäquate Optionen (z.B. `--dbhost <hostname>`)übersteuert werden.
 
@@ -171,62 +166,57 @@ Umgebungsvariablen können auch durch adäquate Optionen (z.B. `--dbhost <hostna
 
 Nur wenn die Option `--savedb` gesetzt ist, werden diese Umgebungsvariablen auch in `config/local.config.php` gespeichert!
 
-- `MYSQL_HOST` Der Host der MySQL/MariaDB Datenbank
-- `MYSQL_PORT` Der Port der MySQL/MariaDB Datenbank
-- `MYSQL_USERNAME` Der Benutzername des MySQL Datenbanklogins (MySql - Variante)
-- `MYSQL_USER` Der Benutzername des MariaDB Datenbanklogins (MariaDB-Variante)
-- `MYSQL_PASSWORD` Das Passwort der MySQL/MariaDB Datenbanklogins
-- `MYSQL_DATABASE` Der Name der MySQL/MariaDB Datenbank
+-	`MYSQL_HOST` Der Host der MySQL/MariaDB Datenbank
+-	`MYSQL_PORT` Der Port der MySQL/MariaDB Datenbank
+-	`MYSQL_USERNAME` Der Benutzername des MySQL Datenbanklogins (MySql - Variante)
+-	`MYSQL_USER` Der Benutzername des MariaDB Datenbanklogins (MariaDB-Variante)
+-	`MYSQL_PASSWORD` Das Passwort der MySQL/MariaDB Datenbanklogins
+-	`MYSQL_DATABASE` Der Name der MySQL/MariaDB Datenbank
 
 **Friendica Einstellungen**
 
 Diese Umgebungsvariablen können nicht während des normalen Friendica Betriebs verwendet werden.
 Sie werden stattdessen direkt in `config/local.config.php` gespeichert.
 
-- `FRIENDICA_PHP_PATH` Der Pfad zur PHP-Datei
-- `FRIENDICA_ADMIN_MAIL` Die Admin E-Mail Adresse dieses Friendica Knotens (wird auch für den Admin-Zugang benötigt)
-- `FRIENDICA_TZ` Die Zeitzone von Friendica
-- `FRIENDICA_LANG` Die Sprache von Friendica
+-	`FRIENDICA_PHP_PATH` Der Pfad zur PHP-Datei
+-	`FRIENDICA_ADMIN_MAIL` Die Admin E-Mail Adresse dieses Friendica Knotens (wird auch für den Admin-Zugang benötigt)
+-	`FRIENDICA_TZ` Die Zeitzone von Friendica
+-	`FRIENDICA_LANG` Die Sprache von Friendica
 
 Gehe im Anschluss in den Friendica-Hauptordner und führe den Kommandozeilen Befehl aus:
-```sh
-bin/console autoinstall [--savedb]
-```
+
+    bin/console autoinstall [--savedb]
 
 #### B.3: Optionen
 
 Alle Optionen werden in `config/local.config.php` gespeichert und überschreiben etwaige, zugehörige Umgebungsvariablen.
 
-- `-H|--dbhost <host>` Der Host der MySQL/MariaDB Datenbank (env `MYSQL_HOST`)
-- `-p|--dbport <port>` Der Port der MySQL/MariaDB Datenbank (env `MYSQL_PORT`)
-- `-U|--dbuser <username>` Der Benutzername des MySQL/MariaDB Datenbanklogins (env `MYSQL_USER` or `MYSQL_USERNAME`)
-- `-P|--dbpass <password>` Das Passwort der MySQL/MariaDB Datenbanklogins (env `MYSQL_PASSWORD`)
-- `-d|--dbdata <database>` Der Name der MySQL/MariaDB Datenbank (env `MYSQL_DATABASE`)
-- `-b|--phppath <path>` Der Pfad zur PHP-Datei (env `FRIENDICA_PHP_PATH`)
-- `-A|--admin <mail>` Die Admin E-Mail Adresse dieses Friendica Knotens (env `FRIENDICA_ADMIN_MAIL`)
-- `-T|--tz <timezone>` Die Zeitzone von Friendica (env `FRIENDICA_TZ`)
-- `-L|--lang <language>` Die Sprache von Friendica (env `FRIENDICA_LANG`)
+-	`-H|--dbhost <host>` Der Host der MySQL/MariaDB Datenbank (env `MYSQL_HOST`)
+-	`-p|--dbport <port>` Der Port der MySQL/MariaDB Datenbank (env `MYSQL_PORT`)
+-	`-U|--dbuser <username>` Der Benutzername des MySQL/MariaDB Datenbanklogins (env `MYSQL_USER` or `MYSQL_USERNAME`)
+-	`-P|--dbpass <password>` Das Passwort der MySQL/MariaDB Datenbanklogins (env `MYSQL_PASSWORD`)
+-	`-d|--dbdata <database>` Der Name der MySQL/MariaDB Datenbank (env `MYSQL_DATABASE`)
+-	`-b|--phppath <path>` Der Pfad zur PHP-Datei (env `FRIENDICA_PHP_PATH`)
+-	`-A|--admin <mail>` Die Admin E-Mail Adresse dieses Friendica Knotens (env `FRIENDICA_ADMIN_MAIL`)
+-	`-T|--tz <timezone>` Die Zeitzone von Friendica (env `FRIENDICA_TZ`)
+-	`-L|--lang <language>` Die Sprache von Friendica (env `FRIENDICA_LANG`)
 
 Gehe in den Friendica-Hauptordner und führe den Kommandozeilen Befehl aus:
-```sh
-bin/console autoinstall [options]
-```
+
+    bin/console autoinstall [options]
 
 ### Einen Worker einrichten
 
 Erstelle einen Cron job oder einen regelmäßigen Task, um den Poller alle 5-10 Minuten im Hintergrund ablaufen zu lassen.
 Beispiel:
-```sh
-cd /base/directory; /path/to/php bin/console.php worker
-```
+
+    cd /base/directory; /path/to/php bin/console.php worker
 
 Ändere "/base/directory" und "/path/to/php" auf deine Systemvorgaben.
 
 Wenn du einen Linux-Server nutzt, benutze den Befehl "crontab -e" und ergänze eine Zeile wie die Folgende; angepasst an dein System
 
-```crontab
-*/10 * * * * cd /home/myname/mywebsite; /usr/bin/php bin/console.php worker
-```
+`*/10 * * * * cd /home/myname/mywebsite; /usr/bin/php bin/console.php worker`
 
 Du kannst den PHP-Pfad finden, indem du den Befehl „which php“ ausführst.
 Wenn du Schwierigkeiten mit diesem Schritt hast, kannst du deinen Hosting-Anbieter kontaktieren.

doc/de/Installing-Connectors.md

@@ -1,4 +1,7 @@
-# Konnektoren installieren
+Konnektoren installieren
+==================================================
+
+* [Zur Startseite der Hilfe](help)
 
 Friendica verwendet Konnektoren, um sich mit einigen Netzwerken zu verbinden, wie Tumblr oder Bluesky.
 
@@ -16,7 +19,8 @@ Andere Konnektoren, wie Bluesky, benötigen überhaupt keinen API-Schlüssel.
 
 Weitere Informationen zu den spezifischen Anforderungen findest du auf der Einstellungsseite des jeweiligen Addons, entweder auf der Verwaltungsseite oder auf der Benutzerseite.
 
-## Bluesky Jetstream
+Bluesky Jetstream
+---
 
 Um die Konnektivität mit Bluesky weiter zu verbessern, kann die „Jetstream“-Konnektivität aktiviert werden.
 Jetstream ist ein Dienst, der sich mit dem Bluesky-Firehose verbindet.

doc/de/Making-Friends.md

@@ -1,4 +1,7 @@
-# Freunde finden
+Freunde finden
+==============
+
+* [Zur Startseite der Hilfe](help)
 
 Freundschaft kann in Friendica viele verschiedene Bedeutungen annehmen.
 Aber lasst es uns einfach halten, du willst einfach mit jemandem befreundet sein.
@@ -9,23 +12,23 @@ Das Verzeichnis ist in zwei Teile aufgeteilt.
 Wenn du auf den "Verzeichnis"-Button klickst, wirst du zunächst alle Mitglieder deines Servers sehen, die sich dazu entschlossen haben, angezeigt zu werden.
 Außerdem siehst du dort einen Link zum globalen Verzeichnis.
 Wenn du dich durch das globale Verzeichnis klickst, siehst du alle Nutzer weltweit auf allen Servern, die sich entschlossen haben, im Verzeichnis zu erscheinen.
-Du wirst zudem den Link "Show Community Groups" sehen, welcher dich zu Gruppen und Fan-Seiten führt.
+Du wirst außerdem den Link "Show Community Groups" sehen, welcher dich zu Gruppen und Fan-Seiten führt.
 Du verbindest dich mit Personen und Gruppen auf die gleiche Art, wobei Gruppen deine Anfrage automatisch annehmen, wohingegen ein Mensch dich erst manuell bestätigen muss.
 
 *Mit anderen Friendica-Nutzern verbinden*
 
 Besuche ihr Profil.
 Direkt unter dem Profilfoto ist das Wort "Verbinden" (bzw. "Connect" in einem englischsprachigem Profil).
-Klicke darauf und du gelangst zur "Verbinden"-Seite.
+Klicke drauf und du gelangst zur "Verbinden"-Seite.
 Dort wirst du nach deiner Identitätsadresse gefragt.
 Das ist nötig, damit die Seite dein Profil finden kann.
 
 *Was kommt in die Box?*
 
 Wenn deine Friendica-Seite "demo.friendica.com" heißt und dein Nutzername/Spitzname auf der Seite "bob" ist, dann wäre es "bob@demo.friendica.com".
-Wie du siehst, sieht es wie eine E-Mail-Adresse aus.
+Wie du siehst, sieht es wie eine Email-Adresse aus.
 Das ist beabsichtigt, da sich die Leute das so leichter merken können.
-Du *kannst* auch die URL deiner Startseite eintragen, wie z.B. "http://demo.friendica.com/profile/bob", aber der E-Mail-Adressen-Stil ist einfacher.
+Du *kannst* auch die URL deiner Startseite eintragen, wie z.B. "http://demo.friendica.com/profile/bob", aber der Email-Adressen-Stil ist einfacher.
 
 Wenn du die "Verbinden"-Seite bestätigt hast, kommst du zurück zu deiner Seite, um dort die Anfrage zu bestätigen.
 Wenn du das gemacht hast, können beide Seiten miteinander kommunizieren, um den Prozess abzuschließen (sobald dein neuer Freund die Anfrage bestätigt hat).
@@ -42,7 +45,7 @@ Wenn du z.B. "bob" auf quitter.se (eine GNU Social-Seite) kennst, dann kannst du
 Tatsächlich kannst du jedem und jeder Website folgen, der/die einen Syndication-Feed (RSS/Atom etc.) zur Verfügung stellt.
 Wenn wir einen Informationsstrom und einen Namen dazu finden, können wir auch versuchen, uns damit zu verbinden.
 
-Wenn du deine E-Mail-Postfachverbindung auf deiner Einstellungsseite konfiguriert hast, dann kannst du die E-Mail-Adresse jeder Person eintragen, die dir schon eine Nachricht an dein Postfach geschickt hat und bereits in deinem sozialen Stream erscheint.
+Wenn du deine Email-Postfachverbindung auf deiner Einstellungsseite konfiguriert hast, dann kannst du die Email-Adresse jeder Person eintragen, die dir schon eine Nachricht an dein Postfach geschickt hat und bereits in deinem sozialen Stream erscheint.
 Du kannst diesen Personen außerdem von Friendica aus antworten.
 
 Leute können sich ebenfalls von anderen Netzwerken aus mit dir befreunden.

doc/de/Message-Flow.md

@@ -1,11 +1,14 @@
-# Friendica Nachrichtenfluss
+Friendica Nachrichtenfluss
+==============
 
-Diese Seite soll einige Infos darüber dokumentieren, wie Nachrichten innerhalb von Friendica von einer Person zur anderen übertragen werden.
-Es gibt verschiedene Pfade, die verschiedene Protokolle und Nachrichtenformate nutzen.
+* [Zur Startseite der Hilfe](help)
+
+Diese Seite soll einige Infos darüber dokumentieren, wie Nachrichten innerhalb von Friendica von einer Person zur anderen übertragen werden. 
+Es gibt verschiedene Pfade, die verschiedene Protokolle und Nachrichtenformate nutzen. 
 
 Diejenigen, die den Nachrichtenfluss genauer verstehen wollen, sollten sich mindestens mit dem DFRN-Protokoll ([Dokument mit den DFRN Spezifikationen](https://github.com/friendica/friendica/blob/stable/spec/dfrn2.pdf)) und den Elementen zur Nachrichtenverarbeitung des OStatus Stack informieren (salmon und Pubsubhubbub).
 
-Wenn eine Nachricht veröffentlicht wird, werden alle Übermittlungen an alle Netzwerke mit include/notifier.php durchgeführt, welche entscheidet, wie und an wen die Nachricht geliefert wird.
+Wenn eine Nachricht veröffentlicht wird, werden alle Übermittlungen an alle Netzwerke mit include/notifier.php durchgeführt, welche entscheidet, wie und an wen die Nachricht geliefert wird. 
 Diese Datei bindet dabei die lokale Bearbeitung aller Übertragungen ein inkl. dfrn-notify.
 
 mod/dfrn_notify.php handhabt die Rückmeldung (remote side) von dfrn-notify.
@@ -19,40 +22,40 @@ PuSh-Feeds (pubsubhubbub) kommen via mod/pubsub.php an.
 DFRN-poll Feed-Imports kommen via src/Worker/OnePoll.php als geplanter Task an, das implementiert die lokale Bearbeitung (local side) des DFRN-Protokolls.
 
 
-## Szenario #1. Bob schreibt eine öffentliche Statusnachricht
+### Szenario #1. Bob schreibt eine öffentliche Statusnachricht
 
-Dies ist eine öffentliche Nachricht ohne begrenzte Nutzerfreigabe, so dass keine private Übertragung notwendig ist.
-Es gibt zwei Wege, die genutzt werden können - als bbcode an DFRN-Clients oder als durch den Server konvertierten HTML-Code (mit PuSH; pubsubhubbub).
-Wenn ein PuSH-Hub einsatzfähig ist, nutzen DFRN-Poll-Clients vorrangig die Informationen, die durch den PuSH-Kanal kommen.
-Sie fallen zurück auf eine tägliche Abfrage, wenn der Hub Übertragungsschwierigkeiten hat (das kann vorkommen, wenn der standardmäßige Google-Referenzhub genutzt wird).
-Wenn kein spezifizierter Hub oder Hubs ausgewählt sind, werden DFRN-Clients in einer pro Kontakt konfigurierbaren Rate mit bis zu 5-Minuten-Intervallen abfragen.
+Dies ist eine öffentliche Nachricht ohne begrenzte Nutzerfreigabe, so dass keine private Übertragung notwendig ist. 
+Es gibt zwei Wege, die genutzt werden können - als bbcode an DFRN-Clients oder als durch den Server konvertierten HTML-Code (mit PuSH; pubsubhubbub). 
+Wenn ein PuSH-Hub einsatzfähig ist, nutzen DFRN-Poll-Clients vorrangig die Informationen, die durch den PuSH-Kanal kommen. 
+Sie fallen zurück auf eine tägliche Abfrage, wenn der Hub Übertragungsschwierigkeiten hat (das kann vorkommen, wenn der standardmäßige Google-Referenzhub genutzt wird). 
+Wenn kein spezifizierter Hub oder Hubs ausgewählt sind, werden DFRN-Clients in einer pro Kontakt konfigurierbaren Rate mit bis zu 5-Minuten-Intervallen abfragen. 
 Feeds, die via DFRN-Poll abgerufen werden, sind bbcode und können auch private Unterhaltungen enthalten, die vom Poller auf ihre Zugriffsrechte hin geprüft werden.
 
-## Szenario #2. Jack antwortet auf Bobs öffentliche Nachricht. Jack ist im Friendica/DFRN-Netzwerk.
+### Szenario #2. Jack antwortet auf Bobs öffentliche Nachricht. Jack ist im Friendica/DFRN-Netzwerk.
 
-Jack nutzt dfrn-notify, um eine direkte Antwort an Bob zu schicken.
-Bob erstellt dann einen Feed der Unterhaltung und sendet diesen an jeden, der an der Unterhaltung beteiligt ist und dfrn-notify nutzt.
+Jack nutzt dfrn-notify, um eine direkte Antwort an Bob zu schicken. 
+Bob erstellt dann einen Feed der Unterhaltung und sendet diesen an jeden, der an der Unterhaltung beteiligt ist und dfrn-notify nutzt. 
 Die PuSH-Hubs werden darüber informiert, dass neuer Inhalt verfügbar ist. Der/die Hub/s erhalten dann die neuesten Feeds und übertragen diese an alle Hub-Teilnehmer (die auch zu verschiedenen Netzwerken gehören können).
 
-## Szenario #3. Mary antwortet auf Bobs öffentliche Nachricht. Mary ist im Friendica/DFRN-Netzwerk.
+### Szenario #3. Mary antwortet auf Bobs öffentliche Nachricht. Mary ist im Friendica/DFRN-Netzwerk.
 
-Mary nutzt dfrn-notify, um eine direkte Antwort an Bob zu schicken.
-Bob erstellt dann einen Feed der Unterhaltung und sendet diesen an jeden, der an der Unterhaltung beteiligt ist (mit Ausnahme von Bob selbst; die Unterhaltung wird nun an Jack und Mary geschickt).
-Die Nachrichten werden mit dfrn-notify übertragen.
-PuSH-Hubs werden darüber informiert, dass neuer Inhalt verfügbar ist.
+Mary nutzt dfrn-notify, um eine direkte Antwort an Bob zu schicken. 
+Bob erstellt dann einen Feed der Unterhaltung und sendet diesen an jeden, der an der Unterhaltung beteiligt ist (mit Ausnahme von Bob selbst; die Unterhaltung wird nun an Jack und Mary geschickt). 
+Die Nachrichten werden mit dfrn-notify übertragen. 
+PuSH-Hubs werden darüber informiert, dass neuer Inhalt verfügbar ist. 
 Der/die Hub/s erhalten dann die neuesten Feeds und übertragen sie an alle Hub-Teilnehmer (die auch zu verschiedenen Netzwerken gehören können).
 
-## Szenario #4. William antwortet auf Bobs öffentliche Nachricht. William ist in einem OStatus-Netzwerk.
+### Szenario #4. William antwortet auf Bobs öffentliche Nachricht. William ist in einem OStatus-Netzwerk.
 
-William nutzt salmon, um Bob über seine Antwort zu benachrichtigen.
-Der Inhalt ist HTML-Code, der in das Salmon Magic Envelope eingebettet ist.
-Bob erstellt dann einen Feed der Unterhaltung und sendet es an alle Friendica-Nutzer, die an der Unterhaltung beteiligt sind und dfrn-notify nutzen (mit Ausnahme von William selbst; die Unterhaltung wird an Jack und Mary weitergeleitet).
+William nutzt salmon, um Bob über seine Antwort zu benachrichtigen. 
+Der Inhalt ist HTML-Code, der in das Salmon Magic Envelope eingebettet ist. 
+Bob erstellt dann einen Feed der Unterhaltung und sendet es an alle Friendica-Nutzer, die an der Unterhaltung beteiligt sind und dfrn-notify nutzen (mit Ausnahme von William selbst; die Unterhaltung wird an Jack und Mary weitergeleitet). 
 PuSH-Hubs werden darüber informiert, dass neuer Inhalt verfügbar ist. Der/die Hub/s erhalten dann die neuesten Feeds und übertragen sie an alle Hub-Teilnehmer (die auch zu verschiedenen Netzwerken gehören können).
 
-## Szenario #5. Bob schreibt eine private Nachricht an Mary und Jack.
+### Szenario #5. Bob schreibt eine private Nachricht an Mary und Jack.
 
-Die Nachricht wird sofort an Mary und Jack mithilfe von dfrn_notify geschickt.
-Öffentliche Hubs werden nicht benachrichtigt.
-Im Falle eines Timeouts wird eine erneute Verarbeitung angestoßen.
-Antworten folgen dem gleichen Nachrichtenfluss wie öffentliche Antworten, allerdings werden die Hubs nicht darüber informiert, wodurch die Nachrichten niemals in öffentliche Feeds gelangen.
+Die Nachricht wird sofort an Mary und Jack mit Hilfe von dfrn_notify geschickt. 
+Öffentliche Hubs werden nicht benachrichtigt. 
+Im Falle eines Timeouts wird eine erneute Verarbeitung angestoßen. 
+Antworten folgen dem gleichen Nachrichtenfluss wie öffentliche Antworten, allerdings werden die Hubs nicht darüber informiert, wodurch die Nachrichten niemals in öffentliche Feeds gelangen. 
 Die komplette Unterhaltung ist nur für Mary und Jack in ihren durch dfrn-poll personalisierten Feeds verfügbar (und für niemanden sonst).

doc/de/Move-Account.md

@@ -1,4 +1,8 @@
-# Accounts Umziehen
+Accounts Umziehen
+=================
+
+* [Zur Startseite der Hilfe](help)
+
 
 ! **Dies ist ein experimentelles Feature**
 
@@ -6,8 +10,8 @@
 
 Unter "Einstellungen" -> "[Persönliche Daten exportieren](uexport)" aufrufen.
 "Account exportieren" anklicken und die Daten speichern.
-Diese Datei enthält Details über dich, deine Kontakte, Gruppen und persönliche Einstellungen.
-Außerdem enthält sie deinen geheimen Schlüssel, mit dem du dich deinen Kontakten gegenüber ausweist.
+Diese Datei enthält Details über dich, deine Kontakte, Gruppen und persönliche Einstellungen. 
+Außerdem enthält sie deinen geheimen Schlüssel mit dem du dich deinen Kontakten gegenüber ausweist.
 
 **Speichere diese Datei an einem sicheren Ort**!
 
@@ -20,11 +24,11 @@ Hier kann dies nur der Administrator selber durchführen.
 Lege auf dem neuen Server auf keinen Fall einen gleichnamigen Account an!
 user import muss anstelle des Registrierens verwendet werden.
 
-Wähle die gesicherte Account-Datei aus und klicke "Importieren".
+Wähle die gesicherte Account Datei aus und klicke "Importieren".
 
-Friendica wird nun deinen Account auf dem neuen Server wiederherstellen, mit all deinen Friendica Kontakten und Gruppen.
+Friendica wird nun deinen Account auf dem neuen Server wiederherstellen, mit all deinen Friendica Kontakten und Gruppen. 
 An deine Friendica Kontakte wird außerdem eine Nachricht gesendet um sie über deine neue Adresse zu informieren.
-Wenn deine Kontakte ihren Account auf einem aktuellen Server haben, werden deine Kontaktdetails automatisch aktualisiert.
+Wenn deine Kontakte ihren Account auf einem aktuellen Server haben werden deine Kontaktdetails automatisch aktualisiert.
 
 Neuere Diaspora Server unterstützen ebenfalls eine Umzugsbenachrichtigung.
 

doc/de/Quick-Start-andfinally.md

@@ -0,0 +1,18 @@
+... und zuletzt
+===============
+
+Und damit sind wir auch schon am Ende der Schnellstartanleitung. 
+
+Hier sind noch einige weitere Dinge, die Dir den Start vereinfachen können. 
+
+**Gruppen**
+
+
+- <a href="http://forum.friendi.ca/profile/helpers">Friendica Support</a> - Probleme?  Dann ist das der Platz, um zu fragen!
+
+**Dokumentation**
+
+- <a href="help/Connectors">Zu weiteren Netzwerken verbinden</a>
+- <a href="help">Zur Startseite der Hilfe</a>
+
+

doc/de/Quick-Start-groupsandpages.md

@@ -1,11 +1,14 @@
-# Gruppen und Seiten
+Gruppen und Seiten
+==========
+
+* [Zur Startseite der Hilfe](help)
 
 Hier siehst Du das globale Verzeichnis.
 Wenn Du Dich mal verirrt hast, kannst Du diesen Link klicken und wieder hierher kommen.
 
-Auf dieser Seite findest Du eine Zusammenstellung von Gruppen.
+Auf dieser Seite findest Du eine Zusammenstellung von Gruppen. 
 Gruppen sind keine realen Personen.
-Sich mit diesen zu verbinden ist, als wenn man jemanden auf Facebook "liked" ("gefällt mir") oder wenn man sich in einem Forum anmeldet.
+Sich mit diesen zu verbinden ist, als wenn man jemanden auf Facebook "liked" ("gefällt mir") oder wenn man sich in einem Forum anmeldet. 
 Du musst nicht unsicher sein, ob Du jemandem zu nahe trittst, wenn Du Dich so ohne weiteres mit einer Gruppe verbindest; es handelt sich eben nicht um reale Personen.
 
 Wenn Du Dich mit einer Gruppe verbindest, erscheinen alle Nachrichten der Gruppe in Deinem "Netzwerk"-Tab.
@@ -16,6 +19,8 @@ Suche Dir einfach eine Gruppe und füge sie so hinzu, wie Du auch normale Freund
 Es gibt eine Menge Gruppen.
 Solltest Du beim Stöbern durch die vielen Gruppen nicht wieder hierher zurück finden, so nutze einfach den Link oben auf dieser Seite.
 
-Wenn Du einige Gruppen hinzugefügt hast, gehe [weiter zum nächsten Schritt](help/user/quick-start/finally).
+Wenn Du einige Gruppen hinzugefügt hast, gehe <a href="help/Quick-Start-andfinally">weiter zum nächsten Schritt</a>.
+
+<iframe src="https://dir.friendica.social/group" width="950" height="600"></iframe>
+
 
-<iframe src="https://dir.friendica.social/group" width="100%" height="600"></iframe>

doc/de/Quick-Start-guide.md

@@ -1,31 +1,36 @@
-# Erste Schritte...
+Erste Schritte... 
+==========
 
-Als Erstes: Gehe sicher, dass Du eingeloggt bist.
-Wenn Du noch nicht eingeloggt bist, kannst Du das in dem Fenster unten machen.
+* [Zur Startseite der Hilfe](help)
 
-Sobald dies geschehen ist, schaust Du auf die Netzwerkseite Deines Profils.
+Als Erstes: Gehe sicher, dass Du eingeloggt bist. 
+Wenn Du noch nicht eingeloggt bist, kannst Du das in dem Fenster unten machen. 
+
+Sobald dies geschehen ist, schaust Du auf die Netzwerkseite Deines Profils. 
 Klicke auf den Reiter "Pinnwand".
 
-Hier sieht es ein wenig wie auf (D)einer Facebook-Seite aus.
-Du findest hier alle Deine Statusmeldungen und Nachrichten Deiner Freunde, die direkt auf Deine "Pinnwand" ("Wall") geschrieben haben.
-Um Deinen Status einzutragen, klicke einfach auf die Box oben, in der "Teilen" steht.
-Wenn Du das machst, vergrößert sich die Box, und Du kannst nun Deinen Text eintragen, mit Hilfe einiger Formatierungsoptionen wie fett, kursiv, unterstrichen formatieren und ebenfalls Bilder und Links hinzufügen.
-Unten findest Du in diesem Feld weitere Knöpfe, mit denen Du Bilder und Dateien von Deinem Computer hochladen, Webseiten mit einem Kurztext teilen und Video- und Audiodateien aus dem Internet einfügen kannst.
-Außerdem kannst Du hier eintragen, wo Du gerade bist.
+Hier sieht es ein wenig wie auf (D)einer Facebook-Seite aus. 
+Du findest hier alle Deine Statusmeldungen und Nachrichten Deiner Freunde, die direkt auf Deine "Pinnwand" ("Wall") geschrieben haben. 
+Um Deinen Status einzutragen, klicke einfach auf die Box oben, in der "Teilen" steht. 
+Wenn Du das machst, vergrößert sich die Box, und Du kannst nun Deinen Text eintragen, mit Hilfe einiger Formatierungsoptionen wie fett, kursiv, unterstrichen formatieren und ebenfalls Bilder und Links hinzufügen. 
+Unten findest Du in diesem Feld weitere Knöpfe, mit denen Du Bilder und Dateien von Deinem Computer hochladen, Webseiten mit einem Kurztext teilen und Video- und Audiodateien aus dem Internet einfügen kannst. 
+Außerdem kannst Du hier eintragen, wo Du gerade bist. 
 
-Wenn Du Deinen Beitrag ("Post") geschrieben hast, kannst Du auf das "Schloss"-Symbol klicken und festlegen, wer Deinen Beitrag sehen kann.
-Wenn Du dieses Symbol nicht anklickst, ist Dein Beitrag öffentlich, bzw. es werden deine Grundeinstellungen verwendet, wenn diese nicht öffentlich sind.
+Wenn Du Deinen Beitrag ("Post") geschrieben hast, kannst Du auf das "Schloss"-Symbol klicken und festlegen, wer Deinen Beitrag sehen kann. 
+Wenn Du dieses Symbol nicht anklickst, ist Dein Beitrag öffentlich, bzw. es werden deine Grundeinstellungen verwendet, wenn diese nicht öffentlich sind. 
 
 Ein öffentlicher Beitrag ist sichbar für
-- Besucher Deines Profils
-- Besucher Deiner "Gemeinschafts"-Seite
-- Besucher der Profile Deiner Kontakte
-- Suchmaschinen
-
+<ul>
+	<li>Besucher Deines Profils</li>
+	<li>Besucher Deiner "Gemeinschafts"-Seite</li>
+	<li>Besucher der Profile Deiner Kontakte</li>
+	<li>Suchmaschinen</li>
+</ul>
 Auch wenn Du Deinen Server so konfiguriert hast, dass der Zugriff von außerhalb des Friendica-Netzwerks theoretisch nicht möglich ist, so ist Dein Beitrag über die Profile Deiner Kontakte sichtbar, wenn deren Knoten solche Zugriffe zulassen.
 
 <!--Das bedeutet, dass jeder, der Dein Profil ansieht, den Beitrag sehen kann. Außerdem auch jene, die den "Community"-Tab Deines Servers oder auf dem "Netzwerk"-Tab ("Beiträge Deiner Kontakte") eines befreundeten Kontakts betrachten.-->
 
-Probiere es doch einfach mal aus. Wenn Du fertig bist, schauen wir uns den ["Netzwerk"-Tab](help/user/quick-start/network) an.
+Probiere es doch einfach mal aus. Wenn Du fertig bist, schauen wir uns den <a href="help/Quick-Start-network">"Netzwerk"-Tab</a> an. 
+
+<iframe src="login" width="950" height="600"></iframe>
 
-<iframe src="login" width="100%" height="600"></iframe>

doc/de/Quick-Start-makingnewfriends.md

@@ -1,7 +1,10 @@
-# Neue Freunde finden
+Neue Freunde finden
+==============
+
+* [Zur Startseite der Hilfe](help)
 
 Hier siehst Du die Kontaktvorschläge.
-Wenn Du Dich mal verirrt hast, kannst Du [diesen Link klicken](help/user/quick-start/making-new-friends) und wieder hierher kommen.
+Wenn Du Dich mal verirrt hast, kannst Du <a href="help/Quick-Start-makingnewfriends">diesen Link klicken</a> und wieder hierher kommen.
 
 Diese Seite funktioniert in etwa wie die Seite für Kontaktvorschläge in Facebook.
 Jeder auf dieser Liste hat zugestimmt, als Kontaktvorschlag zu erscheinen.
@@ -18,6 +21,8 @@ Jetzt, nachdem Du jemanden hinzugefügt hast, weißt Du vielleicht nicht mehr, w
 Klicke einfach auf den Link oben auf dieser Seite und Du gelangst zur Seite mit den Kontaktvorschlägen zurück, um weitere Personen hinzuzufügen.
 
 Du willst nicht einfach Personen hinzufügen, die du nicht kennst?
-Kein Problem - an dieser Stelle kommen wir zu den [Gruppen und Seiten](help/user/quick-start/groups-and-pages).
+Kein Problem - an dieser Stelle kommen wir zu den <a href="help/Quick-Start-groupsandpages">Gruppen und Seiten</a>.
+
+<iframe src="contact/suggestions" width="950" height="600"></iframe>
+
 
-<iframe src="contact/suggestions" width="100%" height="600"></iframe>

doc/de/Quick-Start-network.md

@@ -1,15 +1,20 @@
-# Deine "Netzwerk"-Seite
+Deine "Netzwerk"-Seite
+==============
 
-Dies ist Dein "Netzwerk"-Tab.
-Wenn Du Dich mal verirrt hast, kannst Du [diesen Link klicken](help/user/quick-start/network), um wieder hierher zu kommen.
+* [Zur Startseite der Hilfe](help)
 
-Diese Seite ist ein wenig wie die News-Seite in Facebook oder der Stream in Diaspora.
-Hier findest Du alle Beiträge Deiner Kontakte, Gruppen und Feeds, die Du eingetragen hast.
-Wenn Du neu bist, siehst Du hier noch nichts, falls Du an Deinem Status im letzten Schritt noch nichts geändert haben solltest.
-Wenn Du bereits ein paar Freunde gefunden hast, so findest Du hier ihre Beiträge.
+Dies ist Dein "Netzwerk"-Tab. 
+Wenn Du Dich mal verirrt hast, kannst Du diesen Link klicken, um wieder hierher zu kommen.
+
+Diese Seite ist ein wenig wie die News-Seite in Facebook oder der Stream in Diaspora. 
+Hier findest Du alle Beiträge Deiner Kontakte, Gruppen und Feeds, die Du eingetragen hast. 
+Wenn Du neu bist, siehst Du hier noch nichts, falls Du an Deinem Status im letzten Schritt noch nichts geändert haben solltest. 
+Wenn Du bereits ein paar Freunde gefunden hast, so findest Du hier ihre Beiträge. 
 Du kannst ihre Beiträge von hier aus kommentieren, mitteilen, dass Du den Beitrag magst oder ablehnst (Daumen hoch, Daumen runter) oder die Profile durch einen Klick auf deren Namen besuchen und dort auf deren "Pinnwand" ("Wall") Nachrichten schreiben.
 
-Nun wollen wir diese Seite mit Inhalt füllen.
-Der erste Schritt ist es, [Leute zu Deinem Account hinzuzufügen](help/user/quick-start/making-new-friends).
+Nun wollen wir diese Seite mit Inhalt füllen. 
+Der erste Schritt ist es, <a href="help/Quick-Start-makingnewfriends">Leute zu Deinem Account hinzuzufügen</a>.
+
+<iframe src="network" width="950" height="600"></iframe>
+
 
-<iframe src="network" width="100%" height="600"></iframe>

doc/de/README.md

@@ -1,8 +1,9 @@
-# Friendica-doc-german
+Friendica-doc-german
+====================
 
 Friendica - doc - german
 
-Hier findest du die deutsche Version der Friendica-Hilfedateien.
-Es handelt sich um eine selbst erstellte, öffentlich freigegebene Arbeit mit dem Ziel, Friendica durch deutsche Hilfedateien für weitere Personen zugänglich zu machen, die dem Englischen nicht ausreichend mächtig sind.
+Hier findest du die deutsche Version der Friendica-Hilfedateien. 
+Es handelt sich um eine selbst erstellte, öffentlich freigegebene Arbeit mit dem Ziel, Friendica durch deutsche Hilfedateien für weitere Personen zugänglich zu machen, die dem Englischen nicht ausreichend mächtig sind. 
 
 Die Daten basieren auf dem offiziellen Friendica-Github https://github.com/friendica/friendica (Stand: 03.11.12)

doc/de/Remove-Account.md

@@ -1,20 +1,23 @@
-# Accounts löschen
+Accounts löschen
+==============
+
+* [Zur Startseite der Hilfe](help)
 
 Wir freuen uns nicht, wenn Leute Friendica verlassen, aber wenn du deinen Account löschen willst, dann besuche die folgende URL
 
 [Lösche mich (http://NamederSeite/settings/removeme)](../settings/removeme)
 
-in deinem Webbrowser. Du musst dabei eingeloggt sein.
+in deinem Webbrowser. Du musst dabei eingeloggt sein. 
 
-Du wirst nach deinem Passwort gefragt, um die Anfrage zu bestätigen.
+Du wirst nach deinem Passwort gefragt, um die Anfrage zu bestätigen. 
 Wenn dieses mit deinem gespeichertem Passwort übereinstimmt, dann wird dein Account als "gelöscht" markiert.
 Dies passiert sofort und kann nicht rückgängig gemacht werden.
-Die meisten deiner Inhalte und Benutzerdaten werden kurzfristig danach durch Hintergrundprozesse gelöscht.
+Die meisten Deiner Inhalte und Benutzerdaten werden kurzfristig danach durch Hintergrundprozesse gelöscht.
 
 Parallel dazu senden wir eine Mitteilung an die Server deiner Kontakte, damit sie deine dort vorliegenden Daten ebenfalls löschen.
 Wir haben keinen Einfluss darauf, wie sorgfältig und ob überhaupt diese Systeme der Löschaufforderung nachgehen.
 
-Aus technischen Gründen benötigen wir für die Übertragung dieser Mitteilung ein paar Benutzerdaten.
+Aus technischen Gründen benötigen wir für die Übetragung dieser Mitteilung ein paar Benutzerdaten.
 Diese Daten werden dann nach einer Frist von etwa sieben Tagen ebenfalls gelöscht.
 
 Wir speichern deinen Benutzernamen dauerhaft, damit sich niemand einen Account unter deinem Spitznamen anlegen kann.

doc/de/SSL.md

@@ -1,4 +1,7 @@
-# Friendica mit SSL nutzen
+Friendica mit SSL nutzen
+=====================================
+
+* [Zur Startseite der Hilfe](help)
 
 ## Disclaimer
 
@@ -44,9 +47,9 @@ Wenn ja, dann lies weiter.
 
 Wenn du einen eigenen Server betreibst und den Nameserver kontrollierst, könnte auch die Initiative "Let's encrypt" interessant für dich werden.
 Sie bietet nicht nur freie SSL Zertifikate sondern auch einen automatisierten Prozess zum Erneuern der Zertifikate.
-Um LetsEncrypt Zertifikate verwenden zu können, musst du dir einen Client auf deinem Server installieren.
-Eine Anleitung zum offiziellen Client findest du [hier](https://certbot.eff.org/).
-Falls du dir andere Clients anschauen willst, kannst du einen Blick in diese [Liste von alternativen LetsEncrypt Clients](https://letsencrypt.org/docs/client-options/).
+Um letsencrypt Zertifikate verwenden zu können, musst du dir einen Client auf deinem Server installieren.
+Eine Anleitung zum offiziellen Client findet du [hier](https://certbot.eff.org/).
+Falls du dir andere Clients anschauen willst, kannst du einen Blick in diese [Liste von alternativen letsencrypt Clients](https://letsencrypt.org/docs/client-options/).
 
 ## Webserver-Einstellungen
 
@@ -59,37 +62,32 @@ Wenn du fertig bist, kannst du auf der Testseite [SSL-Labs](https://www.ssllabs.
 
 ## Friendica Konfigurieren
 
-Wenn du deine Friendica Instanz über https erreichen kannst solltest du ein paar Einstellungen vornehmen um sicherzustellen, dass deine Nutzer ausschließlich über https zugreifen können.
+Wenn du deine Friendica Instanz über https erreichen kannst solltest du ein paar Einstellungen vornehmen um sicher zu stellen, dass deine Nutzer ausschließlich über https zugreifen können.
 
 ### Webserver-Umleitungen
 
 Dies ist der einfachste Weg den Zugriff für die ganze Webseite abzusichern.
-Jedes Mal, wenn ein Nutzer Friendica aufruft wird er permanent vom Webserver auf die abgesicherte Seite umgeleitet.
+Jedes Mal wenn ein Nutzer Friendica aufruft wird er permanent vom Webserver auf die abgesicherte Seite umgeleitet.
 
 Wenn du den Apache Webserver verwendest, aktiviere die Module rewrite und ssl (bei einem Shared-Hosting Prider sollte dies bereits der Fall sein):
 
-```sh
-sudo a2enmod rewrite ssl
-```
+        sudo a2enmod rewrite ssl
 
-und füge die folgenden Zeilen zur `.htaccess` Datei im Wurzelverzeichnis deiner Friendica Instanz hinzu:
+und füge die folgenden Zeilen zur .htaccess Datei im Wurzelverzeichnis deiner Friendica Instanz hinzu:
 
-```
-RewriteEngine On
-RewriteCond %{SERVER_PORT} 80
-RewriteRule ^(.*)$ https://your.friendica.domain/$1 [R=301,L]
-```
+        RewriteEngine On
+        RewriteCond %{SERVER_PORT} 80
+        RewriteRule ^(.*)$ https://your.friendica.domain/$1 [R=301,L]
 
 (Dank an [url=https://github.com/AlfredSK]AlfredSK[/url]).
 
 Bei nginx solltest du deinen Server folgendermaßen konfigurieren ([documentation](https://www.nginx.com/blog/creating-nginx-rewrite-rules/)):
-```
-server {
-    listen 80;
-    server_name your.friendica.domain;
-    return 301 https://$server_name$request_uri;
-}
-```
+
+        server {
+             listen 80;
+             server_name your.friendica.domain;
+             return 301 https://$server_name$request_uri;
+        }
 
 ### SSL Einstellungen
 

doc/de/Settings.md

@@ -1,5 +1,7 @@
 # Settings
 
+* [Zur Startseite der Hilfe](help)
+
 Wenn du der Administrator einer Friendica-Instanz bist, hast du Zugriff auf das so genannte **Admin Panel** in dem du die Friendica-Instanz konfigurieren kannst,
 
 Auf der Startseite des Admin Panels werden die Informationen zu der Instanz zusammengefasst.
@@ -39,15 +41,16 @@ Sie wird verwendet, wenn es Friendica nicht gelingt die Spracheinstellungen des
 Nutzer können diese Auswahl in den Einstellungen des Benutzerkontos überschreiben.
 
 Die Friendica Gemeinschaft bietet einige Übersetzungen an, von denen einige mehr andere weniger komplett sind.
-Mehr Informationen zum Übersetzungsprozess von Friendica findest du [auf dieser Seite](/help/developer/translations) der Dokumentation.
+Mehr Informationen zum Übersetzungsprozess von Friendica findest du [auf dieser Seite](/help/translations) der Dokumentation.
 
 #### Systemweites Theme
 
 Hier kann das Theme bestimmt werden, welches standardmäßig zum Anzeigen der Seite verwendet werden soll.
 Nutzer können in ihren Einstellungen andere Themes wählen.
-Derzeit ist das "frio" Theme das vorausgewählte Theme.
+Derzeit ist das "vier" Theme das vorausgewählte Theme.
 
 Für mobile Geräte kannst du ein spezielles Theme wählen, wenn das Standardtheme ungeeignet für mobile Geräte sein sollte.
+Das `vier` Theme z.B. unterstützt kleine Anzeigen und benötigt kein zusätzliches mobiles Theme.
 
 ### Registrierung
 
@@ -63,7 +66,7 @@ Dabei kannst du zwischen den folgenden Optionen wählen:
 ##### Einladungen
 
 Zusätzlich zu den oben genannten Möglichkeiten, kann die Registrierung eines neuen Nutzerkontos an eine Einladung durch einen bestehenden Nutzer gekoppelt werden.
-Hierzu muss in der [config/local.config.php](/help/admin/config) Datei die Option `invitation_only` aktiviert und als Registrierungsmethode entweder *Offen* oder *Bedarf der Zustimmung* gewählt werden.
+Hierzu muss in der [config/local.config.php](/help/Config) Datei die Option `invitation_only` aktiviert und als Registrierungsmethode entweder *Offen* oder *Bedarf der Zustimmung* gewählt werden.
 
 #### Namen auf Vollständigkeit überprüfen
 
@@ -103,7 +106,7 @@ Falls ein solches verwendet wird, sei an dieser Stelle nur auf deren Dokumentati
 Die Grundeinstellung ist 'Datenbank (legacy)': Dies ist die alte Methode von Friendica Daten direkt in der Datenbank abzulegen.
 
 Bestehende Daten können zum aktuell ausgewählten Backend verschoben werden.
-Hierfür kann der ['storage move'](help/admin/tools) Befehl der Friendica Konsole verwendet werden.
+Hierfür kann der ['storage move'](help/tools) Befehl der Friendica Konsole verwendet werden.
 
 Sollte das ausgewählte Speicher Backand zusätzliche Konfigurationsparameter besitzen, werden nach der Auswahl des Backends hier weitere Felder angezeigt.
 
@@ -332,12 +335,10 @@ Du solltest deshalb einen Dienst zur [log rotation](https://en.wikipedia.org/wik
 Normalerweise werden Fehler- und Warnmeldungen von PHP unterdrückt.
 Wenn du sie aktivieren willst, musst du folgendes in der `config/local.config.php` Datei eintragen um die Meldungen in die Datei `php.out` zu speichern
 
-```
-error_reporting(E_ERROR | E_WARNING | E_PARSE );
-ini_set('error_log','php.out');
-ini_set('log_errors','1');
-ini_set('display_errors', '0');
-```
+	error_reporting(E_ERROR | E_WARNING | E_PARSE );
+	ini_set('error_log','php.out');
+	ini_set('log_errors','1');
+	ini_set('display_errors', '0');
 
 Die Datei `php.out` muss vom Webserver schreibbar sein und sollte ebenfalls außerhalb der Webverzeichnisse liegen.
 Es kommt gelegentlich vor, dass nicht deklarierte Variablen referenziert werden, dehalb raten wir davon ab `E_NOTICE` oder `E_ALL` zu verwenden.
@@ -366,15 +367,13 @@ Dies sind die Datenbank Einstellungen, die Administrator Accounts, der PHP Pfad
 
 Mit den folgenden Einstellungen kannst du die Zugriffsdaten für den Datenbank Server festlegen.
 
-```
-'database' => [
-	'hostname' => 'localhost',
-	'username' => 'mysqlusername',
-	'password' => 'mysqlpassword',
-	'database' => 'mysqldatabasename',
-	'charset' => 'utf8mb4',
-],
-```
+	'database' => [
+		'hostname' => 'localhost',
+		'username' => 'mysqlusername',
+		'password' => 'mysqlpassword',
+		'database' => 'mysqldatabasename',
+		'charset' => 'utf8mb4',
+	],
 
 Sollten alle der folgenden Environment-Variablen gesetzt sein, wird Friendica diese anstatt der vorher konfigurierten Werte nutzen.
 
@@ -391,22 +390,18 @@ Normalerweise trifft dies auf den ersten Account zu, der nach der Installation a
 Die Liste der E-Mail Adressen kann aber einfach erweitert werden.
 Mit keiner der angegebenen E-Mail Adressen können weitere Accounts registriert werden.
 
-```
-'config' => [
-	'admin_email' => 'you@example.com, buddy@example.com',
-],
-```
+	'config' => [
+		'admin_email' => 'you@example.com, buddy@example.com',
+	],
 
 ## PHP Pfad
 
 Einige Prozesse von Friendica laufen im Hintergrund.
 Für diese Prozesse muss der Pfad zu der PHP Version gesetzt sein, die verwendet werden soll.
 
-```
-'config' => [
-	'php_path' => '/usr/bin/php',
-],
-```
+	'config' => [
+		'php_path' => '/usr/bin/php',
+	],
 
 ## Unterverzeichnis Konfiguration
 
@@ -414,13 +409,11 @@ Man kann Friendica in ein Unterverzeichnis des Webservers installieren.
 Wir raten allerdings dringen davon ab, da es die Interoperabilität mit anderen Netzwerken (z.B. Diaspora, GNU Social, Hubzilla) verhindert.
 Mal angenommen, du hast ein Unterverzeichnis tests und willst Friendica in ein weiteres Unterverzeichnis installieren, dann lautet die Konfiguration hierfür:
 
-```
-'system' => [
-	'url' => 'https://example.com/tests/friendica',
-],
-```
+	'system' => [
+		'url' => 'https://example.com/tests/friendica',
+	],
 
 ## Weitere Ausnahmen
 
 Es gibt noch einige experimentelle Einstellungen, die nur in der ``config/local.config.php`` Datei konfiguriert werden können.
-Im [Konfigurationswerte, die nur in der config/local.config.php gesetzt werden können (EN)](help/admin/config) Artikel kannst du mehr darüber erfahren.
+Im [Konfigurationswerte, die nur in der config/local.config.php gesetzt werden können (EN)](help/Config) Artikel kannst du mehr darüber erfahren.

doc/de/Tags-and-Mentions.md

@@ -1,4 +1,7 @@
-# Tags und Erwähnungen
+Tags und Erwähnungen
+=================
+
+* [Zur Startseite der Hilfe](help)
 
 Wie viele andere soziale Netzwerke benutzt auch Friendica eine spezielle Schreibweise in seinen Nachrichten, um Tags oder kontextbezogene Links zu anderen Beiträgen hervorzuheben.
 

doc/de/Text_comment.md

@@ -1,8 +1,11 @@
-# Beiträge kommentieren, einordnen und löschen
+Beiträge kommentieren, einordnen und löschen
+==========================================================
 
-Hier findest du eine Übersicht über die verschiedenen Möglichkeiten, bestehende Beiträge einzuordnen und zu kommentieren.
+* [Zur Startseite der Hilfe](help)
+
+Hier findest du eine Übersicht über die verschiedenen Möglichkeiten, bestehende Beiträge einzuordnen und zu kommentieren. 
 <span style="color: red;">
-Achtung: für dieses Beispiel wurde das Thema <b>"Diabook"</b> genutzt.
+Achtung: für dieses Beispiel wurde das Thema <b>"Diabook"</b> genutzt. 
 Wenn du ein anderes Design benutzt, wirst du manche dieser Symbole gar nicht oder in anderer Form vorfinden.
 </span>
 
@@ -10,37 +13,37 @@ Wenn du ein anderes Design benutzt, wirst du manche dieser Symbole gar nicht ode
 
 <i>Die einzelnen Symbole</i>
 
-<img src="doc/img/post_thumbs_up.png" width="27" height="32" alt="post_thumbs_up.png" align="left" style="padding-bottom: 10px;"> Mit diesem Symbol kannst du zeigen, dass dir ein Beitrag gefällt.
+<img src="doc/img/post_thumbs_up.png" width="27" height="32" alt="post_thumbs_up.png" align="left" style="padding-bottom: 10px;"> Mit diesem Symbol kannst du zeigen, dass dir ein Beitrag gefällt. 
 Falls du diese Eingabe zurücknehmen willst, klicke einfach ein zweites Mal auf das Symbol.
 <p style="clear:both;"></p>
 
-<img src="doc/img/post_thumbs_down.png" width="27" height="32" alt="post_thumbs_down.png" align="left" style="padding-bottom: 10px;">  Mit diesem Symbol kannst du zeigen, dass dir ein Beitrag <b>nicht</b> gefällt.
+<img src="doc/img/post_thumbs_down.png" width="27" height="32" alt="post_thumbs_down.png" align="left" style="padding-bottom: 10px;">  Mit diesem Symbol kannst du zeigen, dass dir ein Beitrag <b>nicht</b> gefällt. 
 Falls du diese Eingabe zurücknehmen willst, klicke einfach ein zweites Mal auf das Symbol.
 <p style="clear:both;"></p>
 
-<img src="doc/img/post_share.png" width="27" height="32" alt="post_share.png" align="left" style="padding-bottom: 10px;"> Mit diesem Symbol kannst du einen Beitrag weiter verteilen.
-Einfach anklicken und sofort erscheint der Beitrag in deinem Beitragseditor.
+<img src="doc/img/post_share.png" width="27" height="32" alt="post_share.png" align="left" style="padding-bottom: 10px;"> Mit diesem Symbol kannst du einen Beitrag weiter verteilen. 
+Einfach anklicken und sofort erscheint der Beitrag in deinem Beitragseditor. 
 Am Ende des eingefügten Beitrags erscheint ein Link zum Originalbeitrag.
 <p style="clear:both;"></p>
 
-<img src="doc/img/post_mark.png" width="27" height="32" alt="post_mark.png" align="left" style="padding-bottom: 10px;"> Mit diesem Symbol kannst du einen Beitrag für dich markieren.
-Markierte Beiträge erscheinen in deiner Netzwerk-Seite unter "Markierte".
+<img src="doc/img/post_mark.png" width="27" height="32" alt="post_mark.png" align="left" style="padding-bottom: 10px;"> Mit diesem Symbol kannst du einen Beitrag für dich markieren. 
+Markierte Beiträge erscheinen in deiner Netzwerk-Seite unter "Markierte". 
 Wenn du die Markierung entfernen willst, klicke einfach ein zweites Mal auf das Symbol.
 <p style="clear:both;"></p>
 
-<img src="doc/img/post_tag.png" width="27" height="41" alt="post_tag.png" align="left" style="padding-bottom: 10px;"> Mit diesem Symbol kannst du einen tag zum Beitrag hinzufügen und diesen so einem bestimmten Schlagwort zuzuordnen.
-Anschließend kannst du auf diesen tag klicken und alle Beiträge mit diesem tag ansehen.
+<img src="doc/img/post_tag.png" width="27" height="41" alt="post_tag.png" align="left" style="padding-bottom: 10px;"> Mit diesem Symbol kannst du einen tag zum Beitrag hinzufügen und diesen so einem bestimmten Schlagwort zuzuordnen. 
+Anschließend kannst du auf diesen tag klicken und alle Beiträge mit diesem tag ansehen. 
 ACHTUNG: tags können nicht mehr entfernt werden.
 <p style="clear:both;"></p>
 
-<img src="doc/img/post_categorize.png" width="27" height="32" alt="post_categorize.png" align="left" style="padding-bottom: 20px;"> Mit diesem Symbol ist es möglich, die Beiträge in bestimmte Gruppen einzuordnen.
-Dies dient dazu, gewählte Beiträge nach eigenen Vorstellungen zu sortieren und wieder zu finden.
+<img src="doc/img/post_categorize.png" width="27" height="32" alt="post_categorize.png" align="left" style="padding-bottom: 20px;"> Mit diesem Symbol ist es möglich, die Beiträge in bestimmte Gruppen einzuordnen. 
+Dies dient dazu, gewählte Beiträge nach eigenen Vorstellungen zu sortieren und wieder zu finden. 
 Wähle eine vorhandene Gruppe oder gib einen neuen Namen ein. Die erstellten Gruppen findest du unter "Gespeicherte Ordner" in der Netzwerk-Ansicht.
 <p style="clear:both;"></p>
 
 <img src="doc/img/post_delete.png" width="27" height="32" alt="post_delete.png" align="left"> Mit diesem Symbol löschst du deinen eigenen Beitrag bzw. entfernst einen Beitrag einer anderen Person aus deinem Stream.
 <P style="clear: both;"></p>
 
-<img src="doc/img/post_choose.png" width="27" height="32" alt="post_choose.png" align="left"> Mit diesem Symbol kannst du mehrere Beiträge auswählen und gesammelt löschen.
+<img src="doc/img/post_choose.png" width="27" height="32" alt="post_choose.png" align="left"> Mit diesem Symbol kannst du mehrere Beiträge auswählen und gesammelt löschen. 
 Hierfür gehst du nach dem Markieren aller gewünschten Beiträge auf "Lösche die markierten Beiträge" am Ende der Seite mit allen Beiträgen.
 <P style="clear: both;"></p>

doc/de/Text_editor.md

@@ -0,0 +1,51 @@
+Beiträge erstellen
+=================
+
+* [Zur Startseite der Hilfe](help)
+
+Hier findest du eine Übersicht über die verschiedenen Möglichkeiten, deinen Beitrag zu bearbeiten. 
+<span style="color: red;">
+Achtung: für dieses Beispiel wurde das Thema <b>"Diabook"</b> genutzt. 
+Wenn du ein anderes Design benutzt, wirst du manche dieser Symbole gar nicht oder in anderer Form vorfinden.
+</span>
+
+<img src="doc/img/friendica_rich_editor.png" width="538" height="218" alt="editor">
+
+<i>Die einzelnen Symbole</i>
+
+<img src="doc/img/camera.png" alt="editor" align="left" style="margin: 0 10px 10px 0;"> Wenn du auf dieses Symbol klickst, dann kannst du ein Bild von deinem Computer hinzufügen. 
+Wenn du eine Internetadresse (URL) eingeben willst, dann kannst du das "Baum"-Symbol im oberen Teil des Editors nutzen. 
+Wenn du ein Bild ausgewählt hast, dann erscheint eine Miniaturdarstellung des Bildes im Editor.*
+<p style="clear:both;"></p>
+
+<img src="doc/img/paper_clip.png" alt="paper_clip" align="left" style="margin: 0 10px 10px 0;"> Wenn du dieses Symbol anklickst, dann kannst du weitere Dateien von deinem Computer einfügen. Eine Vorschau des Dateiinhalts erfolgt nicht.*
+<p style="clear:both;"></p>
+
+<img src="doc/img/chain.png" alt="chain" align="left" style="margin: 0 10px 10px 0;"> Wenn du die Kette anklickst, dann kannst du eine Internetadresse (URL) einfügen. 
+Im Editor erscheint automatisch eine kurze Information zum eingefügten Link.*
+<p style="clear:both;"></p>
+
+<img src="doc/img/video.png" alt="video" align="left" style="margin: 0 10px 10px 0;"> Mit dieser Funktion kannst du die Internetadresse (URL) einer Videodatei einfügen. 
+Das Video erscheint dann mit einem Player in deinem Beitrag. 
+Da Friendica zur Einbindung [HTML5](http://en.wikipedia.org/wiki/HTML5_video) verwendet, werden je nach Browser verschiedene Videoformate unterstützt (z.B. WebM oder MP4). 
+Außerdem kannst du hier die URLs von Videos auf Youtube, Vimeo und manchen anderen Videohostern eingeben. 
+Die Videos werden dann mit Vorschaubild angezeigt, nach einem Klick öffnet sich ein eingebetteter Player.*
+<p style="clear:both;"></p>
+
+<img src="doc/img/mic.png" alt="mic" align="left" style="margin: 0 10px 10px 0;"> Mit dieser Funktion kannst du die Internetadresse (URL) einer Sound-Datei einfügen. 
+Da Friendica zur Einbindung [HTML5](http://en.wikipedia.org/wiki/HTML5_video) verwendet, werden je nach Browser und Betriebssystem MP3, Ogg oder AAC unterstützt. 
+Außerdem kannst du hier auch URLs von manchen Audiohostern wie Soundcloud eingeben, um eine dort gespeicherte Audiodatei mit Player in deinem Beitrag anzuzeigen.*
+<p style="clear:both;"></p>
+
+<img src="doc/img/globe.png" alt="globe" align="left" style="margin: 0 10px 10px 0;"> Wenn du dieses Symbol wählst, dann kannst du deinen Standort festlegen. 
+Hier reicht schon eine Angabe wie "Berlin" oder "10775". 
+Dieser Eintrag führt anschließend zu einer Suchanfrage bei Google Maps.
+<p style="clear:both;"></p>
+
+<i>* wie du Dateien hochladen kannst, erfährst du [hier](help/FAQ#upload)</i>
+
+**Im Folgenden findest du Symbole weiterer Themen**
+
+Frio  <img src="doc/img/editor_frio.png" alt="frio.png" style="padding-left: 44px; vertical-align:middle;">
+
+Vier  <img src="doc/img/editor_vier.png" alt="vier.png" style="padding-left: 44px; vertical-align:middle;">

doc/de/events.md

@@ -1,9 +1,12 @@
 # Veranstaltungen
 
+* [Zur Startseite der Hilfe](help)
+
 Veranstaltungen sind spezielle Postings.
 Die Veranstaltungen, die Du und deine Kontakte teilen, können unter [/events](/events) auf deiner Instanz aufgefunden werden.
 Um da hinzukommen gehe über den Tab "Veranstalltungen", abhänig von dem Theme, das du benutzt, ist der eventuell ein zusätzlicher link im Navigationsmenü der Seite vorhanden.
 
+
 ## Veranstaltungsübersicht
 
 Die Übersichtsseite zeigt den Kalender des aktuellen Monats an, plus einige Tage am Beginn und am Ende.

doc/de/guide.md

@@ -0,0 +1,26 @@
+Erste Schritte... 
+==========
+
+* [Zur Startseite der Hilfe](help)
+
+Das Erste zum Anfang: geh sicher, dass du schon eingeloggt bist. 
+Wenn du noch nicht eingeloggt bist, kannst du das in dem Fenster unten machen. 
+
+Sobald du eingeloggt bist (oder wenn du bereits eingeloggt bist), kannst du unten nun auf deine Profilseite schauen.
+
+Hier sieht es ein wenig wie auf deiner Facebook-Seite aus. 
+Hier findest du alle deine Statusmeldungen und Nachrichten deiner Freunde, die direkt auf deine Seite ("Wall") geschrieben haben. 
+Um deinen Status einzutragen, klicke einfach auf die Box oben, in der "Teilen" steht. 
+Wenn du das machst, vergrößert sich die Box. 
+Nun kannst du einige Formatierungsoptionen wie Fett, kursiv, unterstrichen auswählen und ebenfalls Bilder und Links hinzufügen. 
+Unten findest du in diesem Feld weitere Links, mit denen du Bilder und Dateien von deinem Computer hochladen, Webseiten mit einem Kurztext teilen und Video- und Audiodateien aus dem Internet einfügen kannst. 
+Außerdem kannst du hier eintragen, wo du gerade bist. 
+
+Wenn du deinen Beitrag ("Post") geschrieben hast, kannst du auf das "Schloss"-Symbol klicken und festlegen, wer deinen Beitrag sehen kann. 
+Wenn du dieses Symbol nicht anklickst, ist dein Beitrag öffentlich. 
+Das bedeutet, dass jeder, der dein Profil ansieht, der auf dem "Community"-Tab deines Servers oder auf dem "Netzwerk"-Tab ("Beiträge deiner Kontakte") eines befreundeten Kontakts ist, den Beitrag sehen kann.
+
+Probiere es doch einfach mal aus. Wenn du fertg bist, schauen wir uns den <a href="help/network">"Netzwerk"-Tab</a> an. 
+
+<iframe src="login" width="950" height="600"></iframe>
+

doc/de/home.md

@@ -1,72 +0,0 @@
-# Hilfe
-
-## Dokumentation für Benutzer
-
-* Allgemeine Funktionen - Erste Schritte
-	* [Account - Basics](help/user/account-basics)
-	* [Schnellstart für neue Benutzer](help/user/quick-start/guide)
-	* [Beiträge erstellen](help/user/text-editor)
-	* [Referenz der BBCode Elemente](help/user/bbcode)
-	* [Beiträge kommentieren, einordnen und löschen](help/user/text-comment)
-	* [Referenz der Accesskeys](help/user/access-keys) (EN)
-    * [Veranstaltungen](help/user/events)
-    * [Themes](help/user/themes) (EN)
-* Du und andere Nutzer
-	* [Konnektoren (Connectors)](help/user/connectors)
-	* [Freunde finden](help/user/making-friends)
-	* [Circles und Privatsphäre](help/user/circles-and-privacy)
-	* [Tags und Erwähnungen](help/user/tags-and-mentions)
-	* [Accountypen: Gruppen und Seiten](help/user/accounts-groups-pages)
-	* [Kanäle (Channels)](help/user/channels)
-	* [Chats](help/user/chats)
-* Weiterführende Informationen
-	* [Häufig gestellte Fragen (FAQ)](help/user/faq)
-	* [Account umziehen](help/user/move-account)
-	* [Export / Import gefolgter Kontakte](help/user/export-import-contacts)
-	* [Account löschen](help/user/delete-account)
-	* [Bugs und Probleme](help/user/bugs-and-issues)
-
-## Dokumentation für Administratoren
-
-* [Installation](help/admin/install)
-* [Update](help/admin/update) (EN)
-* [Häufig gestellte Fragen FAQ](help/admin/faq)
-* [Konfigurationen & Admin-Panel](help/admin/settings)
-* [Konnektoren (Connectors) installieren](help/admin/installing-connectors)
-* [Installation eines ejabberd Servers (XMPP-Chat) mit synchronisierten Anmeldedaten](help/admin/install-ejabberd) (EN)
-* [Betreibe deine Seite mit einem SSL-Zertifikat](help/admin/ssl)
-* [Konfigurationswerte, die nur in der config/local.config.php gesetzt werden können](help/admin/config) (EN)
-* [Performance verbessern](help/admin/improve-performance)
-* [Administration Werkzeuge](help/admin/tools) (EN)
-
-## Dokumentation für Entwickler
-
-* [Guide](help/developer/guide)
-* [Where to get started?](help/developer/index) (EN)
-* [On GitHub](help/developer/github) (EN)
-* [On Vagrant](help/developer/vagrant) (EN)
-* [Translate Friendica](help/developer/translations) (EN)
-* [Addon Development](help/developer/addon-development)
-* [Smarty 3 Templates](help/developer/smarty3-templates) (EN)
-* [Protokoll Dokumentation](help/spec/protocol/protocol) (EN)
-* [Datenbank-Schema](help/spec/database/index) (EN)
-* [Class Autoloading](help/developer/autoloader) (EN)
-* [Using Composer](help/developer/composer) (EN)
-* [Code-Referenz (mit doxygen generiert - setzt Cookies)](doc/html/)
-* [API Dokumentation](help/spec/api/index) (EN)
-* [Run tests](help/developer/tests) (EN)
-
-## Links
-
-* Website: [https://friendi.ca](https://friendi.ca)
-* Help Group: [@helpers@forum.friendi.ca](https://forum.friendi.ca/~helpers)
-* XMPP: [support@forum.friendi.ca](xmpp:support@forum.friendi.ca?join)
-* IRC: [https://web.libera.chat/?channels=#friendica](https://web.libera.chat/?channels=#friendica)
-* Matrix: [https://matrix.to/#/#friendi.ca:matrix.org](https://matrix.to/#/#friendi.ca:matrix.org)
-* Mailing List: [https://mailman.friendi.ca/mailman/listinfo/support-friendi.ca](http://mailman.friendi.ca/mailman/listinfo/support-friendi.ca)
-
-## Über
-
-* [Server Information](friendica)
-* [Nutzungsbedingungen](tos)
-* [Mitwirkende](credits)

doc/de/user/quick-start/finally.md

@@ -1,14 +0,0 @@
-# ... und zuletzt
-
-Und damit sind wir auch schon am Ende der Schnellstartanleitung.
-
-Hier sind noch einige weitere Dinge, die Dir den Start vereinfachen können.
-
-**Gruppen**
-
-- [Friendica Support](https://forum.friendi.ca/profile/helpers) - Probleme?  Dann ist das der Platz, um zu fragen!
-
-**Dokumentation**
-
-- [Zu weiteren Netzwerken verbinden](help/user/connectors)
-- [Zur Startseite der Hilfe](help)

doc/de/user/text-editor.md

@@ -1,48 +0,0 @@
-# Beiträge erstellen
-
-Hier findest du eine Übersicht über die verschiedenen Möglichkeiten, deinen Beitrag zu bearbeiten.
-<span style="color: red;">
-Achtung: für dieses Beispiel wurde das Thema <b>"Diabook"</b> genutzt.
-Wenn du ein anderes Design benutzt, wirst du manche dieser Symbole gar nicht oder in anderer Form vorfinden.
-</span>
-
-<img src="doc/assets/img/friendica_rich_editor.png" width="538" height="218" alt="editor">
-
-<i>Die einzelnen Symbole</i>
-
-<img src="doc/assets/img/camera.png" alt="editor" align="left" style="margin: 0 10px 10px 0;"> Wenn du auf dieses Symbol klickst, dann kannst du ein Bild von deinem Computer hinzufügen.
-Wenn du eine Internetadresse (URL) eingeben willst, dann kannst du das "Baum"-Symbol im oberen Teil des Editors nutzen.
-Wenn du ein Bild ausgewählt hast, dann erscheint eine Miniaturdarstellung des Bildes im Editor.*
-<p style="clear:both;"></p>
-
-<img src="doc/assets/img/paper_clip.png" alt="paper_clip" align="left" style="margin: 0 10px 10px 0;"> Wenn du dieses Symbol anklickst, dann kannst du weitere Dateien von deinem Computer einfügen. Eine Vorschau des Dateiinhalts erfolgt nicht.*
-<p style="clear:both;"></p>
-
-<img src="doc/assets/img/chain.png" alt="chain" align="left" style="margin: 0 10px 10px 0;"> Wenn du die Kette anklickst, dann kannst du eine Internetadresse (URL) einfügen.
-Im Editor erscheint automatisch eine kurze Information zum eingefügten Link.*
-<p style="clear:both;"></p>
-
-<img src="doc/assets/img/video.png" alt="video" align="left" style="margin: 0 10px 10px 0;"> Mit dieser Funktion kannst du die Internetadresse (URL) einer Videodatei einfügen.
-Das Video erscheint dann mit einem Player in deinem Beitrag.
-Da Friendica zur Einbindung [HTML5](http://en.wikipedia.org/wiki/HTML5_video) verwendet, werden je nach Browser verschiedene Videoformate unterstützt (z.B. WebM oder MP4).
-Außerdem kannst du hier die URLs von Videos auf Youtube, Vimeo und manchen anderen Videohostern eingeben.
-Die Videos werden dann mit Vorschaubild angezeigt, nach einem Klick öffnet sich ein eingebetteter Player.*
-<p style="clear:both;"></p>
-
-<img src="doc/assets/img/mic.png" alt="mic" align="left" style="margin: 0 10px 10px 0;"> Mit dieser Funktion kannst du die Internetadresse (URL) einer Sound-Datei einfügen.
-Da Friendica zur Einbindung [HTML5](http://en.wikipedia.org/wiki/HTML5_video) verwendet, werden je nach Browser und Betriebssystem MP3, Ogg oder AAC unterstützt.
-Außerdem kannst du hier auch URLs von manchen Audiohostern wie Soundcloud eingeben, um eine dort gespeicherte Audiodatei mit Player in deinem Beitrag anzuzeigen.*
-<p style="clear:both;"></p>
-
-<img src="doc/assets/img/globe.png" alt="globe" align="left" style="margin: 0 10px 10px 0;"> Wenn du dieses Symbol wählst, dann kannst du deinen Standort festlegen.
-Hier reicht schon eine Angabe wie "Berlin" oder "10775".
-Dieser Eintrag führt anschließend zu einer Suchanfrage bei Google Maps.
-<p style="clear:both;"></p>
-
-<i>* wie du Dateien hochladen kannst, erfährst du [hier](help/faq#upload)</i>
-
-**Im Folgenden findest du Symbole weiterer Themen**
-
-Frio  <img src="doc/assets/img/editor_frio.png" alt="frio.png" style="padding-left: 44px; vertical-align:middle;">
-
-Vier  <img src="doc/assets/img/editor_vier.png" alt="vier.png" style="padding-left: 44px; vertical-align:middle;">

doc/en/admin/install-ejabberd.md

@@ -1,47 +0,0 @@
-# Install an ejabberd with synchronized credentials
-
-[Ejabberd](https://www.ejabberd.im/) is a chat server that uses XMPP as messaging protocol that you can use with a large amount of clients.
-In conjunction with the "xmpp" addon it can be used for a web based chat solution for your users.
-
-## Installation
-
-- Change its owner to whichever user is running the server, ie. ejabberd
-```sh
-chown ejabberd:ejabberd /path/to/friendica/bin/auth_ejabberd.php
-```
-
-- Change the access mode, so it is readable only to the user ejabberd and has exec
-```sh
-chmod 700 /path/to/friendica/bin/auth_ejabberd.php
-```
-
-- Edit your ejabberd.cfg file, comment out your auth_method and add:
-```
-{auth_method, external}.
-{extauth_program, "/path/to/friendica/bin/auth_ejabberd.php"}.
-```
-
-- Disable the module "mod_register" and disable the registration:
-```
-{access, register, [{deny, all}]}.
-```
-
-- Enable BOSH:
-  - Enable the module "mod_http_bind"
-  - Edit this line:
-```
-{5280, ejabberd_http,    [captcha, http_poll, http_bind]}
-```
-
-  - In your apache configuration for your site add this line:
-```
-ProxyPass /http-bind http://127.0.0.1:5280/http-bind retry=0
-```
-
-- Restart your ejabberd service, you should be able to log in with your friendica credentials
-
-## Other hints
-
-- if a user has a space or a @ in the nickname, the user has to replace these characters:
-  - " " (space) is replaced with "%20"
-  - "@" is replaced with "(a)"

doc/en/home.md

@@ -1,81 +0,0 @@
-# Help
-
-## User Manual
-
-* General functions - first steps
-	* [Account basics](help/user/account-basics)
-	* [Quick start for new users](help/user/quick-start/guide)
-	* [Creating posts](help/user/text-editor)
-	* [BBCode tag reference](help/user/bbcode)
-	* [Comment, sort and delete posts](help/user/text-comment)
-	* [Accesskey reference](help/user/access-keys)
-	* [Events](help/user/events)
-	* [Themes](help/user/themes)
-* You and other users
-	* [Connectors](help/user/connectors)
-	* [Making friends](help/user/making-friends)
-	* [Safety](help/user/safety)
-	* [Circles and privacy](help/user/circles-and-privacy)
-	* [Tags and mentions](help/user/tags-and-mentions)
-	* [Account types: Groups and Pages](help/user/accounts-groups-pages)
-	* [Channels](help/user/channels)
-	* [Chats](help/user/chats)
-* Further information
-	* [Frequently asked questions (FAQ)](help/user/faq)
-	* [Moving an account](help/user/move-account)
-	* [Export / Import of followed Contacts](help/user/export-import-contacts)
-	* [Deleting an account](help/user/delete-account)
-	* [Bugs and issues](help/user/bugs-and-issues)
-
-## Admin Manual
-
-* [Installation](help/admin/install)
-* [Updating](help/admin/update)
-* [Frequently asked questions (FAQ)](help/admin/faq)
-* [Settings & Admin Panel](help/admin/settings)
-* [Installing Connectors](help/admin/installing-connectors)
-* [Installing an ejabberd server (XMPP chat) with synchronized credentials](help/admin/install-ejabberd)
-* [Using SSL with Friendica](help/admin/ssl)
-* [Config values that can only be set in config/local.config.php](help/admin/config)
-* [Improving performance](help/admin/improve-performance)
-* [Migrating to a new server](help/admin/migrate)
-* [Administration tools](help/admin/tools)
-* [Monitoring](help/admin/monitoring)
-
-## Developer Manual
-
-* [Get started](help/developer/index)
-* Set up development environment
-	* [On GitHub](help/developer/github)
-	* [On Vagrant](help/developer/vagrant)
-* Code structure
-    * [Domain-driven design](help/developer/domain-driven-design)
-	* [Addon development](help/developer/addon-development)
-	* [Smarty 3 templates](help/developer/smarty3-templates)
-	* [Storage backend addon](help/developer/addon-storage-backend)
-* How To
-	* [Translating Friendica](help/developer/translations)
-	* [Using Composer](help/developer/composer)
-	* [Moving classes to the src directory](help/developer/how-to-move-classes-to-src)
-	* [Run tests](help/developer/tests)
-* Reference
-	* [API endpoints](help/spec/api/index)
-	* [Code (Doxygen generated - sets cookies)](doc/html/)
-	* [Protocol documentation](help/spec/protocol/protocol)
-	* [Database schema documentation](help/spec/database/index)
-	* [Class autoloading](help/developer/autoloader)
-
-## Links
-
-* Website: [https://friendi.ca](https://friendi.ca)
-* Help Group: [@helpers@forum.friendi.ca](https://forum.friendi.ca/~helpers)
-* XMPP: [support@forum.friendi.ca](xmpp:support@forum.friendi.ca?join)
-* IRC: [https://web.libera.chat/?channels=#friendica](https://web.libera.chat/?channels=#friendica)
-* Matrix: [https://matrix.to/#/#friendi.ca:matrix.org](https://matrix.to/#/#friendi.ca:matrix.org)
-* Mailing list: [https://mailman.friendi.ca/mailman/listinfo/support-friendi.ca](http://mailman.friendi.ca/mailman/listinfo/support-friendi.ca)
-
-## About
-
-* [Server information](friendica)
-* [Terms of service](tos)
-* [Credits](credits)

doc/en/spec/database/index.md

@@ -1,94 +0,0 @@
-# Database tables
-
-| Table | Description |
-|-------|-------------|
-| [2fa_app_specific_password](help/spec/database/db-2fa_app_specific_password) | Two-factor app-specific _password |
-| [2fa_recovery_codes](help/spec/database/db-2fa_recovery_codes) | Two-factor authentication recovery codes |
-| [2fa_trusted_browser](help/spec/database/db-2fa_trusted_browser) | Two-factor authentication trusted browsers |
-| [account-suggestion](help/spec/database/db-account-suggestion) | Account suggestion |
-| [account-user](help/spec/database/db-account-user) | Remote and local accounts |
-| [apcontact](help/spec/database/db-apcontact) | ActivityPub compatible contacts - used in the ActivityPub implementation |
-| [application](help/spec/database/db-application) | OAuth application |
-| [application-marker](help/spec/database/db-application-marker) | Timeline marker |
-| [application-token](help/spec/database/db-application-token) | OAuth user token |
-| [arrived-activity](help/spec/database/db-arrived-activity) | Id of arrived activities |
-| [attach](help/spec/database/db-attach) | file attachments |
-| [cache](help/spec/database/db-cache) | Stores temporary data |
-| [channel](help/spec/database/db-channel) | User defined Channels |
-| [check-full-text-search](help/spec/database/db-check-full-text-search) | Check for a full text search match in user defined channels before storing the message in the system |
-| [config](help/spec/database/db-config) | main configuration storage |
-| [contact](help/spec/database/db-contact) | contact table |
-| [contact-relation](help/spec/database/db-contact-relation) | Contact relations |
-| [conv](help/spec/database/db-conv) | private messages |
-| [delayed-post](help/spec/database/db-delayed-post) | Posts that are about to be distributed at a later time |
-| [delivery-queue](help/spec/database/db-delivery-queue) | Delivery data for posts for the batch processing |
-| [diaspora-contact](help/spec/database/db-diaspora-contact) | Diaspora compatible contacts - used in the Diaspora implementation |
-| [diaspora-interaction](help/spec/database/db-diaspora-interaction) | Signed Diaspora Interaction |
-| [endpoint](help/spec/database/db-endpoint) | ActivityPub endpoints - used in the ActivityPub implementation |
-| [event](help/spec/database/db-event) | Events |
-| [fetch-entry](help/spec/database/db-fetch-entry) |  |
-| [fetched-activity](help/spec/database/db-fetched-activity) | Id of fetched activities |
-| [fsuggest](help/spec/database/db-fsuggest) | friend suggestion stuff |
-| [group](help/spec/database/db-group) | privacy circles, circle info |
-| [group_member](help/spec/database/db-group_member) | privacy circles, member info |
-| [gserver](help/spec/database/db-gserver) | Global servers |
-| [gserver-tag](help/spec/database/db-gserver-tag) | Tags that the server has subscribed |
-| [hook](help/spec/database/db-hook) | addon hook registry |
-| [inbox-entry](help/spec/database/db-inbox-entry) | Incoming activity |
-| [inbox-entry-receiver](help/spec/database/db-inbox-entry-receiver) | Receiver for the incoming activity |
-| [inbox-status](help/spec/database/db-inbox-status) | Status of ActivityPub inboxes |
-| [intro](help/spec/database/db-intro) |  |
-| [item-uri](help/spec/database/db-item-uri) | URI and GUID for items |
-| [key-value](help/spec/database/db-key-value) | A key value storage |
-| [locks](help/spec/database/db-locks) |  |
-| [mail](help/spec/database/db-mail) | private messages |
-| [mailacct](help/spec/database/db-mailacct) | Mail account data for fetching mails |
-| [manage](help/spec/database/db-manage) | table of accounts that can manage each other |
-| [notification](help/spec/database/db-notification) | notifications |
-| [notify](help/spec/database/db-notify) | [Deprecated] User notifications |
-| [notify-threads](help/spec/database/db-notify-threads) |  |
-| [openwebauth-token](help/spec/database/db-openwebauth-token) | Store OpenWebAuth token to verify contacts |
-| [parsed_url](help/spec/database/db-parsed_url) | cache for 'parse_url' queries |
-| [pconfig](help/spec/database/db-pconfig) | personal (per user) configuration storage |
-| [permissionset](help/spec/database/db-permissionset) |  |
-| [photo](help/spec/database/db-photo) | photo storage |
-| [post](help/spec/database/db-post) | Structure for all posts |
-| [post-activity](help/spec/database/db-post-activity) | Original remote activity |
-| [post-category](help/spec/database/db-post-category) | post relation to categories |
-| [post-collection](help/spec/database/db-post-collection) | Collection of posts |
-| [post-content](help/spec/database/db-post-content) | Content for all posts |
-| [post-counts](help/spec/database/db-post-counts) | Original remote activity |
-| [post-delivery](help/spec/database/db-post-delivery) | Delivery data for posts for the batch processing |
-| [post-delivery-data](help/spec/database/db-post-delivery-data) | Delivery data for items |
-| [post-engagement](help/spec/database/db-post-engagement) | Engagement data per post |
-| [post-history](help/spec/database/db-post-history) | Post history |
-| [post-link](help/spec/database/db-post-link) | Post related external links |
-| [post-media](help/spec/database/db-post-media) | Attached media |
-| [post-origin](help/spec/database/db-post-origin) | Posts from local users |
-| [post-question](help/spec/database/db-post-question) | Question |
-| [post-question-option](help/spec/database/db-post-question-option) | Question option |
-| [post-searchindex](help/spec/database/db-post-searchindex) | Content for all posts |
-| [post-tag](help/spec/database/db-post-tag) | post relation to tags |
-| [post-thread](help/spec/database/db-post-thread) | Thread related data |
-| [post-thread-user](help/spec/database/db-post-thread-user) | Thread related data per user |
-| [post-user](help/spec/database/db-post-user) | User specific post data |
-| [post-user-notification](help/spec/database/db-post-user-notification) | User post notifications |
-| [process](help/spec/database/db-process) | Currently running system processes |
-| [profile](help/spec/database/db-profile) | user profiles data |
-| [profile_field](help/spec/database/db-profile_field) | Custom profile fields |
-| [register](help/spec/database/db-register) | registrations requiring admin approval |
-| [report](help/spec/database/db-report) |  |
-| [report-post](help/spec/database/db-report-post) | Individual posts attached to a moderation report |
-| [report-rule](help/spec/database/db-report-rule) | Terms of service rule lines relevant to a moderation report |
-| [search](help/spec/database/db-search) |  |
-| [session](help/spec/database/db-session) | web session storage |
-| [storage](help/spec/database/db-storage) | Data stored by Database storage backend |
-| [subscription](help/spec/database/db-subscription) | Push Subscription for the API |
-| [tag](help/spec/database/db-tag) | tags and mentions |
-| [user](help/spec/database/db-user) | The local users |
-| [user-contact](help/spec/database/db-user-contact) | User specific public contact data |
-| [user-gserver](help/spec/database/db-user-gserver) | User settings about remote servers |
-| [userd](help/spec/database/db-userd) | Deleted usernames |
-| [verb](help/spec/database/db-verb) | Activity Verbs |
-| [worker-ipc](help/spec/database/db-worker-ipc) | Inter process communication between the frontend and the worker |
-| [workerqueue](help/spec/database/db-workerqueue) | Background tasks queue entries |

doc/en/user/keyboard-shortcuts.md

@@ -1,6 +0,0 @@
-# Keyboard shortcuts in Friendica
-
-## General
-
-* j: Scroll to next thread
-* k: Scroll to previous thread

doc/en/user/quick-start/finally.md

@@ -1,12 +0,0 @@
-And that brings the Quick Start to an end.
-
-Here are some more things to help get you started:
-
-**Groups**
-
-- [Friendica Support](https://forum.friendi.ca/profile/helpers) - problems?  This is the place to ask.
-
-**Documentation**
-
-- [Connections to other networks](help/user/connectors)
-- [Help index](help)

doc/en/user/text-comment.md

@@ -1,29 +0,0 @@
-# Comment, sort and delete posts
-
-Here you can find an overview of the different ways to comment and sort existing posts. <span style="color: red;">Attention: we've used the <b>"diabook"</b> theme. If you're using another theme, some of the icons may be different.</span>
-
-<img src="doc/assets/img/diabook.png" width="308" height="42" alt="diabook" >
-
-<i>The different icons</i>
-
-<img src="doc/assets/img/post_thumbs_up.png" width="27" height="32" alt="post_thumbs_up.png" align="left" style="padding-bottom: 10px;"> This symbol is used to indicate that you like the post. Click it twice to undo your choice.<p style="clear:both;"></p>
-
-<img src="doc/assets/img/post_thumbs_down.png" width="27" height="32" alt="post_thumbs_down.png" align="left" style="padding-bottom: 10px;"> This symbol is used to indicate that you <b>dislike</b> the post. Click it twice to undo your choice.
-<p style="clear:both;"></p>
-
-<img src="doc/assets/img/post_share.png" width="27" height="32" alt="post_share.png" align="left" style="padding-bottom: 10px;"> This symbol is used to share a post. A copy of this post will automatically appear in your status editor and add a link to the original post.
-<p style="clear:both;"></p>
-
-<img src="doc/assets/img/post_mark.png" width="27" height="32" alt="post_mark.png" align="left" style="padding-bottom: 10px;"> This symbol is used to mark a post. Marked posts will appear on your network page at the "starred" tab (from "star"). Click it twice to undo your choice.
-<p style="clear:both;"></p>
-
-<img src="doc/assets/img/post_tag.png" width="27" height="41" alt="post_tag.png" align="left" style="padding-bottom: 10px;"> This symbol is used to tag a post with a self-chosen keyword. When you click at the word, you'll get a list of all posts with this tag. Attention: you can't delete the tag once you've set one.
-<p style="clear:both;"></p>
-
-<img src="doc/assets/img/post_categorize.png" width="27" height="32" alt="post_categorize.png" align="left" style="padding-bottom: 20px;"> This symbol is used to categorize posts. Choose an existing folder or create a new one. You'll find the created folder on your network page under the "saved folders" tab.
-<p style="clear:both;"></p>
-
-<img src="doc/assets/img/post_delete.png" width="27" height="32" alt="post_delete.png" align="left"> This symbol is used to delete your own post or to remove a post of another person from your stream.
-<P style="clear: both;"></p>
-
-<img src="doc/assets/img/post_choose.png" width="27" height="32" alt="post_choose.png" align="left"> This symbol is used to choose more than one post to delete in a single step. After selecting all posts, go to the end of the page and click "Delete Selected Items".<P style="clear: both;"></p>

doc/events.md

@@ -1,5 +1,7 @@
 # Events
 
+* [Home](help)
+
 A special form of postings are events.
 The events you and your contacts share can be found at [/events](/events) on your node.
 To get there go to your wall and follow the tab "events"
@@ -29,14 +31,14 @@ Fields marked with a *** have to be filled.
 * **Event Finishes**: enter the finishing date/time for the event here
 
 When you click in one of these fields a pop-up will be opened that allows you to pick the day and the time.
-If you double-clicked on the day box in the calendar these fields will be pre-filled for you.
+If you double clicked on the day box in the calendar these fields will be pre-filled for you.
 The finishing date/time has to be after the beginning date/time of the event.
 But you don't have to specify it.
 If the event is open-ended or the finishing date/time does not matter, just select the box below the two first fields.
 
 * **Title**: a title for the event
 * **Description**: a longer description for the event
-* **Location**: the location the event will take place
+* **Location**: the location the event will took place
 
 These three fields describe your events.
 In the description and location field you can use BBCode to format the text.