summary refs log tree commit diff
diff options
context:
space:
mode:
authorJorik Schellekens <joriksch@gmail.com>2019-09-18 22:30:44 +0100
committerRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-09-18 22:30:44 +0100
commit38fd1f8e3faeffbd4bb3084012bb2c17a953625f (patch)
tree5b02c86272d1063f884f0a7d28c8e8249dfc05b4
parentGive appropriate exit codes when synctl fails (#5992) (diff)
downloadsynapse-38fd1f8e3faeffbd4bb3084012bb2c17a953625f.tar.xz
Fix typo in account_threepid_delegates config (#6028)
-rw-r--r--changelog.d/6028.feature1
-rw-r--r--docs/sample_config.yaml2
-rw-r--r--synapse/config/registration.py2
3 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/6028.feature b/changelog.d/6028.feature
new file mode 100644
index 0000000000..cf603fa0c6
--- /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/docs/sample_config.yaml b/docs/sample_config.yaml
index 1ee0ba8c30..3e4edc6b0b 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 9548560edb..d4654e99b3 100644
--- 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