diff options
Diffstat (limited to 'docs/en')
| -rw-r--r-- | docs/en/user/import.rst | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst index e6c37d72..758e3816 100644 --- a/docs/en/user/import.rst +++ b/docs/en/user/import.rst | |||
| @@ -23,12 +23,11 @@ Now, all is fine to migrate from Pocket. | |||
| 23 | Import your data into wallabag 2.x | 23 | Import your data into wallabag 2.x |
| 24 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 24 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 25 | 25 | ||
| 26 | Click on ``Import`` link in the menu, on ``Import contents`` in Pocket section | 26 | Click on ``Import`` link in the menu, on ``Import contents`` in Pocket section |
| 27 | and then on ``Connect to Pocket and import data``. | 27 | and then on ``Connect to Pocket and import data``. |
| 28 | 28 | ||
| 29 | You need to authorize wallabag to interact with your Pocket account. | 29 | You need to authorize wallabag to interact with your Pocket account. |
| 30 | Your data will be imported. Data import can be a demanding process for your server | 30 | Your data will be imported. Data import can be a demanding process for your server. |
| 31 | (we need to work on this import to improve it). | ||
| 32 | 31 | ||
| 33 | From Readability | 32 | From Readability |
| 34 | ---------------- | 33 | ---------------- |
| @@ -41,15 +40,26 @@ On the tools (`https://www.readability.com/tools/<https://www.readability.com/to | |||
| 41 | Import your data into wallabag 2.x | 40 | Import your data into wallabag 2.x |
| 42 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 41 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 43 | 42 | ||
| 44 | Click on ``Import`` link in the menu, on ``Import contents`` in Readability section | 43 | Click on ``Import`` link in the menu, on ``Import contents`` in Readability section |
| 45 | and then select your json file and upload it. | 44 | and then select your json file and upload it. |
| 46 | 45 | ||
| 47 | 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). | 46 | Your data will be imported. Data import can be a demanding process for your server. |
| 48 | 47 | ||
| 49 | From Instapaper | 48 | From Instapaper |
| 50 | --------------- | 49 | --------------- |
| 51 | 50 | ||
| 52 | *Feature not yet implemented in wallabag v2.* | 51 | Export your Instapaper data |
| 52 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 53 | |||
| 54 | 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``). | ||
| 55 | |||
| 56 | Import your data into wallabag 2.x | ||
| 57 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
| 58 | |||
| 59 | Click on ``Import`` link in the menu, on ``Import contents`` in Instapaper section | ||
| 60 | and then select your CSV file and upload it. | ||
| 61 | |||
| 62 | Your data will be imported. Data import can be a demanding process for your server. | ||
| 53 | 63 | ||
| 54 | From HTML or JSON file | 64 | From HTML or JSON file |
| 55 | ---------------------- | 65 | ---------------------- |