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

[github/wallabag/wallabag.git] / docs / en / index.rst

diff --git a/docs/en/index.rst b/docs/en/index.rst
index 7dd01b3995ca83e4e284bcba8361dfdf6348c3da..beb3816e1a9fa02d5cbf5dda8fc523cf72ca32e6 100644 (file)
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -8,25 +8,43 @@ 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`
 * :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.y
+   user/upgrade-2.0.x-2.0.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:
 
@@ -34,4 +52,10 @@ The main documentation for this application is organized into a couple sections:
    :maxdepth: 2
    :caption: Developer documentation
 
-   developer/docker
\ No newline at end of file
+   developer/api
+   developer/docker
+   developer/documentation
+   developer/translate
+   developer/maintenance
+   developer/redis
+   developer/rabbitmq