Antonin Loubiere
1年前
committed by
GitHub
GitHub
この署名に対応する既知のキーがデータベースに存在しません
GPGキーID: 4AEE18F83AFDEB23
5個のファイルの変更、5行の追加、4行の削除
-
+1 -0changelog.d/13538.doc
-
+1 -1docs/templates.md
-
+1 -1synapse/config/account_validity.py
-
+1 -1synapse/config/emailconfig.py
-
+1 -1synapse/config/sso.py
+ 1
- 0
changelog.d/13538.doc
ファイルの表示
| @@ -0,0 +1 @@ | |||||
| Fix the doc and some warnings that were referring to the nonexistent `custom_templates_directory` setting (instead of `custom_template_directory`). | |||||
+ 1
- 1
docs/templates.md
ファイルの表示
| @@ -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, | ||||
+ 1
- 1
synapse/config/account_validity.py
ファイルの表示
| @@ -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 | ||||
| ---------------------------------------------------------------------------------------""" | ---------------------------------------------------------------------------------------""" | ||||
+ 1
- 1
synapse/config/emailconfig.py
ファイルの表示
| @@ -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 | ||||
| ---------------------------------------------------------------------------------------""" | ---------------------------------------------------------------------------------------""" | ||||
+ 1
- 1
synapse/config/sso.py
ファイルの表示
| @@ -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 | ||||
| ---------------------------------------------------------------------------------------""" | ---------------------------------------------------------------------------------------""" | ||||