36 files changed, 2904 insertions, 250 deletions
diff --git a/docs/de/developer/asynchronous.rst b/docs/de/developer/asynchronous.rst
index 1d241a72..742dd3e5 100644
--- a/docs/de/developer/asynchronous.rst
+++ b/docs/de/developer/asynchronous.rst
@@ -47,6 +47,7 @@ Bearbeite deine ``app/config/parameters.yml``-Datei, um die RabbitMQ-Parameter z
    rabbitmq_port: 5672
    rabbitmq_user: guest
    rabbitmq_password: guest
+    rabbitmq_prefetch_count: 10 # lesen http://www.rabbitmq.com/consumer-prefetch.html
 RabbitMQ in wallabag aktivieren
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -149,10 +150,10 @@ Abhängig davon, über welchen Service du importieren möchtest, musst du den en
  bin/console wallabag:import:redis-worker -e=prod firefox -vv >> /path/to/wallabag/var/logs/redis-firefox.log
  # für den Chrome-Import
-  bin/console wallabag:import:redis-worker -e=prod instapaper -vv >> /path/to/wallabag/var/logs/redis-chrome.log
+  bin/console wallabag:import:redis-worker -e=prod chrome -vv >> /path/to/wallabag/var/logs/redis-chrome.log
 Wenn du den Import nur für einige Artikel nutzen willst, kannst du die Nummer festlegen (hier: 12) und der Consumer wird nach dem zwölften Artikel aufhören:
 .. code:: bash
