From 4a9a118a94748ce287741f207f2077c6595ff178 Mon Sep 17 00:00:00 2001
From: *=0=1=4=*
 <21157384+f35f0ef9d0e827dae86552d3899f78fc@users.noreply.github.com>
Date: Thu, 25 Apr 2019 08:47:22 -0500
Subject: Fix handling of SYNAPSE_NO_TLS in docker image (#5005)

---
 docker/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'docker/README.md')

diff --git a/docker/README.md b/docker/README.md
index b48d74e09c..b27a692d5b 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -102,8 +102,9 @@ when ``SYNAPSE_CONFIG_PATH`` is not set.
 * ``SYNAPSE_SERVER_NAME`` (mandatory), the server public hostname.
 * ``SYNAPSE_REPORT_STATS``, (mandatory, ``yes`` or ``no``), enable anonymous
   statistics reporting back to the Matrix project which helps us to get funding.
-* ``SYNAPSE_NO_TLS``, set this variable to disable TLS in Synapse (use this if
-  you run your own TLS-capable reverse proxy).
+* `SYNAPSE_NO_TLS`, (accepts `true`, `false`, `on`, `off`, `1`, `0`, `yes`, `no`]): disable
+  TLS in Synapse (use this if you run your own TLS-capable reverse proxy). Defaults
+  to `false` (ie, TLS is enabled by default).
 * ``SYNAPSE_ENABLE_REGISTRATION``, set this variable to enable registration on
   the Synapse instance.
 * ``SYNAPSE_ALLOW_GUEST``, set this variable to allow guest joining this server.
-- 
cgit 1.4.1


From 2dfbeea66f65f23582e045821ffd0dfda1dbab94 Mon Sep 17 00:00:00 2001
From: Steffen <33749463+YellowGarbageBag@users.noreply.github.com>
Date: Wed, 22 May 2019 13:53:16 +0200
Subject: Update README.md (#5222)

Add missing backslash
---
 docker/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docker/README.md')

diff --git a/docker/README.md b/docker/README.md
index b27a692d5b..df5d0151e2 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -161,7 +161,7 @@ specify values for `SYNAPSE_CONFIG_PATH`, `SYNAPSE_SERVER_NAME` and
 example:
 
 ```
-docker run -it --rm
+docker run -it --rm \
     --mount type=volume,src=synapse-data,dst=/data \
     -e SYNAPSE_CONFIG_PATH=/data/homeserver.yaml \
     -e SYNAPSE_SERVER_NAME=my.matrix.host \
-- 
cgit 1.4.1


From 4f68188d0bbdb1966250375d34125572eb82a117 Mon Sep 17 00:00:00 2001
From: Neil Johnson <neil@matrix.org>
Date: Thu, 13 Jun 2019 16:42:36 +0100
Subject: Change to absolute path for contrib/docker

because this file is reproduced on dockerhub and relative paths don't work
---
 docker/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docker/README.md')

diff --git a/docker/README.md b/docker/README.md
index df5d0151e2..5a596eecb9 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -14,7 +14,7 @@ This image is designed to run either with an automatically generated
 configuration file or with a custom configuration that requires manual editing.
 
 An easy way to make use of this image is via docker-compose. See the
-[contrib/docker](../contrib/docker) section of the synapse project for
+[contrib/docker](https://github.com/matrix-org/synapse/tree/master/contrib/docker) section of the synapse project for
 examples.
 
 ### Without Compose (harder)
-- 
cgit 1.4.1