Merge pull request #5933 from annando/diaspora-signature

Signed Diaspora posts should now be stored more reliable

diff --git a/INSTALL.txt b/INSTALL.txt
index 705eb8fed2fe90a6f944b615394044b90d944bbe..2f0613fb7d222843883293ce7473e8266bc41b5f 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -56,6 +56,13 @@ you wish to communicate with the Diaspora network.
        - For alternative server configurations (such as Nginx server and MariaDB
        database engine), refer to the wiki at https://github.com/friendica/friendica/wiki
 
+This guide will walk you through the manual installation process of Friendica.
+If this is nothing for you, you might be interested in
+
+* the Friendica Docker image (https://github.com/friendica/docker) or
+* how install Friendica with YunoHost (https://github.com/YunoHost-Apps/friendica_ynh).
+
+
 2. Unpack the Friendica files into the root of your web server document area.
 
        - If you copy the directory tree to your webserver, make sure

diff --git a/doc/Install.md b/doc/Install.md
index 427299c3ea6dbd07197263d6850dd3e7cb4f4267..e6d1d40645a5386e0ef94f2dd218855cd2bc776e 100644 (file)
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -40,6 +40,14 @@ Requirements
 Installation procedure
 ---
 
+### Alternative Installation Methods
+
+This guide will walk you through the manual installation process of Friendica.
+If this is nothing for you, you might be interested in
+
+* the [Friendica Docker image](https://github.com/friendica/docker) or
+* how [install Friendica with YunoHost](https://github.com/YunoHost-Apps/friendica_ynh).
+
 ### Get Friendica
 
 Unpack the Friendica files into the root of your web server document area.

diff --git a/doc/de/Install.md b/doc/de/Install.md
index 84d9a0d48ef49773d5479f38ae2a740e339c9790..132fbc19041a13fd4227d31df45818c243268dee 100644 (file)
--- a/doc/de/Install.md
+++ b/doc/de/Install.md
@@ -40,6 +40,14 @@ Requirements
 Installation
 ---
 
+### Alternative Wege um Friendica zu Installieren
+
+Diese Anleitung wird dir Schritt-für-Schritt zeigen wie du Friendica auf deinem Server installieren kannst.
+Falls du an automatischen Möglichkeiten interesse hast, wirf doch einen Blick auf
+
+* das [Docker image für Friendica](https://github.com/friendica/docker) oder
+* die [Installation von Friendica auf YunoHost](https://github.com/YunoHost-Apps/friendica_ynh).
+
 ### Friendica
 
 Entpacke die Friendica-Daten in das Quellverzeichnis (root) des Dokumentenbereichs deines Webservers.