From ab6ba0e0d80c552ebc66945d7cb3f6cc1e075188 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 19 Apr 2019 17:10:56 -0600 Subject: [PATCH] Add some clarity to the config options --- README.md | 4 +++- src/vector/index.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a662b3197d..29c9d84ef6 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,9 @@ For a good example, see https://riot.im/develop/config.json. with added support for a `server_name` under the `m.homeserver` section to display a custom homeserver name. Alternatively, the config can contain a `default_server_name` instead which is where Riot will go to get that same object - see the `.well-known` - link above for more information. + link above for more information. Note that the `default_server_name` is used to get + a complete server configuration whereas the `server_name` in the `default_server_config` + is for display purposes only. * *Note*: The URLs can also be individually specified as `default_hs_url` and `default_is_url`, however these are deprecated. They are maintained for backwards compatibility with older configurations. `default_is_url` is respected only diff --git a/src/vector/index.js b/src/vector/index.js index 5fff54602b..2ba91e57fe 100644 --- a/src/vector/index.js +++ b/src/vector/index.js @@ -500,7 +500,7 @@ async function verifyServerConfig() { // Add the newly built config to the actual config for use by the app console.log("Updating SdkConfig with validated discovery information"); - SdkConfig.add({"validated_discovery_config": validatedConfig}); + SdkConfig.add({"validated_server_config": validatedConfig}); return SdkConfig.get(); }