summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-18 16:29:02 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-18 16:29:02 +0000
commit8299874aa28b659f0995dc337d1410cb8286ffc1 (patch)
treecbdd2a799c3ca3f09f28b8db71243ce7349a5015 /docs
parentMerge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5 (diff)
parentReplace instance variations of homeserver with correct case/spacing (#6357) (diff)
downloadsynapse-8299874aa28b659f0995dc337d1410cb8286ffc1.tar.xz
Replace instance variations of homeserver with correct case/spacing (#6357)
* commit '6e1b40dc2':
  sample config
  Add changelog
  A couple more instances
  Replace instance variations of homeserver with correct case/spacing
Diffstat (limited to 'docs')
-rw-r--r--docs/sample_config.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index effd05044a..c370d07e54 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -294,7 +294,7 @@ listeners:
 # Used by phonehome stats to group together related servers.
 #server_context: context
 
-# Resource-constrained Homeserver Settings
+# Resource-constrained homeserver Settings
 #
 # If limit_remote_rooms.enabled is True, the room complexity will be
 # checked before a user joins a new remote room. If it is above
@@ -848,11 +848,11 @@ uploads_path: "DATADIR/uploads"
 ## Captcha ##
 # See docs/CAPTCHA_SETUP for full details of configuring this.
 
-# This Home Server's ReCAPTCHA public key.
+# This homeserver's ReCAPTCHA public key.
 #
 #recaptcha_public_key: "YOUR_PUBLIC_KEY"
 
-# This Home Server's ReCAPTCHA private key.
+# This homeserver's ReCAPTCHA private key.
 #
 #recaptcha_private_key: "YOUR_PRIVATE_KEY"
 
@@ -1457,7 +1457,7 @@ password_config:
 #   smtp_user: "exampleusername"
 #   smtp_pass: "examplepassword"
 #   require_transport_security: false
-#   notif_from: "Your Friendly %(app)s Home Server <noreply@example.com>"
+#   notif_from: "Your Friendly %(app)s homeserver <noreply@example.com>"
 #   app_name: Matrix
 #
 #   # Enable email notifications by default