summary refs log tree commit diff
path: root/synapse/config/oidc.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-07-09 10:17:22 +0100
committerErik Johnston <erik@matrix.org>2021-07-09 10:17:22 +0100
commit8a2be4f799d595cbef58297bb8ca723bed354d50 (patch)
treefc562129037ac65dab49f53be02d048c1d612dbc /synapse/config/oidc.py
parentMerge branch 'release-v1.38' into matrix-org-hotfixes (diff)
parentEnsure we always drop the federation inbound lock (#10336) (diff)
downloadsynapse-8a2be4f799d595cbef58297bb8ca723bed354d50.tar.xz
Merge remote-tracking branch 'origin/release-v1.38' into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/oidc.py')
-rw-r--r--synapse/config/oidc.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/oidc.py b/synapse/config/oidc.py

index ea0abf5aa2..942e2672a9 100644 --- a/synapse/config/oidc.py +++ b/synapse/config/oidc.py
@@ -166,7 +166,7 @@ class OIDCConfig(Config): # # module: The class name of a custom mapping module. Default is # {mapping_provider!r}. - # See https://github.com/matrix-org/synapse/blob/master/docs/sso_mapping_providers.md#openid-mapping-providers + # See https://matrix-org.github.io/synapse/latest/sso_mapping_providers.html#openid-mapping-providers # for information on implementing a custom mapping provider. # # config: Configuration for the mapping provider module. This section will @@ -217,7 +217,7 @@ class OIDCConfig(Config): # - attribute: groups # value: "admin" # - # See https://github.com/matrix-org/synapse/blob/master/docs/openid.md + # See https://matrix-org.github.io/synapse/latest/openid.html # for information on how to configure these options. # # For backwards compatibility, it is also possible to configure a single OIDC