Merge pull request #2016 from wallabag/update-documentation

Update documentation

diff --combined docs/en/index.rst
index f4b8628af20ab5934274e649b1872741659d0f89,74e09f1afa57195121da7a81aea8075e139aedb7..03025ef9247bb9015706b2b7c12401f8188bbd9f
--- 1/docs/en/index.rst
--- 2/docs/en/index.rst
+++ b/docs/en/index.rst
@@@ -8,7 -8,7 +8,7 @@@ wallabag documentatio
  **wallabag** is a read-it-later application: it saves a web page by
  keeping content only. Elements like navigation or ads are deleted.
  
- .. note::
+ .. 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>`__.
  
@@@ -25,19 -25,18 +25,19 @@@ The main documentation for this applica
  
     user/faq
     user/installation
-    user/migration
     user/upgrade
+    user/migration
+    user/import
     user/create_account
     user/login
     user/configuration
     user/first_article
     user/errors_during_fetching
     user/annotations
-    user/import
     user/download_articles
     user/filters
     user/tags
 +   user/android
  
  .. _dev-docs:
  
@@@ -47,5 -46,6 +47,6 @@@
  
     developer/api
     developer/docker
+    developer/documentation
     developer/translate
     developer/maintenance