aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/en/user/import.rst
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-01-09 17:33:27 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-01-09 17:33:27 +0100
commit5ad863c63a023d754998a08ec55f43b3ebe2ede9 (patch)
tree66172b7256e757e3e5254e243d41df45a7490c57 /docs/en/user/import.rst
parent1caf557de797a662906779b348759e2937255812 (diff)
parenta42938f42caf91a602617ef4354d17e1bc3f3629 (diff)
downloadwallabag-5ad863c63a023d754998a08ec55f43b3ebe2ede9.tar.gz
wallabag-5ad863c63a023d754998a08ec55f43b3ebe2ede9.tar.zst
wallabag-5ad863c63a023d754998a08ec55f43b3ebe2ede9.zip
Merge pull request #1558 from wallabag/v2-documentation
[v2] documentation cleaning
Diffstat (limited to 'docs/en/user/import.rst')
-rw-r--r--docs/en/user/import.rst25
1 files changed, 25 insertions, 0 deletions
diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst
index d326b06e..8f6cf4c1 100644
--- a/docs/en/user/import.rst
+++ b/docs/en/user/import.rst
@@ -29,11 +29,36 @@ All your wallabag 1.x articles will be imported.
29From Pocket 29From Pocket
30----------- 30-----------
31 31
32Create a new applicaton on Pocket
33~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
34
35To import your data from Pocket, we use the Pocket API. You need to create a new application on their developer website to continue.
36
37* Create a new application `on the developer website <https://getpocket.com/developer/apps/new>`_
38* Fill in the required fields: application name, application description, permissions (only **retrieve**), platform (**web**), accept the terms of service and submit your new application
39
40Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`). You need to configure the ``pocket_consumer_key`` into the ``app/config/parameters.yml`` file in wallabag.
41
42Now, all is fine to migrate from Pocket.
43
44Import your data into wallabag 2.x
45~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
46
47Click on ``Import`` link in the menu, on ``Import contents`` in Pocket section and then on ``Connect to Pocket and import data``.
48
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).
50
32From Instapaper 51From Instapaper
33--------------- 52---------------
34 53
54*Feature not yet implemented in wallabag v2.*
55
35From Readability 56From Readability
36---------------- 57----------------
37 58
59*Feature not yet implemented in wallabag v2.*
60
38From HTML or JSON file 61From HTML or JSON file
39---------------------- 62----------------------
63
64*Feature not yet implemented in wallabag v2.*