Add documentation

[github/wallabag/wallabag.git] / docs / en / user / installation.rst

diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index c2c6cc551179e8881c1cd2272932c730e6a3a62c..28da67b7e15f0ab968af4a2200473afffeebf906 100644 (file)
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -4,14 +4,14 @@ Install wallabag
 Requirements
 ------------
 
-wallabag is compatible with php >= 5.5
+wallabag is compatible with php >= 5.5, including php 7.
 
 You'll need the following extensions for wallabag to work. Some of these may already activated in your version of php, so you may not have to install all corresponding packages.
 
 - php-session
 - php-ctype
 - php-dom
-- pĥp-hash
+- php-hash
 - php-simplexml
 - php-json
 - php-gd
@@ -48,7 +48,10 @@ To install wallabag itself, you must run these two commands:
 
 ::
 
-    SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.*@alpha" --no-dev
+    git clone https://github.com/wallabag/wallabag.git
+    cd wallabag
+    git checkout 2.0.0-beta.2
+    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
 
 To start php's build-in server and test if everything did install correctly, you can do:
@@ -59,6 +62,11 @@ To start php's build-in server and test if everything did install correctly, you
 
 And access wallabag at http://yourserverip:8000
 
+.. note::
+
+    To define parameters with environment variables, you have to set these variables with ``SYMFONY__`` prefix. For example, ``SYMFONY__DATABASE_DRIVER``. You can have a look to the  `Symfony documentation
+<http://symfony.com/doc/current/cookbook/configuration/external_parameters.html>`__.
+
 Installing on Apache
 --------------------
 
@@ -107,7 +115,7 @@ After reloading or restarting Apache, you should now be able to access wallabag
 Installing on Nginx
 -------------------
 
-Assuming you install wallabag in the /var/www/wallabag folder, , here's the recipe for wallabag :
+Assuming you install wallabag in the /var/www/wallabag folder, here's the recipe for wallabag :
 
 ::