X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=docs%2Fen%2Fuser%2Fimport.rst;h=70f0187d484dea35c5290d2140808d9c1ba5e966;hb=bc4564a709ccae949999af77aa456287a72f1591;hp=d6054d39cc5891f7722283cba1593b2ace093ae2;hpb=c90f8036ef2e6dc3e4b485471dbf75677db90d04;p=github%2Fwallabag%2Fwallabag.git

diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst
index d6054d39..70f0187d 100644
--- a/docs/en/user/import.rst
+++ b/docs/en/user/import.rst
@@ -1,42 +1,5 @@
-Migrate to wallabag
-===================
-
-From wallabag
--------------
-
-Export your data from your wallabag 1.x
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-On your config page, click on ``JSON export`` in the ``Export your wallabag data`` section.
-
-.. image:: ../../img/user/export_wllbg_1.png
-   :alt: Export from wallabag 1.x
-   :align: center
-
-You will have a ``wallabag-export-1-1970-01-01.json`` file.
-
-Export your data from your wallabag 2.x
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-On the export sidebar, click on ``JSON``.
-
-.. image:: ../../img/user/export_wllbg_2.png
-   :alt: Export from wallabag 2.x
-   :align: center
-
-You will have a ``Unread articles.json`` file.
-
-Import your data into wallabag 2.x
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Click on  ``Import`` link in the menu, choose the right wallabag version,
-select your export file on your computer and import it.
-
-.. image:: ../../img/user/import_wllbg.png
-   :alt: Import from wallabag 1.x
-   :align: center
-
-All your wallabag articles will be imported.
+Migrate from a third service
+============================
 
 From Pocket
 -----------
@@ -53,29 +16,50 @@ a new application on their developer website to continue.
   and submit your new application
 
 Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`).
-You need to configure the ``pocket_consumer_key`` into the ``app/config/parameters.yml`` file in wallabag.
+You need to configure the ``pocket_consumer_key`` into the ``Import`` section in the ``Internal settings`` menu.
 
 Now, all is fine to migrate from Pocket.
 
 Import your data into wallabag 2.x
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Click on  ``Import`` link in the menu, on ``Import contents`` in Pocket section
+Click on ``Import`` link in the menu, on ``Import contents`` in Pocket section
 and then on ``Connect to Pocket and import data``.
 
 You need to authorize wallabag to interact with your Pocket account.
-Your data will be imported. Data import can be a demanding process for your server
-(we need to work on this import to improve it).
+Your data will be imported. Data import can be a demanding process for your server.
+
+From Readability
+----------------
+
+Export your Readability data
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+On the tools (`https://www.readability.com/tools/ <https://www.readability.com/tools/>`_) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact).
+
+Import your data into wallabag 2.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Click on ``Import`` link in the menu, on ``Import contents`` in Readability section
+and then select your json file and upload it.
+
+Your data will be imported. Data import can be a demanding process for your server.
 
 From Instapaper
 ---------------
 
-*Feature not yet implemented in wallabag v2.*
+Export your Instapaper data
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-From Readability
-----------------
+On the settings (`https://www.instapaper.com/user <https://www.instapaper.com/user>`_) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like ``instapaper-export.csv``).
 
-*Feature not yet implemented in wallabag v2.*
+Import your data into wallabag 2.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Click on ``Import`` link in the menu, on ``Import contents`` in Instapaper section
+and then select your CSV file and upload it.
+
+Your data will be imported. Data import can be a demanding process for your server.
 
 From HTML or JSON file
 ----------------------