docs: temp comment out include (elastic#2626)

(cherry picked from commit 413a91f) # Conflicts: # docs/en/install-upgrade/breaking.asciidoc
bmorelli25 · Jan 12, 2024 · 8a0affd · 8a0affd
1 parent 900856d
commit 8a0affd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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