diff options
| author | Sean Quah <seanq@matrix.org> | 2022-08-31 13:56:50 +0100 |
|---|---|---|
| committer | Sean Quah <seanq@matrix.org> | 2022-08-31 13:56:50 +0100 |
| commit | 737968b8e0c21b2995b3f76348ad981405ab88d4 (patch) | |
| tree | 7832ab0f3eb038451dc90b4b35c6ea1e9f1e6757 /docs | |
| parent | Drop support for calling `/_matrix/client/v3/rooms/{roomId}/invite` without a... (diff) | |
| parent | Tweak changelog formatting (diff) | |
| download | synapse-737968b8e0c21b2995b3f76348ad981405ab88d4.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/upgrade.md | 2 | ||||
| -rw-r--r-- | docs/usage/configuration/config_documentation.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/upgrade.md b/docs/upgrade.md index 0ab5bfeaf0..51719f8c73 100644 --- a/docs/upgrade.md +++ b/docs/upgrade.md @@ -1200,7 +1200,7 @@ updated. When setting up worker processes, we now recommend the use of a Redis server for replication. **The old direct TCP connection method is deprecated and will be removed in a future release.** See -[workers](workers.md) for more details. +the [worker documentation](https://matrix-org.github.io/synapse/v1.66/workers.html) for more details. # Upgrading to v1.14.0 diff --git a/docs/usage/configuration/config_documentation.md b/docs/usage/configuration/config_documentation.md index c0cfe5dcea..bc9fc86bc8 100644 --- a/docs/usage/configuration/config_documentation.md +++ b/docs/usage/configuration/config_documentation.md @@ -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. |