Migrate from ...
================
-In wallabag 2.x, you can import data from:
+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>`_
+- `Pocket <#id1>`_
+- `Readability <#id2>`_
+- `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
------
Your data will be imported. Data import can be a demanding process for your server.
-Instapaper
-----------
+From Pinboard
+-------------
+
+Export your Pinboard data
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+On the backup (`https://pinboard.in/settings/backup <https://pinboard.in/settings/backup>`_) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like ``pinboard_export``).
+
+Import your data into wallabag 2.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Click on ``Import`` link in the menu, on ``Import contents`` in Pinboard 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
+---------------
Export your Instapaper data
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
If you have multiple accounts on the same instance of wallabag, each user must export from v1 and import into v2 its data.
.. note::
- If you encounter issues during the export or the import, don't hesitate to `ask for support <https://www.wallabag.org/pages/support.html>`__.
+ If you encounter issues during the export or the import, don't hesitate to `ask for support <https://gitter.im/wallabag/wallabag>`__.
When you have retrieved the json file containing your entries, you can install wallabag v2 if needed by following `the standard procedure <http://doc.wallabag.org/en/master/user/installation.html>`__.
From your new wallabag instance, create your user account and click on the link in the menu to proceed to import. Choose import from wallabag v2 and select your json file to upload it.
.. note::
- If you encounter issues during the export or the import, don't hesitate to `ask for support <https://www.wallabag.org/pages/support.html>`__.
+ If you encounter issues during the export or the import, don't hesitate to `ask for support <https://gitter.im/wallabag/wallabag>`__.
Import via command-line interface (CLI)
---------------------------------------