X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=docs%2Fen%2Findex.rst;h=0ead261b1f9120997a276bc50b9c6c71f05a0c9c;hb=a3f7d8a8704d6c0ff303ea780314035a779ac84a;hp=6ccfd44c7a1871db7516cd5f8abb0e15f7e7113a;hpb=59e91bc8931a386974a3817e9849aad1ca7fc186;p=github%2Fwallabag%2Fwallabag.git

diff --git a/docs/en/index.rst b/docs/en/index.rst
index 6ccfd44c..0ead261b 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -8,50 +8,56 @@ 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.
 
-The main documentation for the site is organized into a couple sections:
+.. 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:`admin-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
-
+   :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/organize
-user/filters
-User/read_an_article
-User/search
-User/epub_conversion
-User/issue_with_article
-User/rss_feed
-User/import_export
-
-.. _admin-docs:
-
-.. toctree::
-   :maxdepth: 2
-   :caption: Admin Documentation
-
-   Administrator/install
-   Administrator/update
-   Administrator/hidden_options
-   Administrator/multiusers
-   Administrator/sessions
+   user/errors_during_fetching
+   user/annotations
+   user/download_articles
+   user/share
+   user/filters
+   user/tags
+   user/android
+   user/parameters
+   user/backup
 
 .. _dev-docs:
 
 .. toctree::
    :maxdepth: 2
-   :caption: Developer Documentation
-
-   Developer/write_config_files
-   Developer/create_new_theme
-   Developer/git_repo
+   :caption: Developer documentation
+
+   developer/api
+   developer/docker
+   developer/documentation
+   developer/translate
+   developer/maintenance
+   developer/redis
+   developer/rabbitmq