diff options
author | Sven Fischer <git-dev@linux4tw.de> | 2016-05-05 11:24:04 +0200 |
---|---|---|
committer | Sven Fischer <git-dev@linux4tw.de> | 2016-05-05 11:24:04 +0200 |
commit | c6b1112b11c5fc96cc3612f3d131538f0c62fb66 (patch) | |
tree | acf68694adf30685aca87031734c4fc4941cebe5 /docs | |
parent | 3bd50951be29ce94e7d32e4f88d7e02fc4f4f832 (diff) | |
download | wallabag-c6b1112b11c5fc96cc3612f3d131538f0c62fb66.tar.gz wallabag-c6b1112b11c5fc96cc3612f3d131538f0c62fb66.tar.zst wallabag-c6b1112b11c5fc96cc3612f3d131538f0c62fb66.zip |
android docu: Wallabag > wallabag (no uppercase)
Diffstat (limited to 'docs')
-rw-r--r-- | docs/en/user/android.rst | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/en/user/android.rst b/docs/en/user/android.rst index 89ed362b..c13cf031 100644 --- a/docs/en/user/android.rst +++ b/docs/en/user/android.rst | |||
@@ -5,13 +5,13 @@ Android App | |||
5 | Purpose of this document | 5 | Purpose of this document |
6 | ------------------------ | 6 | ------------------------ |
7 | 7 | ||
8 | This document describes how you can setup your Android application to work with your Wallabag instance. There is no difference in this procedure for Wallabag v1 or v2. | 8 | This document describes how you can setup your Android application to work with your wallabag instance. There is no difference in this procedure for wallabag v1 or v2. |
9 | 9 | ||
10 | 10 | ||
11 | Steps to configure your app | 11 | Steps to configure your app |
12 | --------------------------- | 12 | --------------------------- |
13 | 13 | ||
14 | When you first start the app, you see the welcome screen, where you are adviced to configure the app for your Wallabag instance at first. | 14 | When you first start the app, you see the welcome screen, where you are adviced to configure the app for your wallabag instance at first. |
15 | 15 | ||
16 | .. image:: ../../img/user/android_welcome_screen.de.png | 16 | .. image:: ../../img/user/android_welcome_screen.de.png |
17 | :alt: Welcome screen | 17 | :alt: Welcome screen |
@@ -23,7 +23,7 @@ Just confirm that message and you get redirected to the settings screen. | |||
23 | :alt: Settings screen | 23 | :alt: Settings screen |
24 | :align: center | 24 | :align: center |
25 | 25 | ||
26 | Fill in your Wallabag data. You need to enter your Wallabag address. It is important that this URL does not end with a slash. Also add your Wallabag credentials to the user name and password field. | 26 | Fill in your wallabag data. You need to enter your wallabag address. It is important that this URL does not end with a slash. Also add your wallabag credentials to the user name and password field. |
27 | 27 | ||
28 | .. image:: ../../img/user/android_configuration_filled_in.de.png | 28 | .. image:: ../../img/user/android_configuration_filled_in.de.png |
29 | :alt: Filled in settings | 29 | :alt: Filled in settings |
@@ -32,7 +32,7 @@ Fill in your Wallabag data. You need to enter your Wallabag address. It is impor | |||
32 | After you have filled in your data, push the button Connection test and wait for the test to finish. | 32 | After you have filled in your data, push the button Connection test and wait for the test to finish. |
33 | 33 | ||
34 | .. image:: ../../img/user/android_configuration_connection_test.de.png | 34 | .. image:: ../../img/user/android_configuration_connection_test.de.png |
35 | :alt: Connection test with your Wallabag data | 35 | :alt: Connection test with your wallabag data |
36 | :align: center | 36 | :align: center |
37 | 37 | ||
38 | The connection test shall finish with success. If not, you need to fix this first until you proceed. | 38 | The connection test shall finish with success. If not, you need to fix this first until you proceed. |
@@ -41,7 +41,7 @@ The connection test shall finish with success. If not, you need to fix this firs | |||
41 | :alt: Connection test successful | 41 | :alt: Connection test successful |
42 | :align: center | 42 | :align: center |
43 | 43 | ||
44 | After the connection test was successful, you can push the button to get your feed credentials. The app now tries to login to your Wallabag instance and get the user id and the corresponding token for the feeds. | 44 | After the connection test was successful, you can push the button to get your feed credentials. The app now tries to login to your wallabag instance and get the user id and the corresponding token for the feeds. |
45 | 45 | ||
46 | .. image:: ../../img/user/android_configuration_get_feed_credentials.de.png | 46 | .. image:: ../../img/user/android_configuration_get_feed_credentials.de.png |
47 | :alt: Getting the feed credentials | 47 | :alt: Getting the feed credentials |
@@ -82,16 +82,16 @@ Known limitations | |||
82 | Currently the does not support two-factor authentication. You should disable that to get the app working. | 82 | Currently the does not support two-factor authentication. You should disable that to get the app working. |
83 | 83 | ||
84 | 84 | ||
85 | Limited amount of articles with Wallabag v2 | 85 | Limited amount of articles with wallabag v2 |
86 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 86 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
87 | 87 | ||
88 | In your Wallabag web instance you can configure how many items are part of the RSS feed. This option did not exist in Wallabag v1, where all articles were part of the feed. So if you set the amount of articles being displayed greater than the number of items being content of your RSS feed, you will only see the number of items in your RSS feed. | 88 | In your wallabag web instance you can configure how many items are part of the RSS feed. This option did not exist in wallabag v1, where all articles were part of the feed. So if you set the amount of articles being displayed greater than the number of items being content of your RSS feed, you will only see the number of items in your RSS feed. |
89 | 89 | ||
90 | 90 | ||
91 | SSL/TLS encryption | 91 | SSL/TLS encryption |
92 | ~~~~~~~~~~~~~~~~~~ | 92 | ~~~~~~~~~~~~~~~~~~ |
93 | 93 | ||
94 | If you can reach your Wallabag web instance via HTTPS, you should use that. Especially if your HTTP URL redirects you to the HTTPS one. Currently, the app cannot handle that redirect properly. | 94 | If you can reach your wallabag web instance via HTTPS, you should use that. Especially if your HTTP URL redirects you to the HTTPS one. Currently, the app cannot handle that redirect properly. |
95 | 95 | ||
96 | 96 | ||
97 | References | 97 | References |