Merge remote-tracking branch 'origin/master' into 2.2

[github/wallabag/wallabag.git] / docs / en / user / import.rst

diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst
index 269e226c0c4facf70d8de3a2b5072c3edd484539..f420a1318babe0002de039f915ac4341541b08e7 100644 (file)
--- a/docs/en/user/import.rst
+++ b/docs/en/user/import.rst
@@ -1,16 +1,18 @@
 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
 ------
 
@@ -55,8 +57,24 @@ and then select your json file and upload it.
 
 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
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~