aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/en/user
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-11-17 09:53:14 +0100
committerGitHub <noreply@github.com>2016-11-17 09:53:14 +0100
commit9e0a49e6acf60c3dbf3c479cb36d404239dfda89 (patch)
tree78ee9b6c910db597af811337af66fff615c4fa09 /docs/en/user
parentd213219ec785db757dba455acd53480ab0d292fb (diff)
parentc894d76e5790f47a210b673abe00d780a894f55a (diff)
downloadwallabag-9e0a49e6acf60c3dbf3c479cb36d404239dfda89.tar.gz
wallabag-9e0a49e6acf60c3dbf3c479cb36d404239dfda89.tar.zst
wallabag-9e0a49e6acf60c3dbf3c479cb36d404239dfda89.zip
Merge pull request #2578 from wallabag/questionmark-icon
Added help on config screen
Diffstat (limited to 'docs/en/user')
-rw-r--r--docs/en/user/configuration.rst6
-rw-r--r--docs/en/user/import.rst2
2 files changed, 3 insertions, 5 deletions
diff --git a/docs/en/user/configuration.rst b/docs/en/user/configuration.rst
index f74924df..a6edcd4a 100644
--- a/docs/en/user/configuration.rst
+++ b/docs/en/user/configuration.rst
@@ -12,8 +12,7 @@ Settings
12Theme 12Theme
13~~~~~ 13~~~~~
14 14
15wallabag is customizable. You can choose your prefered theme here. You can also 15wallabag is customizable. You can choose your prefered theme here. The default theme is
16create a new one, a chapter will be dedicated for this. The default theme is
17``Material``, it's the theme used in the documentation screenshots. 16``Material``, it's the theme used in the documentation screenshots.
18 17
19Items per page 18Items per page
@@ -30,8 +29,7 @@ a fast or a slow reader. wallabag will recalculate the reading time for each art
30Language 29Language
31~~~~~~~~ 30~~~~~~~~
32 31
33You can change the language of wallabag interface. You need to logout for this change 32You can change the language of wallabag interface.
34to take effect.
35 33
36RSS 34RSS
37--- 35---
diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst
index 70f0187d..38cd30c1 100644
--- a/docs/en/user/import.rst
+++ b/docs/en/user/import.rst
@@ -16,7 +16,7 @@ a new application on their developer website to continue.
16 and submit your new application 16 and submit your new application
17 17
18Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`). 18Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`).
19You need to configure the ``pocket_consumer_key`` into the ``Import`` section in the ``Internal settings`` menu. 19You need to configure the ``pocket_consumer_key`` in the ``Config`` menu.
20 20
21Now, all is fine to migrate from Pocket. 21Now, all is fine to migrate from Pocket.
22 22