summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-22 18:26:10 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-22 18:26:10 +0100
commit15f31e1ca9c90bed34b2de084c669b81e48e7f22 (patch)
treeb34df1a72437244309c1b50204ca02a974f230ae /docs
parentMerge commit 'fa50e4bf4' into anoa/dinsic_release_1_31_0 (diff)
parentSupport icons for Identity Providers (#9154) (diff)
downloadsynapse-15f31e1ca9c90bed34b2de084c669b81e48e7f22.tar.xz
Merge commit '0cd2938bc' into anoa/dinsic_release_1_31_0
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 4b7b3d38e7..b7a70c449f 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml
@@ -1905,6 +1905,10 @@ saml2_config: # idp_name: A user-facing name for this identity provider, which is used to # offer the user a choice of login mechanisms. # +# idp_icon: An optional icon for this identity provider, which is presented +# by identity picker pages. If given, must be an MXC URI of the format +# mxc://<server-name>/<media-id> +# # discover: set to 'false' to disable the use of the OIDC discovery mechanism # to discover endpoints. Defaults to true. #