diff options
Diffstat (limited to 'docs/en/user')
-rw-r--r-- | docs/en/user/errors_during_fetching.rst | 2 | ||||
-rw-r--r-- | docs/en/user/import.rst | 21 |
2 files changed, 17 insertions, 6 deletions
diff --git a/docs/en/user/errors_during_fetching.rst b/docs/en/user/errors_during_fetching.rst index da6ee745..68892750 100644 --- a/docs/en/user/errors_during_fetching.rst +++ b/docs/en/user/errors_during_fetching.rst | |||
@@ -12,7 +12,7 @@ There may be several reasons: | |||
12 | How can I help to fix that? | 12 | How can I help to fix that? |
13 | --------------------------- | 13 | --------------------------- |
14 | 14 | ||
15 | - `by sending us an email with the article's URL <mailto:hello\@wallabag.org>`_ | 15 | - `by sending us an email with the article's URL <mailto:hello@wallabag.org>`_ |
16 | - by trying to fix this article by yourself :) by creating a file for the article. | 16 | - by trying to fix this article by yourself :) by creating a file for the article. |
17 | You can use `this tool <http://siteconfig.fivefilters.org/>`__. | 17 | You can use `this tool <http://siteconfig.fivefilters.org/>`__. |
18 | 18 | ||
diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst index 63210484..e6c37d72 100644 --- a/docs/en/user/import.rst +++ b/docs/en/user/import.rst | |||
@@ -30,14 +30,25 @@ You need to authorize wallabag to interact with your Pocket account. | |||
30 | Your data will be imported. Data import can be a demanding process for your server | 30 | Your data will be imported. Data import can be a demanding process for your server |
31 | (we need to work on this import to improve it). | 31 | (we need to work on this import to improve it). |
32 | 32 | ||
33 | From Instapaper | ||
34 | --------------- | ||
35 | |||
36 | *Feature not yet implemented in wallabag v2.* | ||
37 | |||
38 | From Readability | 33 | From Readability |
39 | ---------------- | 34 | ---------------- |
40 | 35 | ||
36 | Export your Readability data | ||
37 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
38 | |||
39 | On the tools (`https://www.readability.com/tools/<https://www.readability.com/tools/>`_) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact). | ||
40 | |||
41 | Import your data into wallabag 2.x | ||
42 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
43 | |||
44 | Click on ``Import`` link in the menu, on ``Import contents`` in Readability section | ||
45 | and then select your json file and upload it. | ||
46 | |||
47 | 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). | ||
48 | |||
49 | From Instapaper | ||
50 | --------------- | ||
51 | |||
41 | *Feature not yet implemented in wallabag v2.* | 52 | *Feature not yet implemented in wallabag v2.* |
42 | 53 | ||
43 | From HTML or JSON file | 54 | From HTML or JSON file |