Skip to content

Commit 8a0affd

Browse files
committed
docs: temp comment out include (elastic#2626)
(cherry picked from commit 413a91f) # Conflicts: # docs/en/install-upgrade/breaking.asciidoc
1 parent 900856d commit 8a0affd

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

docs/en/install-upgrade/breaking.asciidoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,11 @@ include::{hadoop-repo-dir}/appendix/breaking.adoc[tag=notable-v8-breaking-change
127127
This list summarizes the most important breaking changes in {elastic-sec} {version}. For
128128
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].
129129

130+
<<<<<<< HEAD
130131
include::{security-repo-dir}/release-notes/8.0.asciidoc[tag=breaking-changes]
132+
=======
133+
include::{security-repo-dir}/release-notes/8.8.asciidoc[tag=breaking-changes]
134+
>>>>>>> 413a91f5 (docs: temp comment out include (#2626))
131135
132136
[[kibana-breaking-changes]]
133137
=== {kib} breaking changes

docs/en/install-upgrade/index.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[[elastic-stack]]
22
= Elastic Installation and Upgrade Guide
33

4-
:apm-repo-dir: {apm-server-root}/docs
4+
:apm-repo-dir: {apm-server-root}/changelogs
55
:beats-repo-dir: {beats-root}/libbeat/docs
66
:es-repo-dir: {elasticsearch-root}/docs/reference
77
:hadoop-repo-dir: {elasticsearch-hadoop-root}/docs/src/reference/asciidoc

0 commit comments

Comments
 (0)