From 52e3d3813baf82dc16aae42bdd108cf296c3ead7 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 17 Oct 2018 17:40:01 +0100
Subject: [PATCH] prep changelog

---
 CHANGES.md               | 25 +++++++++++++++++++++++++
 changelog.d/4045.bugfix  |  1 -
 changelog.d/4052.feature | 12 ------------
 3 files changed, 25 insertions(+), 13 deletions(-)
 delete mode 100644 changelog.d/4045.bugfix
 delete mode 100644 changelog.d/4052.feature

diff --git a/CHANGES.md b/CHANGES.md
index 6c80a86461..2598bfc333 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,28 @@
+Synapse 0.33.7rc2 (2018-10-17)
+==============================
+
+**Warning**: 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.
+
+Features
+--------
+
+- Ship the example email templates as part of the package ([\#4052](https://github.com/matrix-org/synapse/issues/4052))
+
+Bugfixes
+--------
+
+- Fix bug which made get_missing_events return too few events ([\#4045](https://github.com/matrix-org/synapse/issues/4045))
+
+
 Synapse 0.33.7rc1 (2018-10-15)
 ==============================
 
diff --git a/changelog.d/4045.bugfix b/changelog.d/4045.bugfix
deleted file mode 100644
index fa50eb5aff..0000000000
--- a/changelog.d/4045.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug which made get_missing_events return too few events
\ No newline at end of file
diff --git a/changelog.d/4052.feature b/changelog.d/4052.feature
deleted file mode 100644
index 0c01f06880..0000000000
--- a/changelog.d/4052.feature
+++ /dev/null
@@ -1,12 +0,0 @@
-Ship the example email templates as part of the package
-
-**Note**: if you deploy your Synapse instance from a git checkout or a github
-snapshot URL, then this means that the example email templates will no longer
-be installed in `res/templates`. 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.
\ No newline at end of file
-- 
GitLab