OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix a typo in docs and in some warnings (#13538)

erikj/push_rule_eval_speedup
Antonin Loubiere 2022-08-17 11:59:05 +02:00 committed by GitHub
parent d75512d19e
commit b71b41c7bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/13538.doc Normal file
View File

@ -0,0 +1 @@
Fix the doc and some warnings that were referring to the nonexistent `custom_templates_directory` setting (instead of `custom_template_directory`).

2
docs/templates.md
View File

@ -9,7 +9,7 @@ in, allowing them to specify custom templates:
```yaml ```yaml
templates: templates:
custom_templates_directory: /path/to/custom/templates/ custom_template_directory: /path/to/custom/templates/
``` ```
If this setting is not set, or the files named below are not found within the directory, If this setting is not set, or the files named below are not found within the directory,

2
synapse/config/account_validity.py
View File

@ -23,7 +23,7 @@ LEGACY_TEMPLATE_DIR_WARNING = """
This server's configuration file is using the deprecated 'template_dir' setting in the This server's configuration file is using the deprecated 'template_dir' setting in the
'account_validity' section. Support for this setting has been deprecated and will be 'account_validity' section. Support for this setting has been deprecated and will be
removed in a future version of Synapse. Server admins should instead use the new removed in a future version of Synapse. Server admins should instead use the new
'custom_templates_directory' setting documented here: 'custom_template_directory' setting documented here:
https://matrix-org.github.io/synapse/latest/templates.html https://matrix-org.github.io/synapse/latest/templates.html
---------------------------------------------------------------------------------------""" ---------------------------------------------------------------------------------------"""

2
synapse/config/emailconfig.py
View File

@ -53,7 +53,7 @@ LEGACY_TEMPLATE_DIR_WARNING = """
This server's configuration file is using the deprecated 'template_dir' setting in the This server's configuration file is using the deprecated 'template_dir' setting in the
'email' section. Support for this setting has been deprecated and will be removed in a 'email' section. Support for this setting has been deprecated and will be removed in a
future version of Synapse. Server admins should instead use the new future version of Synapse. Server admins should instead use the new
'custom_templates_directory' setting documented here: 'custom_template_directory' setting documented here:
https://matrix-org.github.io/synapse/latest/templates.html https://matrix-org.github.io/synapse/latest/templates.html
---------------------------------------------------------------------------------------""" ---------------------------------------------------------------------------------------"""

2
synapse/config/sso.py
View File

@ -26,7 +26,7 @@ LEGACY_TEMPLATE_DIR_WARNING = """
This server's configuration file is using the deprecated 'template_dir' setting in the This server's configuration file is using the deprecated 'template_dir' setting in the
'sso' section. Support for this setting has been deprecated and will be removed in a 'sso' section. Support for this setting has been deprecated and will be removed in a
future version of Synapse. Server admins should instead use the new future version of Synapse. Server admins should instead use the new
'custom_templates_directory' setting documented here: 'custom_template_directory' setting documented here:
https://matrix-org.github.io/synapse/latest/templates.html https://matrix-org.github.io/synapse/latest/templates.html
---------------------------------------------------------------------------------------""" ---------------------------------------------------------------------------------------"""