From 8dde0bf8b3faa75763d6b0f0fb9413f3b8691067 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 17 May 2021 11:50:08 +0100
Subject: [PATCH] Update UPGRADE.rst
---
UPGRADE.rst | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/UPGRADE.rst b/UPGRADE.rst
index 606e357b6e..9f61aad412 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -88,7 +88,7 @@ for example:
Upgrading to v1.34.0
====================
-`room_invite_state_types` configuration setting
+``room_invite_state_types`` configuration setting
-----------------------------------------------
The ``room_invite_state_types`` configuration setting has been deprecated and
@@ -106,13 +106,10 @@ remove it from your configuration file. The default value used to be:
- "m.room.encryption"
- "m.room.name"
-If you have customised this value by adding addition state types, you should
-remove ``room_invite_state_types`` and configure ``additional_event_types`` with
-your customisations.
+If you have customised this value, you should remove ``room_invite_state_types`` and
+configure ``room_prejoin_state`` instead.
+
-If you have customised this value by removing state types, you should rename
-``room_invite_state_types`` to ``additional_event_types``, and set
-``disable_default_event_types`` to ``true``.
Upgrading to v1.33.0
====================
--
GitLab