X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=docs%2Fen%2Findex.rst;h=4e346ae68c817fd4c694df469524644512def438;hb=e4cf672ccf61689ba28c2e89fc55f83167800b18;hp=1bac9ed77ff307196072cc438acc6636a0a6e018;hpb=437f1985b090c026a130420213d608e1b13e141a;p=github%2Fwallabag%2Fwallabag.git

diff --git a/docs/en/index.rst b/docs/en/index.rst
index 1bac9ed7..4e346ae6 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -8,7 +8,7 @@ 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.
 
-.. 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>`__.
 
@@ -17,21 +17,34 @@ The main documentation for this application is organized into a couple sections:
 * :ref:`user-docs`
 * :ref:`dev-docs`
 
+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/>`_
+
 .. _user-docs:
 
 .. toctree::
    :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/import
    user/create_account
    user/login
    user/configuration
    user/first_article
-   user/import
+   user/errors_during_fetching
+   user/annotations
    user/download_articles
+   user/share
    user/filters
    user/tags
+   user/android
 
 .. _dev-docs:
 
@@ -39,6 +52,10 @@ The main documentation for this application is organized into a couple sections:
    :maxdepth: 2
    :caption: Developer documentation
 
+   developer/api
    developer/docker
+   developer/documentation
    developer/translate
    developer/maintenance
+   developer/redis
+   developer/rabbitmq