summary refs log tree commit diff
path: root/docs/usage/configuration/config_documentation.md
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2024-05-13 12:12:54 +0100
committerErik Johnston <erik@matrix.org>2024-05-13 12:12:54 +0100
commit784c048aa407b163d825b0da5e6ea69fed9c995e (patch)
tree4a0ef50f84d9dbf76077588bc48fd1304a39e64a /docs/usage/configuration/config_documentation.md
parentMerge remote-tracking branch 'origin/release-v1.107' into matrix-org-hotfixes (diff)
parentFix bug with creating public rooms on workers (#17177) (diff)
downloadsynapse-784c048aa407b163d825b0da5e6ea69fed9c995e.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'docs/usage/configuration/config_documentation.md')
-rw-r--r--docs/usage/configuration/config_documentation.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/usage/configuration/config_documentation.md b/docs/usage/configuration/config_documentation.md

index 0c582d0387..2046bf4564 100644 --- a/docs/usage/configuration/config_documentation.md +++ b/docs/usage/configuration/config_documentation.md
@@ -2591,6 +2591,11 @@ Possible values for this option are: * "trusted_private_chat": an invitation is required to join this room and the invitee is assigned a power level of 100 upon joining the room. +Each preset will set up a room in the same manner as if it were provided as the `preset` parameter when +calling the +[`POST /_matrix/client/v3/createRoom`](https://spec.matrix.org/latest/client-server-api/#post_matrixclientv3createroom) +Client-Server API endpoint. + If a value of "private_chat" or "trusted_private_chat" is used then `auto_join_mxid_localpart` must also be configured.