diff options
Diffstat (limited to 'docs/en/user')
-rw-r--r-- | docs/en/user/import.rst | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst index 8f6cf4c1..235393ce 100644 --- a/docs/en/user/import.rst +++ b/docs/en/user/import.rst | |||
@@ -1,8 +1,8 @@ | |||
1 | Migrate to wallabag | 1 | Migrate to wallabag |
2 | =================== | 2 | =================== |
3 | 3 | ||
4 | From wallabag 1.x | 4 | From wallabag |
5 | ----------------- | 5 | ------------- |
6 | 6 | ||
7 | Export your data from your wallabag 1.x | 7 | Export your data from your wallabag 1.x |
8 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 8 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
@@ -15,6 +15,17 @@ On your config page, click on ``JSON export`` in the ``Export your wallabag data | |||
15 | 15 | ||
16 | You will have a ``wallabag-export-1-1970-01-01.json`` file. | 16 | You will have a ``wallabag-export-1-1970-01-01.json`` file. |
17 | 17 | ||
18 | Export your data from your wallabag 2.x | ||
19 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
20 | |||
21 | On the export sidebar, click on ``JSON``. | ||
22 | |||
23 | .. image:: ../../img/user/export_wllbg_2.png | ||
24 | :alt: Export from wallabag 2.x | ||
25 | :align: center | ||
26 | |||
27 | You will have a ``Unread articles.json`` file. | ||
28 | |||
18 | Import your data into wallabag 2.x | 29 | Import your data into wallabag 2.x |
19 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 30 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
20 | 31 | ||
@@ -24,7 +35,7 @@ Click on ``Import`` link in the menu, select your export file on your computer | |||
24 | :alt: Import from wallabag 1.x | 35 | :alt: Import from wallabag 1.x |
25 | :align: center | 36 | :align: center |
26 | 37 | ||
27 | All your wallabag 1.x articles will be imported. | 38 | All your wallabag articles will be imported. |
28 | 39 | ||
29 | From Pocket | 40 | From Pocket |
30 | ----------- | 41 | ----------- |
@@ -46,7 +57,7 @@ Import your data into wallabag 2.x | |||
46 | 57 | ||
47 | Click on ``Import`` link in the menu, on ``Import contents`` in Pocket section and then on ``Connect to Pocket and import data``. | 58 | Click on ``Import`` link in the menu, on ``Import contents`` in Pocket section and then on ``Connect to Pocket and import data``. |
48 | 59 | ||
49 | 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). | 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). |
50 | 61 | ||
51 | From Instapaper | 62 | From Instapaper |
52 | --------------- | 63 | --------------- |