diff options
author | Erik Johnston <erik@matrix.org> | 2021-07-09 11:26:17 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-07-09 11:26:17 +0100 |
commit | 251cfc4e09c36c87227771f1a3aa305c4b0a2121 (patch) | |
tree | aadcd7bfc13088274b812f3d48a935eb0b7d5c70 /docker | |
parent | Upsert redactions in case they already exists (#10343) (diff) | |
parent | Fixup changelog (diff) | |
download | synapse-251cfc4e09c36c87227771f1a3aa305c4b0a2121.tar.xz |
Merge tag 'v1.38.0rc2' into develop
Synapse 1.38.0rc2 (2021-07-09) ============================== Bugfixes -------- - Fix bug where inbound federation in a room could be delayed due to not correctly dropping a lock. Introduced in v1.37.1. ([\#10336](https://github.com/matrix-org/synapse/issues/10336)) Improved Documentation ---------------------- - Update links to documentation in the sample config. Contributed by @dklimpel. ([\#10287](https://github.com/matrix-org/synapse/issues/10287)) - Fix broken links in [INSTALL.md](INSTALL.md). Contributed by @dklimpel. ([\#10331](https://github.com/matrix-org/synapse/issues/10331))
Diffstat (limited to 'docker')
-rw-r--r-- | docker/README.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/README.md b/docker/README.md index 3f28cdada3..edf917bb11 100644 --- a/docker/README.md +++ b/docker/README.md @@ -45,7 +45,7 @@ docker run -it --rm \ ``` For information on picking a suitable server name, see -https://github.com/matrix-org/synapse/blob/master/INSTALL.md. +https://matrix-org.github.io/synapse/latest/setup/installation.html. The above command will generate a `homeserver.yaml` in (typically) `/var/lib/docker/volumes/synapse-data/_data`. You should check this file, and @@ -139,7 +139,7 @@ For documentation on using a reverse proxy, see https://github.com/matrix-org/synapse/blob/master/docs/reverse_proxy.md. For more information on enabling TLS support in synapse itself, see -https://github.com/matrix-org/synapse/blob/master/INSTALL.md#tls-certificates. Of +https://matrix-org.github.io/synapse/latest/setup/installation.html#tls-certificates. Of course, you will need to expose the TLS port from the container with a `-p` argument to `docker run`. |