From ad950999482209861e3fe6b5f351d7575d419b17 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marcus=20M=C3=BCller?=
 <25648755+M-arcus@users.noreply.github.com>
Date: Sun, 22 Apr 2018 17:55:43 +0200
Subject: [PATCH] [DOCS] Automatic install: Add documentation

---
 doc/Install.md | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/doc/Install.md b/doc/Install.md
index b9b2debb42..0de42429c2 100644
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -2,6 +2,7 @@ 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 offer a manual and an automatic installation.
 But be aware that Friendica is more than a simple web application.
 It is a complex communications system which more closely resembles an email server than a web server.
 For reliability and performance, messages are delivered in the background and are queued for later delivery when sites are down.
@@ -79,24 +80,47 @@ In this case find the [mysqld] section in your my.cnf file and add the line :
 
 Restart mysql and you should be fine.
 
-
-### Run the installer
+### Option A: Run the manual installer
 
 Point your web browser to the new site and follow the instructions.
 Please note any error messages and correct these before continuing.
 
 If you need to specify a port for the connection to the database, you can do so in the host name setting for the database.
 
-*If* the automated installation fails for any reason, check the following:
+*If* the manual installation fails for any reason, check the following:
 
 * Does ".htconfig.php" exist? If not, edit htconfig.php and change the system settings. Rename to .htconfig.php
-* Is the database is populated? If not, import the contents of "database.sql" with phpmyadmin or mysql command line.
+* Is the database is populated? If not, import the contents of "database.sql" with phpmyadmin or the mysql command line.
 
 At this point visit your website again, and register your personal account.
 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 .htconfig.php to another name and empty (called 'dropping') the database tables, so that you can start fresh.
 
+### Option B: Run the automatic install script
+
+Open the file htconfig.php in the main Friendica directory with a text editor. Remove the `die('...');` line and edit the lines to suit your installation (MySQL, language, theme etc.), then save the file (do not rename it). 
+
+Navigate to the main Friendica directory and execute the following command:
+
+    bin/console autoinstall
+
+Or if you wish to include all optional checks, execute this statement instead:
+
+    bin/console autoinstall -a
+
+At this point visit your website again, and register your personal account.
+
+*If* the automatic installation fails for any reason, check the following:
+
+* Does ".htconfig.php" already exist? If yes, the automatic installation won't start
+* Are the settings inside "htconfig.php" correct? If not, edit the file again.
+* Is the empty MySQL-database created? If not, import the contents of "database.sql" with phpmyadmin or the mysql command line.
+
+For more information during the installation, you can use this command line option;
+
+    bin/console autoinstall -v
+
 ### Set up the worker
 
 Set up a cron job or scheduled task to run the worker once every 5-10 minutes in order to perform background processing.
-- 
2.39.5