diff options
| author | Richard van der Hoff <richard@matrix.org> | 2021-02-03 20:33:32 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2021-02-03 20:33:32 +0000 |
| commit | 17f2a512f3bfd98eea2a63244dd2f893721d8252 (patch) | |
| tree | c0bfad726743cc4e34be489360fd9cae5cba9039 /docs | |
| parent | Social login UI polish (#9301) (diff) | |
| parent | Clarify documentation about escaping URLs in templates. (#9310) (diff) | |
| download | synapse-17f2a512f3bfd98eea2a63244dd2f893721d8252.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.27.0' into social_login_hotfixes
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/sample_config.yaml | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 6d265d2972..236abd9a3f 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1961,8 +1961,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. # @@ -2040,15 +2039,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. # @@ -2068,9 +2064,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 # |