Fix typo in account_threepid_delegates config (#6028)

JorikSchellekens · richvdh · commit 38fd1f8e3fae · 2019-09-18T22:30:44.000+01:00
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
@@ -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
@@ -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

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
`@@ -938,7 +938,7 @@ uploads_path: "DATADIR/uploads"`
`938`	`938`	`# https://matrix.org/docs/spec/identity_service/latest`
`939`	`939`	`#`
`940`	`940`	`account_threepid_delegates:`
`941`		`- #email: https://example.com # Delegate email sending to matrix.org`
	`941`	`+ #email: https://example.com # Delegate email sending to example.org`
`942`	`942`	`#msisdn: http://localhost:8090 # Delegate SMS sending to this local process`
`943`	`943`
`944`	`944`	`# Users who register on this homeserver will automatically be joined`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ def generate_config_section(self, generate_secrets=False, **kwargs):`
`294`	`294`	`# https://matrix.org/docs/spec/identity_service/latest`
`295`	`295`	`#`
`296`	`296`	`account_threepid_delegates:`
`297`		`- #email: https://example.com # Delegate email sending to matrix.org`
	`297`	`+ #email: https://example.com # Delegate email sending to example.org`
`298`	`298`	`#msisdn: http://localhost:8090 # Delegate SMS sending to this local process`
`299`	`299`
`300`	`300`	`# Users who register on this homeserver will automatically be joined`