kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Merge branch 'neilj/improve-federation-docs' of github.com:matrix-org/synapse into neilj/improve-federation-docs

Browse Source
This commit is contained in:
Neil Johnson
2019-06-10 17:45:52 +01:00
parent ed77bb2fcb 1bfab2f8ad
commit 4cb83fa06d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/MSC1711_certificates_FAQ.md
View File

@@ -2,10 +2,10 @@
## Historical Note
This document was originally written to guide server admins through the upgrade
path towards Synapse 1.0.0. Specifically,
path towards Synapse 1.0. Specifically,
[MSC1711](https://github.com/matrix-org/matrix-doc/blob/master/proposals/1711-x509-for-federation.md)
required that all servers present valid TLS certificates on their federation
API. Admins were encouraged to achieve compliance from version 0.99.0 (release
API. Admins were encouraged to achieve compliance from version 0.99.0 (released
in February 2019) ahead of version 1.0 (released June 2019) enforcing the
certificate checks.

6
docs/federate.md
View File

@@ -14,9 +14,9 @@ up and will work provided you set the ``server_name`` to match your
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.)
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
Synapse admins.
## Delegation