Fix merge conflicts (elastic#80205)

patrykkopycinski · Oct 12, 2020 · 7ec3a17 · 7ec3a17
1 parent a817a90
commit 7ec3a17
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 183 deletions.
diff --git a/docs/management/index-lifecycle-policies/add-policy-to-index.asciidoc b/docs/management/index-lifecycle-policies/add-policy-to-index.asciidoc
diff --git a/docs/management/index-lifecycle-policies/create-policy.asciidoc b/docs/management/index-lifecycle-policies/create-policy.asciidoc
diff --git a/docs/management/index-lifecycle-policies/intro-to-lifecycle-policies.asciidoc b/docs/management/index-lifecycle-policies/intro-to-lifecycle-policies.asciidoc
diff --git a/docs/management/index-lifecycle-policies/manage-policy.asciidoc b/docs/management/index-lifecycle-policies/manage-policy.asciidoc
diff --git a/docs/redirects.asciidoc b/docs/redirects.asciidoc
@@ -129,8 +129,33 @@ This content has moved. See
 This content has moved. See
 {ref}/ccr-getting-started.html#ccr-getting-started-remote-cluster[Connect to a remote cluster].
 
+[role="exclude",id="adding-policy-to-index"]
+== Adding a policy to an index
+
+This content has moved. See
+{ref}/set-up-lifecycle-policy.html[Configure a lifecycle policy].
+
+[role="exclude",id="creating-index-lifecycle-policies"]
+== Creating an index lifecycle policy
+
+This content has moved. See
+{ref}/set-up-lifecycle-policy.html[Configure a lifecycle policy].
+
+[role="exclude",id="index-lifecycle-policies"]
+== Index Lifecycle Policies
+
+This content has moved. See
+{ref}/index-lifecycle-management.html[ILM: Manage the index lifecycle].
+
+[role="exclude",id="managing-index-lifecycle-policies"]
+== Managing index lifecycle policies
+
+This content has moved. See
+{ref}/index-lifecycle-management.html[ILM: Manage the index lifecycle].
+
 [role="exclude",id="tutorial-define-index"]
 == Define your index patterns
 
 This content has moved. See
 <<get-started, Quick start>>.
+
diff --git a/docs/user/management.asciidoc b/docs/user/management.asciidoc
@@ -40,7 +40,7 @@ a| <<managing-indices, Index Management>>
 flushing, and clearing the cache. Practicing good index management ensures
 that your data is stored cost effectively.
 
-| <<index-lifecycle-policies, Index Lifecycle Policies>>
+| {ref}/index-lifecycle-management.html[Index Lifecycle Policies]
 |Create a policy for defining the lifecycle of an index as it ages
 through the hot, warm, cold, and delete phases.
 Such policies help you control operation costs
@@ -180,14 +180,6 @@ include::{kib-repo-dir}/management/alerting/connector-management.asciidoc[]
 
 include::{kib-repo-dir}/management/managing-beats.asciidoc[]
 
-include::{kib-repo-dir}/management/index-lifecycle-policies/intro-to-lifecycle-policies.asciidoc[]
-
-include::{kib-repo-dir}/management/index-lifecycle-policies/create-policy.asciidoc[]
-
-include::{kib-repo-dir}/management/index-lifecycle-policies/manage-policy.asciidoc[]
-
-include::{kib-repo-dir}/management/index-lifecycle-policies/add-policy-to-index.asciidoc[]
-
 include::{kib-repo-dir}/management/managing-indices.asciidoc[]
 
 include::{kib-repo-dir}/management/ingest-pipelines/ingest-pipelines.asciidoc[]