diff options
Diffstat (limited to 'docs/en/user/import.rst')
| -rw-r--r-- | docs/en/user/import.rst | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst index 37f375b2..d6054d39 100644 --- a/docs/en/user/import.rst +++ b/docs/en/user/import.rst | |||
| @@ -29,7 +29,8 @@ You will have a ``Unread articles.json`` file. | |||
| 29 | Import your data into wallabag 2.x | 29 | Import your data into wallabag 2.x |
| 30 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 30 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 31 | 31 | ||
| 32 | Click on ``Import`` link in the menu, select your export file on your computer and import it. | 32 | Click on ``Import`` link in the menu, choose the right wallabag version, |
| 33 | select your export file on your computer and import it. | ||
| 33 | 34 | ||
| 34 | .. image:: ../../img/user/import_wllbg.png | 35 | .. image:: ../../img/user/import_wllbg.png |
| 35 | :alt: Import from wallabag 1.x | 36 | :alt: Import from wallabag 1.x |
| @@ -40,24 +41,31 @@ All your wallabag articles will be imported. | |||
| 40 | From Pocket | 41 | From Pocket |
| 41 | ----------- | 42 | ----------- |
| 42 | 43 | ||
| 43 | Create a new applicaton on Pocket | 44 | Create a new application on Pocket |
| 44 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 45 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 45 | 46 | ||
| 46 | To import your data from Pocket, we use the Pocket API. You need to create a new application on their developer website to continue. | 47 | To import your data from Pocket, we use the Pocket API. You need to create |
| 48 | a new application on their developer website to continue. | ||
| 47 | 49 | ||
| 48 | * Create a new application `on the developer website <https://getpocket.com/developer/apps/new>`_ | 50 | * Create a new application `on the developer website <https://getpocket.com/developer/apps/new>`_ |
| 49 | * Fill in the required fields: application name, application description, permissions (only **retrieve**), platform (**web**), accept the terms of service and submit your new application | 51 | * Fill in the required fields: application name, application description, |
| 52 | permissions (only **retrieve**), platform (**web**), accept the terms of service | ||
| 53 | and submit your new application | ||
| 50 | 54 | ||
| 51 | 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. | 55 | Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`). |
| 56 | You need to configure the ``pocket_consumer_key`` into the ``app/config/parameters.yml`` file in wallabag. | ||
| 52 | 57 | ||
| 53 | Now, all is fine to migrate from Pocket. | 58 | Now, all is fine to migrate from Pocket. |
| 54 | 59 | ||
| 55 | Import your data into wallabag 2.x | 60 | Import your data into wallabag 2.x |
| 56 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 61 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 57 | 62 | ||
| 58 | Click on ``Import`` link in the menu, on ``Import contents`` in Pocket section and then on ``Connect to Pocket and import data``. | 63 | Click on ``Import`` link in the menu, on ``Import contents`` in Pocket section |
| 64 | and then on ``Connect to Pocket and import data``. | ||
| 59 | 65 | ||
| 60 | 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). | 66 | You need to authorize wallabag to interact with your Pocket account. |
| 67 | Your data will be imported. Data import can be a demanding process for your server | ||
| 68 | (we need to work on this import to improve it). | ||
| 61 | 69 | ||
| 62 | From Instapaper | 70 | From Instapaper |
| 63 | --------------- | 71 | --------------- |