aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/en/user/import.rst
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-02-20 10:13:48 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-02-20 10:13:48 +0100
commitc90f8036ef2e6dc3e4b485471dbf75677db90d04 (patch)
tree624db5223c2de49d3f199c7cb78d14b7e8cd4b01 /docs/en/user/import.rst
parent0cde91cc6f42497844866d7631b8f28e024af965 (diff)
parent8b197f27d857f7e1f7f45b2eb9e793650a664fc0 (diff)
downloadwallabag-c90f8036ef2e6dc3e4b485471dbf75677db90d04.tar.gz
wallabag-c90f8036ef2e6dc3e4b485471dbf75677db90d04.tar.zst
wallabag-c90f8036ef2e6dc3e4b485471dbf75677db90d04.zip
Merge pull request #1705 from wallabag/v2-french-doc
French translation for documentation
Diffstat (limited to 'docs/en/user/import.rst')
-rw-r--r--docs/en/user/import.rst24
1 files changed, 16 insertions, 8 deletions
diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst
index 37f375b2..d6054d39 100644
--- a/docs/en/user/import.rst
+++ b/docs/en/user/import.rst
@@ -29,7 +29,8 @@ You will have a ``Unread articles.json`` file.
29Import your data into wallabag 2.x 29Import your data into wallabag 2.x
30~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 30~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
31 31
32Click on ``Import`` link in the menu, select your export file on your computer and import it. 32Click on ``Import`` link in the menu, choose the right wallabag version,
33select your export file on your computer and import it.
33 34
34.. image:: ../../img/user/import_wllbg.png 35.. image:: ../../img/user/import_wllbg.png
35 :alt: Import from wallabag 1.x 36 :alt: Import from wallabag 1.x
@@ -40,24 +41,31 @@ All your wallabag articles will be imported.
40From Pocket 41From Pocket
41----------- 42-----------
42 43
43Create a new applicaton on Pocket 44Create a new application on Pocket
44~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 45~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
45 46
46To import your data from Pocket, we use the Pocket API. You need to create a new application on their developer website to continue. 47To import your data from Pocket, we use the Pocket API. You need to create
48a new application on their developer website to continue.
47 49
48* Create a new application `on the developer website <https://getpocket.com/developer/apps/new>`_ 50* Create a new application `on the developer website <https://getpocket.com/developer/apps/new>`_
49* Fill in the required fields: application name, application description, permissions (only **retrieve**), platform (**web**), accept the terms of service and submit your new application 51* Fill in the required fields: application name, application description,
52 permissions (only **retrieve**), platform (**web**), accept the terms of service
53 and submit your new application
50 54
51Pocket 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. 55Pocket 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.
52 57
53Now, all is fine to migrate from Pocket. 58Now, all is fine to migrate from Pocket.
54 59
55Import your data into wallabag 2.x 60Import your data into wallabag 2.x
56~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 61~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
57 62
58Click on ``Import`` link in the menu, on ``Import contents`` in Pocket section and then on ``Connect to Pocket and import data``. 63Click on ``Import`` link in the menu, on ``Import contents`` in Pocket section
64and then on ``Connect to Pocket and import data``.
59 65
60You 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). 66You need to authorize wallabag to interact with your Pocket account.
67Your data will be imported. Data import can be a demanding process for your server
68(we need to work on this import to improve it).
61 69
62From Instapaper 70From Instapaper
63--------------- 71---------------