From 2502f5f48bcbd760be9a183b4e727dfa984fc2f1 Mon Sep 17 00:00:00 2001 From: Neil Johnson Date: Thu, 6 Jun 2019 13:26:16 +0100 Subject: [PATCH 1/3] Update INSTALL.md Co-Authored-By: Brendan Abolivier --- INSTALL.md | 1 - 1 file changed, 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index eb79ee1827..c878084399 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -398,7 +398,6 @@ For those of you upgrading your TLS certificate in readiness for Synapse 1.0, please take a look at [our guide](docs/MSC1711_certificates_FAQ.md#configuring-certificates-for-compatibility-with-synapse-100). ## Email -Email It is desirable for Synapse to have the capability to send email, particularly in the case of password reset. From 097d2652f7b3297f4406f0a7a8d5a33972adecb4 Mon Sep 17 00:00:00 2001 From: Neil Johnson Date: Thu, 6 Jun 2019 13:27:13 +0100 Subject: [PATCH 2/3] Update INSTALL.md Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> --- INSTALL.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/INSTALL.md b/INSTALL.md index c878084399..7200a28330 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -415,7 +415,8 @@ compromised, it would be theoretically possible to hijack an account through this means. If you are absolutely certain that you wish to continue using an identity -server for email, set ``enable_password_reset_from_is`` to ``true``. +server for email, set ``disable_local_password_reset`` to ``true`` +under the ``email:`` configuration section. ## Registering a user From 3a7f6b65a2ab02245b969367c4f1afa368636fbc Mon Sep 17 00:00:00 2001 From: Neil Johnson Date: Thu, 6 Jun 2019 13:27:25 +0100 Subject: [PATCH 3/3] Update UPGRADE.rst Co-Authored-By: Brendan Abolivier --- UPGRADE.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPGRADE.rst b/UPGRADE.rst index 8b7b745836..8b5351f466 100644 --- a/UPGRADE.rst +++ b/UPGRADE.rst @@ -88,7 +88,7 @@ and ``notif_from`` fields filled out. You may also need to set ``smtp_user``, ``smtp_pass``, and ``require_transport_security``.. If you are absolutely certain that you wish to continue using an identity -server for email, set ``enable_password_reset_from_is`` to ``true``. +server for password resets, set ``enable_password_reset_from_is`` to ``true``. See the `sample configuration file `_