summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-11-14 11:02:58 +0000
committerGitHub <noreply@github.com>2019-11-14 11:02:58 +0000
commit6e1b40dc26229e2ec1a97f9c1f27618067c370a7 (patch)
treedf6441348856b5a731b91ca09602a9e127bb8801 /synapse/config
parentMerge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5 (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into anoa/homeserver_... (diff)
downloadsynapse-6e1b40dc26229e2ec1a97f9c1f27618067c370a7.tar.xz
Replace instance variations of homeserver with correct case/spacing (#6357)
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.py4
3 files changed, 5 insertions, 5 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 9015ca5f87..00d01c43af 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py
@@ -721,7 +721,7 @@ class ServerConfig(Config): # 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 @@ -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",