From d6e0f33fdb9caa31eff62c015b1ed6181ef692d5 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 12 Sep 2019 12:34:48 +0000
Subject: [PATCH 1/2] document disable_custom_urls

---
 docs/config.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/config.md b/docs/config.md
index 1e06c9d264..ae58f8bc50 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -80,6 +80,7 @@ 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

From b809343cb6e61e3d9d6c4b850da1d0676f240acc Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 12 Sep 2019 17:04:24 +0200
Subject: [PATCH 2/2] line wrap

---
 docs/config.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/config.md b/docs/config.md
index ae58f8bc50..1ff8a7cfb3 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -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
@@ -80,7 +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.
+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