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 | |
| 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
| -rw-r--r-- | changelog.d/4881.misc | 1 | ||||
| -rw-r--r-- | docs/federate.md | 6 | ||||
| -rw-r--r-- | docs/reverse_proxy.rst | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/changelog.d/4881.misc b/changelog.d/4881.misc new file mode 100644 index 0000000000..308c21c839 --- /dev/null +++ b/changelog.d/4881.misc @@ -0,0 +1 @@ +Update link to federation docs. diff --git a/docs/federate.md b/docs/federate.md index 186245a94b..b7fc09661c 100644 --- a/docs/federate.md +++ b/docs/federate.md @@ -15,8 +15,8 @@ machine's public DNS hostname, and provide Synapse with a TLS certificate which is valid for your ``server_name``. Once you have completed the steps necessary to federate, you should be able to -join a room via federation. (A good place to start is ``#synapse:matrix.org`` -- a room for Synapse admins.) +join a room via federation. (A good place to start is ``#synapse:matrix.org`` - a +room for Synapse admins.) ## Delegation @@ -89,7 +89,6 @@ In our example, we would need to add this SRV record in the _matrix._tcp.example.com. 3600 IN SRV 10 5 443 synapse.example.com. - Once done and set up, you can check the DNS record with ``dig -t srv _matrix._tcp.<server_name>``. In our example, we would expect this: @@ -117,7 +116,6 @@ you invite them to. This can be caused by an incorrectly-configured reverse proxy: see [reverse_proxy.rst](<reverse_proxy.rst>) for instructions on how to correctly configure a reverse proxy. - ## Running a Demo Federation of Synapses If you want to get up and running quickly with a trio of homeservers in a 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 |