From 3dbdcdfb61ea8d445bf6dc00fd1b259eb05ef281 Mon Sep 17 00:00:00 2001 From: nastasha-solomon <79124755+nastasha-solomon@users.noreply.github.com> Date: Tue, 28 Jun 2022 12:35:33 -0400 Subject: [PATCH 1/4] [DOCS] Add Elastic Security breaking changes to Installation and Upgrade Guide for 8.3 (#2148) (cherry picked from commit 5ad3225861bdec555fcc3b6e38e043411db99dd8) # Conflicts: # docs/en/install-upgrade/breaking.asciidoc --- docs/en/install-upgrade/breaking.asciidoc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/en/install-upgrade/breaking.asciidoc b/docs/en/install-upgrade/breaking.asciidoc index 70ccae066..23259236f 100644 --- a/docs/en/install-upgrade/breaking.asciidoc +++ b/docs/en/install-upgrade/breaking.asciidoc @@ -65,10 +65,17 @@ include::{es-repo-dir}/migration/migrate_8_3.asciidoc[tag=notable-breaking-chang {elastic-sec} ++++ +<<<<<<< HEAD This list summarizes the most important breaking changes in {elastic-sec} {version}. //For the complete list, go to {security-guide-all}/8.3/release-notes-header-8.2.0.html#breaking-changes-8.2.0[{elastic-sec} breaking changes]. //include::{security-repo-dir}/release-notes/8.3.asciidoc[tag=breaking-changes] +======= +This list summarizes the most important breaking changes in {elastic-sec} {version}. For +the complete list, go to {security-guide-all}/8.3/release-notes-header-8.3.0.html#breaking-changes-8.3.0[{elastic-sec} breaking changes]. + +include::{security-repo-dir}/release-notes/8.3.asciidoc[tag=breaking-changes] +>>>>>>> 5ad3225 ([DOCS] Add Elastic Security breaking changes to Installation and Upgrade Guide for 8.3 (#2148)) [[kibana-breaking-changes]] === {kib} breaking changes From e55a7a2a46c36e977e2e8da594ba7b717767f697 Mon Sep 17 00:00:00 2001 From: "nastasha.solomon" Date: Tue, 28 Jun 2022 12:51:45 -0400 Subject: [PATCH 2/4] Removed tags --- docs/en/install-upgrade/breaking.asciidoc | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/en/install-upgrade/breaking.asciidoc b/docs/en/install-upgrade/breaking.asciidoc index 23259236f..b56e84419 100644 --- a/docs/en/install-upgrade/breaking.asciidoc +++ b/docs/en/install-upgrade/breaking.asciidoc @@ -65,7 +65,6 @@ include::{es-repo-dir}/migration/migrate_8_3.asciidoc[tag=notable-breaking-chang {elastic-sec} ++++ -<<<<<<< HEAD This list summarizes the most important breaking changes in {elastic-sec} {version}. //For the complete list, go to {security-guide-all}/8.3/release-notes-header-8.2.0.html#breaking-changes-8.2.0[{elastic-sec} breaking changes]. @@ -75,7 +74,6 @@ This list summarizes the most important breaking changes in {elastic-sec} {versi the complete list, go to {security-guide-all}/8.3/release-notes-header-8.3.0.html#breaking-changes-8.3.0[{elastic-sec} breaking changes]. include::{security-repo-dir}/release-notes/8.3.asciidoc[tag=breaking-changes] ->>>>>>> 5ad3225 ([DOCS] Add Elastic Security breaking changes to Installation and Upgrade Guide for 8.3 (#2148)) [[kibana-breaking-changes]] === {kib} breaking changes From 7779de2fa98939b89281983eccd697322a49a775 Mon Sep 17 00:00:00 2001 From: "nastasha.solomon" Date: Tue, 28 Jun 2022 13:24:05 -0400 Subject: [PATCH 3/4] Updating versions in commented out text --- docs/en/install-upgrade/breaking.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/install-upgrade/breaking.asciidoc b/docs/en/install-upgrade/breaking.asciidoc index b56e84419..05c14fd40 100644 --- a/docs/en/install-upgrade/breaking.asciidoc +++ b/docs/en/install-upgrade/breaking.asciidoc @@ -66,7 +66,7 @@ include::{es-repo-dir}/migration/migrate_8_3.asciidoc[tag=notable-breaking-chang ++++ This list summarizes the most important breaking changes in {elastic-sec} {version}. -//For the complete list, go to {security-guide-all}/8.3/release-notes-header-8.2.0.html#breaking-changes-8.2.0[{elastic-sec} breaking changes]. +//For the complete list, go to {security-guide-all}/8.3/release-notes-header-8.3.0.html#breaking-changes-8.3.0[{elastic-sec} breaking changes]. //include::{security-repo-dir}/release-notes/8.3.asciidoc[tag=breaking-changes] ======= From 13986dff0508cc25a9e244d4fb1d3d8c3302a27b Mon Sep 17 00:00:00 2001 From: "nastasha.solomon" Date: Tue, 28 Jun 2022 13:25:15 -0400 Subject: [PATCH 4/4] Removed duplicate content --- docs/en/install-upgrade/breaking.asciidoc | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/en/install-upgrade/breaking.asciidoc b/docs/en/install-upgrade/breaking.asciidoc index 05c14fd40..fc791a6a3 100644 --- a/docs/en/install-upgrade/breaking.asciidoc +++ b/docs/en/install-upgrade/breaking.asciidoc @@ -65,11 +65,6 @@ include::{es-repo-dir}/migration/migrate_8_3.asciidoc[tag=notable-breaking-chang {elastic-sec} ++++ -This list summarizes the most important breaking changes in {elastic-sec} {version}. -//For the complete list, go to {security-guide-all}/8.3/release-notes-header-8.3.0.html#breaking-changes-8.3.0[{elastic-sec} breaking changes]. - -//include::{security-repo-dir}/release-notes/8.3.asciidoc[tag=breaking-changes] -======= This list summarizes the most important breaking changes in {elastic-sec} {version}. For the complete list, go to {security-guide-all}/8.3/release-notes-header-8.3.0.html#breaking-changes-8.3.0[{elastic-sec} breaking changes].