summary refs log tree commit diff
path: root/docs/reverse_proxy.rst
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-03-19 11:43:46 +0000
committerRichard van der Hoff <richard@matrix.org>2019-03-19 11:43:46 +0000
commit45c4e19c74d8b3e05af221ffc5c81e04bd427fcc (patch)
tree6a6e9743f1c6926690c6e070abec0dbc5efc0fa7 /docs/reverse_proxy.rst
parentEnforce hs_disabled_message correctly (diff)
parentfix test_auto_create_auto_join_where_no_consent (#4886) (diff)
downloadsynapse-45c4e19c74d8b3e05af221ffc5c81e04bd427fcc.tar.xz
Merge remote-tracking branch 'origin/develop' into HEAD
Diffstat (limited to 'docs/reverse_proxy.rst')
-rw-r--r--docs/reverse_proxy.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/reverse_proxy.rst b/docs/reverse_proxy.rst

index 6cd129abf4..8e26c50f1b 100644 --- a/docs/reverse_proxy.rst +++ b/docs/reverse_proxy.rst
@@ -18,7 +18,7 @@ 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 -<../README.rst#setting-up-federation>`_ for more details of the algorithm used for +<federate.md>`_ for more details of the algorithm used for federation connections. Let's assume that we expect clients to connect to our server at