Skip to content

Commit

Permalink
Merge pull request #10844 from vector-im/bwindels/document-disable_cu…
Browse files Browse the repository at this point in the history
…stom_urls

document disable_custom_urls
  • Loading branch information
bwindels committed Sep 12, 2019
2 parents eaf3bdb + b809343 commit e120524
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions docs/config.md
Expand Up @@ -20,8 +20,8 @@ For a good example, see https://riot.im/develop/config.json.
if `default_hs_url` is used.
* The identity server is used for verifying third party identifiers like emails
and phone numbers. It is not used to store your password or account information.
If not provided, the identity server defaults to vector.im. Currently the only
two public identity servers are https://matrix.org and https://vector.im, however
If not provided, the identity server defaults to vector.im. Currently the only
two public identity servers are https://matrix.org and https://vector.im, however
in future identity servers will be decentralised. In the future it will be possible
to disable the identity server functionality.
* Riot will fail to load if a mix of `default_server_config`, `default_server_name`, or
Expand Down Expand Up @@ -80,6 +80,8 @@ For a good example, see https://riot.im/develop/config.json.
1. `defaultCountryCode`: The ISO 3166 alpha2 country code to use when showing
country selectors, like the phone number input on the registration page.
Defaults to `GB` if the given code is unknown or not provided.
1. `disable_custom_urls`: disallow the user to change the
default homeserver when signing up or logging in.

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
Expand Down

0 comments on commit e120524

Please sign in to comment.