diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-11-18 12:05:36 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-11-18 12:05:36 +0000 |
| commit | 870c00e278a8156cf67f8c916c39215ef2333b56 (patch) | |
| tree | 6a3fb77c7d8b1c2f9d919e1aa3b91de8a61567ab /docs | |
| parent | newsfile (diff) | |
| parent | Replace UPDATE with UPSERT on device_max_stream_id table (#6363) (diff) | |
| download | synapse-870c00e278a8156cf67f8c916c39215ef2333b56.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/event_auth/4
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/sample_config.yaml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index d2f4aff826..896159394c 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -72,7 +72,7 @@ pid_file: DATADIR/homeserver.pid # For example, for room version 1, default_room_version should be set # to "1". # -#default_room_version: "4" +#default_room_version: "5" # The GC threshold parameters to pass to `gc.set_threshold`, if defined # @@ -287,7 +287,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 @@ -743,11 +743,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" @@ -1270,7 +1270,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 |