diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index be5ae548ec..e1d4ca2eff 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -267,8 +267,8 @@ listeners:
 # Skip federation certificate verification on the following whitelist
 # of domains.
 #
-# Note that this should only be used within the context of private
-# federation as it will otherwise break things.
+# This setting should only normally be used within a private network of
+# homeservers.
 #
 # Only effective if federation_verify_certicates is `true`.
 #
@@ -279,6 +279,9 @@ listeners:
 
 # List of custom certificate authorities for federation traffic.
 #
+# This setting should only normally be used within a private network of
+# homeservers.
+#
 # Note that this list will replace those that are provided by your
 # operating environment. Certificates must be in PEM format.
 #