From 25dbeca0837dce22212e4410a010a0e7c1d4632c Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 21 Apr 2020 09:27:03 -0600 Subject: [PATCH 1/2] Fix `default_federate` settting description --- docs/config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/config.md b/docs/config.md index 738978ba3f..cb501da02a 100644 --- a/docs/config.md +++ b/docs/config.md @@ -100,7 +100,7 @@ For a good example, see https://riot.im/develop/config.json. 1. `disable_3pid_login`: Disables 3rd party identity options on login and registration form Defaults to false (3rd party identity options are shown). 1. `default_federate`: Default option for room federation when creating a room - Defaults to false (room federation enabled). + Defaults to true (room federation enabled). Note that `index.html` also has an og:image meta tag that is set to an image hosted on riot.im. This is the image used if links to your copy of Riot From 601816862f7d84ac47547891bd53effa73d32957 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 21 Apr 2020 13:27:05 -0600 Subject: [PATCH 2/2] Clarify that the .well-known method for Jitsi isn't available yet We should remove this at release time, but if we forget it should be vaguely worded well enough. People keep assuming it'll just work even though the feature hasn't launched yet. The original theory was that a release was around the corner, but it's since been pushed back several times. --- docs/jitsi.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/jitsi.md b/docs/jitsi.md index 1d2c5536a7..ba4f9edc14 100644 --- a/docs/jitsi.md +++ b/docs/jitsi.md @@ -40,7 +40,8 @@ should start a new conference on your Jitsi server. domain will appear later in the URL as a configuration parameter. **Hint**: If you want everyone on your homeserver to use the same Jitsi server by -default, set the following on your homeserver's `/.well-known/matrix/client` config: +default, and you are using riot-web 1.6 or newer, set the following on your homeserver's +`/.well-known/matrix/client` config: ```json { "im.vector.riot.jitsi": {