diff options
| author | Neil Johnson <neil@matrix.org> | 2019-06-06 13:30:29 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2019-06-06 13:30:29 +0100 |
| commit | 8510939011a5867fa249c09b60878863883ce029 (patch) | |
| tree | 87acf5d97a9ec2c05fcc3f82def0779297b89b4e | |
| parent | fix typo (diff) | |
| parent | Update UPGRADE.rst (diff) | |
| download | synapse-8510939011a5867fa249c09b60878863883ce029.tar.xz | |
Merge branch 'neilj/1.0-upgrade-notes' of github.com:matrix-org/synapse into neilj/1.0-upgrade-notes
| -rw-r--r-- | INSTALL.md | 4 | ||||
| -rw-r--r-- | UPGRADE.rst | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/INSTALL.md b/INSTALL.md index eb79ee1827..7200a28330 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. @@ -416,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 diff --git a/UPGRADE.rst b/UPGRADE.rst index 813cdb9b65..134c21df06 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 <https://github.com/matrix-org/synapse/blob/master/docs/sample_config.yaml>`_ |