Fix merge conflict (elastic#90)

benskelker · Aug 3, 2020 · b1fc7e9 · b1fc7e9
1 parent 3a2526c
commit b1fc7e9
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 17 deletions.
diff --git a/docs/agent/agent.asciidoc b/docs/agent/agent.asciidoc
diff --git a/docs/data-visibility/data-visibility.asciidoc b/docs/data-visibility/data-visibility.asciidoc
diff --git a/docs/management/management.asciidoc → docs/detections-and-alerts/index.asciidoc b/docs/management/management.asciidoc → docs/detections-and-alerts/index.asciidoc
diff --git a/docs/response/response.asciidoc → docs/get-started/index.asciidoc b/docs/response/response.asciidoc → docs/get-started/index.asciidoc
diff --git a/docs/hosts/index.asciidoc b/docs/hosts/index.asciidoc
diff --git a/...ent/images/esensor-permission-granted.png → docs/images/esensor-permission-granted.png b/...ent/images/esensor-permission-granted.png → docs/images/esensor-permission-granted.png
diff --git a/docs/agent/images/select-esensor-file.png → docs/images/select-esensor-file.png b/docs/agent/images/select-esensor-file.png → docs/images/select-esensor-file.png
diff --git a/docs/agent/images/select-fda.png → docs/images/select-fda.png b/docs/agent/images/select-fda.png → docs/images/select-fda.png
diff --git a/docs/investigations-and-timelines/index.asciidoc b/docs/investigations-and-timelines/index.asciidoc
diff --git a/docs/reference/index.asciidoc b/docs/reference/index.asciidoc
diff --git a/docs/siem-apis.asciidoc b/docs/siem-apis.asciidoc
@@ -1,6 +1,6 @@
 [role="xpack"]
 [[security-apis]]
-= Elastic Security APIs
+== Elastic Security APIs
 
 You can use these APIs to interface with {siem-soln} features:
 
@@ -28,15 +28,15 @@ Where:
 * `<endpoint>` is the API endpoint, such as `detection_engine/rules` or
 `cases/configure`.
 
-If you are making calls to a {kib} space *other than* the `Default` space, the 
+If you are making calls to a {kib} space *other than* the `Default` space, the
 space identifier is part of the endpoint's URL:
 
 `<kibana host>:<port>/s/<space URL>/api/<endpoint>`
 
 Where `<space URL>` is the URL identifier for the {kib} space.
 
 NOTE: You can find space URL identifiers on
-{kibana-ref}/xpack-spaces.html[*Edit space*] pages (Management -> Spaces -> 
+{kibana-ref}/xpack-spaces.html[*Edit space*] pages (Management -> Spaces ->
 <space name>) or by calling
 {kibana-ref}/spaces-api-get-all.html[`GET /api/spaces/space`].
 
@@ -53,7 +53,7 @@ All calls to APIs are stateless. Each call must include all the information {sie
 
 Requests must contain these headers:
 
-* `kbn-xsrf: <value>`, where `<value>` can be any alphanumeric string (for 
+* `kbn-xsrf: <value>`, where `<value>` can be any alphanumeric string (for
 example, `kbn-xsrf: kibana`)
 * `Content-Type: application/json` (when the request contains a JSON payload)
 
@@ -66,9 +66,9 @@ curl -X GET "<kibana host>:<port>/s/siem/api/detection_engine/rules/_find"
 -H 'kbn-xsrf: kibana' -u <username>:<password>
 --------------------------------------------------
 
-NOTE: In dev mode, the Kibana server runs behind a proxy which adds a random 
+NOTE: In dev mode, the Kibana server runs behind a proxy which adds a random
 path component to its URL.
-{kibana-ref}/development-basepath.html[Considerations for basePath] describes 
+{kibana-ref}/development-basepath.html[Considerations for basePath] describes
 how to work with and disable the random path component.
 
 include::siem/detections/api/det-api-index.asciidoc[]

diff --git a/docs/siem/detections/machine-learning/machine-learning.asciidoc b/docs/siem/detections/machine-learning/machine-learning.asciidoc
@@ -75,4 +75,5 @@ the ECS fields listed in each job description.
 NOTE: Some jobs use fields that are not ECS-compliant. These jobs are only
 available when you use {beats} to ship data.
 
-include::{stack-docs-root}/docs/en/stack/ml/anomaly-detection/ootb-ml-jobs-siem.asciidoc[tag=siem-jobs]
+include::{ml-dir}/anomaly-detection/ootb-ml-jobs-siem.asciidoc[tag=siem-jobs]
+