8 files changed, 112 insertions, 34 deletions

diff --git a/docs/en/conf.py b/docs/en/conf.py
index 717b35f1..5926f8c9 100644
--- a/docs/en/conf.py
+++ b/docs/en/conf.py
@@ -11,8 +11,8 @@ templates_path = ['_templates']
 source_suffix = '.rst'
 master_doc = 'index'
 project = u'wallabag'
-copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
-version = '2.1.0'
+copyright = u'2013-2017, Nicolas Lœuillet - MIT Licence'
+version = '2.3.0'
 release = version
 exclude_patterns = ['_build']
 pygments_style = 'sphinx'
diff --git a/docs/en/developer/console_commands.rst b/docs/en/developer/console_commands.rst
new file mode 100644
index 00000000..85a8a092
--- /dev/null
+++ b/docs/en/developer/console_commands.rst
@@ -0,0 +1,30 @@
+Console Commands
+================
+
+wallabag has a number of CLI commands to manage a number of tasks. You can list all the commands by executing `bin/console` in the wallabag folder.
+
+Each command has a help accessible through `bin/console help %command%`.
+
+.. note::
+
+    If you're in a production environment, remember to add `-e prod` to each command.
+
+Notable commands
+----------------
+
+* `assets:install`: May be helpful if assets are missing.
+* `cache:clear`: should be run after each update (included in `make update`).
+* `doctrine:migrations:status`: Output the status of your database migrations.
+* `fos:user:activate`: Manually activate an user.
+* `fos:user:change-password`: Change a password for an user.
+* `fos:user:create`: Create an user.
+* `fos:user:deactivate`: Deactivate an user (not deleted).
+* `fos:user:demote`: Removes a role from an user, typically admin rights.
+* `fos:user:promote`: Adds a role to an user, typically admin rights.
+* `rabbitmq:*`: May be useful if you're using RabbitMQ.
+* `wallabag:clean-duplicates`: Removes all entry duplicates for one user or all users
+* `wallabag:export`: Exports all entries for an user. You can choose the output path of the file.
+* `wallabag:import`: Import entries to different formats to an user account.
+* `wallabag:import:redis-worker`: Useful if you use Redis.
+* `wallabag:install`: (re)Install wallabag
+* `wallabag:tag:all`: Tag all entries for an user using his/her tagging rules.
diff --git a/docs/en/developer/front_end.rst b/docs/en/developer/front_end.rst
new file mode 100644
index 00000000..40f18a42
--- /dev/null
+++ b/docs/en/developer/front_end.rst
@@ -0,0 +1,33 @@
+Tips for front-end developers
+=============================
+
+Starting from version 2.3, wallabag uses webpack to bundle its assets.
+
+Dev mode
+--------
+
+If the server runs in dev mode, you need to run ``yarn run build:dev`` to generate the outputted javascript files for each theme. These are named ``%theme%.dev.js`` and are ignored by git. You need to relaunch ``yarn run build:dev`` for each change made to one of the assets files (js, css, pictures, fonts,...).
+
+Live reload
+-----------
+
+Webpack brings support for live reload, which means you don't need to regenerate the assets file for each change neither reload the page manually. Changes are applied automatically in the web page. Just set the ``use_webpack_dev_server`` setting to ``true`` in ``app/config/config.yml`` and run ``yarn run watch`` and you're good to go.
+
+.. note::
+
+    Don't forget to put back ``use_webpack_dev_server`` to ``false`` when not using the live reload feature.
+
+Production builds
+-----------------
+
+When you want to commit your changes, build them in production environment by using ``yarn run build:prod``. This will build all the assets needed for wallabag. To test that it properly works, you'll need to have a server in production mode, for instance with ``bin/console server:run -e=prod``.
+
+.. note::
+
+    Don't forget to generate production builds before committing !
+
+
+Code style
+----------
+
+Code style is checked by two tools : stylelint for (S)CSS and eslint for JS. ESlint config is based on the Airbnb base preset.
diff --git a/docs/en/user/articles.rst b/docs/en/user/articles.rst
index 16b3b0d2..862bba3e 100644
--- a/docs/en/user/articles.rst
+++ b/docs/en/user/articles.rst
@@ -34,20 +34,20 @@ By using a browser add-on
 Firefox
 """""""
 
