diff options
Diffstat (limited to 'docs/en/user')
-rw-r--r-- | docs/en/user/android.rst | 21 | ||||
-rw-r--r-- | docs/en/user/configuration.rst | 4 | ||||
-rw-r--r-- | docs/en/user/import.rst | 8 | ||||
-rw-r--r-- | docs/en/user/parameters.rst | 2 |
4 files changed, 16 insertions, 19 deletions
diff --git a/docs/en/user/android.rst b/docs/en/user/android.rst index d210d6da..e286bb3b 100644 --- a/docs/en/user/android.rst +++ b/docs/en/user/android.rst | |||
@@ -21,7 +21,7 @@ Just confirm that message and you get redirected to the settings screen. | |||
21 | :alt: Settings screen | 21 | :alt: Settings screen |
22 | :align: center | 22 | :align: center |
23 | 23 | ||
24 | 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. | 24 | 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. |
25 | 25 | ||
26 | .. image:: ../../img/user/android_configuration_filled_in.en.png | 26 | .. image:: ../../img/user/android_configuration_filled_in.en.png |
27 | :alt: Filled in settings | 27 | :alt: Filled in settings |
@@ -57,13 +57,13 @@ Now you need to scroll to the bottom of the settings menu. Of course you can adj | |||
57 | :alt: Bottom of the settings screen | 57 | :alt: Bottom of the settings screen |
58 | :align: center | 58 | :align: center |
59 | 59 | ||
60 | After hitting the save button, you get the following screen. The app proposes to initiate a syncronisation process to update your feeds of articles. It is recommended to acknowledge this action and press Yes. | 60 | After hitting the save button, you get the following screen. The app proposes to initiate a synchronization process to update your feeds of articles. It is recommended to acknowledge this action and press Yes. |
61 | 61 | ||
62 | .. image:: ../../img/user/android_configuration_saved_feed_update.en.png | 62 | .. image:: ../../img/user/android_configuration_saved_feed_update.en.png |
63 | :alt: Settings saved the first time | 63 | :alt: Settings saved the first time |
64 | :align: center | 64 | :align: center |
65 | 65 | ||
66 | Finally after the synchronisation finished successfully, you are presented to the list of unread articles. | 66 | Finally after the synchronization finished successfully, you are presented to the list of unread articles. |
67 | 67 | ||
68 | .. image:: ../../img/user/android_unread_feed_synced.en.png | 68 | .. image:: ../../img/user/android_unread_feed_synced.en.png |
69 | :alt: Filled article list cause feeds successfully synchronized | 69 | :alt: Filled article list cause feeds successfully synchronized |
@@ -72,8 +72,8 @@ Finally after the synchronisation finished successfully, you are presented to th | |||
72 | Known limitations | 72 | Known limitations |
73 | ----------------- | 73 | ----------------- |
74 | 74 | ||
75 | 2FA | 75 | Two factor authentication (2FA) |
76 | ~~~ | 76 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
77 | 77 | ||
78 | Currently the Android application does not support two-factor authentication. You should disable that to get the application working. | 78 | Currently the Android application does not support two-factor authentication. You should disable that to get the application working. |
79 | 79 | ||
@@ -90,11 +90,6 @@ If you can reach your wallabag web instance via HTTPS, you should use that. Espe | |||
90 | References | 90 | References |
91 | ---------- | 91 | ---------- |
92 | 92 | ||
93 | `Source code of the Android application <https://github.com/wallabag/android-app>`_ | 93 | - `Source code of the Android application <https://github.com/wallabag/android-app>`_ |
94 | 94 | - `Android Application on F-Droid <https://f-droid.org/repository/browse/?fdfilter=wallabag&fdid=fr.gaulupeau.apps.InThePoche>`_ | |
95 | `Android Application on F-Droid <https://f-droid.org/repository/browse/?fdfilter=wallabag&fdid=fr.gaulupeau.apps.InThePoche>`_ | 95 | - `Android Application on Google Play <https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche>`_ |
96 | |||
97 | `Android Application on Google Play <https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche>`_ | ||
98 | |||
99 | `Support chat <https://gitter.im/wallabag/wallabag>`_ | ||
100 | |||
diff --git a/docs/en/user/configuration.rst b/docs/en/user/configuration.rst index a6edcd4a..2c1385a8 100644 --- a/docs/en/user/configuration.rst +++ b/docs/en/user/configuration.rst | |||
@@ -48,8 +48,8 @@ User information | |||
48 | 48 | ||
49 | You can change your name, your email address and enable ``Two factor authentication``. | 49 | You can change your name, your email address and enable ``Two factor authentication``. |
50 | 50 | ||
51 | Two factor authentication | 51 | Two factor authentication (2FA) |
52 | ~~~~~~~~~~~~~~~~~~~~~~~~~ | 52 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
53 | 53 | ||
54 | Two-factor authentication (also known as 2FA) is a technology patented in 1984 | 54 | Two-factor authentication (also known as 2FA) is a technology patented in 1984 |
55 | that provides identification of users by means of the combination of two different components. | 55 | that provides identification of users by means of the combination of two different components. |
diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst index 269e226c..a6754fa0 100644 --- a/docs/en/user/import.rst +++ b/docs/en/user/import.rst | |||
@@ -5,12 +5,14 @@ In wallabag 2.x, you can import data from: | |||
5 | 5 | ||
6 | - `Pocket <#id1>`_ | 6 | - `Pocket <#id1>`_ |
7 | - `Readability <#id2>`_ | 7 | - `Readability <#id2>`_ |
8 | - `Instapaper <#instapaper>`_ | 8 | - `Instapaper <#id4>`_ |
9 | - `wallabag 1.x <#wallabag-1-x>`_ | 9 | - `wallabag 1.x <#id6>`_ |
10 | - `wallabag 2.x <#wallabag-2-x>`_ | 10 | - `wallabag 2.x <#id7>`_ |
11 | 11 | ||
12 | We also developed `a script to execute migrations via command-line interface <#import-via-command-line-interface-cli>`_. | 12 | We also developed `a script to execute migrations via command-line interface <#import-via-command-line-interface-cli>`_. |
13 | 13 | ||
14 | Because imports can take ages, we developed an asynchronous tasks system. `You can read the documentation here <http://doc.wallabag.org/fr/master/developer/asynchronous.html>`_ (for experts). | ||
15 | |||
14 | 16 | ||
15 | ------ | 17 | ------ |
16 | 18 | ||
diff --git a/docs/en/user/parameters.rst b/docs/en/user/parameters.rst index 6ccc03b4..2b02a34d 100644 --- a/docs/en/user/parameters.rst +++ b/docs/en/user/parameters.rst | |||
@@ -5,7 +5,7 @@ Default `parameters.yml` file | |||
5 | ----------------------------- | 5 | ----------------------------- |
6 | 6 | ||
7 | Here is the last version of the default `app/config/parameters.yml` file. Be sure that yours respects this one. | 7 | Here is the last version of the default `app/config/parameters.yml` file. Be sure that yours respects this one. |
8 | If you don't know which parameter you need to set, please leave the default one. | 8 | If you don't know which value you need to set, please leave the default one. |
9 | 9 | ||
10 | .. code-block:: yml | 10 | .. code-block:: yml |
11 | 11 | ||