Merge branch 'release-v1.61' into develop

4 files changed, 40 insertions, 20 deletions

diff --git a/CHANGES.md b/CHANGES.md
index c42a18cbff..84641aee96 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,8 +1,20 @@
-Synapse 1.61.0rc1 (2022-06-07)
-==============================
+Synapse 1.61.0 (2022-06-14)
+===========================
 
 This release removes support for the non-standard feature known both as 'groups' and as 'communities', which have been superseded by *Spaces*.
 
+See [the upgrade notes](https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md#upgrading-to-v1610)
+for more details.
+
+Improved Documentation
+----------------------
+
+- Mention removed community/group worker endpoints in [upgrade.md](https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md#upgrading-to-v1610s). Contributed by @olmari. ([\#13023](https://github.com/matrix-org/synapse/issues/13023))
+
+
+Synapse 1.61.0rc1 (2022-06-07)
+==============================
+
 Features
 --------
 
diff --git a/debian/changelog b/debian/changelog
index 9591334c58..753a03065a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.61.0) stable; urgency=medium
+
+  * New Synapse release 1.61.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 14 Jun 2022 11:44:19 +0100
+
 matrix-synapse-py3 (1.61.0~rc1) stable; urgency=medium
 
   * Remove unused `jitsimeetbridge` experiment from `contrib` directory.
diff --git a/docs/upgrade.md b/docs/upgrade.md
index 2803de8b8b..312f0b87fe 100644
--- a/docs/upgrade.md
+++ b/docs/upgrade.md
@@ -89,23 +89,7 @@ process, for example:
     dpkg -i matrix-synapse-py3_1.3.0+stretch1_amd64.deb
     ```
 
-# Upgrading to v1.61.0
-
-## Removal of depracated community/groups
-
-This release of Synapse will remove deprecated community/groups from codebase.
-
-### Worker endpoints
-
-For those who have deployed workers, following worker endpoints will no longer be existing
-and they are expected to be removed from reverse proxy config:
-
--   `^/_matrix/federation/v1/get_groups_publicised$`
--   `^/_matrix/client/(r0|v3|unstable)/joined_groups$`
--   `^/_matrix/client/(r0|v3|unstable)/publicised_groups$`
--   `^/_matrix/client/(r0|v3|unstable)/publicised_groups/`
--   `^/_matrix/federation/v1/groups/`
--   `^/_matrix/client/(r0|v3|unstable)/groups/`
+# Upgrading to v1.62.0
 
 ## New signatures for spam checker callbacks
 
@@ -146,6 +130,24 @@ async def user_may_join_room(self, user_id: str, room_id: str, is_invited: bool)
     return synapse.module_api.NOT_SPAM
 ```
 
+# Upgrading to v1.61.0
+
+## Removal of deprecated community/groups
+
+This release of Synapse will remove deprecated community/groups from codebase.
+
+### Worker endpoints
+
+For those who have deployed workers, following worker endpoints will no longer
+exist and they can be removed from the reverse proxy configuration:
+
+-   `^/_matrix/federation/v1/get_groups_publicised$`
+-   `^/_matrix/client/(r0|v3|unstable)/joined_groups$`
+-   `^/_matrix/client/(r0|v3|unstable)/publicised_groups$`
+-   `^/_matrix/client/(r0|v3|unstable)/publicised_groups/`
+-   `^/_matrix/federation/v1/groups/`
+-   `^/_matrix/client/(r0|v3|unstable)/groups/`
+
 # Upgrading to v1.60.0
 
 ## Adding a new unique index to `state_group_edges` could fail if your database is corrupted
diff --git a/pyproject.toml b/pyproject.toml
index fde6a4f424..3c64e248ab 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ skip_gitignore = true
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.61.0rc1"
+version = "1.61.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"