aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-02-01 14:17:20 +0100
committerJeremy Benoist <j0k3r@users.noreply.github.com>2016-02-01 14:17:20 +0100
commit85ad629a3ca209907effd75f5fd7f384f42361bc (patch)
tree6fde1374b404567153478373f3e65e63af9c1120 /docs
parente43d27f8450dcdf79850e935b762ac390a19dd63 (diff)
parent6785f4aa749e381081b93e3db46424cc7475eab8 (diff)
downloadwallabag-85ad629a3ca209907effd75f5fd7f384f42361bc.tar.gz
wallabag-85ad629a3ca209907effd75f5fd7f384f42361bc.tar.zst
wallabag-85ad629a3ca209907effd75f5fd7f384f42361bc.zip
Merge pull request #1601 from wallabag/v2-import-from-v2
[#1590] Add JSON import from wallabag v2
Diffstat (limited to 'docs')
-rw-r--r--docs/en/user/import.rst19
-rw-r--r--docs/img/user/export_wllbg_2.pngbin0 -> 7703 bytes
2 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 @@
1Migrate to wallabag 1Migrate to wallabag
2=================== 2===================
3 3
4From wallabag 1.x 4From wallabag
5----------------- 5-------------
6 6
7Export your data from your wallabag 1.x 7Export 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
16You will have a ``wallabag-export-1-1970-01-01.json`` file. 16You will have a ``wallabag-export-1-1970-01-01.json`` file.
17 17
18Export your data from your wallabag 2.x
19~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
20
21On 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
27You will have a ``Unread articles.json`` file.
28
18Import your data into wallabag 2.x 29Import 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
27All your wallabag 1.x articles will be imported. 38All your wallabag articles will be imported.
28 39
29From Pocket 40From Pocket
30----------- 41-----------
@@ -46,7 +57,7 @@ Import your data into wallabag 2.x
46 57
47Click on ``Import`` link in the menu, on ``Import contents`` in Pocket section and then on ``Connect to Pocket and import data``. 58Click on ``Import`` link in the menu, on ``Import contents`` in Pocket section and then on ``Connect to Pocket and import data``.
48 59
49You 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). 60You 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
51From Instapaper 62From Instapaper
52--------------- 63---------------
diff --git a/docs/img/user/export_wllbg_2.png b/docs/img/user/export_wllbg_2.png
new file mode 100644
index 00000000..db2d4cf6
--- /dev/null
+++ b/docs/img/user/export_wllbg_2.png
Binary files differ