summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-11-12 13:08:12 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-11-12 13:08:12 +0000
commitbc29a19731c518dbd70f3adefc66061fb4629cee (patch)
tree0972f4fed7174d727cee976d84e8f85f582f7284 /synapse/config
parentMerge pull request #6340 from matrix-org/babolivier/pagination_query (diff)
downloadsynapse-bc29a19731c518dbd70f3adefc66061fb4629cee.tar.xz
Replace instance variations of homeserver with correct case/spacing
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/captcha.py4
-rw-r--r--synapse/config/emailconfig.py2
-rw-r--r--synapse/config/server.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/synapse/config/captcha.py b/synapse/config/captcha.py

index 44bd5c6799..f0171bb5b2 100644 --- a/synapse/config/captcha.py +++ b/synapse/config/captcha.py
@@ -35,11 +35,11 @@ class CaptchaConfig(Config): ## 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" diff --git a/synapse/config/emailconfig.py b/synapse/config/emailconfig.py
index 39e7a1dddb..43fad0bf8b 100644 --- a/synapse/config/emailconfig.py +++ b/synapse/config/emailconfig.py
@@ -305,7 +305,7 @@ class EmailConfig(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 diff --git a/synapse/config/server.py b/synapse/config/server.py
index d556df308d..a04e600fda 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py
@@ -781,7 +781,7 @@ class ServerConfig(Config): "--daemonize", action="store_true", default=None, - help="Daemonize the home server", + help="Daemonize the homeserver", ) server_group.add_argument( "--print-pidfile",