-Migrate to wallabag
-===================
+Migrate from a third service
+============================
-From wallabag 1.x
------------------
+From Pocket
+-----------
+
+Create a new application on Pocket
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Export your data from your wallabag 1.x
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+To import your data from Pocket, we use the Pocket API. You need to create
+a new application on their developer website to continue.
-On your config page, click on ``JSON export`` in the ``Export your wallabag data`` section.
+* Create a new application `on the developer website <https://getpocket.com/developer/apps/new>`_
+* Fill in the required fields: application name, application description,
+ permissions (only **retrieve**), platform (**web**), accept the terms of service
+ and submit your new application
-.. image:: ../../img/user/export_wllbg_1.png
- :alt: Export from wallabag 1.x
- :align: center
+Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`).
+You need to configure the ``pocket_consumer_key`` into the ``Import`` section in the ``Internal settings`` menu.
-You will have a ``wallabag-export-1-1970-01-01.json`` file.
+Now, all is fine to migrate from Pocket.
Import your data into wallabag 2.x
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Click on ``Import`` link in the menu, 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 1.x articles will be imported.
-
-From Pocket
------------
-
-Create a new applicaton on Pocket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Click on ``Import`` link in the menu, on ``Import contents`` in Pocket section
+and then on ``Connect to Pocket and import data``.
-To import your data from Pocket, we use the Pocket API. You need to create a new application on their developer website to continue.
+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.
-* Create a new application `on the developer website <https://getpocket.com/developer/apps/new>`_
-* Fill in the required fields: application name, application description, permissions (only **retrieve**), platform (**web**), accept the terms of service and submit your new application
+From Readability
+----------------
-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.
+Export your Readability data
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Now, all is fine to migrate from Pocket.
+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 Pocket section and then on ``Connect to Pocket and import data``.
+Click on ``Import`` link in the menu, on ``Import contents`` in Readability section
+and then select your json file and upload it.
-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 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
----------------------