diff options
| author | Erik Johnston <erik@matrix.org> | 2021-05-17 12:14:58 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2021-05-17 12:14:58 +0100 |
| commit | 653fe2f3cd49dbfe6e16597a3ab8d73c1fcb2832 (patch) | |
| tree | 811fbcd684024e08ad6e16f001edea181697c119 /UPGRADE.rst | |
| parent | Split multiplart email sending into a dedicated handler (#9977) (diff) | |
| parent | Changelog (diff) | |
| download | synapse-653fe2f3cd49dbfe6e16597a3ab8d73c1fcb2832.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'UPGRADE.rst')
| -rw-r--r-- | UPGRADE.rst | 11 |
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 ==================== |