mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-19 01:21:09 +03:00
Code Issues Projects Releases Packages Wiki Activity

style typos

Browse source
This commit is contained in:
Neil Johnson 2019-06-06 16:56:54 +01:00
parent 5fb7028c7a
commit f45030d8d7
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
INSTALL.md
View file

@ -394,13 +394,13 @@ To configure Synapse to expose an HTTPS port, you will need to edit
instance, if using certbot, use `fullchain.pem` as your certificate, not instance, if using certbot, use `fullchain.pem` as your certificate, not
`cert.pem`). `cert.pem`).
For those of you upgrading your TLS certificate in readiness for Synapse 1.0, For those of you upgrading your TLS certificate for Synapse 1.0 compliance,
please take a look at [our guide](docs/MSC1711_certificates_FAQ.md#configuring-certificates-for-compatibility-with-synapse-100). 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. It is desirable for Synapse to have the capability to send email. For example,
For example, this is required to support the 'password reset' feature. this is required to support the 'password reset' feature.
To configure an SMTP server for Synapse, modify the configuration section To configure an SMTP server for Synapse, modify the configuration section
headed ``email``, and be sure to have at least the ``smtp_host``, ``smtp_port`` headed ``email``, and be sure to have at least the ``smtp_host``, ``smtp_port``
@ -410,13 +410,14 @@ and ``notif_from`` fields filled out. You may also need to set ``smtp_user``,
If Synapse is not configured with an SMTP server, password reset via email will If Synapse is not configured with an SMTP server, password reset via email will
be disabled by default. be disabled by default.
Alternatively it is possible delegate the sending of email to the server's identity server. Alternatively it is possible delegate the sending of email to the server's
Doing so is convenient but not recommended, since a malicious or compromised identity server could identity server. Doing so is convenient but not recommended, since a malicious
theoretically hijack a given user's account by redirecting mail. or compromised identity server could theoretically hijack a given user's
account by redirecting mail.
If you are absolutely certain that you wish to use the server's identity If you are absolutely certain that you wish to use the server's identity server
server for password resets, set ``trust_identity_server_for_password_resets`` to ``true`` for password resets, set ``trust_identity_server_for_password_resets`` to
under the ``email:`` configuration section. ``true`` under the ``email:`` configuration section.
## Registering a user ## Registering a user

3
UPGRADE.rst
View file

@ -70,8 +70,7 @@ server in a closed federation. This can be done in one of two ways:-
* Configure a whitelist of server domains to trust via * Configure a whitelist of server domains to trust via
``federation_certificate_verification_whitelist``. ``federation_certificate_verification_whitelist``.
See the `sample configuration file See the `sample configuration file <docs/sample_config.yaml>`_
<https://github.com/matrix-org/synapse/blob/master/docs/sample_config.yaml>`_
for more details on these settings. When a user requests for more details on these settings. When a user requests
a password reset, Synapse will send an email to the user to confirm the a password reset, Synapse will send an email to the user to confirm the
request. request.