aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/en
diff options
context:
space:
mode:
Diffstat (limited to 'docs/en')
-rw-r--r--docs/en/user/first_article.rst14
-rw-r--r--docs/en/user/import.rst24
2 files changed, 25 insertions, 13 deletions
diff --git a/docs/en/user/first_article.rst b/docs/en/user/first_article.rst
index 6f94bbef..1400e1e8 100644
--- a/docs/en/user/first_article.rst
+++ b/docs/en/user/first_article.rst
@@ -10,20 +10,24 @@ The main purpose of wallabag is to save web articles. You have many ways to do i
10By using a bookmarklet 10By using a bookmarklet
11---------------------- 11----------------------
12 12
13On the ``Howto`` page, you have a ``Bookmarklet`` tab. Drag and drop the ``bag it!`` link to your bookmarks bar of your browser. 13On the ``Howto`` page, you have a ``Bookmarklet`` tab. Drag and drop the ``bag it!``
14link to your bookmarks bar of your browser.
14 15
15Now, each time you're reading an article on the web and you want to save it, click on the ``bag it!`` link in your bookmarks bar. The article is saved. 16Now, each time you're reading an article on the web and you want to save it,
17click on the ``bag it!`` link in your bookmarks bar. The article is saved.
16 18
17By using the classic form 19By using the classic form
18------------------------- 20-------------------------
19 21
20In the top bar of your screen, you have 3 icons. With the first one, a plus sign, you can easily save a new article. 22In the top bar of your screen, you have 3 icons. With the first one, a plus sign,
23you can easily save a new article.
21 24
22.. image:: ../../img/user/topbar.png 25.. image:: ../../img/user/topbar.png
23 :alt: Top bar 26 :alt: Top bar
24 :align: center 27 :align: center
25 28
26Click on it to display a new field, paste the article URL inside and press your ``Return`` key. The article is saved. 29Click on it to display a new field, paste the article URL inside and press your
30``Return`` key. The article is saved.
27 31
28By using a browser add-on 32By using a browser add-on
29------------------------- 33-------------------------
@@ -59,4 +63,4 @@ Windows Phone
59iOS 63iOS
60~~~ 64~~~
61 65
62*This application is not yet available for wallabag v2*. \ No newline at end of file 66*This application is not yet available for wallabag v2*.
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---------------