Update wall_thread.tpl (#5352)

[friendica.git] / doc / Install.md

diff --git a/doc/Install.md b/doc/Install.md
index b8929d371bbb6416c8ae3bce7aff37c9450fcb2f..35747809614d21349701187265a8cc5fb7c00b0a 100644 (file)
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -47,14 +47,15 @@ If you are able to do so, we recommend using git to clone the source repository
 This makes the software much easier to update.
 The Linux commands to clone the repository into a directory "mywebsite" would be
 
-    git clone https://github.com/friendica/friendica.git mywebsite
+    git clone https://github.com/friendica/friendica.git -b master mywebsite
     cd mywebsite
     bin/composer.phar install
 
-Make sure the folder *view/smarty3* exists and is writable by the webserver user
+Make sure the folder *view/smarty3* exists and is writable by the webserver user, in this case `www-data`
 
     mkdir view/smarty3
-    chmod 777 view/smarty3
+    chown www-data:www-data view/smarty3
+    chmod 775 view/smarty3
 
 Get the addons by going into your website folder.
 
@@ -62,10 +63,20 @@ Get the addons by going into your website folder.
 
 Clone the addon repository (separately):
 
-    git clone https://github.com/friendica/friendica-addons.git addon
+    git clone https://github.com/friendica/friendica-addons.git -b master addon
 
 If you copy the directory tree to your webserver, make sure that you also copy .htaccess - as "dot" files are often hidden and aren't normally copied.
 
+If you want to use the development version of Friendica you can switch to the devel branch in the repository by running
+
+    git checkout develop
+    bin/composer.phar install
+    cd addon
+    git checkout develop
+
+please be aware that the develop branch may break your Friendica node at any time.
+If you encounter a bug, please let us know.
+
 ### Create a database
 
 Create an empty database and note the access details (hostname, username, password, database name).
@@ -99,7 +110,9 @@ You might wish to move/rename .htconfig.php to another name and empty (called 'd
 
 ### 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). 
+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: