From 28614a82a0694d4a91bf314efd4ee58115229d5e Mon Sep 17 00:00:00 2001
From: Yuliia Naumenko <yuliia.naumenko@elastic.com>
Date: Mon, 8 Jun 2020 17:12:21 -0700
Subject: [PATCH 1/2] Fixed pre-configured docs link points to the wrong page
 and functional tests configs

---
 .../alerting/action-types/pre-configured-connectors.asciidoc    | 2 +-
 x-pack/test/alerting_api_integration/common/config.ts           | 2 +-
 x-pack/test/functional_with_es_ssl/config.ts                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/user/alerting/action-types/pre-configured-connectors.asciidoc b/docs/user/alerting/action-types/pre-configured-connectors.asciidoc
index b3e401256f27b..e41bd0939495d 100644
--- a/docs/user/alerting/action-types/pre-configured-connectors.asciidoc
+++ b/docs/user/alerting/action-types/pre-configured-connectors.asciidoc
@@ -28,7 +28,7 @@ two out-of-the box connectors: <<slack-action-type, Slack>> and <<webhook-action
     my-slack1:                  <1>
       actionTypeId: .slack      <2>
       name: 'Slack #xyz'        <3>
-      config:                   <4>
+      secrets:                   <4>
         webhookUrl: 'https://hooks.slack.com/services/abcd/efgh/ijklmnopqrstuvwxyz'
     webhook-service:
       actionTypeId: .webhook
diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts
index 19aee29e9b36d..bc209e2bb4925 100644
--- a/x-pack/test/alerting_api_integration/common/config.ts
+++ b/x-pack/test/alerting_api_integration/common/config.ts
@@ -88,7 +88,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
             'my-slack1': {
               actionTypeId: '.slack',
               name: 'Slack#xyz',
-              config: {
+              secrets: {
                 webhookUrl: 'https://hooks.slack.com/services/abcd/efgh/ijklmnopqrstuvwxyz',
               },
             },
diff --git a/x-pack/test/functional_with_es_ssl/config.ts b/x-pack/test/functional_with_es_ssl/config.ts
index 3452caf0ccdb3..43192d906336d 100644
--- a/x-pack/test/functional_with_es_ssl/config.ts
+++ b/x-pack/test/functional_with_es_ssl/config.ts
@@ -69,7 +69,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
           'my-slack1': {
             actionTypeId: '.slack',
             name: 'Slack#xyztest',
-            config: {
+            secrets: {
               webhookUrl: 'https://hooks.slack.com/services/abcd/efgh/ijklmnopqrstuvwxyz',
             },
           },

From 88ee502e0d386c3a5bc2ab88a897e7d06d4d157d Mon Sep 17 00:00:00 2001
From: Yuliia Naumenko <yuliia.naumenko@elastic.com>
Date: Mon, 8 Jun 2020 21:07:52 -0700
Subject: [PATCH 2/2] Fixed doc link

---
 .../sections/action_connector_form/connector_edit_flyout.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx
index 24dead473fb61..cbbbbfaea7ea3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_edit_flyout.tsx
@@ -197,7 +197,7 @@ export const ConnectorEditFlyout = ({
               )}
             </EuiText>
             <EuiLink
-              href={`${docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${docLinks.DOC_LINK_VERSION}/pre-configured-connectors.html`}
+              href={`${docLinks.ELASTIC_WEBSITE_URL}guide/en/kibana/${docLinks.DOC_LINK_VERSION}/pre-configured-action-types-and-connectors.html`}
               target="_blank"
             >
               <FormattedMessage