-  bin/console wallabag:import:redis-worker -e=prod pocket -vv --maxIterations=12
-\ No newline at end of file
+  bin/console wallabag:import:redis-worker -e=prod pocket -vv --maxIterations=12
diff --git a/docs/de/developer/maintenance.rst b/docs/de/developer/maintenance.rst
deleted file mode 100644
index 31343876..00000000
--- a/docs/de/developer/maintenance.rst
+++ /dev/null
@@ -1,32 +0,0 @@
-Wartungsmodus
-=============
-Wenn du längere Aufgaben auf deiner wallabag Instanz ausführen willst, kannst du den Wartungsmodus aktivieren.
-Keiner wird dann Zugang zu deiner Instanz haben.
-Aktivieren des Wartungsmodus
----------------------------
-Um den Wartungsmodus zu aktivieren, führe folgendes Kommando aus:
-::
-    bin/console lexik:maintenance:lock -e=prod --no-interaction
-Du kannst deine IP Adresse in ``app/config/config.yml`` setzen, wenn du Zugriff zu wallabag haben willst, auch wenn der Wartungsmodus aktiv ist. Zum Beispiel:
-::
-    lexik_maintenance:
-        authorized:
-            ips: ['127.0.0.1']
-Deaktivieren des Wartungsmodus
------------------------
-Um den Wartungsmodus zu deaktivieren, führe dieses Kommando aus:
-::
-    bin/console lexik:maintenance:unlock -e=prod
diff --git a/docs/de/developer/paywall.rst b/docs/de/developer/paywall.rst
new file mode 100644
index 00000000..365027b4
--- /dev/null
+++ b/docs/de/developer/paywall.rst
@@ -0,0 +1,56 @@
+Articles behind a paywall
+=========================
+wallabag can fetch articles from websites which use a paywall system.
+Enable paywall authentication
+-----------------------------
+In internal settings, in the **Article** section, enable authentication for websites with paywall (with the value 1).
+Configure credentials in wallabag
+---------------------------------
+Edit your ``app/config/parameters.yml`` file to edit credentials for each website with paywall. Here is an example for some french websites:
+.. code:: yaml
+    sites_credentials:
+        mediapart.fr: {username: "myMediapartLogin", password: "mypassword"}
+        arretsurimages.net: {username: "myASILogin", password: "mypassword"}
+.. note::
+    These credentials will be shared between each user of your wallabag instance.
+Parsing configuration files
+---------------------------
+.. note::
+    Read `this part of the documentation <http://doc.wallabag.org/en/master/user/errors_during_fetching.html>`_ to understand the configuration files.
+Each parsing configuration file needs to be improved by adding ``requires_login``, ``login_uri``,
+``login_username_field``, ``login_password_field`` and ``not_logged_in_xpath``.
+Be careful, the login form must be in the page content when wallabag loads it. It's impossible for wallabag to be authenticated
+on a website where the login form is loaded after the page (by ajax for example).
+``login_uri`` is the action URL of the form (``action`` attribute in the form).
+``login_username_field`` is the ``name`` attribute of the login field.
+``login_password_field`` is the ``name`` attribute of the password field.
+For example:
+.. code::
+    title://div[@id="titrage-contenu"]/h1[@class="title"]
+    body: //div[@class="contenu-html"]/div[@class="page-pane"]
+    requires_login: yes
+    login_uri: http://www.arretsurimages.net/forum/login.php
+    login_username_field: username
+    login_password_field: password
+    not_logged_in_xpath: //body[@class="not-logged-in"]
diff --git a/docs/de/developer/translate.rst b/docs/de/developer/translate.rst
index 50e136ea..10544e31 100644
--- a/docs/de/developer/translate.rst
+++ b/docs/de/developer/translate.rst
@@ -20,7 +20,7 @@ der ISO 639-1 Code deiner Sprache ist (`siehe Wikipedia <https://en.wikipedia.or
 Andere Dateien zum Übersetzen:
 - https://github.com/wallabag/wallabag/tree/master/app/Resources/CraueConfigBundle/translations.
- https://github.com/wallabag/wallabag/tree/master/app/Resources/FOSUserBundle/translations.
+- https://github.com/wallabag/wallabag/tree/master/src/Wallabag/UserBundle/Resources/translations.
 Du musst die ``THE_TRANSLATION_FILE.CODE.yml`` Dateien erstellen.
diff --git a/docs/de/index.rst b/docs/de/index.rst
index 28a47200..1c3e4873 100644
--- a/docs/de/index.rst
+++ b/docs/de/index.rst
@@ -46,7 +46,7 @@ Die Dokumentation ist in anderen Sprachen verfügbar :
   developer/api
   developer/docker
+   developer/paywall
   developer/documentation
   developer/translate
-   developer/maintenance
   developer/asynchronous
diff --git a/docs/de/user/configuration.rst b/docs/de/user/configuration.rst
index 3fb501eb..47c60f4c 100644
--- a/docs/de/user/configuration.rst
+++ b/docs/de/user/configuration.rst
@@ -27,6 +27,14 @@ Lesegeschwindigkeit
 wallabag berechnet die Lesezeit für jeden Artikel. Du kannst hier definieren, dank dieser Liste, ob du
 ein schneller oder langsamer Leser bist. wallabag wird die Lesezeit für jeden Artikel neu berechnen.
+Wohin möchtest du weitergeleitet werden, nach dem ein Artikel als gelesen markiert wurde?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Jedes Mal, wenn du eine Aktion ausführst (nach dem Markieren eines Artikels als gelesen oder Favorit, nach dem Löschen eines Artikels oder dem Entfernen eines Tag von einem Eintrag), kannst du weitergeleitet werden:
+- zur Homepage
+- zur aktuellen Seite
 Sprache
 ~~~~~~~
@@ -44,6 +52,9 @@ Jetzt hast du drei Links, einen für jeden Status: Füge sie in deinem liebsten
 Du kannst auch definieren wie viele Artikel du in deinem RSS Feed (Standardwert: 50) haben willst.
+There is also a pagination available for these feeds. You can add ``?page=2`` to jump to the second page.
+The pagination follow `the RFC <https://tools.ietf.org/html/rfc5005#page-4>`_ about that, which means you'll find the ``next``, ``previous`` & ``last`` page link inside the `<channel>` tag of each RSS feed.
 Benutzer-Informationen
 ----------------------
diff --git a/docs/de/user/filters.rst b/docs/de/user/filters.rst
index c9cda6b6..94b82b24 100644
--- a/docs/de/user/filters.rst
+++ b/docs/de/user/filters.rst
@@ -30,6 +30,11 @@ Sprache
 wallabag (via graby) kann die Artikelsprache erkennen. Es ist einfach für dich, Artikel
 in einer bestimmten Sprache zu filtern.
+HTTP status
+-----------
+You can retrieve the articles by filtering by their HTTP status code: 200, 404, 500, etc.
 Lesezeit
 --------
diff --git a/docs/de/user/import.rst b/docs/de/user/import.rst
index 55ab9291..399a1b98 100644
--- a/docs/de/user/import.rst
+++ b/docs/de/user/import.rst
@@ -42,35 +42,50 @@ Du musst wallabag erlauben, mit deinem Pocketaccount zu interagieren.
 Deine Daten werden importiert. Datenimport kann ein sehr anspruchsvoller Prozess für deinen Server
 sein (wir müssen daran arbeiten, um diesen Import zu verbessern).
-Readability
+Von Readability
-----------
+----------------
-Exportiere deine Readability-Daten
+Exportiere deine Readability Daten
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Auf der Seite Tools (`https://www.readability.com/tools/ <https://www.readability.com/tools/>`_), klicke auf "Exportiere deine Daten" in dem Abschnitt "Daten Export". Du wirst eine E-Mail empfangen, um eine JSON Datei herunterladen zu können (Datei endet aber nicht auf .json).
+Importiere deine Daten in wallabag 2.x
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Auf der Tools-Seite (`https://www.readability.com/tools/ <https://www.readability.com/tools/>`_), klicke auf "Daten exportieren" im "Daten-Export"-Abschnitt. Du wirst eine E-Mail mit einem Downloadlink zu einer JSON-Datei erhalten, welche zugegebenermaßen nicht mit .json endet.
+Klicke auf den ``Importieren`` Link im Menü, auf ``Importiere Inhalte`` in dem Readability Abschnitt und wähle dann deine JSON Datei aus und lade sie hoch.
+Deine Daten werden importiert. Der Datenimport can ein beanspruchender Prozess für deinen Server sein.
+Von Pinboard
+-------------
+Exportiere deine Pinboard Daten
+~~~~~~~~~~~~~~~~~~~~~~~~~
+Auf der Seite Backup (`https://pinboard.in/settings/backup <https://pinboard.in/settings/backup>`_), klicke auf "JSON" in dem Abschnitt "Lesezeichen". Eine JSON Datei wird heruntergeladen (z.B. ``pinboard_export``).
 Importiere deine Daten in wallabag 2.x
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Klicke auf den ``Importieren``-Link im Menü, auf ``Inhalte importieren`` im Readability-Abschnitt und wähle dann deine JSON-Datei aus und lade sie hoch. 
+Klicke auf den ``Importieren`` Link im Menü, auf ``Importiere Inhalte`` in dem Pinboard Abschnitt und wähle dann deine JSON Datei aus und lade sie hoch.
-Deine Daten werden dann importiert. Dies kann eine starke Belastung für den Server sein.
+Deine Daten werden importiert. Der Datenimport can ein beanspruchender Prozess für deinen Server sein.
-Instapaper
+Von Instapaper
----------
+---------------
-Exportiere deine Instapaper-Daten
+Exportiere deine Instapaper Daten
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Klicke in den Einstellungen (`https://www.instapaper.com/user <https://www.instapaper.com/user>`_) auf "CSV-Datei herunterladen" im Export-Abschnitt. Eine CSV-Datei mit dem Namen ``instapaper-export.csv`` wird heruntergeladen.
+Auf der Seite Einstellungen (`https://www.instapaper.com/user <https://www.instapaper.com/user>`_), klicke auf "Download .CSV Datei" in dem Abschnitt "Export". Eine CSV Datei wird heruntergeladen (z.B. ``instapaper-export.csv``).
 Importiere deine Daten in wallabag 2.x
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Klicke auf den ``Importieren``-Link im Menü, auf ``Inhalte importieren`` im Instapaper-Abschnitt und wähle dann deine CSV-Datei aus und lade sie hoch. 
+Klicke auf den ``Importieren`` Link im Menü, auf ``Importiere Inhalte`` in dem Instapaper Abschnitt und wähle dann deine JSON Datei aus und lade sie hoch.
-Deine Daten werden dann importiert. Dies kann eine starke Belastung für den Server sein.
+Deine Daten werden importiert. Der Datenimport can ein beanspruchender Prozess für deinen Server sein.
 wallabag 1.x
 ------------
@@ -134,4 +149,4 @@ Als Ergebnis wirst du so etwas erhalten:
    Start : 05-04-2016 11:36:07 ---
    403 imported
    0 already saved
-    End : 05-04-2016 11:36:09 ---
-\ No newline at end of file
+    End : 05-04-2016 11:36:09 ---
diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst
index 131aa1f8..cec62d18 100644
--- a/docs/de/user/installation.rst
+++ b/docs/de/user/installation.rst
@@ -16,7 +16,7 @@ Composer installieren:
 ::
-    curl -s http://getcomposer.org/installer | php
+    curl -s https://getcomposer.org/installer | php
 Du kannst eine spezifische Anleitung `hier <https://getcomposer.org/doc/00-intro.md>`__ finden.
@@ -86,7 +86,7 @@ Führe dieses Kommando aus, um das neueste Paket herunterzuladen und zu entpacke
 .. code-block:: bash
-    wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+    wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
 Du findest die `md5 Hashsumme des neuesten Pakets auf unserer Website <https://www.wallabag.org/pages/download-wallabag.html>`_.
diff --git a/docs/de/user/parameters.rst b/docs/de/user/parameters.rst
index a5a4e4f2..8d8f9206 100644
--- a/docs/de/user/parameters.rst
+++ b/docs/de/user/parameters.rst
@@ -39,6 +39,7 @@ Wenn du nicht weißt, welchen Wert du setzen sollst, belasse es bei dem Standard
        redis_host: localhost
        redis_port: 6379
        redis_path: null
+        redis_password: null
 Bedeutung von jedem Parameter
 -----------------------------
@@ -91,3 +92,4 @@ Bedeutung von jedem Parameter
   "redis_host", "localhost", "IP oder Hostname des Zielservers (ignoriert bei Unix Schema)"
   "redis_port", "6379", "TCP/IP Port des Zielservers (ignoriert bei Unix Schema)"
   "redis_path", "null", "Pfad zur Unix Domain Socket Datei, wenn Redis Unix Domain Sockets nutzt"
+   "redis_password", "null", "Kennwort, welches in der Redis-Server-Konfiguration definiert ist (Parameter `requirepass` in `redis.conf`)"
diff --git a/docs/de/user/query-upgrade-21-22.rst b/docs/de/user/query-upgrade-21-22.rst
new file mode 100644
index 00000000..cd201dc2
--- /dev/null
+++ b/docs/de/user/query-upgrade-21-22.rst
@@ -0,0 +1,797 @@
+Migration 20161001072726
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry_tag DROP FOREIGN KEY FK_C9F0DD7CBA364942
+    ALTER TABLE wallabag_entry_tag DROP FOREIGN KEY FK_C9F0DD7CBAD26311
+    ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_entry_tag_entry FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE
+    ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_entry_tag_tag FOREIGN KEY (tag_id) REFERENCES wallabag_tag (id) ON DELETE CASCADE
+    ALTER TABLE wallabag_annotation DROP FOREIGN KEY FK_A7AED006BA364942
+    ALTER TABLE wallabag_annotation ADD CONSTRAINT FK_annotation_entry FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE
+Migration down
+""""""""""""""
+We didn't write down migration for ``20161001072726``.
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry_tag DROP CONSTRAINT fk_c9f0dd7cba364942
+    ALTER TABLE wallabag_entry_tag DROP CONSTRAINT fk_c9f0dd7cbad26311
+    ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_entry_tag_entry FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE
+    ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_entry_tag_tag FOREIGN KEY (tag_id) REFERENCES wallabag_tag (id) ON DELETE CASCADE
+    ALTER TABLE wallabag_annotation DROP CONSTRAINT fk_a7aed006ba364942
+    ALTER TABLE wallabag_annotation ADD CONSTRAINT FK_annotation_entry FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE
+Migration down
+""""""""""""""
+We didn't write down migration for ``20161001072726``.
+SQLite
+^^^^^^
+This migration can only be executed safely on MySQL or PostgreSQL.
+Migration 20161022134138
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER DATABASE wallabag CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_user CHANGE confirmation_token confirmation_token VARCHAR(180) DEFAULT NULL;
+    ALTER TABLE wallabag_user CHANGE salt salt VARCHAR(180) NOT NULL;
+    ALTER TABLE wallabag_user CHANGE password password VARCHAR(180) NOT NULL;
+    ALTER TABLE wallabag_annotation CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_entry CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_tag CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_user CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_annotation CHANGE `text` `text` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_annotation CHANGE `quote` `quote` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_entry CHANGE `title` `title` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_entry CHANGE `content` `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_tag CHANGE `label` `label` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_user CHANGE `name` `name` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER DATABASE wallabag CHARACTER SET = utf8 COLLATE = utf8_unicode_ci;
+    ALTER TABLE wallabag_annotation CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_entry CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_tag CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_user CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_annotation CHANGE `text` `text` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_annotation CHANGE `quote` `quote` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_entry CHANGE `title` `title` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_entry CHANGE `content` `content` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_tag CHANGE `label` `label` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_user CHANGE `name` `name` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+PostgreSQL and SQLite
+^^^^^^^^^^^^^^^^^^^^^
+This migration only apply to MySQL.
+Migration 20161024212538
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_oauth2_clients ADD user_id INT NOT NULL
+    ALTER TABLE wallabag_oauth2_clients ADD CONSTRAINT IDX_user_oauth_client FOREIGN KEY (user_id) REFERENCES wallabag_user (id) ON DELETE CASCADE
+    CREATE INDEX IDX_635D765EA76ED395 ON wallabag_oauth2_clients (user_id)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_oauth2_clients DROP FOREIGN KEY IDX_user_oauth_client
+    ALTER TABLE wallabag_oauth2_clients DROP user_id
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_oauth2_clients ADD user_id INT DEFAULT NULL
+    ALTER TABLE wallabag_oauth2_clients ADD CONSTRAINT IDX_user_oauth_client FOREIGN KEY (user_id) REFERENCES wallabag_user (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE
+    CREATE INDEX IDX_635D765EA76ED395 ON wallabag_oauth2_clients (user_id)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_oauth2_clients DROP CONSTRAINT idx_user_oauth_client
+    ALTER TABLE wallabag_oauth2_clients DROP user_id
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    CREATE TEMPORARY TABLE __temp__wallabag_oauth2_clients AS SELECT id, random_id, redirect_uris, secret, allowed_grant_types, name FROM wallabag_oauth2_clients
+    DROP TABLE wallabag_oauth2_clients
+    CREATE TABLE wallabag_oauth2_clients (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, random_id VARCHAR(255) NOT NULL COLLATE BINARY, redirect_uris CLOB NOT NULL COLLATE BINARY, secret VARCHAR(255) NOT NULL COLLATE BINARY, allowed_grant_types CLOB NOT NULL COLLATE BINARY, name CLOB DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id), CONSTRAINT IDX_user_oauth_client FOREIGN KEY (user_id) REFERENCES wallabag_user (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE)
+    INSERT INTO wallabag_oauth2_clients (id, random_id, redirect_uris, secret, allowed_grant_types, name) SELECT id, random_id, redirect_uris, secret, allowed_grant_types, name FROM __temp__wallabag_oauth2_clients
+    DROP TABLE __temp__wallabag_oauth2_clients
+    CREATE INDEX IDX_635D765EA76ED395 ON wallabag_oauth2_clients (user_id)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_635D765EA76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_oauth2_clients AS SELECT id, random_id, redirect_uris, secret, allowed_grant_types, name FROM wallabag_oauth2_clients
+    DROP TABLE wallabag_oauth2_clients
+    CREATE TABLE wallabag_oauth2_clients (id INTEGER NOT NULL, random_id VARCHAR(255) NOT NULL COLLATE BINARY, redirect_uris CLOB NOT NULL COLLATE BINARY, secret VARCHAR(255) NOT NULL COLLATE BINARY, allowed_grant_types CLOB NOT NULL COLLATE BINARY, name CLOB DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id))
+    INSERT INTO wallabag_oauth2_clients (id, random_id, redirect_uris, secret, allowed_grant_types, name) SELECT id, random_id, redirect_uris, secret, allowed_grant_types, name FROM __temp__wallabag_oauth2_clients
+    DROP TABLE __temp__wallabag_oauth2_clients
+Migration 20161031132655
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('download_images_enabled', 0, 'misc')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'download_images_enabled';
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('download_images_enabled', 0, 'misc')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'download_images_enabled';
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('download_images_enabled', 0, 'misc')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'download_images_enabled';
+Migration 20161104073720
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    CREATE INDEX IDX_entry_created_at ON wallabag_entry (created_at)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_entry_created_at ON wallabag_entry
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    CREATE INDEX IDX_entry_created_at ON wallabag_entry (created_at)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX idx_entry_created_at
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    DROP INDEX created_at_idx
+    DROP INDEX IDX_F4D18282A76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry
+    DROP TABLE wallabag_entry
+    CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uuid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id))
+    INSERT INTO wallabag_entry (id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry
+    DROP TABLE __temp__wallabag_entry
+    CREATE INDEX created_at_idx ON wallabag_entry (created_at)
+    CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id)
+    CREATE INDEX IDX_entry_created_at ON wallabag_entry (created_at)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_entry_created_at
+    DROP INDEX IDX_F4D18282A76ED395
+    DROP INDEX created_at_idx
+    CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry
+    DROP TABLE wallabag_entry
+    CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uuid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id))
+    INSERT INTO wallabag_entry (id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry
+    DROP TABLE __temp__wallabag_entry
+    CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id)
+    CREATE INDEX created_at_idx ON wallabag_entry (created_at)
+Migration 20161106113822
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD action_mark_as_read INT DEFAULT 0
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config DROP action_mark_as_read
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD action_mark_as_read INT DEFAULT 0
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config DROP action_mark_as_read
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD COLUMN action_mark_as_read INTEGER DEFAULT 0
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX UNIQ_87E64C53A76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_config AS SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key FROM wallabag_config
+    DROP TABLE wallabag_config
+    CREATE TABLE wallabag_config (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, theme VARCHAR(255) NOT NULL COLLATE BINARY, items_per_page INTEGER NOT NULL, language VARCHAR(255) NOT NULL COLLATE BINARY, rss_token VARCHAR(255) DEFAULT NULL COLLATE BINARY, rss_limit INTEGER DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, pocket_consumer_key VARCHAR(255) DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id))
+    INSERT INTO wallabag_config (id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key) SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key FROM __temp__wallabag_config
+    DROP TABLE __temp__wallabag_config
+    CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON wallabag_config (user_id)
+Migration 20161117071626
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('share_unmark', 0, 'entry')
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'share_unmark';
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'unmark_url';
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('share_unmark', 0, 'entry')
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'share_unmark';
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'unmark_url';
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('share_unmark', 0, 'entry')
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'share_unmark';
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'unmark_url';
+Migration 20161118134328
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry ADD http_status VARCHAR(3) DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry DROP http_status
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry ADD http_status VARCHAR(3) DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry DROP http_status
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry ADD COLUMN http_status VARCHAR(3) DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX created_at_idx
+    DROP INDEX IDX_F4D18282A76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry
+    DROP TABLE wallabag_entry
+    CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uuid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id))
+    INSERT INTO wallabag_entry (id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry
+    DROP TABLE __temp__wallabag_entry
+    CREATE INDEX created_at_idx ON wallabag_entry (created_at)
+    CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id)
+Migration 20161122144743
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('restricted_access', 0, 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'restricted_access';
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('restricted_access', 0, 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'restricted_access';
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('restricted_access', 0, 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'restricted_access';
+Migration 20161122203647
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user DROP expired, DROP credentials_expired
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD expired SMALLINT DEFAULT NULL, ADD credentials_expired SMALLINT DEFAULT NULL
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user DROP expired
+    ALTER TABLE wallabag_user DROP credentials_expired
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD expired SMALLINT DEFAULT NULL
+    ALTER TABLE wallabag_user ADD credentials_expired SMALLINT DEFAULT NULL
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    DROP INDEX UNIQ_1D63E7E5C05FB297
+    DROP INDEX UNIQ_1D63E7E5A0D96FBF
+    DROP INDEX UNIQ_1D63E7E592FC23A8
+    CREATE TEMPORARY TABLE __temp__wallabag_user AS SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, locked, expires_at, confirmation_token, password_requested_at, roles, credentials_expire_at, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted FROM wallabag_user
+    DROP TABLE wallabag_user
+    CREATE TABLE wallabag_user (id INTEGER NOT NULL, username VARCHAR(180) NOT NULL COLLATE BINARY, username_canonical VARCHAR(180) NOT NULL COLLATE BINARY, email VARCHAR(180) NOT NULL COLLATE BINARY, email_canonical VARCHAR(180) NOT NULL COLLATE BINARY, enabled BOOLEAN NOT NULL, salt VARCHAR(255) NOT NULL COLLATE BINARY, password VARCHAR(255) NOT NULL COLLATE BINARY, last_login DATETIME DEFAULT NULL, locked BOOLEAN NOT NULL, expires_at DATETIME DEFAULT NULL, confirmation_token VARCHAR(180) DEFAULT NULL COLLATE BINARY, password_requested_at DATETIME DEFAULT NULL, roles CLOB NOT NULL COLLATE BINARY, credentials_expire_at DATETIME DEFAULT NULL, name CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INTEGER DEFAULT NULL, twoFactorAuthentication BOOLEAN NOT NULL, trusted CLOB DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id))
+    INSERT INTO wallabag_user (id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, locked, expires_at, confirmation_token, password_requested_at, roles, credentials_expire_at, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted) SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, locked, expires_at, confirmation_token, password_requested_at, roles, credentials_expire_at, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted FROM __temp__wallabag_user
+    DROP TABLE __temp__wallabag_user
+    CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON wallabag_user (confirmation_token)
+    CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON wallabag_user (email_canonical)
+    CREATE UNIQUE INDEX UNIQ_1D63E7E592FC23A8 ON wallabag_user (username_canonical)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD COLUMN expired SMALLINT DEFAULT NULL
+    ALTER TABLE wallabag_user ADD COLUMN credentials_expired SMALLINT DEFAULT NULL
+Migration 20161128084725
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD list_mode INT DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config DROP list_mode
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD list_mode INT DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config DROP list_mode
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD COLUMN list_mode INTEGER DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX UNIQ_87E64C53A76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_config AS SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key FROM wallabag_config
+    DROP TABLE wallabag_config
+    CREATE TABLE wallabag_config (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, theme VARCHAR(255) NOT NULL COLLATE BINARY, items_per_page INTEGER NOT NULL, language VARCHAR(255) NOT NULL COLLATE BINARY, rss_token VARCHAR(255) DEFAULT NULL COLLATE BINARY, rss_limit INTEGER DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, pocket_consumer_key VARCHAR(255) DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id))
+    INSERT INTO wallabag_config (id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key) SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key FROM __temp__wallabag_config
+    DROP TABLE __temp__wallabag_config
+    CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON wallabag_config (user_id)
+Migration 20161128131503
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user DROP locked, DROP credentials_expire_at, DROP expires_at
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD locked SMALLINT DEFAULT NULL, ADD credentials_expire_at DATETIME DEFAULT NULL, ADD expires_at DATETIME DEFAULT NULL
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user DROP locked
+    ALTER TABLE wallabag_user DROP credentials_expire_at
+    ALTER TABLE wallabag_user DROP expires_at
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD locked SMALLINT DEFAULT NULL
+    ALTER TABLE wallabag_user ADD credentials_expire_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL
+    ALTER TABLE wallabag_user ADD expires_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD COLUMN locked SMALLINT DEFAULT NULL
+    ALTER TABLE wallabag_user ADD COLUMN credentials_expire_at DATETIME DEFAULT NULL
+    ALTER TABLE wallabag_user ADD COLUMN expires_at DATETIME DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX UNIQ_1D63E7E592FC23A8
+    DROP INDEX UNIQ_1D63E7E5A0D96FBF
+    DROP INDEX UNIQ_1D63E7E5C05FB297
+    CREATE TEMPORARY TABLE __temp__wallabag_user AS SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted, expired, credentials_expired FROM wallabag_user
+    DROP TABLE wallabag_user
+    CREATE TABLE wallabag_user (id INTEGER NOT NULL, username VARCHAR(180) NOT NULL COLLATE BINARY, username_canonical VARCHAR(180) NOT NULL COLLATE BINARY, email VARCHAR(180) NOT NULL COLLATE BINARY, email_canonical VARCHAR(180) NOT NULL COLLATE BINARY, enabled BOOLEAN NOT NULL, salt VARCHAR(255) NOT NULL COLLATE BINARY, password VARCHAR(255) NOT NULL COLLATE BINARY, last_login DATETIME DEFAULT NULL, confirmation_token VARCHAR(180) DEFAULT NULL COLLATE BINARY, password_requested_at DATETIME DEFAULT NULL, roles CLOB NOT NULL COLLATE BINARY, name CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INTEGER DEFAULT NULL, twoFactorAuthentication BOOLEAN NOT NULL, trusted CLOB DEFAULT NULL COLLATE BINARY, expired SMALLINT DEFAULT NULL, credentials_expired SMALLINT DEFAULT NULL, PRIMARY KEY(id))
+    INSERT INTO wallabag_user (id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted, expired, credentials_expired) SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted, expired, credentials_expired FROM __temp__wallabag_user
+    DROP TABLE __temp__wallabag_user
+    CREATE UNIQUE INDEX UNIQ_1D63E7E592FC23A8 ON wallabag_user (username_canonical)
+    CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON wallabag_user (email_canonical)
+    CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON wallabag_user (confirmation_token)
+Migration 20161214094403
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    CREATE INDEX IDX_entry_uid ON wallabag_entry (uid)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_entry_uid ON wallabag_entry
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    CREATE INDEX IDX_entry_uid ON wallabag_entry (uid)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX idx_entry_uid
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_F4D18282A76ED395
+    DROP INDEX created_at_idx
+    CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry
+    DROP TABLE wallabag_entry
+    CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id))
+    INSERT INTO wallabag_entry (id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry
+    DROP TABLE __temp__wallabag_entry
+    CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id)
+    CREATE INDEX created_at_idx ON wallabag_entry (created_at)
+    CREATE INDEX IDX_entry_uid ON wallabag_entry (uid)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_entry_uid
+    DROP INDEX created_at_idx
+    DROP INDEX IDX_F4D18282A76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry
+    DROP TABLE wallabag_entry
+    CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id))
+    INSERT INTO wallabag_entry (id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry
+    DROP TABLE __temp__wallabag_entry
+    CREATE INDEX created_at_idx ON wallabag_entry (created_at)
+    CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id)
diff --git a/docs/de/user/upgrade.rst b/docs/de/user/upgrade.rst
index ad020dd8..1107616e 100644
--- a/docs/de/user/upgrade.rst
+++ b/docs/de/user/upgrade.rst
@@ -3,42 +3,53 @@ wallabag-Installation aktualisieren
 Du wirst hier mehrere Wege finden, um deine wallabag zu aktualisieren:
+- `von 2.1.x zu 2.2.x <#upgrade-von-2-1-x-zu-2-2-x>`_
 - `von 2.0.x zu 2.1.1 <#upgrade-von-2-0-x-zu-2-1-1>`_
- `von 2.1.x zu 2.1.y <#upgrade-von-2-1-x-zu-2-1-y>`_
 - `von 1.x zu 2.x <#upgrade-von-1-x>`_
-Upgrade von 2.0.x zu 2.1.1
+Upgrade von 2.1.x zu 2.2.x
---------------------------
+--------------------------
-.. warning::
-    Mache eine Sicherung deines Pocket-Consumer-Key, falls hinzugefügt, da dieser nach dem Upgrade erneut hinzugefügt werden muss.
 Upgrade auf einem dedizierten Webserver
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ::
-    rm -rf var/cache/*
+    make update
-    git fetch origin
-    git fetch --tags
+Erklärungen über die Datenbankmigration
-    git checkout 2.1.1 --force
+"""""""""""""""""""""""""""""""""""""""
-    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
-    php bin/console doctrine:migrations:migrate --env=prod
+Während des Updates migrieren wir die Datenbank.
-    php bin/console cache:clear --env=prod
+Alle Datenbankmigrationen sind im Verzeichnis ``app/DoctrineMigrations`` gespeichert. Jede von ihnen kann einzeln ausgeführt werden:
+``bin/console doctrine:migrations:execute 20161001072726 --env=prod``.
+Dies ist die Migrationsliste von 2.1.x auf 2.2.0:
+* ``20161001072726``: Fremdschlüssel für das Zurücksetzen des Kontos hinzugefügt
+* ``20161022134138``: Datenbank zum ``utf8mb4``-Encoding ändern (nur für MySQL)
+* ``20161024212538``: ``user_id``-Spalte zu ``oauth2_clients`` hinzugefügt, um Benutzer davon abzuhalten, API-Clients anderer Nutzer zu löschen
+* ``20161031132655``: Interne Einstellung für das (de-)aktivieren vom Bilder-Download hinzugefügt
+* ``20161104073720``: ``created_at``-Index zur ``entry``-Tabelle hinzugefügt
+* ``20161106113822``: ``action_mark_as_read``-Feld zur ``config``-Tabelle hinzugefügt
+* ``20161117071626``: Interne Einstellung zum Teilen mit unmark.it hinzugefügt
+* ``20161118134328``: ``http_status``-Feld zur ``entry``-Tabelle hinzugefügt
+* ``20161122144743``: Interne Einstellung für das (de-)aktivieren zum Holen von Artikeln mit einer Paywall hinzugefügt
+* ``20161122203647``: ``expired``- und ``credentials_expired``-Feld aus der ``user``-Tabelle entfernt
 Upgrade auf einem Shared Hosting
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Sichere deine ``app/config/parameters.yml``-Datei.
-Lade das 2.1.1-Release von wallabag herunter:
+Lade das letzte Release von wallabag herunter:
 .. code-block:: bash
-    wget http://framabag.org/wallabag-release-2.1.1.tar.gz && tar xvf wallabag-release-2.1.1.tar.gz
+    wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
-(md5 hash of the 2.1.1 package: ``9584a3b60a2b2a4de87f536548caac93``)
+Du findest den `aktuellen MD5-Hash auf unserer Webseite <https://www.wallabag.org/pages/download-wallabag.html>`_.
 Extrahiere das Archiv in deinen wallabag-Ordner und ersetze die ``app/config/parameters.yml`` mit deiner.
@@ -48,42 +59,42 @@ Falls du SQLite nutzt, musst du außerdem deinen ``data/``-Ordner in die neue In
 Leere den ``var/cache``-Ordner.
-Du musst einige SQL-Abfragen durchführen, um deine Datenbank zu aktualisieren. Wir gehen in diesem Fall davon aus, dass das Tabellenpräfix ``wallabag_`` ist und eine MySQL-Datenbank verwendet wird:
+Du musst einige SQL-Abfragen durchführen, um deine Datenbank zu aktualisieren. Wir gehen in diesem Fall davon aus, dass das Tabellenpräfix ``wallabag_`` ist.
-.. code-block:: sql
+`You can find all the queries here <http://doc.wallabag.org/en/master/user/query-upgrade-21-22.html>`_.
-    ALTER TABLE `wallabag_entry` ADD `uuid` LONGTEXT DEFAULT NULL;
+Upgrade von 2.0.x zu 2.1.1
-    INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('share_public', '1', 'entry');
+---------------------------
-    ALTER TABLE `wallabag_oauth2_clients` ADD name longtext COLLATE 'utf8_unicode_ci' DEFAULT NULL;
-    INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_redis', '0', 'import');
-    INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_rabbitmq', '0', 'import');
-    ALTER TABLE `wallabag_config` ADD `pocket_consumer_key` VARCHAR(255) DEFAULT NULL;
-    DELETE FROM `wallabag_craue_config_setting` WHERE `name` = 'pocket_consumer_key';
-Upgrade von 2.1.x zu 2.1.y
+.. warning::
-----------------------------
+    Mache eine Sicherung deines Pocket-Consumer-Key, falls hinzugefügt, da dieser nach dem Upgrade erneut hinzugefügt werden muss.
 Upgrade auf einem dedizierten Webserver
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Um deine wallabag-Installation auf die letzte Version zu aktualisieren, führe den folgenden Befehl in deinem wallabag-Ordner aus:
 ::
-    make update
+    rm -rf var/cache/*
+    git fetch origin
+    git fetch --tags
+    git checkout 2.1.1 --force
+    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
+    php bin/console doctrine:migrations:migrate --env=prod
+    php bin/console cache:clear --env=prod
 Upgrade auf einem Shared Hosting
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Sichere deine ``app/config/parameters.yml``-Datei.
-Lade das letzte Release von wallabag herunter:
+Lade das 2.1.1-Release von wallabag herunter:
 .. code-block:: bash
-    wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+    wget http://framabag.org/wallabag-release-2.1.1.tar.gz && tar xvf wallabag-release-2.1.1.tar.gz
-Du findest den `aktuellen MD5-Hash auf unserer Webseite <https://www.wallabag.org/pages/download-wallabag.html>`_.
+(md5 hash of the 2.1.1 package: ``9584a3b60a2b2a4de87f536548caac93``)
 Extrahiere das Archiv in deinen wallabag-Ordner und ersetze die ``app/config/parameters.yml`` mit deiner.
@@ -93,6 +104,18 @@ Falls du SQLite nutzt, musst du außerdem deinen ``data/``-Ordner in die neue In
 Leere den ``var/cache``-Ordner.
+Du musst einige SQL-Abfragen durchführen, um deine Datenbank zu aktualisieren. Wir gehen in diesem Fall davon aus, dass das Tabellenpräfix ``wallabag_`` ist und eine MySQL-Datenbank verwendet wird:
+.. code-block:: sql
+    ALTER TABLE `wallabag_entry` ADD `uuid` LONGTEXT DEFAULT NULL;
+    INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('share_public', '1', 'entry');
+    ALTER TABLE `wallabag_oauth2_clients` ADD name longtext COLLATE 'utf8_unicode_ci' DEFAULT NULL;
+    INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_redis', '0', 'import');
+    INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_rabbitmq', '0', 'import');
+    ALTER TABLE `wallabag_config` ADD `pocket_consumer_key` VARCHAR(255) DEFAULT NULL;
+    DELETE FROM `wallabag_craue_config_setting` WHERE `name` = 'pocket_consumer_key';
 Upgrade von 1.x
 ---------------
@@ -100,4 +123,4 @@ Es gibt kein automatisiertes Skript, um wallabag 1.x auf wallabag 2.x zu aktuali
 - deine Daten exportieren
 - wallabag 2.x installieren (Dokumentation <http://doc.wallabag.org/en/master/user/installation.html>`_ )
- die Daten in die neue Installation importieren (`Dokumentation <http://doc.wallabag.org/en/master/user/import.html>`_ )
-\ No newline at end of file
+- die Daten in die neue Installation importieren (`Dokumentation <http://doc.wallabag.org/en/master/user/import.html>`_ )
diff --git a/docs/en/developer/asynchronous.rst b/docs/en/developer/asynchronous.rst
index 6a991cf6..2e409e4a 100644
--- a/docs/en/developer/asynchronous.rst
+++ b/docs/en/developer/asynchronous.rst
@@ -48,6 +48,7 @@ Edit your ``app/config/parameters.yml`` file to edit RabbitMQ configuration. The
    rabbitmq_port: 5672
    rabbitmq_user: guest
    rabbitmq_password: guest
+    rabbitmq_prefetch_count: 10 # read http://www.rabbitmq.com/consumer-prefetch.html
 Enable RabbitMQ in wallabag
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -150,7 +151,7 @@ Depending on which service you want to import from you need to enable one (or ma
  bin/console wallabag:import:redis-worker -e=prod firefox -vv >> /path/to/wallabag/var/logs/redis-firefox.log
  # for Chrome import
-  bin/console wallabag:import:redis-worker -e=prod instapaper -vv >> /path/to/wallabag/var/logs/redis-chrome.log
+  bin/console wallabag:import:redis-worker -e=prod chrome -vv >> /path/to/wallabag/var/logs/redis-chrome.log
 If you want to launch the import only for some messages and not all, you can specify this number (here 12) and the worker will stop right after the 12th message :
diff --git a/docs/en/developer/maintenance.rst b/docs/en/developer/maintenance.rst
deleted file mode 100644
index 6d55ed60..00000000
--- a/docs/en/developer/maintenance.rst
+++ /dev/null
@@ -1,32 +0,0 @@
-Maintenance mode
-================
-If you have some long tasks to do on your wallabag instance, you can enable a maintenance mode.
-Nobody will have access to your instance.
-Enable maintenance mode
-----------------------
-To enable maintenance mode, execute this command:
-::
-    bin/console lexik:maintenance:lock --no-interaction -e=prod
-You can set your IP address in ``app/config/config.yml`` if you want to access to wallabag even if maintenance mode is enabled. For example:
-::
-    lexik_maintenance:
-        authorized:
-            ips: ['127.0.0.1']
-Disable maintenance mode
------------------------
-To disable maintenance mode, execute this command:
-::
-    bin/console lexik:maintenance:unlock -e=prod
diff --git a/docs/en/developer/paywall.rst b/docs/en/developer/paywall.rst
new file mode 100644
index 00000000..365027b4
--- /dev/null
+++ b/docs/en/developer/paywall.rst
@@ -0,0 +1,56 @@
+Articles behind a paywall
+=========================
+wallabag can fetch articles from websites which use a paywall system.
+Enable paywall authentication
+-----------------------------
+In internal settings, in the **Article** section, enable authentication for websites with paywall (with the value 1).
+Configure credentials in wallabag
+---------------------------------
+Edit your ``app/config/parameters.yml`` file to edit credentials for each website with paywall. Here is an example for some french websites:
+.. code:: yaml
+    sites_credentials:
+        mediapart.fr: {username: "myMediapartLogin", password: "mypassword"}
+        arretsurimages.net: {username: "myASILogin", password: "mypassword"}
+.. note::
+    These credentials will be shared between each user of your wallabag instance.
+Parsing configuration files
+---------------------------
+.. note::
+    Read `this part of the documentation <http://doc.wallabag.org/en/master/user/errors_during_fetching.html>`_ to understand the configuration files.
+Each parsing configuration file needs to be improved by adding ``requires_login``, ``login_uri``,
+``login_username_field``, ``login_password_field`` and ``not_logged_in_xpath``.
+Be careful, the login form must be in the page content when wallabag loads it. It's impossible for wallabag to be authenticated
+on a website where the login form is loaded after the page (by ajax for example).
+``login_uri`` is the action URL of the form (``action`` attribute in the form).
+``login_username_field`` is the ``name`` attribute of the login field.
+``login_password_field`` is the ``name`` attribute of the password field.
+For example:
+.. code::
+    title://div[@id="titrage-contenu"]/h1[@class="title"]
+    body: //div[@class="contenu-html"]/div[@class="page-pane"]
+    requires_login: yes
+    login_uri: http://www.arretsurimages.net/forum/login.php
+    login_username_field: username
+    login_password_field: password
+    not_logged_in_xpath: //body[@class="not-logged-in"]
diff --git a/docs/en/developer/translate.rst b/docs/en/developer/translate.rst
index d412d3e9..1e5d5009 100644
--- a/docs/en/developer/translate.rst
+++ b/docs/en/developer/translate.rst
@@ -20,7 +20,7 @@ is the ISO 639-1 code of your language (`see wikipedia <https://en.wikipedia.org
 Other files to translate:
 - https://github.com/wallabag/wallabag/tree/master/app/Resources/CraueConfigBundle/translations.
- https://github.com/wallabag/wallabag/tree/master/app/Resources/FOSUserBundle/translations.
+- https://github.com/wallabag/wallabag/tree/master/src/Wallabag/UserBundle/Resources/translations.
 You have to create ``THE_TRANSLATION_FILE.CODE.yml`` files.
diff --git a/docs/en/index.rst b/docs/en/index.rst
index 77425bfa..2e20aee6 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -46,7 +46,7 @@ The documentation is available in other languages:
   developer/api
   developer/docker
+   developer/paywall
   developer/documentation
   developer/translate
-   developer/maintenance
   developer/asynchronous
diff --git a/docs/en/user/configuration.rst b/docs/en/user/configuration.rst
index 2c1385a8..caca834f 100644
--- a/docs/en/user/configuration.rst
+++ b/docs/en/user/configuration.rst
@@ -26,6 +26,15 @@ Reading speed
 wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are
 a fast or a slow reader. wallabag will recalculate the reading time for each article.
+Where do you want to be redirected after mark an article as read?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Each time you'll do some actions (after marking an article as read/favorite,
+after deleting an article, after removing a tag from an entry), you can be redirected:
+- To the homepage
+- To the current page
 Language
 ~~~~~~~~
@@ -43,11 +52,16 @@ Now you have three links, one for each status: add them into your favourite RSS
 You can also define how many articles you want in each RSS feed (default value: 50).
+There is also a pagination available for these feeds. You can add ``?page=2`` to jump to the second page.
+The pagination follow `the RFC <https://tools.ietf.org/html/rfc5005#page-4>`_ about that, which means you'll find the ``next``, ``previous`` & ``last`` page link inside the `<channel>` tag of each RSS feed.
 User information
 ----------------
 You can change your name, your email address and enable ``Two factor authentication``.
+If the wallabag instance has more than one enabled user, you can delete your account here. **Take care, we delete all your data**.
 Two factor authentication (2FA)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/en/user/filters.rst b/docs/en/user/filters.rst
index 4d1df6eb..aae8a749 100644
--- a/docs/en/user/filters.rst
+++ b/docs/en/user/filters.rst
@@ -30,6 +30,11 @@ Language
 wallabag (via graby) can detect article language. It's easy to you to retrieve articles
 written in a specific language.
+HTTP status
+-----------
+You can retrieve the articles by filtering by their HTTP status code: 200, 404, 500, etc.
 Reading time
 ------------
diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst
index a6754fa0..f420a131 100644
--- a/docs/en/user/import.rst
+++ b/docs/en/user/import.rst
@@ -1,13 +1,13 @@
 Migrate from ...
 ================
-In wallabag 2.x, you can import data from: 
+In wallabag 2.x, you can import data from:
- `Pocket <#id1>`_ 
+- `Pocket <#id1>`_
- `Readability <#id2>`_ 
+- `Readability <#id2>`_
- `Instapaper <#id4>`_ 
+- `Instapaper <#id4>`_
- `wallabag 1.x <#id6>`_ 
+- `wallabag 1.x <#id6>`_
- `wallabag 2.x <#id7>`_ 
+- `wallabag 2.x <#id7>`_
 We also developed `a script to execute migrations via command-line interface <#import-via-command-line-interface-cli>`_.
@@ -57,8 +57,24 @@ and then select your json file and upload it.
 Your data will be imported. Data import can be a demanding process for your server.
-Instapaper
+From Pinboard
----------
+-------------
+Export your Pinboard data
+~~~~~~~~~~~~~~~~~~~~~~~~~
+On the backup (`https://pinboard.in/settings/backup <https://pinboard.in/settings/backup>`_) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like ``pinboard_export``).
+Import your data into wallabag 2.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Click on ``Import`` link in the menu, on ``Import contents`` in Pinboard section
+and then select your json file and upload it.
+Your data will be imported. Data import can be a demanding process for your server.
+From Instapaper
+---------------
 Export your Instapaper data
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 77ef60a8..7d3bcf61 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -16,7 +16,7 @@ Install Composer:
 ::
-    curl -s http://getcomposer.org/installer | php
+    curl -s https://getcomposer.org/installer | php
 You can find specific instructions `here <https://getcomposer.org/doc/00-intro.md>`__.
@@ -85,7 +85,7 @@ Execute this command to download and extract the latest package:
 .. code-block:: bash
-    wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-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>`_.
diff --git a/docs/en/user/parameters.rst b/docs/en/user/parameters.rst
index 2b02a34d..d8a209e7 100644
--- a/docs/en/user/parameters.rst
+++ b/docs/en/user/parameters.rst
@@ -39,6 +39,7 @@ If you don't know which value you need to set, please leave the default one.
        redis_host: localhost
        redis_port: 6379
        redis_path: null
+        redis_password: null
 Meaning of each parameter
 -------------------------
@@ -55,6 +56,7 @@ Meaning of each parameter
   "database_path", "``""%kernel.root_dir%/../data/db/wallabag.sqlite""``", "only for SQLite, define where to put the database file. Leave it empty for other database"
   "database_table_prefix", "wallabag_", "all wallabag's tables will be prefixed with that string. You can include a ``_`` for clarity"
   "database_socket", "null", "If your database is using a socket instead of tcp, put the path of the socket (other connection parameters will then be ignored)"
+   "database_charset", "utf8mb4", "For PostgreSQL & SQLite you should use utf8, for MySQL use utf8mb4 which handle emoji"
 .. csv-table:: Configuration to send emails from wallabag
   :header: "name", "default", "description"
@@ -91,3 +93,4 @@ Meaning of each parameter
   "redis_host", "localhost", "IP or hostname of the target server (ignored for unix scheme)"
   "redis_port", "6379", "TCP/IP port of the target server (ignored for unix scheme)"
   "redis_path", "null", "Path of the UNIX domain socket file used when connecting to Redis using UNIX domain sockets"
+   "redis_password", "null", "Password defined in the Redis server configuration (parameter `requirepass` in `redis.conf`)"
diff --git a/docs/en/user/query-upgrade-21-22.rst b/docs/en/user/query-upgrade-21-22.rst
new file mode 100644
index 00000000..cd201dc2
--- /dev/null
+++ b/docs/en/user/query-upgrade-21-22.rst
@@ -0,0 +1,797 @@
+Migration 20161001072726
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry_tag DROP FOREIGN KEY FK_C9F0DD7CBA364942
+    ALTER TABLE wallabag_entry_tag DROP FOREIGN KEY FK_C9F0DD7CBAD26311
+    ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_entry_tag_entry FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE
+    ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_entry_tag_tag FOREIGN KEY (tag_id) REFERENCES wallabag_tag (id) ON DELETE CASCADE
+    ALTER TABLE wallabag_annotation DROP FOREIGN KEY FK_A7AED006BA364942
+    ALTER TABLE wallabag_annotation ADD CONSTRAINT FK_annotation_entry FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE
+Migration down
+""""""""""""""
+We didn't write down migration for ``20161001072726``.
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry_tag DROP CONSTRAINT fk_c9f0dd7cba364942
+    ALTER TABLE wallabag_entry_tag DROP CONSTRAINT fk_c9f0dd7cbad26311
+    ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_entry_tag_entry FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE
+    ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_entry_tag_tag FOREIGN KEY (tag_id) REFERENCES wallabag_tag (id) ON DELETE CASCADE
+    ALTER TABLE wallabag_annotation DROP CONSTRAINT fk_a7aed006ba364942
+    ALTER TABLE wallabag_annotation ADD CONSTRAINT FK_annotation_entry FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE
+Migration down
+""""""""""""""
+We didn't write down migration for ``20161001072726``.
+SQLite
+^^^^^^
+This migration can only be executed safely on MySQL or PostgreSQL.
+Migration 20161022134138
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER DATABASE wallabag CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_user CHANGE confirmation_token confirmation_token VARCHAR(180) DEFAULT NULL;
+    ALTER TABLE wallabag_user CHANGE salt salt VARCHAR(180) NOT NULL;
+    ALTER TABLE wallabag_user CHANGE password password VARCHAR(180) NOT NULL;
+    ALTER TABLE wallabag_annotation CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_entry CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_tag CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_user CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_annotation CHANGE `text` `text` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_annotation CHANGE `quote` `quote` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_entry CHANGE `title` `title` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_entry CHANGE `content` `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_tag CHANGE `label` `label` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_user CHANGE `name` `name` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER DATABASE wallabag CHARACTER SET = utf8 COLLATE = utf8_unicode_ci;
+    ALTER TABLE wallabag_annotation CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_entry CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_tag CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_user CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_annotation CHANGE `text` `text` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_annotation CHANGE `quote` `quote` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_entry CHANGE `title` `title` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_entry CHANGE `content` `content` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_tag CHANGE `label` `label` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_user CHANGE `name` `name` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+PostgreSQL and SQLite
+^^^^^^^^^^^^^^^^^^^^^
+This migration only apply to MySQL.
+Migration 20161024212538
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_oauth2_clients ADD user_id INT NOT NULL
+    ALTER TABLE wallabag_oauth2_clients ADD CONSTRAINT IDX_user_oauth_client FOREIGN KEY (user_id) REFERENCES wallabag_user (id) ON DELETE CASCADE
+    CREATE INDEX IDX_635D765EA76ED395 ON wallabag_oauth2_clients (user_id)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_oauth2_clients DROP FOREIGN KEY IDX_user_oauth_client
+    ALTER TABLE wallabag_oauth2_clients DROP user_id
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_oauth2_clients ADD user_id INT DEFAULT NULL
+    ALTER TABLE wallabag_oauth2_clients ADD CONSTRAINT IDX_user_oauth_client FOREIGN KEY (user_id) REFERENCES wallabag_user (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE
+    CREATE INDEX IDX_635D765EA76ED395 ON wallabag_oauth2_clients (user_id)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_oauth2_clients DROP CONSTRAINT idx_user_oauth_client
+    ALTER TABLE wallabag_oauth2_clients DROP user_id
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    CREATE TEMPORARY TABLE __temp__wallabag_oauth2_clients AS SELECT id, random_id, redirect_uris, secret, allowed_grant_types, name FROM wallabag_oauth2_clients
+    DROP TABLE wallabag_oauth2_clients
+    CREATE TABLE wallabag_oauth2_clients (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, random_id VARCHAR(255) NOT NULL COLLATE BINARY, redirect_uris CLOB NOT NULL COLLATE BINARY, secret VARCHAR(255) NOT NULL COLLATE BINARY, allowed_grant_types CLOB NOT NULL COLLATE BINARY, name CLOB DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id), CONSTRAINT IDX_user_oauth_client FOREIGN KEY (user_id) REFERENCES wallabag_user (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE)
+    INSERT INTO wallabag_oauth2_clients (id, random_id, redirect_uris, secret, allowed_grant_types, name) SELECT id, random_id, redirect_uris, secret, allowed_grant_types, name FROM __temp__wallabag_oauth2_clients
+    DROP TABLE __temp__wallabag_oauth2_clients
+    CREATE INDEX IDX_635D765EA76ED395 ON wallabag_oauth2_clients (user_id)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_635D765EA76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_oauth2_clients AS SELECT id, random_id, redirect_uris, secret, allowed_grant_types, name FROM wallabag_oauth2_clients
+    DROP TABLE wallabag_oauth2_clients
+    CREATE TABLE wallabag_oauth2_clients (id INTEGER NOT NULL, random_id VARCHAR(255) NOT NULL COLLATE BINARY, redirect_uris CLOB NOT NULL COLLATE BINARY, secret VARCHAR(255) NOT NULL COLLATE BINARY, allowed_grant_types CLOB NOT NULL COLLATE BINARY, name CLOB DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id))
+    INSERT INTO wallabag_oauth2_clients (id, random_id, redirect_uris, secret, allowed_grant_types, name) SELECT id, random_id, redirect_uris, secret, allowed_grant_types, name FROM __temp__wallabag_oauth2_clients
+    DROP TABLE __temp__wallabag_oauth2_clients
+Migration 20161031132655
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('download_images_enabled', 0, 'misc')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'download_images_enabled';
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('download_images_enabled', 0, 'misc')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'download_images_enabled';
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('download_images_enabled', 0, 'misc')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'download_images_enabled';
+Migration 20161104073720
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    CREATE INDEX IDX_entry_created_at ON wallabag_entry (created_at)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_entry_created_at ON wallabag_entry
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    CREATE INDEX IDX_entry_created_at ON wallabag_entry (created_at)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX idx_entry_created_at
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    DROP INDEX created_at_idx
+    DROP INDEX IDX_F4D18282A76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry
+    DROP TABLE wallabag_entry
+    CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uuid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id))
+    INSERT INTO wallabag_entry (id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry
+    DROP TABLE __temp__wallabag_entry
+    CREATE INDEX created_at_idx ON wallabag_entry (created_at)
+    CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id)
+    CREATE INDEX IDX_entry_created_at ON wallabag_entry (created_at)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_entry_created_at
+    DROP INDEX IDX_F4D18282A76ED395
+    DROP INDEX created_at_idx
+    CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry
+    DROP TABLE wallabag_entry
+    CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uuid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id))
+    INSERT INTO wallabag_entry (id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry
+    DROP TABLE __temp__wallabag_entry
+    CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id)
+    CREATE INDEX created_at_idx ON wallabag_entry (created_at)
+Migration 20161106113822
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD action_mark_as_read INT DEFAULT 0
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config DROP action_mark_as_read
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD action_mark_as_read INT DEFAULT 0
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config DROP action_mark_as_read
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD COLUMN action_mark_as_read INTEGER DEFAULT 0
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX UNIQ_87E64C53A76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_config AS SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key FROM wallabag_config
+    DROP TABLE wallabag_config
+    CREATE TABLE wallabag_config (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, theme VARCHAR(255) NOT NULL COLLATE BINARY, items_per_page INTEGER NOT NULL, language VARCHAR(255) NOT NULL COLLATE BINARY, rss_token VARCHAR(255) DEFAULT NULL COLLATE BINARY, rss_limit INTEGER DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, pocket_consumer_key VARCHAR(255) DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id))
+    INSERT INTO wallabag_config (id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key) SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key FROM __temp__wallabag_config
+    DROP TABLE __temp__wallabag_config
+    CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON wallabag_config (user_id)
+Migration 20161117071626
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('share_unmark', 0, 'entry')
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'share_unmark';
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'unmark_url';
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('share_unmark', 0, 'entry')
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'share_unmark';
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'unmark_url';
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('share_unmark', 0, 'entry')
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'share_unmark';
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'unmark_url';
+Migration 20161118134328
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry ADD http_status VARCHAR(3) DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry DROP http_status
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry ADD http_status VARCHAR(3) DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry DROP http_status
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry ADD COLUMN http_status VARCHAR(3) DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX created_at_idx
+    DROP INDEX IDX_F4D18282A76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry
+    DROP TABLE wallabag_entry
+    CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uuid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id))
+    INSERT INTO wallabag_entry (id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry
+    DROP TABLE __temp__wallabag_entry
+    CREATE INDEX created_at_idx ON wallabag_entry (created_at)
+    CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id)
+Migration 20161122144743
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('restricted_access', 0, 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'restricted_access';
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('restricted_access', 0, 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'restricted_access';
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('restricted_access', 0, 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'restricted_access';
+Migration 20161122203647
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user DROP expired, DROP credentials_expired
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD expired SMALLINT DEFAULT NULL, ADD credentials_expired SMALLINT DEFAULT NULL
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user DROP expired
+    ALTER TABLE wallabag_user DROP credentials_expired
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD expired SMALLINT DEFAULT NULL
+    ALTER TABLE wallabag_user ADD credentials_expired SMALLINT DEFAULT NULL
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    DROP INDEX UNIQ_1D63E7E5C05FB297
+    DROP INDEX UNIQ_1D63E7E5A0D96FBF
+    DROP INDEX UNIQ_1D63E7E592FC23A8
+    CREATE TEMPORARY TABLE __temp__wallabag_user AS SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, locked, expires_at, confirmation_token, password_requested_at, roles, credentials_expire_at, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted FROM wallabag_user
+    DROP TABLE wallabag_user
+    CREATE TABLE wallabag_user (id INTEGER NOT NULL, username VARCHAR(180) NOT NULL COLLATE BINARY, username_canonical VARCHAR(180) NOT NULL COLLATE BINARY, email VARCHAR(180) NOT NULL COLLATE BINARY, email_canonical VARCHAR(180) NOT NULL COLLATE BINARY, enabled BOOLEAN NOT NULL, salt VARCHAR(255) NOT NULL COLLATE BINARY, password VARCHAR(255) NOT NULL COLLATE BINARY, last_login DATETIME DEFAULT NULL, locked BOOLEAN NOT NULL, expires_at DATETIME DEFAULT NULL, confirmation_token VARCHAR(180) DEFAULT NULL COLLATE BINARY, password_requested_at DATETIME DEFAULT NULL, roles CLOB NOT NULL COLLATE BINARY, credentials_expire_at DATETIME DEFAULT NULL, name CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INTEGER DEFAULT NULL, twoFactorAuthentication BOOLEAN NOT NULL, trusted CLOB DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id))
+    INSERT INTO wallabag_user (id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, locked, expires_at, confirmation_token, password_requested_at, roles, credentials_expire_at, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted) SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, locked, expires_at, confirmation_token, password_requested_at, roles, credentials_expire_at, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted FROM __temp__wallabag_user
+    DROP TABLE __temp__wallabag_user
+    CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON wallabag_user (confirmation_token)
+    CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON wallabag_user (email_canonical)
+    CREATE UNIQUE INDEX UNIQ_1D63E7E592FC23A8 ON wallabag_user (username_canonical)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD COLUMN expired SMALLINT DEFAULT NULL
+    ALTER TABLE wallabag_user ADD COLUMN credentials_expired SMALLINT DEFAULT NULL
+Migration 20161128084725
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD list_mode INT DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config DROP list_mode
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD list_mode INT DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config DROP list_mode
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD COLUMN list_mode INTEGER DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX UNIQ_87E64C53A76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_config AS SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key FROM wallabag_config
+    DROP TABLE wallabag_config
+    CREATE TABLE wallabag_config (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, theme VARCHAR(255) NOT NULL COLLATE BINARY, items_per_page INTEGER NOT NULL, language VARCHAR(255) NOT NULL COLLATE BINARY, rss_token VARCHAR(255) DEFAULT NULL COLLATE BINARY, rss_limit INTEGER DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, pocket_consumer_key VARCHAR(255) DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id))
+    INSERT INTO wallabag_config (id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key) SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key FROM __temp__wallabag_config
+    DROP TABLE __temp__wallabag_config
+    CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON wallabag_config (user_id)
+Migration 20161128131503
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user DROP locked, DROP credentials_expire_at, DROP expires_at
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD locked SMALLINT DEFAULT NULL, ADD credentials_expire_at DATETIME DEFAULT NULL, ADD expires_at DATETIME DEFAULT NULL
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user DROP locked
+    ALTER TABLE wallabag_user DROP credentials_expire_at
+    ALTER TABLE wallabag_user DROP expires_at
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD locked SMALLINT DEFAULT NULL
+    ALTER TABLE wallabag_user ADD credentials_expire_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL
+    ALTER TABLE wallabag_user ADD expires_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD COLUMN locked SMALLINT DEFAULT NULL
+    ALTER TABLE wallabag_user ADD COLUMN credentials_expire_at DATETIME DEFAULT NULL
+    ALTER TABLE wallabag_user ADD COLUMN expires_at DATETIME DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX UNIQ_1D63E7E592FC23A8
+    DROP INDEX UNIQ_1D63E7E5A0D96FBF
+    DROP INDEX UNIQ_1D63E7E5C05FB297
+    CREATE TEMPORARY TABLE __temp__wallabag_user AS SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted, expired, credentials_expired FROM wallabag_user
+    DROP TABLE wallabag_user
+    CREATE TABLE wallabag_user (id INTEGER NOT NULL, username VARCHAR(180) NOT NULL COLLATE BINARY, username_canonical VARCHAR(180) NOT NULL COLLATE BINARY, email VARCHAR(180) NOT NULL COLLATE BINARY, email_canonical VARCHAR(180) NOT NULL COLLATE BINARY, enabled BOOLEAN NOT NULL, salt VARCHAR(255) NOT NULL COLLATE BINARY, password VARCHAR(255) NOT NULL COLLATE BINARY, last_login DATETIME DEFAULT NULL, confirmation_token VARCHAR(180) DEFAULT NULL COLLATE BINARY, password_requested_at DATETIME DEFAULT NULL, roles CLOB NOT NULL COLLATE BINARY, name CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INTEGER DEFAULT NULL, twoFactorAuthentication BOOLEAN NOT NULL, trusted CLOB DEFAULT NULL COLLATE BINARY, expired SMALLINT DEFAULT NULL, credentials_expired SMALLINT DEFAULT NULL, PRIMARY KEY(id))
+    INSERT INTO wallabag_user (id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted, expired, credentials_expired) SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted, expired, credentials_expired FROM __temp__wallabag_user
+    DROP TABLE __temp__wallabag_user
+    CREATE UNIQUE INDEX UNIQ_1D63E7E592FC23A8 ON wallabag_user (username_canonical)
+    CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON wallabag_user (email_canonical)
+    CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON wallabag_user (confirmation_token)
+Migration 20161214094403
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    CREATE INDEX IDX_entry_uid ON wallabag_entry (uid)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_entry_uid ON wallabag_entry
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    CREATE INDEX IDX_entry_uid ON wallabag_entry (uid)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX idx_entry_uid
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_F4D18282A76ED395
+    DROP INDEX created_at_idx
+    CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry
+    DROP TABLE wallabag_entry
+    CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id))
+    INSERT INTO wallabag_entry (id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry
+    DROP TABLE __temp__wallabag_entry
+    CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id)
+    CREATE INDEX created_at_idx ON wallabag_entry (created_at)
+    CREATE INDEX IDX_entry_uid ON wallabag_entry (uid)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_entry_uid
+    DROP INDEX created_at_idx
+    DROP INDEX IDX_F4D18282A76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry
+    DROP TABLE wallabag_entry
+    CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id))
+    INSERT INTO wallabag_entry (id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry
+    DROP TABLE __temp__wallabag_entry
+    CREATE INDEX created_at_idx ON wallabag_entry (created_at)
+    CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id)
diff --git a/docs/en/user/upgrade.rst b/docs/en/user/upgrade.rst
index 544d57eb..99260e13 100644
--- a/docs/en/user/upgrade.rst
+++ b/docs/en/user/upgrade.rst
@@ -1,21 +1,87 @@
+==================================
 Upgrade your wallabag installation
 ==================================
 You will find here different ways to upgrade your wallabag:
+- `from 2.1.x to 2.2.x <#upgrading-from-2-1-x-to-2-2-x>`_
 - `from 2.0.x to 2.1.1 <#upgrade-from-2-0-x-to-2-1-1>`_
- `from 2.1.x to 2.1.y <#upgrading-from-2-1-x-to-2-1-y>`_
 - `from 1.x to 2.x <#from-wallabag-1-x>`_
+*****************************
+Upgrading from 2.1.x to 2.2.x
+*****************************
+Upgrade on a dedicated web server
+=================================
+::
+    make update
+Explanations about database migrations
+--------------------------------------
+During the update, we execute database migrations.
+All the database migrations are stored in ``app/DoctrineMigrations``. You can execute each migration individually:
+``bin/console doctrine:migrations:execute 20161001072726 --env=prod``.
+You can also cancel each migration individually: ``bin/console doctrine:migrations:execute 20161001072726 --down --env=prod``.
+Here is the migrations list for 2.1.x to 2.2.0 release:
+* ``20161001072726``: added foreign keys for account resetting
+* ``20161022134138``: converted database to ``utf8mb4`` encoding (for MySQL only)
+* ``20161024212538``: added ``user_id`` column on ``oauth2_clients`` to prevent users to delete API clients from other users
+* ``20161031132655``: added the internal setting to enable/disable downloading pictures
+* ``20161104073720``: added ``created_at`` index on ``entry`` table
+* ``20161106113822``: added ``action_mark_as_read`` field on ``config`` table
+* ``20161117071626``: added the internal setting to share articles to unmark.it
+* ``20161118134328``: added ``http_status`` field on ``entry`` table
+* ``20161122144743``: added the internal setting to enable/disable fetching articles with paywall
+* ``20161122203647``: dropped ``expired`` and ``credentials_expired`` fields on ``user`` table
+* ``20161128084725``: added ``list_mode`` field on ``config`` table
+* ``20161128131503``: dropped ``locked``, ``credentials_expire_at`` and ``expires_at`` fields on ``user`` table
+* ``20161214094403``: added ``uid`` index on ``entry`` table
+Upgrade on a shared hosting
+===========================
+Backup your ``app/config/parameters.yml`` file.
+Download the last release of wallabag:
+.. code-block:: bash
+    wget http://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>`_.
+Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours.
+Please check that your ``app/config/parameters.yml`` contains all the required parameters. You can find `here a documentation about parameters <http://doc.wallabag.org/en/master/user/parameters.html>`_.
+If you use SQLite, you must also copy your ``data/`` folder inside the new installation.
+Empty ``var/cache`` folder.
+You must run some SQL queries to upgrade your database. We assume that the table prefix is ``wallabag_``. Don't forgete to backup your database before migrating.
+You may encounter issues with indexes names: if so, please change queries with the correct index name.
+`You can find all the queries here <http://doc.wallabag.org/en/master/user/query-upgrade-21-22.html>`_.
+***************************
 Upgrade from 2.0.x to 2.1.1
---------------------------
+***************************
 .. warning::
    Before this migration, if you configured the Pocket import by adding your consumer key in Internal settings, please do a backup of it: you'll have to add it into the Config page after the upgrade.
 Upgrade on a dedicated web server
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+=================================
 ::
@@ -28,7 +94,7 @@ Upgrade on a dedicated web server
    php bin/console cache:clear --env=prod
 Upgrade on a shared hosting
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+===========================
 Backup your ``app/config/parameters.yml`` file.
@@ -60,41 +126,9 @@ You must run some SQL queries to upgrade your database. We assume that the table
    ALTER TABLE `wallabag_config` ADD `pocket_consumer_key` VARCHAR(255) DEFAULT NULL;
    DELETE FROM `wallabag_craue_config_setting` WHERE `name` = 'pocket_consumer_key';
-Upgrading from 2.1.x to 2.1.y
+*****************
-----------------------------
-Upgrade on a dedicated web server
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-In order to upgrade your wallabag installation and get the last version, run the following command in you wallabag folder:
-::
-    make update
-Upgrade on a shared hosting
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Backup your ``app/config/parameters.yml`` file.
-Download the last release of wallabag:
-.. code-block:: bash
-    wget http://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>`_.
-Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours.
-Please check that your ``app/config/parameters.yml`` contains all the required parameters. You can find `here a documentation about parameters <http://doc.wallabag.org/en/master/user/parameters.html>`_.
-If you use SQLite, you must also copy your ``data/`` folder inside the new installation.
-Empty ``var/cache`` folder.
 From wallabag 1.x
-----------------
+*****************
 There is no automatic script to update from wallabag 1.x to wallabag 2.x. You need to:
diff --git a/docs/fr/developer/asynchronous.rst b/docs/fr/developer/asynchronous.rst
index c5489228..ff22daea 100644
--- a/docs/fr/developer/asynchronous.rst
+++ b/docs/fr/developer/asynchronous.rst
@@ -49,6 +49,7 @@ Modifiez votre fichier ``app/config/parameters.yml`` pour éditer la configurati
    rabbitmq_port: 5672
    rabbitmq_user: guest
    rabbitmq_password: guest
+    rabbitmq_prefetch_count: 10 # lire http://www.rabbitmq.com/consumer-prefetch.html
 Activer RabbitMQ dans wallabag
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -150,7 +151,7 @@ En fonction du service dont vous souhaitez importer vos données, vous devez act
  bin/console wallabag:import:redis-worker -e=prod firefox -vv >> /path/to/wallabag/var/logs/redis-firefox.log
  # for Chrome import
-  bin/console wallabag:import:redis-worker -e=prod instapaper -vv >> /path/to/wallabag/var/logs/redis-chrome.log
+  bin/console wallabag:import:redis-worker -e=prod chrome -vv >> /path/to/wallabag/var/logs/redis-chrome.log
 Si vous souhaitez démarrer l'import pour quelques messages uniquement, vous pouvez spécifier cette valeur en paramètre (ici 12) et le client va s'arrêter après le 12ème message :
diff --git a/docs/fr/developer/maintenance.rst b/docs/fr/developer/maintenance.rst
deleted file mode 100644
index 8007a85f..00000000
--- a/docs/fr/developer/maintenance.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-Mode maintenance
-================
-Si vous devez effectuer de longues tâches sur votre instance de wallabag, vous pouvez activer le mode maintenance.
-Plus personne ne pourra accéder à wallabag.
-Activer le mode maintenance
---------------------------
-Pour activer le mode maintenance, exécutez cette commande :
-::
-    bin/console lexik:maintenance:lock --no-interaction -e=prod
-Vous pouvez spécifier votre adresse IP dans ``app/config/config.yml`` si vous souhaitez accéder à wallabag même si
- le mode maintenance est activé. Par exemple :
-::
-    lexik_maintenance:
-        authorized:
-            ips: ['127.0.0.1']
-Désactiver le mode maintenance
------------------------------
-Pour désactiver le mode maintenance, exécutez cette commande :
-::
-    bin/console lexik:maintenance:unlock -e=prod
diff --git a/docs/fr/developer/paywall.rst b/docs/fr/developer/paywall.rst
new file mode 100644
index 00000000..c1c410b1
--- /dev/null
+++ b/docs/fr/developer/paywall.rst
@@ -0,0 +1,56 @@
+Articles derrière un paywall
+============================
+wallabag peut récupérer le contenu des articles des sites qui utilisent un système de paiement.
+Activer l'authentification pour les paywall
+-------------------------------------------
+Dans les paramètres internes, section **Article**, activez l'authentification pour les articles derrière un paywall (avec la valeur 1).
+Configurer les accès dans wallabag
+----------------------------------
+Éditez le fichier ``app/config/parameters.yml`` pour modifier les accès aux sites avec paywall. Voici un exemple pour certains sites :
+.. code:: yaml
+    sites_credentials:
+        mediapart.fr: {username: "myMediapartLogin", password: "mypassword"}
+        arretsurimages.net: {username: "myASILogin", password: "mypassword"}
+.. note::
+    Ces accès seront partagés entre chaque utilisateur de votre instance wallabag.
+Fichiers de configuration pour parser les articles
+--------------------------------------------------
+.. note::
+    Lisez `cette documentation <http://doc.wallabag.org/fr/master/user/errors_during_fetching.html>`_ pour en savoir plus sur ces fichiers de configuration.
+Chaque fichier de configuration doit être enrichi en ajoutant ``requires_login``, ``login_uri``,
+``login_username_field``, ``login_password_field`` et ``not_logged_in_xpath``.
+Attention, le formulaire de connexion doit se trouver dans le contenu de la page lors du chargement de celle-ci.
+Il sera impossible pour wallabag de se connecter à un site dont le formulaire de connexion est chargé après coup (en ajax par exemple).
+``login_uri`` correspond à l'URL à laquelle le formulaire est soumis (attribut ``action`` du formulaire).
+``login_username_field`` correspond à l'attribut ``name`` du champ de l'identifiant.
+``login_password_field`` correspond à l'attribut ``name`` du champ du mot de passe.
+Par exemple :
+.. code::
+    title://div[@id="titrage-contenu"]/h1[@class="title"]
+    body: //div[@class="contenu-html"]/div[@class="page-pane"]
+    requires_login: yes
+    login_uri: http://www.arretsurimages.net/forum/login.php
+    login_username_field: username
+    login_password_field: password
+    not_logged_in_xpath: //body[@class="not-logged-in"]
diff --git a/docs/fr/developer/translate.rst b/docs/fr/developer/translate.rst
index 902c29ad..870d1c20 100644
--- a/docs/fr/developer/translate.rst
+++ b/docs/fr/developer/translate.rst
@@ -21,7 +21,7 @@ où CODE est le code ISO 639-1 de votre langue (`cf wikipedia <https://fr.wikipe
 Autres fichiers à traduire :
 - https://github.com/wallabag/wallabag/tree/master/app/Resources/CraueConfigBundle/translations.
- https://github.com/wallabag/wallabag/tree/master/app/Resources/FOSUserBundle/translations.
+- https://github.com/wallabag/wallabag/tree/master/src/Wallabag/UserBundle/Resources/translations.
 Vous devez créer les fichiers ``LE_FICHIER_DE_TRADUCTION.CODE.yml``.
diff --git a/docs/fr/index.rst b/docs/fr/index.rst
index 564ffe52..e3f14b04 100644
--- a/docs/fr/index.rst
+++ b/docs/fr/index.rst
@@ -47,7 +47,7 @@ La documentation est disponible dans d'autres langues :
   developer/api
   developer/docker
+   developer/paywall
   developer/documentation
   developer/translate
-   developer/maintenance
   developer/asynchronous
diff --git a/docs/fr/user/configuration.rst b/docs/fr/user/configuration.rst
index 8ee0a49b..025b05bb 100644
--- a/docs/fr/user/configuration.rst
+++ b/docs/fr/user/configuration.rst
@@ -26,6 +26,15 @@ Vitesse de lecture
 wallabag calcule une durée de lecture pour chaque article. Vous pouvez définir ici, grâce à cette liste déroulante, si vous lisez plus ou moins vite. wallabag recalculera la durée de lecture de chaque article.
+Où souhaitez-vous être redirigé après avoir marqué un article comme lu ?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Chaque fois que vous ferez certaines actions (après avoir marqué un article comme lu / comme favori,
+après avoir supprimé un article, après avoir retiré un tag d'un article), vous pouvez être redirigé :
+- sur la page d'accueil
+- sur la page courante
 Langue
 ~~~~~~
@@ -44,11 +53,16 @@ Vous avez maintenant trois liens, un par statut : ajoutez-les dans votre agrég
 Vous pouvez aussi définir combien d'articles vous souhaitez dans vos flux RSS
 (50 est la valeur par défaut).
+Une pagination est aussi disponible pour ces flux. Il suffit de rajouter ``?page=2`` pour aller à la seconde page, par exemple.
+Cette pagination suit `la RFC <https://tools.ietf.org/html/rfc5005#page-4>`_, ce qui signifie que vous trouverez la page suivante (``next``), précédente (``previous``) et la dernière (``last``) dans la balise `<channel>` de chaque flux RSS.
 Mon compte
 ----------
 Vous pouvez ici modifier votre nom, votre adresse email et activer la ``Double authentification``.
+Si l'instance de wallabag compte plus d'un utilisateur actif, vous pouvez supprimer ici votre compte. **Attention, nous supprimons toutes vos données**.
 Double authentification (2FA)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/fr/user/filters.rst b/docs/fr/user/filters.rst
index 449bf010..5807bdbd 100644
--- a/docs/fr/user/filters.rst
+++ b/docs/fr/user/filters.rst
@@ -30,6 +30,11 @@ Langage
 wallabag (via graby) peut détecter la langue dans laquelle l'article est écrit.
 C'est ainsi facile pour vous de retrouver des articles écrits dans une langue spécifique.
+Statut HTTP
+-----------
+Vous pouvez retrouver des articles en filtrant par leur code HTTP : 200, 404, 500, etc.
 Temps de lecture
 ----------------
diff --git a/docs/fr/user/import.rst b/docs/fr/user/import.rst
index a5d53247..9a2dda8f 100644
--- a/docs/fr/user/import.rst
+++ b/docs/fr/user/import.rst
@@ -1,13 +1,13 @@
 Migrer depuis ...
 =================
-Dans wallabag 2.x, vous pouvez importer des données depuis : 
+Dans wallabag 2.x, vous pouvez importer des données depuis :
- `Pocket <#id1>`_ 
+- `Pocket <#id1>`_
- `Readability <#id2>`_ 
+- `Readability <#id2>`_
- `Instapaper <#id4>`_ 
+- `Instapaper <#id4>`_
- `wallabag 1.x <#id6>`_ 
+- `wallabag 1.x <#id6>`_
- `wallabag 2.x <#id7>`_ 
+- `wallabag 2.x <#id7>`_
 Nous avons aussi développé `un script pour exécuter des migrations via la ligne de commande <#import-via-la-ligne-de-commande-cli>`_.
@@ -58,8 +58,24 @@ la section Readability et ensuite sélectionnez votre fichier json pour l'upload
 Vos données vont être importées. L'import de données est une action qui peut être couteuse pour votre serveur.
-Instapaper
+Depuis Pinboard
----------
+---------------
+Exportez vos données de Pinboard
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Sur la page « Backup » (`https://pinboard.in/settings/backup <https://pinboard.in/settings/backup>`_), cliquez sur « JSON » dans la section « Bookmarks ». Un fichier json (sans extension) sera téléchargé (``pinboard_export``).
+Importez vos données dans wallabag 2.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Cliquez sur le lien ``Importer`` dans le menu, sur  ``Importer les contenus`` dans
+la section Pinboard et ensuite sélectionnez votre fichier json pour l'uploader.
+Vos données vont être importées. L'import de données est une action qui peut être couteuse pour votre serveur.
+Depuis Instapaper
+-----------------
 Exportez vos données de Instapaper
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -136,4 +152,4 @@ Vous obtiendrez :
    Start : 05-04-2016 11:36:07 ---
    403 imported
    0 already saved
-    End : 05-04-2016 11:36:09 ---
-\ No newline at end of file
+    End : 05-04-2016 11:36:09 ---
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index f6afcda6..9ef5ee98 100644
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -16,7 +16,7 @@ Installation de Composer :
 ::
-    curl -s http://getcomposer.org/installer | php
+    curl -s https://getcomposer.org/installer | php
 Vous pouvez trouver des instructions spécifiques `ici (en anglais) <https://getcomposer.org/doc/00-intro.md>`__.
@@ -82,7 +82,7 @@ Exécutez cette commande pour télécharger et décompresser l'archive :
 .. code-block:: bash
-    wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+    wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package
 Vous trouverez `le hash md5 du dernier package sur notre site <https://www.wallabag.org/pages/download-wallabag.html>`_.
diff --git a/docs/fr/user/parameters.rst b/docs/fr/user/parameters.rst
index d1c20ceb..b2e33524 100644
--- a/docs/fr/user/parameters.rst
+++ b/docs/fr/user/parameters.rst
@@ -39,6 +39,7 @@ Si vous ne savez pas quelle valeur vous devez mettre, laissez celle par défaut.
        redis_host: localhost
        redis_port: 6379
        redis_path: null
+        redis_password: null
 Meaning of each parameter
 -------------------------
@@ -91,3 +92,4 @@ Meaning of each parameter
   "redis_host", "localhost", "IP ou hôte du serveur cible (ignoré pour un schéma unix)"
   "redis_port", "6379", "Port TCP/IP du serveur cible (ignoré pour un schéma unix)"
   "redis_path", "null", "Chemin du fichier de socket du domaine UNIX utilisé quand on se connecte à Redis en utilisant les sockets du domaine UNIX"
+   "redis_password", "null", "Mot de passe défini dans la configuration serveur de Redis (paramètre `requirepass` dans `redis.conf`)"
diff --git a/docs/fr/user/query-upgrade-21-22.rst b/docs/fr/user/query-upgrade-21-22.rst
new file mode 100644
index 00000000..cd201dc2
--- /dev/null
+++ b/docs/fr/user/query-upgrade-21-22.rst
@@ -0,0 +1,797 @@
+Migration 20161001072726
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry_tag DROP FOREIGN KEY FK_C9F0DD7CBA364942
+    ALTER TABLE wallabag_entry_tag DROP FOREIGN KEY FK_C9F0DD7CBAD26311
+    ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_entry_tag_entry FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE
+    ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_entry_tag_tag FOREIGN KEY (tag_id) REFERENCES wallabag_tag (id) ON DELETE CASCADE
+    ALTER TABLE wallabag_annotation DROP FOREIGN KEY FK_A7AED006BA364942
+    ALTER TABLE wallabag_annotation ADD CONSTRAINT FK_annotation_entry FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE
+Migration down
+""""""""""""""
+We didn't write down migration for ``20161001072726``.
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry_tag DROP CONSTRAINT fk_c9f0dd7cba364942
+    ALTER TABLE wallabag_entry_tag DROP CONSTRAINT fk_c9f0dd7cbad26311
+    ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_entry_tag_entry FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE
+    ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_entry_tag_tag FOREIGN KEY (tag_id) REFERENCES wallabag_tag (id) ON DELETE CASCADE
+    ALTER TABLE wallabag_annotation DROP CONSTRAINT fk_a7aed006ba364942
+    ALTER TABLE wallabag_annotation ADD CONSTRAINT FK_annotation_entry FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE
+Migration down
+""""""""""""""
+We didn't write down migration for ``20161001072726``.
+SQLite
+^^^^^^
+This migration can only be executed safely on MySQL or PostgreSQL.
+Migration 20161022134138
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER DATABASE wallabag CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_user CHANGE confirmation_token confirmation_token VARCHAR(180) DEFAULT NULL;
+    ALTER TABLE wallabag_user CHANGE salt salt VARCHAR(180) NOT NULL;
+    ALTER TABLE wallabag_user CHANGE password password VARCHAR(180) NOT NULL;
+    ALTER TABLE wallabag_annotation CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_entry CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_tag CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_user CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_annotation CHANGE `text` `text` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_annotation CHANGE `quote` `quote` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_entry CHANGE `title` `title` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_entry CHANGE `content` `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_tag CHANGE `label` `label` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+    ALTER TABLE wallabag_user CHANGE `name` `name` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER DATABASE wallabag CHARACTER SET = utf8 COLLATE = utf8_unicode_ci;
+    ALTER TABLE wallabag_annotation CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_entry CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_tag CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_user CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_annotation CHANGE `text` `text` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_annotation CHANGE `quote` `quote` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_entry CHANGE `title` `title` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_entry CHANGE `content` `content` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_tag CHANGE `label` `label` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+    ALTER TABLE wallabag_user CHANGE `name` `name` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+PostgreSQL and SQLite
+^^^^^^^^^^^^^^^^^^^^^
+This migration only apply to MySQL.
+Migration 20161024212538
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_oauth2_clients ADD user_id INT NOT NULL
+    ALTER TABLE wallabag_oauth2_clients ADD CONSTRAINT IDX_user_oauth_client FOREIGN KEY (user_id) REFERENCES wallabag_user (id) ON DELETE CASCADE
+    CREATE INDEX IDX_635D765EA76ED395 ON wallabag_oauth2_clients (user_id)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_oauth2_clients DROP FOREIGN KEY IDX_user_oauth_client
+    ALTER TABLE wallabag_oauth2_clients DROP user_id
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_oauth2_clients ADD user_id INT DEFAULT NULL
+    ALTER TABLE wallabag_oauth2_clients ADD CONSTRAINT IDX_user_oauth_client FOREIGN KEY (user_id) REFERENCES wallabag_user (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE
+    CREATE INDEX IDX_635D765EA76ED395 ON wallabag_oauth2_clients (user_id)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_oauth2_clients DROP CONSTRAINT idx_user_oauth_client
+    ALTER TABLE wallabag_oauth2_clients DROP user_id
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    CREATE TEMPORARY TABLE __temp__wallabag_oauth2_clients AS SELECT id, random_id, redirect_uris, secret, allowed_grant_types, name FROM wallabag_oauth2_clients
+    DROP TABLE wallabag_oauth2_clients
+    CREATE TABLE wallabag_oauth2_clients (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, random_id VARCHAR(255) NOT NULL COLLATE BINARY, redirect_uris CLOB NOT NULL COLLATE BINARY, secret VARCHAR(255) NOT NULL COLLATE BINARY, allowed_grant_types CLOB NOT NULL COLLATE BINARY, name CLOB DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id), CONSTRAINT IDX_user_oauth_client FOREIGN KEY (user_id) REFERENCES wallabag_user (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE)
+    INSERT INTO wallabag_oauth2_clients (id, random_id, redirect_uris, secret, allowed_grant_types, name) SELECT id, random_id, redirect_uris, secret, allowed_grant_types, name FROM __temp__wallabag_oauth2_clients
+    DROP TABLE __temp__wallabag_oauth2_clients
+    CREATE INDEX IDX_635D765EA76ED395 ON wallabag_oauth2_clients (user_id)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_635D765EA76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_oauth2_clients AS SELECT id, random_id, redirect_uris, secret, allowed_grant_types, name FROM wallabag_oauth2_clients
+    DROP TABLE wallabag_oauth2_clients
+    CREATE TABLE wallabag_oauth2_clients (id INTEGER NOT NULL, random_id VARCHAR(255) NOT NULL COLLATE BINARY, redirect_uris CLOB NOT NULL COLLATE BINARY, secret VARCHAR(255) NOT NULL COLLATE BINARY, allowed_grant_types CLOB NOT NULL COLLATE BINARY, name CLOB DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id))
+    INSERT INTO wallabag_oauth2_clients (id, random_id, redirect_uris, secret, allowed_grant_types, name) SELECT id, random_id, redirect_uris, secret, allowed_grant_types, name FROM __temp__wallabag_oauth2_clients
+    DROP TABLE __temp__wallabag_oauth2_clients
+Migration 20161031132655
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('download_images_enabled', 0, 'misc')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'download_images_enabled';
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('download_images_enabled', 0, 'misc')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'download_images_enabled';
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('download_images_enabled', 0, 'misc')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'download_images_enabled';
+Migration 20161104073720
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    CREATE INDEX IDX_entry_created_at ON wallabag_entry (created_at)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_entry_created_at ON wallabag_entry
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    CREATE INDEX IDX_entry_created_at ON wallabag_entry (created_at)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX idx_entry_created_at
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    DROP INDEX created_at_idx
+    DROP INDEX IDX_F4D18282A76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry
+    DROP TABLE wallabag_entry
+    CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uuid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id))
+    INSERT INTO wallabag_entry (id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry
+    DROP TABLE __temp__wallabag_entry
+    CREATE INDEX created_at_idx ON wallabag_entry (created_at)
+    CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id)
+    CREATE INDEX IDX_entry_created_at ON wallabag_entry (created_at)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_entry_created_at
+    DROP INDEX IDX_F4D18282A76ED395
+    DROP INDEX created_at_idx
+    CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry
+    DROP TABLE wallabag_entry
+    CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uuid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id))
+    INSERT INTO wallabag_entry (id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry
+    DROP TABLE __temp__wallabag_entry
+    CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id)
+    CREATE INDEX created_at_idx ON wallabag_entry (created_at)
+Migration 20161106113822
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD action_mark_as_read INT DEFAULT 0
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config DROP action_mark_as_read
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD action_mark_as_read INT DEFAULT 0
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config DROP action_mark_as_read
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD COLUMN action_mark_as_read INTEGER DEFAULT 0
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX UNIQ_87E64C53A76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_config AS SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key FROM wallabag_config
+    DROP TABLE wallabag_config
+    CREATE TABLE wallabag_config (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, theme VARCHAR(255) NOT NULL COLLATE BINARY, items_per_page INTEGER NOT NULL, language VARCHAR(255) NOT NULL COLLATE BINARY, rss_token VARCHAR(255) DEFAULT NULL COLLATE BINARY, rss_limit INTEGER DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, pocket_consumer_key VARCHAR(255) DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id))
+    INSERT INTO wallabag_config (id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key) SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key FROM __temp__wallabag_config
+    DROP TABLE __temp__wallabag_config
+    CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON wallabag_config (user_id)
+Migration 20161117071626
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('share_unmark', 0, 'entry')
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'share_unmark';
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'unmark_url';
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('share_unmark', 0, 'entry')
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'share_unmark';
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'unmark_url';
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('share_unmark', 0, 'entry')
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'share_unmark';
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'unmark_url';
+Migration 20161118134328
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry ADD http_status VARCHAR(3) DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry DROP http_status
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry ADD http_status VARCHAR(3) DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry DROP http_status
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_entry ADD COLUMN http_status VARCHAR(3) DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX created_at_idx
+    DROP INDEX IDX_F4D18282A76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry
+    DROP TABLE wallabag_entry
+    CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uuid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id))
+    INSERT INTO wallabag_entry (id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry
+    DROP TABLE __temp__wallabag_entry
+    CREATE INDEX created_at_idx ON wallabag_entry (created_at)
+    CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id)
+Migration 20161122144743
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('restricted_access', 0, 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'restricted_access';
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('restricted_access', 0, 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'restricted_access';
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('restricted_access', 0, 'entry')
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DELETE FROM wallabag_craue_config_setting WHERE name = 'restricted_access';
+Migration 20161122203647
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user DROP expired, DROP credentials_expired
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD expired SMALLINT DEFAULT NULL, ADD credentials_expired SMALLINT DEFAULT NULL
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user DROP expired
+    ALTER TABLE wallabag_user DROP credentials_expired
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD expired SMALLINT DEFAULT NULL
+    ALTER TABLE wallabag_user ADD credentials_expired SMALLINT DEFAULT NULL
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    DROP INDEX UNIQ_1D63E7E5C05FB297
+    DROP INDEX UNIQ_1D63E7E5A0D96FBF
+    DROP INDEX UNIQ_1D63E7E592FC23A8
+    CREATE TEMPORARY TABLE __temp__wallabag_user AS SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, locked, expires_at, confirmation_token, password_requested_at, roles, credentials_expire_at, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted FROM wallabag_user
+    DROP TABLE wallabag_user
+    CREATE TABLE wallabag_user (id INTEGER NOT NULL, username VARCHAR(180) NOT NULL COLLATE BINARY, username_canonical VARCHAR(180) NOT NULL COLLATE BINARY, email VARCHAR(180) NOT NULL COLLATE BINARY, email_canonical VARCHAR(180) NOT NULL COLLATE BINARY, enabled BOOLEAN NOT NULL, salt VARCHAR(255) NOT NULL COLLATE BINARY, password VARCHAR(255) NOT NULL COLLATE BINARY, last_login DATETIME DEFAULT NULL, locked BOOLEAN NOT NULL, expires_at DATETIME DEFAULT NULL, confirmation_token VARCHAR(180) DEFAULT NULL COLLATE BINARY, password_requested_at DATETIME DEFAULT NULL, roles CLOB NOT NULL COLLATE BINARY, credentials_expire_at DATETIME DEFAULT NULL, name CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INTEGER DEFAULT NULL, twoFactorAuthentication BOOLEAN NOT NULL, trusted CLOB DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id))
+    INSERT INTO wallabag_user (id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, locked, expires_at, confirmation_token, password_requested_at, roles, credentials_expire_at, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted) SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, locked, expires_at, confirmation_token, password_requested_at, roles, credentials_expire_at, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted FROM __temp__wallabag_user
+    DROP TABLE __temp__wallabag_user
+    CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON wallabag_user (confirmation_token)
+    CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON wallabag_user (email_canonical)
+    CREATE UNIQUE INDEX UNIQ_1D63E7E592FC23A8 ON wallabag_user (username_canonical)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD COLUMN expired SMALLINT DEFAULT NULL
+    ALTER TABLE wallabag_user ADD COLUMN credentials_expired SMALLINT DEFAULT NULL
+Migration 20161128084725
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD list_mode INT DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config DROP list_mode
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD list_mode INT DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config DROP list_mode
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_config ADD COLUMN list_mode INTEGER DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX UNIQ_87E64C53A76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_config AS SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key FROM wallabag_config
+    DROP TABLE wallabag_config
+    CREATE TABLE wallabag_config (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, theme VARCHAR(255) NOT NULL COLLATE BINARY, items_per_page INTEGER NOT NULL, language VARCHAR(255) NOT NULL COLLATE BINARY, rss_token VARCHAR(255) DEFAULT NULL COLLATE BINARY, rss_limit INTEGER DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, pocket_consumer_key VARCHAR(255) DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id))
+    INSERT INTO wallabag_config (id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key) SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key FROM __temp__wallabag_config
+    DROP TABLE __temp__wallabag_config
+    CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON wallabag_config (user_id)
+Migration 20161128131503
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user DROP locked, DROP credentials_expire_at, DROP expires_at
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD locked SMALLINT DEFAULT NULL, ADD credentials_expire_at DATETIME DEFAULT NULL, ADD expires_at DATETIME DEFAULT NULL
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user DROP locked
+    ALTER TABLE wallabag_user DROP credentials_expire_at
+    ALTER TABLE wallabag_user DROP expires_at
+Migration down
+""""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD locked SMALLINT DEFAULT NULL
+    ALTER TABLE wallabag_user ADD credentials_expire_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL
+    ALTER TABLE wallabag_user ADD expires_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    ALTER TABLE wallabag_user ADD COLUMN locked SMALLINT DEFAULT NULL
+    ALTER TABLE wallabag_user ADD COLUMN credentials_expire_at DATETIME DEFAULT NULL
+    ALTER TABLE wallabag_user ADD COLUMN expires_at DATETIME DEFAULT NULL
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX UNIQ_1D63E7E592FC23A8
+    DROP INDEX UNIQ_1D63E7E5A0D96FBF
+    DROP INDEX UNIQ_1D63E7E5C05FB297
+    CREATE TEMPORARY TABLE __temp__wallabag_user AS SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted, expired, credentials_expired FROM wallabag_user
+    DROP TABLE wallabag_user
+    CREATE TABLE wallabag_user (id INTEGER NOT NULL, username VARCHAR(180) NOT NULL COLLATE BINARY, username_canonical VARCHAR(180) NOT NULL COLLATE BINARY, email VARCHAR(180) NOT NULL COLLATE BINARY, email_canonical VARCHAR(180) NOT NULL COLLATE BINARY, enabled BOOLEAN NOT NULL, salt VARCHAR(255) NOT NULL COLLATE BINARY, password VARCHAR(255) NOT NULL COLLATE BINARY, last_login DATETIME DEFAULT NULL, confirmation_token VARCHAR(180) DEFAULT NULL COLLATE BINARY, password_requested_at DATETIME DEFAULT NULL, roles CLOB NOT NULL COLLATE BINARY, name CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INTEGER DEFAULT NULL, twoFactorAuthentication BOOLEAN NOT NULL, trusted CLOB DEFAULT NULL COLLATE BINARY, expired SMALLINT DEFAULT NULL, credentials_expired SMALLINT DEFAULT NULL, PRIMARY KEY(id))
+    INSERT INTO wallabag_user (id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted, expired, credentials_expired) SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted, expired, credentials_expired FROM __temp__wallabag_user
+    DROP TABLE __temp__wallabag_user
+    CREATE UNIQUE INDEX UNIQ_1D63E7E592FC23A8 ON wallabag_user (username_canonical)
+    CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON wallabag_user (email_canonical)
+    CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON wallabag_user (confirmation_token)
+Migration 20161214094403
+------------------------
+MySQL
+^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    CREATE INDEX IDX_entry_uid ON wallabag_entry (uid)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_entry_uid ON wallabag_entry
+PostgreSQL
+^^^^^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    CREATE INDEX IDX_entry_uid ON wallabag_entry (uid)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX idx_entry_uid
+SQLite
+^^^^^^
+Migration up
+""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_F4D18282A76ED395
+    DROP INDEX created_at_idx
+    CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry
+    DROP TABLE wallabag_entry
+    CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id))
+    INSERT INTO wallabag_entry (id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry
+    DROP TABLE __temp__wallabag_entry
+    CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id)
+    CREATE INDEX created_at_idx ON wallabag_entry (created_at)
+    CREATE INDEX IDX_entry_uid ON wallabag_entry (uid)
+Migration down
+""""""""""""""
+.. code-block:: sql
+    DROP INDEX IDX_entry_uid
+    DROP INDEX created_at_idx
+    DROP INDEX IDX_F4D18282A76ED395
+    CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry
+    DROP TABLE wallabag_entry
+    CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id))
+    INSERT INTO wallabag_entry (id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry
+    DROP TABLE __temp__wallabag_entry
+    CREATE INDEX created_at_idx ON wallabag_entry (created_at)
+    CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id)
diff --git a/docs/fr/user/upgrade.rst b/docs/fr/user/upgrade.rst
index c3d33904..088b19a0 100644
--- a/docs/fr/user/upgrade.rst
+++ b/docs/fr/user/upgrade.rst
@@ -3,41 +3,53 @@ Mettre à jour votre installation de wallabag
 Vous trouverez ici différentes manières de mettre à jour wallabag :
+- `de la 2.1.x à la 2.2.x <#mettre-a-jour-de-la-2-1-x-a-la-2-2-x>`_
 - `de la 2.0.x à la 2.1.1 <#mettre-a-jour-de-la-2-0-x-a-la-2-1-1>`_
- `de la 2.1.x à la 2.1.y <#mettre-a-jour-de-la-2-1-x-a-la-2-1-y>`_
 - `de la 1.x à la 2.x <#depuis-wallabag-1-x>`_
-Mettre à jour de la 2.0.x à la 2.1.1
+Mettre à jour de la 2.1.x à la 2.2.x
 ------------------------------------
-.. warning::
-Avant cette migration, si vous aviez configuré l'import depuis Pocket en ajoutant votre consumer key dans les paramètres internes, pensez à effectuer une sauvegarde de celle-ci : vous devrez l'ajouter dans la configuration de wallabag après la mise à jour.
 Mise à jour sur un serveur dédié
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 ::
-    rm -rf var/cache/*
+    make update
-    git fetch origin
-    git fetch --tags
+Explications à propos des migrations de base de données
-    git checkout 2.1.1 --force
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""
-    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
-    php bin/console doctrine:migrations:migrate --env=prod
+Durant la mise à jour, nous exécutons des migrations de base de données.
-    php bin/console cache:clear --env=prod
+Toutes les migrations de base de données sont stockées dans le dossier ``app/DoctrineMigrations``. Vous pouvez exécuter chaque migration individuellement :
+``bin/console doctrine:migrations:execute 20161001072726 --env=prod``.
+Voici la liste des migrations de la 2.1.x à la 2.2.0 :
+* ``20161001072726``: ajout de clés étrangères pour la réinitialisation de compte
+* ``20161022134138``: conversion de la base de données à l'encodage ``utf8mb4`` (pour MySQL uniquement)
+* ``20161024212538``: ajout de la colonne ``user_id`` sur la table ``oauth2_clients`` pour empêcher les utilisateurs de supprimer des clients API d'autres utilisateurs
+* ``20161031132655``: ajout du paramètre interne pour activer/désactiver le téléchargement des images
+* ``20161104073720``: ajout de l'index ``created_at`` sur la table ``entry``
+* ``20161106113822``: ajout du champ ``action_mark_as_read`` sur la table ``config``
+* ``20161117071626``: ajout du paramètre interne pour partager ses articles vers unmark.it
+* ``20161118134328``: ajout du champ ``http_status`` sur la table ``entry``
+* ``20161122144743``: ajout du paramètre interne pour activer/désactiver la récupération d'articles derrière un paywall
+* ``20161122203647``: suppression des champs ``expired`` et ``credentials_expired`` sur la table ``user``
 Mise à jour sur un hébergement mutualisé
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Effectuez une sauvegarde du fichier ``app/config/parameters.yml``.
-Téléchargez la version 2.1.1 de wallabag :
+Téléchargez la dernière version de wallabag :
 .. code-block:: bash
-    wget http://framabag.org/wallabag-release-2.1.1.tar.gz && tar xvf wallabag-release-2.1.1.tar.gz
+    wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
-(hash md5 de l'archive 2.1.1 : ``9584a3b60a2b2a4de87f536548caac93``)
+Vous trouverez `le hash md5 du dernier package sur notre site <https://www.wallabag.org/pages/download-wallabag.html>`_.
 Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre.
@@ -47,42 +59,42 @@ Si vous utilisez SQLite, vous devez également conserver le contenu du répertoi
 Videz le répertoire ``var/cache``.
-Vous allez devoir également exécuter des requêtes SQL pour mettre à jour votre base de données. Nous partons du principe que le préfixe de vos tables est ``wallabag_`` et que le serveur SQL est un serveur MySQL :
+Vous allez devoir également exécuter des requêtes SQL pour mettre à jour votre base de données. Nous partons du principe que le préfixe de vos tables est ``wallabag_``.
-.. code-block:: sql
+`Vous trouverez toutes les requêtes à exécuter ici <http://doc.wallabag.org/fr/master/user/query-upgrade-21-22.html>`_.
-    ALTER TABLE `wallabag_entry` ADD `uuid` LONGTEXT DEFAULT NULL;
-    INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('share_public', '1', 'entry');
-    ALTER TABLE `wallabag_oauth2_clients` ADD name longtext COLLATE 'utf8_unicode_ci' DEFAULT NULL;
-    INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_redis', '0', 'import');
-    INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_rabbitmq', '0', 'import');
-    ALTER TABLE `wallabag_config` ADD `pocket_consumer_key` VARCHAR(255) DEFAULT NULL;
-    DELETE FROM `wallabag_craue_config_setting` WHERE `name` = 'pocket_consumer_key';
-Mettre à jour de la 2.1.x à la 2.1.y
+Mettre à jour de la 2.0.x à la 2.1.1
 ------------------------------------
+.. warning::
+Avant cette migration, si vous aviez configuré l'import depuis Pocket en ajoutant votre consumer key dans les paramètres internes, pensez à effectuer une sauvegarde de celle-ci : vous devrez l'ajouter dans la configuration de wallabag après la mise à jour.
 Mise à jour sur un serveur dédié
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Pour mettre à jour votre installation de wallabag et récupérer la dernière version, exécutez la commande suivante dans votre répertoire d'installation : 
 ::
-    make update
+    rm -rf var/cache/*
+    git fetch origin
+    git fetch --tags
+    git checkout 2.1.1 --force
+    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
+    php bin/console doctrine:migrations:migrate --env=prod
+    php bin/console cache:clear --env=prod
 Mise à jour sur un hébergement mutualisé
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Effectuez une sauvegarde du fichier ``app/config/parameters.yml``.
-Téléchargez la dernière version de wallabag :
+Téléchargez la version 2.1.1 de wallabag :
 .. code-block:: bash
-    wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
+    wget http://framabag.org/wallabag-release-2.1.1.tar.gz && tar xvf wallabag-release-2.1.1.tar.gz
-Vous trouverez `le hash md5 du dernier package sur notre site <https://www.wallabag.org/pages/download-wallabag.html>`_.
+(hash md5 de l'archive 2.1.1 : ``9584a3b60a2b2a4de87f536548caac93``)
 Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre.
@@ -92,6 +104,18 @@ Si vous utilisez SQLite, vous devez également conserver le contenu du répertoi
 Videz le répertoire ``var/cache``.
+Vous allez devoir également exécuter des requêtes SQL pour mettre à jour votre base de données. Nous partons du principe que le préfixe de vos tables est ``wallabag_`` et que le serveur SQL est un serveur MySQL :
+.. code-block:: sql
+    ALTER TABLE `wallabag_entry` ADD `uuid` LONGTEXT DEFAULT NULL;
+    INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('share_public', '1', 'entry');
+    ALTER TABLE `wallabag_oauth2_clients` ADD name longtext COLLATE 'utf8_unicode_ci' DEFAULT NULL;
+    INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_redis', '0', 'import');
+    INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_rabbitmq', '0', 'import');
+    ALTER TABLE `wallabag_config` ADD `pocket_consumer_key` VARCHAR(255) DEFAULT NULL;
+    DELETE FROM `wallabag_craue_config_setting` WHERE `name` = 'pocket_consumer_key';
 Depuis wallabag 1.x
 -------------------