docs: temp comment out include (elastic#2626)

(cherry picked from commit 413a91f) # Conflicts: # docs/en/install-upgrade/breaking.asciidoc
bmorelli25 · Jan 12, 2024 · 2587962 · 2587962
1 parent c642140
commit 2587962
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
@@ -33,7 +33,11 @@ Upgrade Assistant provides information about which {dfeeds} need to be updated.
 This list summarizes the most important breaking changes in APM.
 For the complete list, go to {apm-guide-ref}/apm-breaking.html[APM breaking changes].
 
+<<<<<<< HEAD
 include::{apm-repo-dir}/apm-breaking.asciidoc[tag=82-bc]
+=======
+// include::{apm-repo-dir}/apm-breaking.asciidoc[tag=notable-v8-breaking-changes]
+>>>>>>> 413a91f5 (docs: temp comment out include (#2626))
 
 [[beats-breaking-changes]]
 === Beats 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