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

1 files changed, 7 insertions, 0 deletions

diff --git a/docs/en/user/faq.rst b/docs/en/user/faq.rst
index 61303604..0f995ce5 100644
--- a/docs/en/user/faq.rst
+++ b/docs/en/user/faq.rst
@@ -46,3 +46,10 @@ I forgot my password
 You can reset your password by clicking on ``Forgot your password?`` link,
 on the login page. Then, fill the form with your email address or your username,
 you'll receive an email to reset your password.
+
+I've got the ``failed to load external entity`` error when I try to install wallabag
+------------------------------------------------------------------------------------
+
+As described `here <https://github.com/wallabag/wallabag/issues/2529>`_, please edit your ``web/app.php`` file and add this line: ``libxml_disable_entity_loader(false);`` on line 5.
+
+This is a Doctrine / PHP bug, nothing we can do about it.