Merge pull request #2878 from matteocoder/wallabag-docs-ita

[github/wallabag/wallabag.git] / docs / en / user / configuration.rst

diff --git a/docs/en/user/configuration.rst b/docs/en/user/configuration.rst
index 824878dc825dede60c91fccd7903b04ff2dbb613..caca834f26e07487e5e78e158e53bec3a93edd73 100644 (file)
--- a/docs/en/user/configuration.rst
+++ b/docs/en/user/configuration.rst
@@ -12,8 +12,7 @@ Settings
 Theme
 ~~~~~
 
-wallabag is customizable. You can choose your prefered theme here. You can also
-create a new one, a chapter will be dedicated for this. The default theme is
+wallabag is customizable. You can choose your prefered theme here. The default theme is
 ``Material``, it's the theme used in the documentation screenshots.
 
 Items per page
@@ -27,11 +26,19 @@ Reading speed
 wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are
 a fast or a slow reader. wallabag will recalculate the reading time for each article.
 
+Where do you want to be redirected after mark an article as read?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Each time you'll do some actions (after marking an article as read/favorite,
+after deleting an article, after removing a tag from an entry), you can be redirected:
+
+- To the homepage
+- To the current page
+
 Language
 ~~~~~~~~
 
-You can change the language of wallabag interface. You need to logout for this change
-to take effect.
+You can change the language of wallabag interface.
 
 RSS
 ---
@@ -45,6 +52,9 @@ Now you have three links, one for each status: add them into your favourite RSS
 
 You can also define how many articles you want in each RSS feed (default value: 50).
 
+There is also a pagination available for these feeds. You can add ``?page=2`` to jump to the second page.
+The pagination follow `the RFC <https://tools.ietf.org/html/rfc5005#page-4>`_ about that, which means you'll find the ``next``, ``previous`` & ``last`` page link inside the `<channel>` tag of each RSS feed.
+
 User information
 ----------------
 
@@ -52,8 +62,8 @@ You can change your name, your email address and enable ``Two factor authenticat
 
 If the wallabag instance has more than one enabled user, you can delete your account here. **Take care, we delete all your data**.
 
-Two factor authentication
-~~~~~~~~~~~~~~~~~~~~~~~~~
+Two factor authentication (2FA)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Two-factor authentication (also known as 2FA) is a technology patented in 1984
     that provides identification of users by means of the combination of two different components.
@@ -102,7 +112,7 @@ if *« readingTime >= 5 AND domainName = "github.com" »* then tag as *« long r
 Which variables and operators can I use to write rules?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The following variables and operators can be used to create tagging rules:
+The following variables and operators can be used to create tagging rules (be careful, for some values, you need to add quotes, for example ``language = "en"``):
 
 ===========  ==============================================  ========  ==========
 Variable     Meaning                                         Operator  Meaning