summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-10-18 17:29:57 +0100
committerRichard van der Hoff <richard@matrix.org>2018-10-18 17:29:57 +0100
commit2baebace6a26dfa65f577a4d0d118a3d6f165154 (patch)
tree3c344639139a6bf643a1d877510b09ab9c7e7dca
parentremove redundant changelog file (diff)
parentAdd warnings about the upgrade to 0.33.7 (diff)
downloadsynapse-2baebace6a26dfa65f577a4d0d118a3d6f165154.tar.xz
Merge branch 'master' into develop
-rw-r--r--UPGRADE.rst17
1 files changed, 17 insertions, 0 deletions
diff --git a/UPGRADE.rst b/UPGRADE.rst
index 6cf3169f75..201d298123 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -48,6 +48,23 @@ returned by the Client-Server API:
     # configured on port 443.
     curl -kv https://<host.name>/_matrix/client/versions 2>&1 | grep "Server:"
 
+Upgrading to v0.33.7
+====================
+
+This release removes the example email notification templates from
+``res/templates`` (they are now internal to the python package). This should
+only affect you if you (a) deploy your Synapse instance from a git checkout or
+a github snapshot URL, and (b) have email notifications enabled.
+
+If you have email notifications enabled, you should ensure that
+``email.template_dir`` is either configured to point at a directory where you
+have installed customised templates, or leave it unset to use the default
+templates.
+
+The configuration parser will try to detect the situation where
+``email.template_dir`` is incorrectly set to ``res/templates`` and do the right
+thing, but will warn about this.
+
 Upgrading to v0.27.3
 ====================