From 5bb6666f2661cba1f5f86607779542e03224a3eb Mon Sep 17 00:00:00 2001 From: Jorik Schellekens Date: Thu, 12 Sep 2019 16:26:45 +0100 Subject: [PATCH 1/3] Fix comment --- docs/sample_config.yaml | 2 +- synapse/config/registration.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index dd4e2d5ebd90..c977bcfb5728 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -938,7 +938,7 @@ uploads_path: "DATADIR/uploads" # https://matrix.org/docs/spec/identity_service/latest # account_threepid_delegates: - #email: https://example.com # Delegate email sending to matrix.org + #email: https://example.com # Delegate email sending to example.org #msisdn: http://localhost:8090 # Delegate SMS sending to this local process # Users who register on this homeserver will automatically be joined diff --git a/synapse/config/registration.py b/synapse/config/registration.py index 9548560edb10..d4654e99b34a 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py @@ -294,7 +294,7 @@ def generate_config_section(self, generate_secrets=False, **kwargs): # https://matrix.org/docs/spec/identity_service/latest # account_threepid_delegates: - #email: https://example.com # Delegate email sending to matrix.org + #email: https://example.com # Delegate email sending to example.org #msisdn: http://localhost:8090 # Delegate SMS sending to this local process # Users who register on this homeserver will automatically be joined From 35bab62bc760f9000dc1709057bb9a8bff76f821 Mon Sep 17 00:00:00 2001 From: Jorik Schellekens Date: Thu, 12 Sep 2019 16:28:57 +0100 Subject: [PATCH 2/3] newsfile --- changelog.d/6028.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/6028.misc diff --git a/changelog.d/6028.misc b/changelog.d/6028.misc new file mode 100644 index 000000000000..85e81003ac91 --- /dev/null +++ b/changelog.d/6028.misc @@ -0,0 +1 @@ +Fix typo in account_treepid_delegates config. From 83af73a08a301e88fbf096096132cecfbfabad7a Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Wed, 18 Sep 2019 22:30:07 +0100 Subject: [PATCH 3/3] Update and rename 6028.misc to 6028.feature --- changelog.d/6028.feature | 1 + changelog.d/6028.misc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 changelog.d/6028.feature delete mode 100644 changelog.d/6028.misc diff --git a/changelog.d/6028.feature b/changelog.d/6028.feature new file mode 100644 index 000000000000..cf603fa0c6a5 --- /dev/null +++ b/changelog.d/6028.feature @@ -0,0 +1 @@ +Replace `trust_identity_server_for_password_resets` config option with `account_threepid_delegates`. diff --git a/changelog.d/6028.misc b/changelog.d/6028.misc deleted file mode 100644 index 85e81003ac91..000000000000 --- a/changelog.d/6028.misc +++ /dev/null @@ -1 +0,0 @@ -Fix typo in account_treepid_delegates config.