From 10b40f85d664da2b3ebcfd24d6e7145c9cd90d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 23 Oct 2015 10:14:22 +0200 Subject: add docs for Import feature --- docs/en/index.rst | 1 + docs/en/user/import.rst | 39 +++++++++++++++++++++++++++++++++++++++ docs/img/user/export_wllbg_1.png | Bin 0 -> 10954 bytes docs/img/user/import_wllbg.png | Bin 0 -> 11803 bytes 4 files changed, 40 insertions(+) create mode 100644 docs/en/user/import.rst create mode 100644 docs/img/user/export_wllbg_1.png create mode 100644 docs/img/user/import_wllbg.png (limited to 'docs') diff --git a/docs/en/index.rst b/docs/en/index.rst index 6ccfd44c..8cb1b479 100644 --- a/docs/en/index.rst +++ b/docs/en/index.rst @@ -24,6 +24,7 @@ The main documentation for the site is organized into a couple sections: user/login user/configuration user/first_article + user/import user/organize user/filters diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst new file mode 100644 index 00000000..d326b06e --- /dev/null +++ b/docs/en/user/import.rst @@ -0,0 +1,39 @@ +Migrate to wallabag +=================== + +From wallabag 1.x +----------------- + +Export your data from your wallabag 1.x +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +On your config page, click on ``JSON export`` in the ``Export your wallabag data`` section. + +.. image:: ../../img/user/export_wllbg_1.png + :alt: Export from wallabag 1.x + :align: center + +You will have a ``wallabag-export-1-1970-01-01.json`` file. + +Import your data into wallabag 2.x +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Click on ``Import`` link in the menu, select your export file on your computer and import it. + +.. image:: ../../img/user/import_wllbg.png + :alt: Import from wallabag 1.x + :align: center + +All your wallabag 1.x articles will be imported. + +From Pocket +----------- + +From Instapaper +--------------- + +From Readability +---------------- + +From HTML or JSON file +---------------------- diff --git a/docs/img/user/export_wllbg_1.png b/docs/img/user/export_wllbg_1.png new file mode 100644 index 00000000..f9d24517 Binary files /dev/null and b/docs/img/user/export_wllbg_1.png differ diff --git a/docs/img/user/import_wllbg.png b/docs/img/user/import_wllbg.png new file mode 100644 index 00000000..6eec07e4 Binary files /dev/null and b/docs/img/user/import_wllbg.png differ -- cgit v1.2.3