summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-10-30 11:07:42 +0000
committerGitHub <noreply@github.com>2019-10-30 11:07:42 +0000
commit46c12918add132d8d0cbb808b499c815e2745f72 (patch)
tree1dfb1f06f42dd19cdc0f6d9546098f6f6e089a79
parentRemove redundant arguments to CI's flake8 (#6277) (diff)
downloadsynapse-46c12918add132d8d0cbb808b499c815e2745f72.tar.xz
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 6c81c0db75..d2f4aff826 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml
@@ -955,7 +955,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 ab41623b2b..1f6dac69da 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py
@@ -300,7 +300,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