Merge remote-tracking branch 'origin/master' into 2.2

# Conflicts:
#	.editorconfig
#	docs/de/index.rst
#	docs/de/user/import.rst
#	docs/en/index.rst
#	docs/en/user/configuration.rst
#	docs/en/user/import.rst
#	docs/fr/index.rst
#	docs/fr/user/import.rst
#	src/Wallabag/CoreBundle/Command/InstallCommand.php
#	src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
#	src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
#	web/bundles/wallabagcore/themes/baggy/css/style.min.css
#	web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
#	web/bundles/wallabagcore/themes/material/css/style.min.css
#	web/bundles/wallabagcore/themes/material/js/material.min.js

1 files changed, 6 insertions, 17 deletions

diff --git a/docs/en/index.rst b/docs/en/index.rst
index 6fe33c76..54a1eef8 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -8,10 +8,6 @@ wallabag documentation
 **wallabag** is a read-it-later application: it saves a web page by
 keeping content only. Elements like navigation or ads are deleted.
 
-.. tip::
-
-    This documentation is about wallabag v2. If you want to read documentation for wallabag v1, `please have a look here <https://github.com/wallabag/documentation>`__.
-
 The main documentation for this application is organized into a couple sections:
 
 * :ref:`user-docs`
@@ -20,7 +16,7 @@ The main documentation for this application is organized into a couple sections:
 The documentation is available in other languages:
 
 * `Documentation en français <http://doc.wallabag.org/fr/master/>`_
-* `Deutsch Dokumentation <http://doc.wallabag.org/de/master/>`_
+* `Dokumentation in Deutsch <http://doc.wallabag.org/de/master/>`_
 
 .. _user-docs:
 
@@ -28,25 +24,19 @@ The documentation is available in other languages:
    :maxdepth: 2
    :caption: User documentation
 
-   user/faq
    user/installation
-   user/upgrade-2.0.x-2.1.1
-   user/upgrade-2.1.x-2.1.y
-   user/migration
+   user/upgrade
+   user/configuration
    user/import
    user/create_account
-   user/login
-   user/configuration
-   user/first_article
+   user/articles
    user/errors_during_fetching
-   user/annotations
-   user/download_articles
-   user/share
    user/filters
    user/tags
    user/android
    user/parameters
    user/backup
+   user/faq
 
 .. _dev-docs:
 
@@ -58,5 +48,4 @@ The documentation is available in other languages:
    developer/docker
    developer/documentation
    developer/translate
-   developer/redis
-   developer/rabbitmq
+   developer/asynchronous