summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-02-18 13:57:15 +0000
committerBrendan Abolivier <babolivier@matrix.org>2020-02-18 13:57:15 +0000
commitba7a5238547cf6c23dda37b2f2424ea5af5d9192 (patch)
tree394982a7e27c7b150543a30d210b5079894f1593
parentFix links in the reverse proxy doc (diff)
downloadsynapse-ba7a5238547cf6c23dda37b2f2424ea5af5d9192.tar.xz
Argh trailing spaces
-rw-r--r--docs/federate.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/federate.md b/docs/federate.md

index 255e907b58..e85a077c34 100644 --- a/docs/federate.md +++ b/docs/federate.md
@@ -10,7 +10,7 @@ The `server_name` configured in the Synapse configuration file (often identified (eg: `@user:example.com`, `#room:example.com`). By default, it is also the domain that other servers will use to try to reach your server (via port 8448). This is easy to set up and will work provided -you set the `server_name` to match your machine's public DNS hostname. +you set the `server_name` to match your machine's public DNS hostname. You will also need a valid TLS certificate for this `server_name` served on port 8448 - the preferred way to do that is by using a reverse proxy, @@ -23,7 +23,7 @@ to use port than 8448 (e.g. you want to use `example.com` as your `server_name` but want Synapse to be reachable on `synapse.example.com:443`). This can be done using delegation, which allows an admin to dictate where federation traffic should be sent, see [delegate.md](<delegate.md>) for instructions on -how to set this up. +how to set this up. Once federation has been configured, you should be able to join a room over federation. A good place to start is `#synapse:matrix.org` - a room for