summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-03-27 15:34:41 +0100
committerGitHub <noreply@github.com>2020-03-27 15:34:41 +0100
commit319c41f573eb14a966367b60b2e6e93bf6b028d9 (patch)
treee06b3dd08144f896551dea3a5b764b377f43be69 /docs
parentMerge tag 'v1.12.0' (diff)
parentUpdate the wording of the config comment (diff)
downloadsynapse-319c41f573eb14a966367b60b2e6e93bf6b028d9.tar.xz
Merge pull request #7153 from matrix-org/babolivier/sso_whitelist_login_fallback
Always whitelist the login fallback for SSO
Diffstat (limited to 'docs')
-rw-r--r--docs/sample_config.yaml4
1 files changed, 4 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index 2ff0dd05a2..07e922dc27 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -1392,6 +1392,10 @@ sso:
     # phishing attacks from evil.site. To avoid this, include a slash after the
     # hostname: "https://my.client/".
     #
+    # If public_baseurl is set, then the login fallback page (used by clients
+    # that don't natively support the required login flows) is whitelisted in
+    # addition to any URLs in this list.
+    #
     # By default, this list is empty.
     #
     #client_whitelist: