From c2c2f25d9224dee090d92a883d2b9c72fe813068 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 15 Oct 2018 10:36:27 +0200 Subject: [PATCH 1/3] added links to alternative ways to install Friendica to the docs --- INSTALL.txt | 7 +++++++ doc/Install.md | 8 ++++++++ doc/de/Install.md | 8 ++++++++ 3 files changed, 23 insertions(+) diff --git a/INSTALL.txt b/INSTALL.txt index 705eb8fed2..fe733eefe7 100644 --- 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 427299c3ea..e6d1d40645 100644 --- 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 84d9a0d48e..132fbc1904 100644 --- 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. From 4496fdba2475540458e5878d6525bacf47487218 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 15 Oct 2018 13:44:09 +0200 Subject: [PATCH 2/3] use the right bracket --- INSTALL.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.txt b/INSTALL.txt index fe733eefe7..ee98b8981d 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -60,7 +60,7 @@ 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). +* how install Friendica with YunoHos (https://github.com/YunoHost-Apps/friendica_ynh). 2. Unpack the Friendica files into the root of your web server document area. From 092125edb6812116d4a2f82d5a58afdd396a599b Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 15 Oct 2018 13:45:21 +0200 Subject: [PATCH 3/3] ypot --- INSTALL.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.txt b/INSTALL.txt index ee98b8981d..2f0613fb7d 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -60,7 +60,7 @@ 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 YunoHos (https://github.com/YunoHost-Apps/friendica_ynh). +* 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.