-You can download the `Firefox addon here <https://addons.mozilla.org/firefox/addon/wallabag-v2/>`_.
+You can download the `Firefox addon here <https://addons.mozilla.org/firefox/addon/wallabagger/>`_.
 
 Chrome
 """"""
 
 You can download the `Chrome addon here <https://chrome.google.com/webstore/detail/wallabagger/gbmgphmejlcoihgedabhgjdkcahacjlj?hl=fr>`_.
 
-By using your smarphone application
+By using your smartphone application
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Android
 """""""
 
-You can download the `Android application here <https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche>`_.
+You can download the `Android application here <https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche>`_ or on `F-Droid <https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.InThePoche>`_.
 
 Windows Phone
 """""""""""""
@@ -86,6 +86,7 @@ Now, you can share the article:
 - with a public URL (you'll have a light view of the article)
 - with a tweet
 - into your Shaarli
+- into your Scuttle
 - with a post in Diaspora*
 - to Carrot
 - with an email
diff --git a/docs/en/user/configuration.rst b/docs/en/user/configuration.rst
index bba12cb9..0f3ac38f 100644
--- a/docs/en/user/configuration.rst
+++ b/docs/en/user/configuration.rst
@@ -116,16 +116,17 @@ Which variables and operators can I use to write rules?
 
 The following variables and operators can be used to create tagging rules (be careful, for some values, you need to add quotes, for example ``language = "en"``):
 
-===========  ==============================================  ========  ==========
-Variable     Meaning                                         Operator  Meaning
------------  ----------------------------------------------  --------  ----------
-title        Title of the entry                              <=        Less than…
-url          URL of the entry                                <         Strictly less than…
-isArchived   Whether the entry is archived or not            =>        Greater than…
-isStarred    Whether the entry is starred or not             >         Strictly greater than…
-content      The entry's content                             =         Equal to…
-language     The entry's language                            !=        Not equal to…
-mimetype     The entry's mime-type                           OR        One rule or another
-readingTime  The estimated entry's reading time, in minutes  AND       One rule and another
-domainName   The domain name of the entry                    matches   Tests that a subject is matches a search (case-insensitive). Example: title matches "football"
-===========  ==============================================  ========  ==========
+===========  ==============================================  ==========  ==========
+Variable     Meaning                                         Operator    Meaning
+-----------  ----------------------------------------------  ----------  ----------
+title        Title of the entry                              <=          Less than…
+url          URL of the entry                                <           Strictly less than…
+isArchived   Whether the entry is archived or not            =>          Greater than…
+isStarred    Whether the entry is starred or not             >           Strictly greater than…
+content      The entry's content                             =           Equal to…
+language     The entry's language                            !=          Not equal to…
+mimetype     The entry's mime-type                           OR          One rule or another
+readingTime  The estimated entry's reading time, in minutes  AND         One rule and another
+domainName   The domain name of the entry                    matches     Tests that a subject is matches a search (case-insensitive). Example: title matches "football"
+                                                             notmatches  Tests that a subject is not matches a search (case-insensitive). Example: title notmatches "football"
+===========  ==============================================  ==========  ==========
diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst
index f420a131..f6aaa373 100644
--- a/docs/en/user/import.rst
+++ b/docs/en/user/import.rst
@@ -77,7 +77,7 @@ From Instapaper
 ---------------
 
 Export your Instapaper data
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 On the settings (`https://www.instapaper.com/user <https://www.instapaper.com/user>`_) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like ``instapaper-export.csv``).
 
@@ -102,7 +102,7 @@ If you were using wallabag v1.x, you need to export your data before migrating t
     If you have multiple accounts on the same instance of wallabag, each user must export from v1 and import into v2 its data.
 
 .. note::
-    If you encounter issues during the export or the import, don't hesitate to `ask for support <https://www.wallabag.org/pages/support.html>`__.
+    If you encounter issues during the export or the import, don't hesitate to `ask for support <https://gitter.im/wallabag/wallabag>`__.
 
 When you have retrieved the json file containing your entries, you can install wallabag v2 if needed by following `the standard procedure <http://doc.wallabag.org/en/master/user/installation.html>`__.
 
