From 08ea5fe635e6d2337a48186ab3dd4582a382d7db Mon Sep 17 00:00:00 2001 From: Ruben Barkow Date: Fri, 25 May 2018 23:19:55 +0200 Subject: [PATCH 1/3] add link to thorough instruction how to configure consent --- synapse/config/consent_config.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/synapse/config/consent_config.py b/synapse/config/consent_config.py index ddcd305f4..da39636d6 100644 --- a/synapse/config/consent_config.py +++ b/synapse/config/consent_config.py @@ -18,6 +18,8 @@ from ._base import Config DEFAULT_CONFIG = """\ # User Consent configuration # +# for a detailed instruction, see https://github.com/matrix-org/synapse/blob/master/docs/consent_tracking.md +# # Parts of this section are required if enabling the 'consent' resource under # 'listeners', in particular 'template_dir' and 'version'. # From 2e4be8bfd93c9ebfe2c6262c59e9367121246110 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Wed, 30 May 2018 19:24:12 +0100 Subject: [PATCH 2/3] fix english and wrap comment --- synapse/config/consent_config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/synapse/config/consent_config.py b/synapse/config/consent_config.py index da39636d6..e6eee9167 100644 --- a/synapse/config/consent_config.py +++ b/synapse/config/consent_config.py @@ -18,7 +18,8 @@ from ._base import Config DEFAULT_CONFIG = """\ # User Consent configuration # -# for a detailed instruction, see https://github.com/matrix-org/synapse/blob/master/docs/consent_tracking.md +# for detailed instructions, see +# https://github.com/matrix-org/synapse/blob/master/docs/consent_tracking.md # # Parts of this section are required if enabling the 'consent' resource under # 'listeners', in particular 'template_dir' and 'version'. From 219c2a322b15526bab1dcd5a562fffee26f36d68 Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Wed, 30 May 2018 19:42:19 +0100 Subject: [PATCH 3/3] remove trailing whitespace --- synapse/config/consent_config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/synapse/config/consent_config.py b/synapse/config/consent_config.py index e6eee9167..6d0e847fa 100644 --- a/synapse/config/consent_config.py +++ b/synapse/config/consent_config.py @@ -18,9 +18,9 @@ from ._base import Config DEFAULT_CONFIG = """\ # User Consent configuration # -# for detailed instructions, see +# for detailed instructions, see # https://github.com/matrix-org/synapse/blob/master/docs/consent_tracking.md -# +# # Parts of this section are required if enabling the 'consent' resource under # 'listeners', in particular 'template_dir' and 'version'. #