diff options
| author | Neil Johnson <neil@matrix.org> | 2019-06-06 17:07:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 17:07:25 +0100 |
| commit | 2ec57c5d168971de1d2663e80189f4bcd3940c15 (patch) | |
| tree | a92b4b532e3ae7c8b235ac3d3aa387e67104abe5 /UPGRADE.rst | |
| parent | Update INSTALL.md (diff) | |
| download | synapse-neilj/1.0-upgrade-notes.tar.xz | |
Update UPGRADE.rst github/neilj/1.0-upgrade-notes neilj/1.0-upgrade-notes
Diffstat (limited to 'UPGRADE.rst')
| -rw-r--r-- | UPGRADE.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/UPGRADE.rst b/UPGRADE.rst index d0310abec3..6032a505c9 100644 --- a/UPGRADE.rst +++ b/UPGRADE.rst @@ -66,9 +66,9 @@ that have not correctly configured their certificates. In rare cases, it may be desirable to disable certificate checking: for example, it might be essential to be able to federate with a given legacy server in a closed federation. This can be done in one of two ways:- - * Configure the global switch ``federation_verify_certificates`` to ``false``. - * Configure a whitelist of server domains to trust via - ``federation_certificate_verification_whitelist``. + +* Configure the global switch ``federation_verify_certificates`` to ``false``. +* Configure a whitelist of server domains to trust via ``federation_certificate_verification_whitelist``. See the `sample configuration file <docs/sample_config.yaml>`_ for more details on these settings. |