summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2022-10-19 20:17:37 +0100
committerGitHub <noreply@github.com>2022-10-19 20:17:37 +0100
commit695a85d1bc05d38592b811f38f724bc61d683b1c (patch)
tree6d711f26e755163bbe4ee8b055881c96dce28535
parentlet update_synapse_database run on a multi-database configurations (#13422) (diff)
downloadsynapse-695a85d1bc05d38592b811f38f724bc61d683b1c.tar.xz
Document encryption_enabled_by_default_for_room_type under the right name (#14110)
* document encryption_enabled_by_default_for_room_type under the right name

* add changelog

* Update changelog.d/14110.doc
-rw-r--r--changelog.d/14110.doc1
-rw-r--r--docs/usage/configuration/config_documentation.md2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/14110.doc b/changelog.d/14110.doc
new file mode 100644
index 0000000000..0927e31e4f
--- /dev/null
+++ b/changelog.d/14110.doc
@@ -0,0 +1 @@
+Correct the name of the config option [`encryption_enabled_by_default_for_room_type`](https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#encryption_enabled_by_default_for_room_type).
diff --git a/docs/usage/configuration/config_documentation.md b/docs/usage/configuration/config_documentation.md
index 7c91a3ac4e..d81eda52c1 100644
--- a/docs/usage/configuration/config_documentation.md
+++ b/docs/usage/configuration/config_documentation.md
@@ -3385,7 +3385,7 @@ push:
 Config options relating to rooms.
 
 ---
-### `encryption_enabled_by_default`
+### `encryption_enabled_by_default_for_room_type`
 
 Controls whether locally-created rooms should be end-to-end encrypted by
 default.