diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-01-07 22:15:08 +0100 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-01-07 22:15:08 +0100 |
commit | 39643c6b76d92d509b1af0228b6379d7fdce8a1c (patch) | |
tree | 931dceef7dbc8ae9911d01ded709d558417a6cdd /docs/en | |
parent | 488a468e3e11ff0ab6284afe232bf0f7fa68a8eb (diff) | |
parent | b88cf91fc8371194df78e690983c61ea94f266cd (diff) | |
download | wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.tar.gz wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.tar.zst wallabag-39643c6b76d92d509b1af0228b6379d7fdce8a1c.zip |
Merge pull request #1493 from wallabag/v2-pocket-import2.0.0-alpha.1
v2 – 1st draft for Pocket import via API & Wallabag v1 import
Diffstat (limited to 'docs/en')
-rw-r--r-- | docs/en/index.rst | 1 | ||||
-rw-r--r-- | docs/en/user/import.rst | 39 |
2 files changed, 40 insertions, 0 deletions
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: | |||
24 | user/login | 24 | user/login |
25 | user/configuration | 25 | user/configuration |
26 | user/first_article | 26 | user/first_article |
27 | user/import | ||
27 | 28 | ||
28 | user/organize | 29 | user/organize |
29 | user/filters | 30 | 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 @@ | |||
1 | Migrate to wallabag | ||
2 | =================== | ||
3 | |||
4 | From wallabag 1.x | ||
5 | ----------------- | ||
6 | |||
7 | Export your data from your wallabag 1.x | ||
8 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
9 | |||
10 | On your config page, click on ``JSON export`` in the ``Export your wallabag data`` section. | ||
11 | |||
12 | .. image:: ../../img/user/export_wllbg_1.png | ||
13 | :alt: Export from wallabag 1.x | ||
14 | :align: center | ||
15 | |||
16 | You will have a ``wallabag-export-1-1970-01-01.json`` file. | ||
17 | |||
18 | Import your data into wallabag 2.x | ||
19 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
20 | |||
21 | Click on ``Import`` link in the menu, select your export file on your computer and import it. | ||
22 | |||
23 | .. image:: ../../img/user/import_wllbg.png | ||
24 | :alt: Import from wallabag 1.x | ||
25 | :align: center | ||
26 | |||
27 | All your wallabag 1.x articles will be imported. | ||
28 | |||
29 | From Pocket | ||
30 | ----------- | ||
31 | |||
32 | From Instapaper | ||
33 | --------------- | ||
34 | |||
35 | From Readability | ||
36 | ---------------- | ||
37 | |||
38 | From HTML or JSON file | ||
39 | ---------------------- | ||