From b5d622ad8f31754b7f3bcc598ef2c26f7a39afa9 Mon Sep 17 00:00:00 2001 From: Jerin J Titus <72017981+jerinjtitus@users.noreply.github.com> Date: Sun, 27 Dec 2020 18:33:22 +0530 Subject: [PATCH 1/4] Change value of group_creation_prefix in sample_config (Issue #7537) Signed-off-by: Jerin J Titus <72017981+jerinjtitus@users.noreply.github.com> --- docs/sample_config.yaml | 2 +- synapse/config/groups.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 0b4dd115fb52..dd981609acb2 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -2366,7 +2366,7 @@ spam_checker: # If enabled, non server admins can only create groups with local parts # starting with this prefix # -#group_creation_prefix: "unofficial/" +#group_creation_prefix: "unofficial_" diff --git a/synapse/config/groups.py b/synapse/config/groups.py index d6862d9a643b..7b7860ea713f 100644 --- a/synapse/config/groups.py +++ b/synapse/config/groups.py @@ -32,5 +32,5 @@ def generate_config_section(self, **kwargs): # If enabled, non server admins can only create groups with local parts # starting with this prefix # - #group_creation_prefix: "unofficial/" + #group_creation_prefix: "unofficial_" """ From f1d5de24691da00122d78e3cea5bd144dee6be8f Mon Sep 17 00:00:00 2001 From: Jerin J Titus <72017981+jerinjtitus@users.noreply.github.com> Date: Sun, 27 Dec 2020 18:49:46 +0530 Subject: [PATCH 2/4] Added changelog file Signed-off-by: Jerin J Titus <72017981+jerinjtitus@users.noreply.github.com> --- changelog.d/8992.doc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/8992.doc diff --git a/changelog.d/8992.doc b/changelog.d/8992.doc new file mode 100644 index 000000000000..77aee5bde4d7 --- /dev/null +++ b/changelog.d/8992.doc @@ -0,0 +1 @@ +Changed value of group_creation_prefix in sample_config (unofficial/ -> unofficial_) \ No newline at end of file From a7805d6dcaee23c6401d0114193f87da1087320b Mon Sep 17 00:00:00 2001 From: Jerin J Titus <72017981+jerinjtitus@users.noreply.github.com> Date: Sun, 27 Dec 2020 18:56:02 +0530 Subject: [PATCH 3/4] Added '.' to changelog.d/8992.doc Signed-off-by: Jerin J Titus <72017981+jerinjtitus@users.noreply.github.com> --- changelog.d/8992.doc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/8992.doc b/changelog.d/8992.doc index 77aee5bde4d7..94a36d81fd53 100644 --- a/changelog.d/8992.doc +++ b/changelog.d/8992.doc @@ -1 +1 @@ -Changed value of group_creation_prefix in sample_config (unofficial/ -> unofficial_) \ No newline at end of file +Changed value of group_creation_prefix in sample_config (unofficial/ -> unofficial_). \ No newline at end of file From 081a8c49af4c86c3904cf45782debf927ed1e59f Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 29 Dec 2020 09:07:15 -0500 Subject: [PATCH 4/4] Update changelog. --- changelog.d/8992.doc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/8992.doc b/changelog.d/8992.doc index 94a36d81fd53..6a47bda26b2e 100644 --- a/changelog.d/8992.doc +++ b/changelog.d/8992.doc @@ -1 +1 @@ -Changed value of group_creation_prefix in sample_config (unofficial/ -> unofficial_). \ No newline at end of file +Update the example value of `group_creation_prefix` in the sample configuration.