mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-18 17:10:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'neilj/1.0-upgrade-notes' of github.com:matrix-org/synapse into neilj/1.0-upgrade-notes

Browse source
This commit is contained in:
Neil Johnson 2019-06-06 13:30:29 +01:00
commit 8510939011
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
INSTALL.md
View file

@ -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

2
UPGRADE.rst
View file

@ -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>`_