summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-16 15:36:10 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-16 15:36:10 +0000
commit5bbc2577624dcd5eb5dc6772528dcc20a2543e55 (patch)
treef7bce009d8dad9305b252fc5f41ca5d46709c944
parentRemove redundant arguments to CI's flake8 (#6277) (diff)
parentFix typo in domain name in account_threepid_delegates config option (#6273) (diff)
downloadsynapse-5bbc2577624dcd5eb5dc6772528dcc20a2543e55.tar.xz
Fix typo in domain name in account_threepid_delegates config option (#6273)
* commit '46c12918a':
  Fix typo in domain name in account_threepid_delegates config option (#6273)
-rw-r--r--changelog.d/6273.doc1
-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/6273.doc b/changelog.d/6273.doc
new file mode 100644

index 0000000000..21a41d987d --- /dev/null +++ b/changelog.d/6273.doc
@@ -0,0 +1 @@ +Fix a small typo in `account_threepid_delegates` configuration option. \ No newline at end of file diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index 513eb8627d..8eddf37d1d 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml
@@ -1112,7 +1112,7 @@ uploads_path: "DATADIR/uploads" # If a delegate is specified, the config option public_baseurl must also be filled out. # account_threepid_delegates: - #email: https://example.com # Delegate email sending to example.org + #email: https://example.com # Delegate email sending to example.com #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 dce4273ba0..0bafdd5634 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py
@@ -375,7 +375,7 @@ class RegistrationConfig(Config): # If a delegate is specified, the config option public_baseurl must also be filled out. # account_threepid_delegates: - #email: https://example.com # Delegate email sending to example.org + #email: https://example.com # Delegate email sending to example.com #msisdn: http://localhost:8090 # Delegate SMS sending to this local process # Users who register on this homeserver will automatically be joined