Update and rename 6028.misc to 6028.feature

newsfile
Fix comment
2025-12-09 01:30:18 +00:00 · 2019-09-18 22:30:07 +01:00 · 2019-09-12 16:28:57 +01:00 · 2019-09-12 16:26:45 +01:00
3 changed files with 3 additions and 2 deletions
--- a/changelog.d/6028.feature
+++ b/changelog.d/6028.feature
@@ -0,0 +1 @@
+Replace `trust_identity_server_for_password_resets` config option with `account_threepid_delegates`.
--- 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
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -294,7 +294,7 @@ class RegistrationConfig(Config):
        # 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
Author	SHA1	Message	Date
Richard van der Hoff	83af73a08a	Update and rename 6028.misc to 6028.feature	2019-09-18 22:30:07 +01:00
Jorik Schellekens	35bab62bc7	newsfile	2019-09-12 16:28:57 +01:00
Jorik Schellekens	5bb6666f26	Fix comment	2019-09-12 16:26:45 +01:00
				`@@ -0,0 +1 @@`
				Replace `trust_identity_server_for_password_resets` config option with `account_threepid_delegates`.