From 716c5c828bfbd9532747c26066d8d59579b07dca Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 28 Oct 2019 15:44:33 +0000
Subject: [PATCH] Remove unneeded help about identity servers

The custom server path no longer shows an identity server field (for modern
homeservers), so it's confusing to have the help dialog reference it.

Fixes https://github.com/vector-im/riot-web/issues/11236
---
 src/components/views/auth/VectorCustomServerDialog.js | 7 +------
 src/i18n/strings/en_EN.json                           | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/components/views/auth/VectorCustomServerDialog.js b/src/components/views/auth/VectorCustomServerDialog.js
index 5dc3c271..24830166 100644
--- a/src/components/views/auth/VectorCustomServerDialog.js
+++ b/src/components/views/auth/VectorCustomServerDialog.js
@@ -1,6 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
-Copyright 2017 New Vector Ltd
+Copyright 2017, 2019 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -35,11 +35,6 @@ module.exports = ({onFinished}) => {
                     "allows you to use Riot with an existing Matrix account on a " +
                     "different homeserver.",
                 )}</p>
-                <p>{_t(
-                    "You can also set a custom identity server, but you won't be " +
-                    "able to invite users by email address, or be invited by email " +
-                    "address yourself.",
-                )}</p>
             </div>
             <div className="mx_Dialog_buttons">
                 <button onClick={onFinished} autoFocus={true}>
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 8fc45a29..523e4551 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -13,7 +13,6 @@
     "powered by Matrix": "powered by Matrix",
     "Custom Server Options": "Custom Server Options",
     "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use Riot with an existing Matrix account on a different homeserver.",
-    "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.",
     "Dismiss": "Dismiss",
     "Welcome to Riot.im": "Welcome to Riot.im",
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; collaboration powered by [matrix]",