Fix typo in account_threepid_delegates config (#6028)

anoadragon453 · anoadragon453 · commit 8fb18d87a1cf · 2020-02-25T14:35:05.000Z
diff --git 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`.
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
@@ -1095,7 +1095,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
@@ -369,7 +369,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

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Replace `trust_identity_server_for_password_resets` config option with `account_threepid_delegates`.
Original file line number	Diff line number	Diff line change
`@@ -1095,7 +1095,7 @@ uploads_path: "DATADIR/uploads"`
`1095`	`1095`	`# https://matrix.org/docs/spec/identity_service/latest`
`1096`	`1096`	`#`
`1097`	`1097`	`account_threepid_delegates:`
`1098`		`- #email: https://example.com # Delegate email sending to matrix.org`
	`1098`	`+ #email: https://example.com # Delegate email sending to example.org`
`1099`	`1099`	`#msisdn: http://localhost:8090 # Delegate SMS sending to this local process`
`1100`	`1100`
`1101`	`1101`	`# Users who register on this homeserver will automatically be joined`
Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ def generate_config_section(self, generate_secrets=False, **kwargs):`
`369`	`369`	`# https://matrix.org/docs/spec/identity_service/latest`
`370`	`370`	`#`
`371`	`371`	`account_threepid_delegates:`
`372`		`- #email: https://example.com # Delegate email sending to matrix.org`
	`372`	`+ #email: https://example.com # Delegate email sending to example.org`
`373`	`373`	`#msisdn: http://localhost:8090 # Delegate SMS sending to this local process`
`374`	`374`
`375`	`375`	`# Users who register on this homeserver will automatically be joined`