diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-02-21 09:37:03 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-02-21 09:37:03 +0000 |
| commit | 4f7e4fc2fbad2b8bd12a1ff6b2babb0e8497adf1 (patch) | |
| tree | 1560ad5d399073feaf1e38058eabd4bd8497dbbe /INSTALL.md | |
| parent | Do not send alias events when creating / upgrading a room (#6941) (diff) | |
| parent | 1.11.0 (diff) | |
| download | synapse-4f7e4fc2fbad2b8bd12a1ff6b2babb0e8497adf1.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'INSTALL.md')
| -rw-r--r-- | INSTALL.md | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/INSTALL.md b/INSTALL.md index 9fe767704b..aa5eb882bb 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -420,11 +420,10 @@ so, you will need to edit `homeserver.yaml`, as follows: Note that, as pointed out in that document, this feature will not work with installs set up after November 2020. - If you are using your - own certificate, be sure to use a `.pem` file that includes the full - certificate chain including any intermediate certificates (for - instance, if using certbot, use `fullchain.pem` as your certificate, - not `cert.pem`). + If you are using your own certificate, be sure to use a `.pem` file that + includes the full certificate chain including any intermediate certificates + (for instance, if using certbot, use `fullchain.pem` as your certificate, not + `cert.pem`). For a more detailed guide to configuring your server for federation, see [federate.md](docs/federate.md) |