Add documentation about article sharing

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

diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 58d9fb7e0a80078ff9f13b28064e9b208e3a999a..3794c75763cf8e8a5e8fd06301a7fe6453255d1a 100644 (file)
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -37,7 +37,7 @@ Installation
 On a dedicated web server (recommended way)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-wallabag uses a large number of libraries in order to function. These libraries must be installed with a tool called Composer. You need to install it if you have not already done so.
+wallabag uses a large number of PHP libraries in order to function. These libraries must be installed with a tool called Composer. You need to install it if you have not already done so and be sure to use the 1.2 version (if you already have Composer, run a ``composer selfupdate``).
 
 Install Composer:
 
@@ -45,7 +45,14 @@ Install Composer:
 
     curl -s http://getcomposer.org/installer | php
 
-You can find specific instructions `here <https://getcomposer.org/doc/00-intro.md>`__:
+You can find specific instructions `here <https://getcomposer.org/doc/00-intro.md>`__.
+
+You also need to install node.js (via `the Download page <https://nodejs.org/en/download/>`__), npm (already install with node.js), bower and grunt:
+
+::
+
+    npm install -g bower
+    npm install -g grunt-cli
 
 To install wallabag itself, you must run the following commands:
 
@@ -53,9 +60,8 @@ To install wallabag itself, you must run the following commands:
 
     git clone https://github.com/wallabag/wallabag.git
     cd wallabag
-    git checkout 2.0.5
-    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
-    php bin/console wallabag:install --env=prod
+    git checkout 2.1
+    ./install.sh
 
 To start PHP's build-in server and test if everything did install correctly, you can do:
 
@@ -85,6 +91,8 @@ Execute this command to download and extract the latest package:
 
     wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
 
+(md5 hash of the package: ``4f84c725d1d6e3345eae0a406115e5ff``)
+
 Now, read the following documentation to create your virtual host, then access your wallabag.
 If you changed the database configuration to use MySQL or PostgreSQL, you need to create a user via this command ``php bin/console wallabag:install --env=prod``.