Merge remote-tracking branch 'origin/master' into 2.2

# Conflicts: # .editorconfig # docs/de/index.rst # docs/de/user/import.rst # docs/en/index.rst # docs/en/user/configuration.rst # docs/en/user/import.rst # docs/fr/index.rst # docs/fr/user/import.rst # src/Wallabag/CoreBundle/Command/InstallCommand.php # src/Wallabag/CoreBundle/Resources/translations/messages.da.yml # src/Wallabag/CoreBundle/Resources/translations/messages.de.yml # src/Wallabag/CoreBundle/Resources/translations/messages.en.yml # src/Wallabag/CoreBundle/Resources/translations/messages.es.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml # src/Wallabag/CoreBundle/Resources/translations/messages.it.yml # src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml # src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml # src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml # src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig # web/bundles/wallabagcore/themes/baggy/css/style.min.css # web/bundles/wallabagcore/themes/baggy/js/baggy.min.js # web/bundles/wallabagcore/themes/material/css/style.min.css # web/bundles/wallabagcore/themes/material/js/material.min.js
author: Jeremy Benoist <jeremy.benoist@gmail.com> 2016-11-19 15:30:49 +0100
committer: Jeremy Benoist <jeremy.benoist@gmail.com> 2016-11-19 15:30:49 +0100
commit: 68003139e133835805b143b62c4407f19b495dab (patch)
tree: 9a71a15d021330fb6d55cc338f125161ddfc61dd /docs/en/user/configuration.rst
parent: bbd4ae7b56d9db744482a5630abad350f2d819af (diff)
parent: cb1a6590c0e58c56d0612066501b3a586b103ed5 (diff)
download: wallabag-68003139e133835805b143b62c4407f19b495dab.tar.gz
wallabag-68003139e133835805b143b62c4407f19b495dab.tar.zst
wallabag-68003139e133835805b143b62c4407f19b495dab.zip
1 files changed, 4 insertions, 6 deletions
diff --git a/docs/en/user/configuration.rst b/docs/en/user/configuration.rst
index e16af12c..a52d3ddd 100644
--- 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
+wallabag is customizable. You can choose your prefered theme here. The default theme is
-create a new one, a chapter will be dedicated for this. The default theme is
 ``Material``, it's the theme used in the documentation screenshots.
 Items per page
@@ -39,8 +38,7 @@ after deleting an article, after removing a tag from an entry), you can be redir
 Language
 ~~~~~~~~
-You can change the language of wallabag interface. You need to logout for this change
+You can change the language of wallabag interface.
-to take effect.
 RSS
 ---
@@ -61,8 +59,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.
author	Jeremy Benoist <jeremy.benoist@gmail.com>	2016-11-19 15:30:49 +0100
committer	Jeremy Benoist <jeremy.benoist@gmail.com>	2016-11-19 15:30:49 +0100
commit	68003139e133835805b143b62c4407f19b495dab (patch)
tree	9a71a15d021330fb6d55cc338f125161ddfc61dd /docs/en/user/configuration.rst
parent	bbd4ae7b56d9db744482a5630abad350f2d819af (diff)
parent	cb1a6590c0e58c56d0612066501b3a586b103ed5 (diff)
download	wallabag-68003139e133835805b143b62c4407f19b495dab.tar.gz wallabag-68003139e133835805b143b62c4407f19b495dab.tar.zst wallabag-68003139e133835805b143b62c4407f19b495dab.zip

diff --git a/docs/en/user/configuration.rst b/docs/en/user/configuration.rst index e16af12c..a52d3ddd 100644 --- a/docs/en/user/configuration.rst +++ b/docs/en/user/configuration.rst
@@ -12,8 +12,7 @@ Settings
12	Theme	12	Theme
13	~~~~~	13	~~~~~
14		14
15	wallabag is customizable. You can choose your prefered theme here. You can also	15	wallabag is customizable. You can choose your prefered theme here. The default theme is
16	create 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
19	Items per page	18	Items per page
@@ -39,8 +38,7 @@ after deleting an article, after removing a tag from an entry), you can be redir
39	Language	38	Language
40	~~~~~~~~	39	~~~~~~~~
41		40
42	You can change the language of wallabag interface. You need to logout for this change	41	You can change the language of wallabag interface.
43	to take effect.
44		42
45	RSS	43	RSS
46	---	44	---
@@ -61,8 +59,8 @@ You can change your name, your email address and enable ``Two factor authenticat
61		59
62	If the wallabag instance has more than one enabled user, you can delete your account here. Take care, we delete all your data.	60	If the wallabag instance has more than one enabled user, you can delete your account here. Take care, we delete all your data.
63		61
64	Two factor authentication	62	Two factor authentication (2FA)
65	~~~~~~~~~~~~~~~~~~~~~~~~~	63	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
66		64
67	Two-factor authentication (also known as 2FA) is a technology patented in 1984	65	Two-factor authentication (also known as 2FA) is a technology patented in 1984
68	that provides identification of users by means of the combination of two different components.	66	that provides identification of users by means of the combination of two different components.