diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-02-19 10:58:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-19 10:58:59 +0000 |
| commit | bbe39f808c7a35e68d865da9e574d03082994b65 (patch) | |
| tree | f72502ebae28c829c5cadbbc414363b680cb0b7d /docs/reverse_proxy.md | |
| parent | Move MSC2432 stuff onto unstable prefix (#6948) (diff) | |
| parent | Incorporate review (diff) | |
| download | synapse-bbe39f808c7a35e68d865da9e574d03082994b65.tar.xz | |
Merge pull request #6940 from matrix-org/babolivier/federate.md
Clean up and update federation docs
Diffstat (limited to 'docs/reverse_proxy.md')
| -rw-r--r-- | docs/reverse_proxy.md | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/reverse_proxy.md b/docs/reverse_proxy.md index dcfc5c64aa..af6d73927a 100644 --- a/docs/reverse_proxy.md +++ b/docs/reverse_proxy.md @@ -18,9 +18,10 @@ When setting up a reverse proxy, remember that Matrix clients and other Matrix servers do not necessarily need to connect to your server via the same server name or port. Indeed, clients will use port 443 by default, whereas servers default to port 8448. Where these are different, we -refer to the 'client port' and the \'federation port\'. See [Setting -up federation](federate.md) for more details of the algorithm used for -federation connections. +refer to the 'client port' and the \'federation port\'. See [the Matrix +specification](https://matrix.org/docs/spec/server_server/latest#resolving-server-names) +for more details of the algorithm used for federation connections, and +[delegate.md](<delegate.md>) for instructions on setting up delegation. Let's assume that we expect clients to connect to our server at `https://matrix.example.com`, and other servers to connect at |