summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-05-17 11:50:08 +0100
committerErik Johnston <erik@matrix.org>2021-05-17 11:50:08 +0100
commit8dde0bf8b3faa75763d6b0f0fb9413f3b8691067 (patch)
tree4c3628ee90418638eec85b24a018285c0e9acd1a
parent 1.34.0 (diff)
downloadsynapse-8dde0bf8b3faa75763d6b0f0fb9413f3b8691067.tar.xz
Update UPGRADE.rst
-rw-r--r--UPGRADE.rst11
1 files 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 ====================