Clarifications in sample config and newsfile

Co-authored-by: Richard van der Hoff <[email protected]>
matrix-org · Jun 10, 2020 · 04c3455 · 04c3455
1 parent c57d563
commit 04c3455
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/changelog.d/7639.feature b/changelog.d/7639.feature
@@ -1 +1 @@
-Add an option to enable encryption by default for private rooms.
+Add an option to enable encryption by default for new rooms.
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
@@ -1981,7 +1981,7 @@ spam_checker:
 # The default value is "off".
 #
 # Note that this option will only affect rooms created after it is set. It
-# will also not affect rooms created by another, federated server.
+# will also not affect rooms created by other servers.
 #
 #encryption_enabled_by_default_for_room_type: invite
 

diff --git a/synapse/config/room.py b/synapse/config/room.py
@@ -74,7 +74,7 @@ def generate_config_section(self, **kwargs):
         # The default value is "off".
         #
         # Note that this option will only affect rooms created after it is set. It
-        # will also not affect rooms created by another, federated server.
+        # will also not affect rooms created by other servers.
         #
         #encryption_enabled_by_default_for_room_type: invite
         """