X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=docs%2Fen%2Fuser%2Fimport.rst;h=d6054d39cc5891f7722283cba1593b2ace093ae2;hb=6e3d65ccb085752c8cc9b95c32add546260f5b85;hp=235393ce32222c3c1aed7d8e6189fdd56daaf2f9;hpb=6785f4aa749e381081b93e3db46424cc7475eab8;p=github%2Fwallabag%2Fwallabag.git diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst index 235393ce..d6054d39 100644 --- a/docs/en/user/import.rst +++ b/docs/en/user/import.rst @@ -21,7 +21,7 @@ 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 + :alt: Export from wallabag 2.x :align: center You will have a ``Unread articles.json`` file. @@ -29,7 +29,8 @@ You will have a ``Unread articles.json`` file. Import your data into wallabag 2.x ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Click on ``Import`` link in the menu, select your export file on your computer and import it. +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 @@ -40,24 +41,31 @@ All your wallabag articles will be imported. From Pocket ----------- -Create a new applicaton on Pocket -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Create a new application on Pocket +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -To import your data from Pocket, we use the Pocket API. You need to create a new application on their developer website to continue. +To import your data from Pocket, we use the Pocket API. You need to create +a new application on their developer website to continue. * Create a new application `on the developer website `_ -* Fill in the required fields: application name, application description, permissions (only **retrieve**), platform (**web**), accept the terms of service and submit your new application +* Fill in the required fields: application name, application description, + permissions (only **retrieve**), platform (**web**), accept the terms of service + 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. +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. 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 and then on ``Connect to Pocket and import data``. +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). +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). From Instapaper ---------------