Clarifications in sample config and newsfile

anoadragon453 · richvdh · anoadragon453 · commit 04c3455d2bff · 2020-06-10T17:17:50.000+01:00
Co-authored-by: Richard van der Hoff &lt;1389908+richvdh@users.noreply.github.com&gt;
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
         """

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Add an option to enable encryption by default for private rooms.`
	`1`	`+Add an option to enable encryption by default for new rooms.`
Original file line number	Diff line number	Diff line change
`@@ -1981,7 +1981,7 @@ spam_checker:`
`1981`	`1981`	`# The default value is "off".`
`1982`	`1982`	`#`
`1983`	`1983`	`# Note that this option will only affect rooms created after it is set. It`
`1984`		`-# will also not affect rooms created by another, federated server.`
	`1984`	`+# will also not affect rooms created by other servers.`
`1985`	`1985`	`#`
`1986`	`1986`	`#encryption_enabled_by_default_for_room_type: invite`
`1987`	`1987`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ def generate_config_section(self, **kwargs):`
`74`	`74`	`# The default value is "off".`
`75`	`75`	`#`
`76`	`76`	`# Note that this option will only affect rooms created after it is set. It`
`77`		`- # will also not affect rooms created by another, federated server.`
	`77`	`+ # will also not affect rooms created by other servers.`
`78`	`78`	`#`
`79`	`79`	`#encryption_enabled_by_default_for_room_type: invite`
`80`	`80`	`"""`