X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=docs%2Fen%2Fuser%2Finstallation.rst;h=4aaabd82e1fbc072769d78288590c8cbc81c02f4;hb=e40bed36077164cb6d83761a6554b6b88ad95097;hp=41542c45a9a4a21d0f31998067bf128a372eaefb;hpb=839475776bdacf7e939984ee8230cb84d34c2289;p=github%2Fwallabag%2Fwallabag.git

diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 41542c45..4aaabd82 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -22,6 +22,7 @@ You'll need the following extensions for wallabag to work. Some of these may alr
 - php-curl
 - php-gettext
 - php-tokenizer
+- php-bcmath
 
 wallabag uses PDO to connect to the database, so you'll need one of the following:
 
@@ -37,7 +38,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 +46,7 @@ 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>`__.
 
 To install wallabag itself, you must run the following commands:
 
@@ -53,7 +54,7 @@ To install wallabag itself, you must run the following commands:
 
     git clone https://github.com/wallabag/wallabag.git
     cd wallabag
-    git checkout 2.0.4
+    git checkout 2.1.1 --force
     SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
     php bin/console wallabag:install --env=prod
 
@@ -85,6 +86,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 2.1.1 package: ``9584a3b60a2b2a4de87f536548caac93``)
+
 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``.
 
@@ -226,7 +229,7 @@ Assuming you install wallabag in the /var/www/wallabag folder, here's the recipe
     dir-listing.activate = "disable"
 
     url.rewrite-if-not-file = (
-        "^/([^?])(?:\?(.))?" => "/app.php?$1&$2",
+        "^/([^?]*)(?:\?(.*))?" => "/app.php?$1&$2",
         "^/([^?]*)" => "/app.php?=$1",
     )