summary refs log tree commit diff
path: root/docs/federate.md
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-03-19 10:37:50 +0000
committerRichard van der Hoff <richard@matrix.org>2019-03-19 10:37:50 +0000
commitd2a537ea605b50a34cbf234d140f9a7edfeb9785 (patch)
tree04baa6a2c9e995fe422107c179616e492b355da0 /docs/federate.md
parentComment out most options in the generated config. (#4863) (diff)
parentRepoint docs for federation (#4881) (diff)
downloadsynapse-d2a537ea605b50a34cbf234d140f9a7edfeb9785.tar.xz
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'docs/federate.md')
-rw-r--r--docs/federate.md6
1 files changed, 2 insertions, 4 deletions
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