summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-02-03 20:34:27 +0000
committerRichard van der Hoff <richard@matrix.org>2021-02-03 20:34:27 +0000
commit3f534d3fdf672d4118230304cdb04f9b68b5f28a (patch)
tree8bd44e694cf065681527161ee164ab929ad965b5 /docs
parentconfig: Add detail to auto_join_rooms comment (#9291) (diff)
parentMerge remote-tracking branch 'origin/release-v1.27.0' into social_login_hotfixes (diff)
downloadsynapse-3f534d3fdf672d4118230304cdb04f9b68b5f28a.tar.xz
Merge branch 'social_login_hotfixes' into develop
Diffstat (limited to 'docs')
-rw-r--r--docs/sample_config.yaml14
1 files changed, 4 insertions, 10 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml

index 601a8338eb..9dbba63bac 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml
@@ -1971,8 +1971,7 @@ sso: # # When rendering, this template is given the following variables: # * redirect_url: the URL that the user will be redirected to after - # login. Needs manual escaping (see - # https://jinja.palletsprojects.com/en/2.11.x/templates/#html-escaping). + # login. # # * server_name: the homeserver's name. # @@ -2050,15 +2049,12 @@ sso: # # When rendering, this template is given the following variables: # - # * redirect_url: the URL the user is about to be redirected to. Needs - # manual escaping (see - # https://jinja.palletsprojects.com/en/2.11.x/templates/#html-escaping). + # * redirect_url: the URL the user is about to be redirected to. # # * display_url: the same as `redirect_url`, but with the query # parameters stripped. The intention is to have a # human-readable URL to show to users, not to use it as - # the final address to redirect to. Needs manual escaping - # (see https://jinja.palletsprojects.com/en/2.11.x/templates/#html-escaping). + # the final address to redirect to. # # * server_name: the homeserver's name. # @@ -2078,9 +2074,7 @@ sso: # process: 'sso_auth_confirm.html'. # # When rendering, this template is given the following variables: - # * redirect_url: the URL the user is about to be redirected to. Needs - # manual escaping (see - # https://jinja.palletsprojects.com/en/2.11.x/templates/#html-escaping). + # * redirect_url: the URL the user is about to be redirected to. # # * description: the operation which the user is being asked to confirm #