From 8a0affd22817be18a1bc64f98ca57bdc9bad34dd Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Thu, 11 Jan 2024 19:08:10 -0700 Subject: [PATCH] docs: temp comment out include (#2626) (cherry picked from commit 413a91f502c4d6fda5c5f841d86e72f3fb039de6) # Conflicts: # docs/en/install-upgrade/breaking.asciidoc --- docs/en/install-upgrade/breaking.asciidoc | 4 ++++ docs/en/install-upgrade/index.asciidoc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/en/install-upgrade/breaking.asciidoc b/docs/en/install-upgrade/breaking.asciidoc index 7a3012ee6..0617bd1f4 100644 --- a/docs/en/install-upgrade/breaking.asciidoc +++ b/docs/en/install-upgrade/breaking.asciidoc @@ -127,7 +127,11 @@ include::{hadoop-repo-dir}/appendix/breaking.adoc[tag=notable-v8-breaking-change This list summarizes the most important breaking changes in {elastic-sec} {version}. For the complete list, go to {security-guide-all}/8.0/release-notes-header-8.0.0.html#breaking-changes-8.0.0[{elastic-sec} breaking changes]. +<<<<<<< HEAD include::{security-repo-dir}/release-notes/8.0.asciidoc[tag=breaking-changes] +======= +include::{security-repo-dir}/release-notes/8.8.asciidoc[tag=breaking-changes] +>>>>>>> 413a91f5 (docs: temp comment out include (#2626)) [[kibana-breaking-changes]] === {kib} breaking changes diff --git a/docs/en/install-upgrade/index.asciidoc b/docs/en/install-upgrade/index.asciidoc index e1fe3e92b..14b8c5e69 100644 --- a/docs/en/install-upgrade/index.asciidoc +++ b/docs/en/install-upgrade/index.asciidoc @@ -1,7 +1,7 @@ [[elastic-stack]] = Elastic Installation and Upgrade Guide -:apm-repo-dir: {apm-server-root}/docs +:apm-repo-dir: {apm-server-root}/changelogs :beats-repo-dir: {beats-root}/libbeat/docs :es-repo-dir: {elasticsearch-root}/docs/reference :hadoop-repo-dir: {elasticsearch-hadoop-root}/docs/src/reference/asciidoc