summary refs log tree commit diff
path: root/docs/upgrade.md
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-08-18 17:02:47 +0100
committerErik Johnston <erik@matrix.org>2021-08-18 17:02:47 +0100
commit78a70a2e0bdff5bdf02ba093eefab0b16ebefd73 (patch)
tree8de7b7805a9840101b00529a50812d6ffcb99cc4 /docs/upgrade.md
parentFix weakref_slot parameter for room member storage attrs. (#10642) (diff)
parentUpdate docs/upgrade.md with new version (diff)
downloadsynapse-78a70a2e0bdff5bdf02ba093eefab0b16ebefd73.tar.xz
Merge branch 'release-v1.41' into develop
Diffstat (limited to 'docs/upgrade.md')
-rw-r--r--docs/upgrade.md34
1 files changed, 26 insertions, 8 deletions
diff --git a/docs/upgrade.md b/docs/upgrade.md
index adbd16fda5..6d4b8cb48e 100644
--- a/docs/upgrade.md
+++ b/docs/upgrade.md
@@ -95,11 +95,20 @@ The following admin APIs were deprecated in [Synapse 1.25](https://github.com/ma
 -   `POST /_synapse/admin/v1/purge_room`
 -   `POST /_synapse/admin/v1/shutdown_room/<room_id>`
 
-Any scripts still using the above APIs should be converted to use the 
+Any scripts still using the above APIs should be converted to use the
 [Delete Room API](https://matrix-org.github.io/synapse/latest/admin_api/rooms.html#delete-room-api).
 
+## User-interactive authentication fallback templates can now display errors
+
+This may affect you if you make use of custom HTML templates for the
+[reCAPTCHA](../synapse/res/templates/recaptcha.html) or
+[terms](../synapse/res/templates/terms.html) fallback pages.
+
+The template is now provided an `error` variable if the authentication
+process failed. See the default templates linked above for an example.
 
-# Upgrading to v1.xx.0
+
+# Upgrading to v1.41.0
 
 ## Add support for routing outbound HTTP requests via a proxy for federation
 
@@ -125,14 +134,23 @@ environment variable.
 See [using a forward proxy with Synapse documentation](setup/forward_proxy.md) for
 details.
 
-## User-interactive authentication fallback templates can now display errors
+## Deprecation of `template_dir`
 
-This may affect you if you make use of custom HTML templates for the
-[reCAPTCHA](../synapse/res/templates/recaptcha.html) or
-[terms](../synapse/res/templates/terms.html) fallback pages.
+The `template_dir` settings in the `sso`, `account_validity` and `email` sections of the
+configuration file are now deprecated. Server admins should use the new
+`templates.custom_template_directory` setting in the configuration file and use one single
+custom template directory for all aforementioned features. Template file names remain
+unchanged. See [the related documentation](https://matrix-org.github.io/synapse/latest/templates.html)
+for more information and examples.
 
-The template is now provided an `error` variable if the authentication
-process failed. See the default templates linked above for an example.
+We plan to remove support for these settings in October 2021.
+
+## `/_synapse/admin/v1/users/{userId}/media` must be handled by media workers
+
+The [media repository worker documentation](https://matrix-org.github.io/synapse/latest/workers.html#synapseappmedia_repository)
+has been updated to reflect that calls to `/_synapse/admin/v1/users/{userId}/media`
+must now be handled by media repository workers. This is due to the new `DELETE` method
+of this endpoint modifying the media store.
 
 # Upgrading to v1.39.0