From 688aaf4025f650ce306bb01b759feb80bfa6ee8d Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Mon, 7 Mar 2022 09:32:02 +0100 Subject: [PATCH 1/3] Remove trailing whitespace. --- docs/reference/config-options.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/reference/config-options.md b/docs/reference/config-options.md index 649c9c90d12..292c4c41686 100644 --- a/docs/reference/config-options.md +++ b/docs/reference/config-options.md @@ -396,7 +396,7 @@ Additionally if `setSftListAllServers` is set to `enabled` (disabled by default) #### setDefaultLocale (deprecated / ignored) -The brig server config option `setDefaultLocale` has been replaced by `setDefaultUserLocale` and `setDefaultTemplateLocale`. Both settings are optional and `setDefaultTemplateLocale` defaults to `EN` and `setDefaultLocale` defaults to `setDefaultTemplateLocale`. If `setDefaultLocale` was not set or set to `EN` before this change, nothing needs to be done. If `setDefaultLocale` was set to any other language other than `EN` the name of the setting should be changed to `setDefaultTemplateLocale`. +The brig server config option `setDefaultLocale` has been replaced by `setDefaultUserLocale` and `setDefaultTemplateLocale`. Both settings are optional and `setDefaultTemplateLocale` defaults to `EN` and `setDefaultLocale` defaults to `setDefaultTemplateLocale`. If `setDefaultLocale` was not set or set to `EN` before this change, nothing needs to be done. If `setDefaultLocale` was set to any other language other than `EN` the name of the setting should be changed to `setDefaultTemplateLocale`. #### `setDefaultTemplateLocale` @@ -433,7 +433,7 @@ optSettings: any key package whose expiry date is set further than 15 days after upload time will be rejected. -### Federated domain specific configuration settings +### Federated domain specific configuration settings #### Restrict user search The lookup and search of users on a wire instance can be configured. This can be done per federated domain. From 51630f6ff6ff07171a6a366b5d7a5101a0e31c05 Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Mon, 7 Mar 2022 09:32:15 +0100 Subject: [PATCH 2/3] Tweak wording. --- docs/reference/config-options.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/config-options.md b/docs/reference/config-options.md index 292c4c41686..14d1c859ef3 100644 --- a/docs/reference/config-options.md +++ b/docs/reference/config-options.md @@ -410,7 +410,7 @@ optSettings: #### `setDefaultUserLocale` -This option is the default user locale to be used if it is not set in the user profile. This can be the case if the users are provisioned by SCIM e.g. This option determines which language to use for email communication. If not set the default is the value that is configured for `setDefaultTemplateLocale`. +This option determines which language to use for email communication. It is the default if not set in the user profile, or if no user profile exists (eg., if user is being provisioned via SCIM or manual team invitation via the team management app). If not set, `setDefaultTemplateLocale` is used instead. ``` # [brig.yaml] From ebe2be32b2fc05967551da97b83e7b5cdcaee74a Mon Sep 17 00:00:00 2001 From: fisx Date: Mon, 7 Mar 2022 09:48:59 +0100 Subject: [PATCH 3/3] Update docs/reference/config-options.md --- docs/reference/config-options.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/config-options.md b/docs/reference/config-options.md index 14d1c859ef3..3594f5ae3dc 100644 --- a/docs/reference/config-options.md +++ b/docs/reference/config-options.md @@ -410,7 +410,7 @@ optSettings: #### `setDefaultUserLocale` -This option determines which language to use for email communication. It is the default if not set in the user profile, or if no user profile exists (eg., if user is being provisioned via SCIM or manual team invitation via the team management app). If not set, `setDefaultTemplateLocale` is used instead. +This option determines which language to use for email communication. It is the default value if none is given in the user profile, or if no user profile exists (eg., if user is being provisioned via SCIM or manual team invitation via the team management app). If not set, `setDefaultTemplateLocale` is used instead. ``` # [brig.yaml]