From 79e41e31def49ccc85257edd1eb91a6067ba291a Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alisonmllr20@gmail.com>
Date: Tue, 17 Mar 2020 10:43:34 -0400
Subject: [PATCH] address copy feedback

---
 .../remote_cluster_form.js                    | 37 ++----------
 .../remote_cluster_page_title.js              | 24 ++++++--
 .../remote_cluster_add/remote_cluster_add.js  |  6 ++
 .../remote_cluster_edit.js                    |  2 +-
 .../detail_panel/detail_panel.js              | 60 +++++++++++--------
 .../remote_cluster_table.js                   |  2 +-
 6 files changed, 67 insertions(+), 64 deletions(-)

diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
index 358ffc03da783b..fff68b79f7aed2 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.js
@@ -34,11 +34,7 @@ import {
   htmlIdGenerator,
 } from '@elastic/eui';
 
-import {
-  skippingDisconnectedClustersUrl,
-  transportPortUrl,
-  proxyModeUrl,
-} from '../../../services/documentation';
+import { skippingDisconnectedClustersUrl, transportPortUrl } from '../../../services/documentation';
 
 import { RequestFlyout } from './request_flyout';
 
@@ -456,33 +452,14 @@ export class RemoteClusterForm extends Component {
           <>
             <FormattedMessage
               id="xpack.remoteClusters.remoteClusterForm.sectionModeDescription"
-              defaultMessage="Remote cluster connections work by configuring a remote cluster and connecting only to a limited number of nodes in that remote cluster."
+              defaultMessage="Use seed nodes by default, or switch to a single proxy address."
             />
-            <EuiFormRow
-              hasEmptyLabelSpace
-              fullWidth
-              helpText={
-                <FormattedMessage
-                  id="xpack.remoteClusters.remoteClusterForm.fieldModeDescription"
-                  defaultMessage="Configure a remote cluster with a single proxy address. {learnMoreLink}"
-                  values={{
-                    learnMoreLink: (
-                      <EuiLink href={proxyModeUrl} target="_blank">
-                        <FormattedMessage
-                          id="xpack.remoteClusters.remoteClusterForm.fieldModeDescription.learnMoreLinkLabel"
-                          defaultMessage="Learn more."
-                        />
-                      </EuiLink>
-                    ),
-                  }}
-                />
-              }
-            >
+            <EuiFormRow hasEmptyLabelSpace fullWidth>
               <EuiSwitch
                 label={
                   <FormattedMessage
                     id="xpack.remoteClusters.remoteClusterForm.fieldModeLabel"
-                    defaultMessage="Use proxy mode"
+                    defaultMessage="Use a single proxy address"
                   />
                 }
                 checked={mode === PROXY_MODE}
@@ -523,9 +500,7 @@ export class RemoteClusterForm extends Component {
             <p>
               <FormattedMessage
                 id="xpack.remoteClusters.remoteClusterForm.sectionSkipUnavailableDescription"
-                defaultMessage="By default, a request fails if any of the queried remote clusters
-                  are unavailable. To continue sending a request to other remote clusters if this
-                  cluster is unavailable, enable {optionName}. {learnMoreLink}"
+                defaultMessage="A request fails if any of the queried remote clusters are unavailable. To send requests to other remote clusters if this cluster is unavailable, enable {optionName}. {learnMoreLink}"
                 values={{
                   optionName: (
                     <strong>
@@ -839,7 +814,7 @@ export class RemoteClusterForm extends Component {
             description={
               <FormattedMessage
                 id="xpack.remoteClusters.remoteClusterForm.sectionNameDescription"
-                defaultMessage="A unique name for the remote cluster."
+                defaultMessage="A unique name for the cluster."
               />
             }
             fullWidth
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_page_title/remote_cluster_page_title.js b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_page_title/remote_cluster_page_title.js
index 82d8a7b0cfa8b4..5a3b1faedad2ba 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_page_title/remote_cluster_page_title.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_page_title/remote_cluster_page_title.js
@@ -7,23 +7,22 @@
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { remoteClustersUrl } from '../../../services/documentation';
 
 import {
   EuiButtonEmpty,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiPageContentHeader,
   EuiSpacer,
+  EuiText,
   EuiTitle,
 } from '@elastic/eui';
 
-import { remoteClustersUrl } from '../../../services/documentation';
-
-export const RemoteClusterPageTitle = ({ title }) => (
+export const RemoteClusterPageTitle = ({ title, description }) => (
   <Fragment>
     <EuiSpacer size="xs" />
 
-    <EuiPageContentHeader>
+    <EuiTitle size="l">
       <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
         <EuiFlexItem grow={false}>
           <EuiTitle size="l" data-test-subj="remoteClusterPageTitle">
@@ -47,10 +46,23 @@ export const RemoteClusterPageTitle = ({ title }) => (
           </EuiButtonEmpty>
         </EuiFlexItem>
       </EuiFlexGroup>
-    </EuiPageContentHeader>
+    </EuiTitle>
+
+    {description ? (
+      <>
+        <EuiSpacer size="s" />
+
+        <EuiTitle size="s">
+          <EuiText color="subdued">{description}</EuiText>
+        </EuiTitle>
+      </>
+    ) : null}
+
+    <EuiSpacer size="m" />
   </Fragment>
 );
 
 RemoteClusterPageTitle.propTypes = {
   title: PropTypes.node.isRequired,
+  description: PropTypes.node,
 };
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_add/remote_cluster_add.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_add/remote_cluster_add.js
index 4a861695c0eb37..8fb84d8d2eabca 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_add/remote_cluster_add.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_add/remote_cluster_add.js
@@ -65,6 +65,12 @@ export class RemoteClusterAdd extends PureComponent {
               defaultMessage="Add remote cluster"
             />
           }
+          description={
+            <FormattedMessage
+              id="xpack.remoteClusters.remoteClustersDescription"
+              defaultMessage="Add a remote cluster that is connected to either seed nodes or a single proxy address."
+            />
+          }
         />
 
         <RemoteClusterForm
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.js
index 2c0936b319d09a..d582fc2b0af1ba 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_edit/remote_cluster_edit.js
@@ -193,7 +193,7 @@ export class RemoteClusterEdit extends Component {
             >
               <FormattedMessage
                 id="xpack.remoteClusters.edit.deprecatedSettingsMessage"
-                defaultMessage="This remote cluster contains deprecated settings. We have attempted to resolve them. Please verify all changes before saving."
+                defaultMessage="This remote cluster has deprecated settings that we tried to resolve. Verify all changes before saving."
               />
             </EuiCallOut>
             <EuiSpacer />
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/detail_panel.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/detail_panel.js
index 89a48927f68338..4006422d3df508 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/detail_panel.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/detail_panel/detail_panel.js
@@ -125,7 +125,7 @@ export class DetailPanel extends Component {
           title={
             <FormattedMessage
               id="xpack.remoteClusters.detailPanel.deprecatedSettingsTitle"
-              defaultMessage='"{remoteCluster}" contains deprecated settings'
+              defaultMessage="'{remoteCluster}' has deprecated settings"
               values={{
                 remoteCluster: clusterName,
               }}
@@ -134,28 +134,38 @@ export class DetailPanel extends Component {
           color="warning"
           iconType="help"
         >
-          <FormattedMessage
-            id="xpack.remoteClusters.detailPanel.deprecatedSettingsMessage"
-            defaultMessage="We recommend updating this remote cluster to use the correct settings. {helpLink}"
-            values={{
-              helpLink: isConfiguredByNode ? (
-                // A remote cluster is not editable if configured in elasticsearch.yml, so we direct the user to documentation instead
-                <EuiLink href={proxyModeUrl} target="_blank">
-                  <FormattedMessage
-                    id="xpack.remoteClusters.detailPanel.deprecatedSettingsLearnMoreLinkLabel"
-                    defaultMessage="Learn more."
-                  />
-                </EuiLink>
-              ) : (
-                <EuiLink {...getRouterLinkProps(`${CRUD_APP_BASE_PATH}/edit/${clusterName}`)}>
-                  <FormattedMessage
-                    id="xpack.remoteClusters.detailPanel.deprecatedSettingsEditLinkLabel"
-                    defaultMessage="Edit remote cluster."
-                  />
-                </EuiLink>
-              ),
-            }}
-          />
+          {/* A remote cluster is not editable if configured in elasticsearch.yml, so we direct the user to documentation instead */}
+          {isConfiguredByNode ? (
+            <FormattedMessage
+              id="xpack.remoteClusters.detailPanel.deprecatedSettingsConfiguredByNodeMessage"
+              defaultMessage="Edit the cluster to update the settings. {helpLink}"
+              values={{
+                helpLink: (
+                  <EuiLink href={proxyModeUrl} target="_blank">
+                    <FormattedMessage
+                      id="xpack.remoteClusters.detailPanel.deprecatedSettingsLearnMoreLinkLabel"
+                      defaultMessage="Learn more."
+                    />
+                  </EuiLink>
+                ),
+              }}
+            />
+          ) : (
+            <FormattedMessage
+              id="xpack.remoteClusters.detailPanel.deprecatedSettingsMessage"
+              defaultMessage="{editLink} to update the settings."
+              values={{
+                editLink: (
+                  <EuiLink {...getRouterLinkProps(`${CRUD_APP_BASE_PATH}/edit/${clusterName}`)}>
+                    <FormattedMessage
+                      id="xpack.remoteClusters.detailPanel.deprecatedSettingsEditLinkLabel"
+                      defaultMessage="Edit the cluster"
+                    />
+                  </EuiLink>
+                ),
+              }}
+            />
+          )}
         </EuiCallOut>
         <EuiSpacer size="l" />
       </>
@@ -249,7 +259,7 @@ export class DetailPanel extends Component {
               <EuiTitle size="xs">
                 <FormattedMessage
                   id="xpack.remoteClusters.detailPanel.maxConnectionsPerClusterLabel"
-                  defaultMessage="Maximum number of connections"
+                  defaultMessage="Maximum connections"
                 />
               </EuiTitle>
             </EuiDescriptionListTitle>
@@ -363,7 +373,7 @@ export class DetailPanel extends Component {
               <EuiTitle size="xs">
                 <FormattedMessage
                   id="xpack.remoteClusters.detailPanel.maxSocketConnectionsLabel"
-                  defaultMessage="Maximum number of socket connections"
+                  defaultMessage="Maximum socket connections"
                 />
               </EuiTitle>
             </EuiDescriptionListTitle>
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js
index ec20805ccd9192..52ec9f24eb7875 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js
+++ b/x-pack/plugins/remote_clusters/public/application/sections/remote_cluster_list/remote_cluster_table/remote_cluster_table.js
@@ -141,7 +141,7 @@ export class RemoteClusterTable extends Component {
                     content={
                       <FormattedMessage
                         id="xpack.remoteClusters.remoteClusterList.table.hasDeprecatedSettingMessage"
-                        defaultMessage="This remote cluster contains deprecated settings. Edit the remote cluster to resolve."
+                        defaultMessage="Edit this cluster to update deprecated settings."
                       />
                     }
                   />