JavaScriptExample
diff --git a/‎docs/config.md‎
Lines changed: 1 addition & 1 deletion b/‎docs/config.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎docs/jitsi.md‎
Lines changed: 2 additions & 1 deletion b/‎docs/jitsi.md‎
Lines changed: 2 additions & 1 deletion
@@ -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
 
@@ -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": {
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,8 @@ should start a new conference on your Jitsi server.`
`40`	`40`	`domain will appear later in the URL as a configuration parameter.`
`41`	`41`
`42`	`42`	`Hint: If you want everyone on your homeserver to use the same Jitsi server by`
`43`		-default, set the following on your homeserver's `/.well-known/matrix/client` config:
	`43`	`+default, and you are using riot-web 1.6 or newer, set the following on your homeserver's`
	`44`	+`/.well-known/matrix/client` config:
`44`	`45`	```json
`45`	`46`	`{`
`46`	`47`	`"im.vector.riot.jitsi": {`