From 6785f4aa749e381081b93e3db46424cc7475eab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 20 Jan 2016 14:37:01 +0100 Subject: [#1590] Add JSON import from wallabag v2 --- docs/en/user/import.rst | 19 +++++++++++++++---- docs/img/user/export_wllbg_2.png | Bin 0 -> 7703 bytes 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 docs/img/user/export_wllbg_2.png (limited to 'docs') 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 @@ Migrate to wallabag =================== -From wallabag 1.x ------------------ +From wallabag +------------- Export your data from your wallabag 1.x ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -15,6 +15,17 @@ On your config page, click on ``JSON export`` in the ``Export your wallabag data You will have a ``wallabag-export-1-1970-01-01.json`` file. +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 + :align: center + +You will have a ``Unread articles.json`` file. + Import your data into wallabag 2.x ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -24,7 +35,7 @@ Click on ``Import`` link in the menu, select your export file on your computer :alt: Import from wallabag 1.x :align: center -All your wallabag 1.x articles will be imported. +All your wallabag articles will be imported. From Pocket ----------- @@ -46,7 +57,7 @@ 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``. -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 --------------- 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 Binary files /dev/null and b/docs/img/user/export_wllbg_2.png differ -- cgit v1.2.3