diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-18 16:29:02 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-03-18 16:29:02 +0000 |
| commit | 8299874aa28b659f0995dc337d1410cb8286ffc1 (patch) | |
| tree | cbdd2a799c3ca3f09f28b8db71243ce7349a5015 /synapse/config | |
| parent | Merge pull request #6220 from matrix-org/neilj/set_room_version_default_to_5 (diff) | |
| parent | Replace instance variations of homeserver with correct case/spacing (#6357) (diff) | |
| download | synapse-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 'synapse/config')
| -rw-r--r-- | synapse/config/captcha.py | 4 | ||||
| -rw-r--r-- | synapse/config/emailconfig.py | 2 | ||||
| -rw-r--r-- | synapse/config/server.py | 4 |
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 a297020672..21117f8d32 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -858,7 +858,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 @@ -986,7 +986,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", |