Reordered :fr: documentation

5 files changed, 17 insertions, 20 deletions

diff --git a/docs/en/index.rst b/docs/en/index.rst
index 3c8595a4..76067a0f 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -26,9 +26,9 @@ The documentation is available in other languages:
 
    user/installation
    user/upgrade
+   user/configuration
    user/import
    user/create_account
-   user/configuration
    user/articles
    user/errors_during_fetching
    user/filters
diff --git a/docs/en/user/android.rst b/docs/en/user/android.rst
index d210d6da..e286bb3b 100644
--- a/docs/en/user/android.rst
+++ b/docs/en/user/android.rst
@@ -21,7 +21,7 @@ Just confirm that message and you get redirected to the settings screen.
     :alt: Settings screen
     :align: center
 
-Fill in your wallabag data. You need to enter your wallabag address. It is important that this URL does not end with a slash. Also add your wallabag credentials to the user name and password field.
+Fill in your wallabag data. You need to enter your wallabag address. **It is important that this URL does not end with a slash**. Also add your wallabag credentials to the user name and password field.
 
 .. image:: ../../img/user/android_configuration_filled_in.en.png
     :alt: Filled in settings
@@ -57,13 +57,13 @@ Now you need to scroll to the bottom of the settings menu. Of course you can adj
     :alt: Bottom of the settings screen
     :align: center
 
-After hitting the save button, you get the following screen. The app proposes to initiate a syncronisation process to update your feeds of articles. It is recommended to acknowledge this action and press Yes.
+After hitting the save button, you get the following screen. The app proposes to initiate a synchronization process to update your feeds of articles. It is recommended to acknowledge this action and press Yes.
 
 .. image:: ../../img/user/android_configuration_saved_feed_update.en.png
     :alt: Settings saved the first time
     :align: center
 
-Finally after the synchronisation finished successfully, you are presented to the list of unread articles.
+Finally after the synchronization finished successfully, you are presented to the list of unread articles.
 
 .. image:: ../../img/user/android_unread_feed_synced.en.png
     :alt: Filled article list cause feeds successfully synchronized
@@ -72,8 +72,8 @@ Finally after the synchronisation finished successfully, you are presented to th
 Known limitations
 -----------------
 
-2FA
-~~~
+Two factor authentication (2FA)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Currently the Android application does not support two-factor authentication. You should disable that to get the application working.
 
@@ -90,11 +90,6 @@ If you can reach your wallabag web instance via HTTPS, you should use that. Espe
 References
 ----------
 
-`Source code of the Android application <https://github.com/wallabag/android-app>`_
-
-`Android Application on F-Droid <https://f-droid.org/repository/browse/?fdfilter=wallabag&fdid=fr.gaulupeau.apps.InThePoche>`_
-
-`Android Application on Google Play <https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche>`_
-
-`Support chat <https://gitter.im/wallabag/wallabag>`_
-
+- `Source code of the Android application <https://github.com/wallabag/android-app>`_
+- `Android Application on F-Droid <https://f-droid.org/repository/browse/?fdfilter=wallabag&fdid=fr.gaulupeau.apps.InThePoche>`_
+- `Android Application on Google Play <https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche>`_
diff --git a/docs/en/user/configuration.rst b/docs/en/user/configuration.rst
index a6edcd4a..2c1385a8 100644
--- a/docs/en/user/configuration.rst
+++ b/docs/en/user/configuration.rst
@@ -48,8 +48,8 @@ User information
 
 You can change your name, your email address and enable ``Two factor authentication``.
 
-Two factor authentication
-~~~~~~~~~~~~~~~~~~~~~~~~~
+Two factor authentication (2FA)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Two-factor authentication (also known as 2FA) is a technology patented in 1984
     that provides identification of users by means of the combination of two different components.
diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst
index 269e226c..a6754fa0 100644
--- a/docs/en/user/import.rst
+++ b/docs/en/user/import.rst
@@ -5,12 +5,14 @@ In wallabag 2.x, you can import data from:
 
 - `Pocket <#id1>`_ 
 - `Readability <#id2>`_ 
-- `Instapaper <#instapaper>`_ 
-- `wallabag 1.x <#wallabag-1-x>`_ 
-- `wallabag 2.x <#wallabag-2-x>`_ 
+- `Instapaper <#id4>`_ 
+- `wallabag 1.x <#id6>`_ 
+- `wallabag 2.x <#id7>`_ 
 
 We also developed `a script to execute migrations via command-line interface <#import-via-command-line-interface-cli>`_.
 
+Because imports can take ages, we developed an asynchronous tasks system. `You can read the documentation here <http://doc.wallabag.org/fr/master/developer/asynchronous.html>`_ (for experts).
+
 Pocket
 ------
 
diff --git a/docs/en/user/parameters.rst b/docs/en/user/parameters.rst
index 6ccc03b4..2b02a34d 100644
--- a/docs/en/user/parameters.rst
+++ b/docs/en/user/parameters.rst
@@ -5,7 +5,7 @@ Default `parameters.yml` file
 -----------------------------
 
 Here is the last version of the default `app/config/parameters.yml` file. Be sure that yours respects this one.
-If you don't know which parameter you need to set, please leave the default one.
+If you don't know which value you need to set, please leave the default one.
 
 .. code-block:: yml