diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-03-19 10:37:50 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-03-19 10:37:50 +0000 |
commit | d2a537ea605b50a34cbf234d140f9a7edfeb9785 (patch) | |
tree | 04baa6a2c9e995fe422107c179616e492b355da0 /docs/reverse_proxy.rst | |
parent | Comment out most options in the generated config. (#4863) (diff) | |
parent | Repoint docs for federation (#4881) (diff) | |
download | synapse-d2a537ea605b50a34cbf234d140f9a7edfeb9785.tar.xz |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'docs/reverse_proxy.rst')
-rw-r--r-- | docs/reverse_proxy.rst | 2 |
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 |