we only want to maintain one INSTALL.txt - and it is in the directory 'install' where it belongs.

1 files changed, 47 insertions, 2 deletions

diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index 3f135c349..89b53c7c0 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -17,6 +17,17 @@ Red Matrix. Many will - but please review the requirements and confirm these
 with your hosting provider prior to installation. (And preferably before 
 entering into a long-term contract.)
 
+If you encounter installation issues, please let us know via the Github issue 
+tracker (https://github.com/friendica/red/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.
+
+
+
 Before you begin: Choose a domain name or subdomain name for your server.
 Put some thought into this - because changing it is currently not-supported.
 Things will break, and some of your friends may have difficulty communicating
@@ -52,6 +63,40 @@ directory/path component in the URL) is REQUIRED.
 	that you also copy .htaccess - as "dot" files are often hidden 
 	and aren't normally copied.
 
+    - If you are able to do so, we recommend using git to clone the 
+	source repository rather than to use a packaged tar or zip file.
+	This makes the software much easier to update. The Linux command
+	to clone the repository into a directory "mywebsite" would be
+
+        git clone https://github.com/friendica/red.git mywebsite
+
+    - and then you can pick up the latest changes at any time with
+
+        git pull
+
+    - make sure folder *view/tpl/smarty3* exists and is writable by webserver
+
+        mkdir view/tpl/smarty3
+
+        chmod 777 view/tpl/smarty3
+
+    - For installing addons
+
+        - First you should be **on** your website folder
+
+            cd mywebsite
+
+        - Then you should clone the addon repository (separately)
+
+            git clone https://github.com/friendica/red-addons.git addon
+
+        - For keeping the addon tree updated, you should be on you addon tree and issue a git pull
+
+            cd mywebsite/addon
+
+			git pull
+
+
 3. Create an empty database and note the access details (hostname, username, 
 password, database name).
 
@@ -123,7 +168,7 @@ $a->config['system']['php_path'] = '/usr/local/php53/bin/php';
 	
 	Check your database settings. It usually means your database could not 
 be opened or accessed. If the database resides on the same machine, check that
-the database server name is "localhost". 
+the database server name is the word "localhost". 
 
 #####################################################################
 - 500 Internal Error
@@ -167,7 +212,7 @@ configuration for your site. This will need to be changed to
 	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 flavour of Linux,
+	On most flavours of Linux,
 
 % a2enmod rewrite
 % /etc/init.d/apache2 restart