aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/en/user/import.rst
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-05-07 11:10:21 +0200
committerJeremy Benoist <j0k3r@users.noreply.github.com>2016-05-07 11:10:21 +0200
commit1556c925a42619c1298edebb73eb86c009b3f3c8 (patch)
tree2e893a9ed9ab1fb28db290d3643d7945e0ad611b /docs/en/user/import.rst
parentf54de6817ea320e6d92bea368123b2fb1395d95f (diff)
parente0f4f25fd6fba6f41532e9bf5cb6fa4c515c7a46 (diff)
downloadwallabag-1556c925a42619c1298edebb73eb86c009b3f3c8.tar.gz
wallabag-1556c925a42619c1298edebb73eb86c009b3f3c8.tar.zst
wallabag-1556c925a42619c1298edebb73eb86c009b3f3c8.zip
Merge pull request #2016 from wallabag/update-documentation
Update documentation
Diffstat (limited to 'docs/en/user/import.rst')
-rw-r--r--docs/en/user/import.rst43
1 files changed, 3 insertions, 40 deletions
diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst
index d6054d39..63210484 100644
--- a/docs/en/user/import.rst
+++ b/docs/en/user/import.rst
@@ -1,42 +1,5 @@
1Migrate to wallabag 1Migrate from a third service
2=================== 2============================
3
4From wallabag
5-------------
6
7Export your data from your wallabag 1.x
8~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9
10On 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
16You will have a ``wallabag-export-1-1970-01-01.json`` file.
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
29Import your data into wallabag 2.x
30~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
31
32Click on ``Import`` link in the menu, choose the right wallabag version,
33select your export file on your computer and import it.
34
35.. image:: ../../img/user/import_wllbg.png
36 :alt: Import from wallabag 1.x
37 :align: center
38
39All your wallabag articles will be imported.
40 3
41From Pocket 4From Pocket
42----------- 5-----------
@@ -53,7 +16,7 @@ a new application on their developer website to continue.
53 and submit your new application 16 and submit your new application
54 17
55Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`). 18Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`).
56You need to configure the ``pocket_consumer_key`` into the ``app/config/parameters.yml`` file in wallabag. 19You need to configure the ``pocket_consumer_key`` into the ``Import`` section in the ``Internal settings`` menu.
57 20
58Now, all is fine to migrate from Pocket. 21Now, all is fine to migrate from Pocket.
59 22