Merge branch 'master' into develop

This commit is contained in:
Sean Quah 2022-08-31 13:56:50 +01:00
commit 737968b8e0
5 changed files with 47 additions and 9 deletions

View file

@ -431,7 +431,7 @@ Sub-options for each listener include:
* `metrics`: (see the docs [here](../../metrics-howto.md)),
* `replication`: (see the docs [here](../../workers.md)).
* `replication`: (deprecated as of Synapse 1.18, see the docs [here](../../workers.md)).
* `tls`: set to true to enable TLS for this listener. Will use the TLS key/cert specified in tls_private_key_path / tls_certificate_path.