@@ -124,7 +124,7 @@ From the previous wallabag instance on which you were before, go to `All article
 From your new wallabag instance, create your user account and click on the link in the menu to proceed to import. Choose import from wallabag v2 and select your json file to upload it.
 
 .. note::
-    If you encounter issues during the export or the import, don't hesitate to `ask for support <https://www.wallabag.org/pages/support.html>`__.
+    If you encounter issues during the export or the import, don't hesitate to `ask for support <https://gitter.im/wallabag/wallabag>`__.
 
 Import via command-line interface (CLI)
 ---------------------------------------
@@ -133,16 +133,21 @@ If you have a CLI access on your web server, you can execute this command to imp
 
 ::
 
-    bin/console wallabag:import 1 ~/Downloads/wallabag-export-1-2016-04-05.json --env=prod
+    bin/console wallabag:import username ~/Downloads/wallabag-export-1-2016-04-05.json --env=prod
 
 Please replace values:
 
-* ``1`` is the user identifier in database (The ID of the first user created on wallabag is 1)
+* ``username`` is the user's username
 * ``~/Downloads/wallabag-export-1-2016-04-05.json`` is the path of your wallabag v1 export
 
-If you want to mark all these entries as read, you can add the ``--markAsRead`` option.
+.. note::
+    If you want to mark all these entries as read, you can add the ``--markAsRead`` option.
 
-To import a wallabag v2 file, you need to add the option ``--importer=v2``.
+.. note::
+    To import a wallabag v2 file, you need to add the option ``--importer=v2``.
+
+.. note::
+    If you want to pass the user id of the user instead of it's username, add the option ``--useUserId=true``.
 
 You'll have this in return:
 
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 2b730b83..f1146b49 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -4,7 +4,7 @@ Install wallabag
 Requirements
 ------------
 
-wallabag is compatible with PHP >= 5.5, including PHP 7.
+wallabag is compatible with **PHP >= 5.6**, including PHP 7.
 
 .. note::
 
@@ -87,7 +87,7 @@ Execute this command to download and extract the latest package:
 
     wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
 
-You will find the `md5 hash of the latest package on our website <https://www.wallabag.org/pages/download-wallabag.html>`_.
+You will find the `md5 hash of the latest package on our website <https://static.wallabag.org/releases/>`_.
 
 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``.
@@ -104,6 +104,14 @@ Command to launch container
 
     docker pull wallabag/wallabag
 
+Installation on Cloudron
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Cloudron provides an easy way to install webapps on your server with a focus on sysadmin automation and keeping apps updated.
+wallabag is packaged as a Cloudron app and available to install directly from the store.
+
+`Install wallabag on your Cloudron <https://cloudron.io/store/org.wallabag.cloudronapp.html>`__
+
 Virtual hosts
 -------------
 
@@ -155,9 +163,9 @@ Assuming you install wallabag in the ``/var/www/wallabag`` folder and that you w
         ErrorLog /var/log/apache2/wallabag_error.log
         CustomLog /var/log/apache2/wallabag_access.log combined
     </VirtualHost>
-    
-    
-.. tip:: Note for Apache 2.4, in the section `<Directory /var/www/wallabag/web>` you have to replace the directives : 
+
+
+.. tip:: Note for Apache 2.4, in the section `<Directory /var/www/wallabag/web>` you have to replace the directives :
 
 ::
 
@@ -166,12 +174,12 @@ Assuming you install wallabag in the ``/var/www/wallabag`` folder and that you w
     Allow from All
 
 
-by 
+by
 
 ::
-    
+
     Require All granted
-    
+
 
 After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld.
 
diff --git a/docs/en/user/upgrade.rst b/docs/en/user/upgrade.rst
index 46b490c3..3157684c 100644
--- a/docs/en/user/upgrade.rst
+++ b/docs/en/user/upgrade.rst
@@ -67,7 +67,7 @@ Download the last release of wallabag:
 
     wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
 
-You will find the `md5 hash of the latest package on our website <https://www.wallabag.org/pages/download-wallabag.html>`_.
+You will find the `md5 hash of the latest package on our website <https://static.wallabag.org/releases/>`_.
 
 Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours.