diff --git a/docs/en/stack/data-frames/index.asciidoc b/docs/en/stack/data-frames/index.asciidoc
index 4dc66496d..a965fe2d0 100644
--- a/docs/en/stack/data-frames/index.asciidoc
+++ b/docs/en/stack/data-frames/index.asciidoc
@@ -1,4 +1,5 @@
include::dataframes.asciidoc[]
include::ecommerce-example.asciidoc[]
include::api-quickref.asciidoc[]
-include::dataframe-examples.asciidoc[]
\ No newline at end of file
+include::dataframe-examples.asciidoc[]
+include::limitations.asciidoc[]
\ No newline at end of file
diff --git a/docs/en/stack/data-frames/limitations.asciidoc b/docs/en/stack/data-frames/limitations.asciidoc
index f98ffbb11..fa9f198f9 100644
--- a/docs/en/stack/data-frames/limitations.asciidoc
+++ b/docs/en/stack/data-frames/limitations.asciidoc
@@ -1,5 +1,9 @@
[[dataframe-limitations]]
== {dataframe-cap} limitations
+[subs="attributes"]
+++++
+Limitations
+++++
beta[]
diff --git a/docs/en/stack/images/watcher-ui-edit-watch.png b/docs/en/stack/images/watcher-ui-edit-watch.png
deleted file mode 100644
index f6a3ab435..000000000
Binary files a/docs/en/stack/images/watcher-ui-edit-watch.png and /dev/null differ
diff --git a/docs/en/stack/index.asciidoc b/docs/en/stack/index.asciidoc
index 5f03c9fe6..52422a3f1 100644
--- a/docs/en/stack/index.asciidoc
+++ b/docs/en/stack/index.asciidoc
@@ -21,31 +21,20 @@ include::{asciidoc-dir}/../../shared/attributes.asciidoc[]
include::introduction.asciidoc[]
-:edit_url: https://github.com/elastic/stack-docs/edit/{branch}/docs/en/stack/security/index.asciidoc
include::security/index.asciidoc[]
-:edit_url:
include::monitoring/index.asciidoc[]
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/index.asciidoc
include::{xes-repo-dir}/watcher/index.asciidoc[]
-:edit_url: https://github.com/elastic/stack-docs/edit/{branch}/docs/en/stack/ml/index.asciidoc
include::ml/index.asciidoc[]
include::data-frames/index.asciidoc[]
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/docs/reference/ccr/index.asciidoc
include::{es-repo-dir}/ccr/index.asciidoc[]
-:edit_url:
include::troubleshooting.asciidoc[]
-:edit_url:
-include::limitations.asciidoc[]
-
-:edit_url:
include::license.asciidoc[]
-:edit_url:
include::redirects.asciidoc[]
diff --git a/docs/en/stack/limitations.asciidoc b/docs/en/stack/limitations.asciidoc
deleted file mode 100644
index a94da3126..000000000
--- a/docs/en/stack/limitations.asciidoc
+++ /dev/null
@@ -1,35 +0,0 @@
-[[limitations]]
-= Limitations
-
-[partintro]
---
-[quote, Brendan Francis Behan]
-__________________________
-Once we accept our limits, we go beyond them.
-__________________________
-
-////
-For a list of known issues in the 6.0.0 alpha release, see
-https://www.elastic.co/blog/elastic-stack-6-0-0-alpha1-released[Elastic Stack 6.0.0-alpha1 Released].
-////
-
-* <>
-
-* <>
-
-* <>
-
-* <>
-
---
-:edit_url: https://github.com/elastic/stack-docs/edit/{branch}/docs/en/stack/security/limitations.asciidoc
-include::security/limitations.asciidoc[]
-
-:edit_url: https://github.com/elastic/stack-docs/edit/{branch}/docs/en/stack/watcher/limitations.asciidoc
-include::watcher/limitations.asciidoc[]
-
-:edit_url: https://github.com/elastic/stack-docs/edit/{branch}/docs/en/stack/ml/limitations.asciidoc
-include::ml/limitations.asciidoc[]
-
-:edit_url: https://github.com/elastic/stack-docs/edit/{branch}/docs/en/stack/data-frames/limitations.asciidoc
-include::data-frames/limitations.asciidoc[]
\ No newline at end of file
diff --git a/docs/en/stack/ml/index.asciidoc b/docs/en/stack/ml/index.asciidoc
index b8b66abcf..32498e95c 100644
--- a/docs/en/stack/ml/index.asciidoc
+++ b/docs/en/stack/ml/index.asciidoc
@@ -18,22 +18,17 @@ from {es} for analysis and anomaly results are displayed in {kib} dashboards.
--
-:edit_url: https://github.com/elastic/stack-docs/edit/{branch}/docs/en/stack/ml/overview.asciidoc
include::overview.asciidoc[]
-:edit_url: https://github.com/elastic/stack-docs/edit/{branch}/docs/en/stack/ml/getting-started.asciidoc
include::getting-started.asciidoc[]
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/docs/reference/ml/configuring.asciidoc
include::{es-repo-dir}/ml/configuring.asciidoc[]
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/docs/reference/ml/stopping-ml.asciidoc
include::{es-repo-dir}/ml/stopping-ml.asciidoc[]
-:edit_url: https://github.com/elastic/stack-docs/edit/{branch}/docs/en/stack/ml/api-quickref.asciidoc
include::api-quickref.asciidoc[]
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/docs/reference/ml/functions.asciidoc
include::{es-repo-dir}/ml/functions.asciidoc[]
+include::limitations.asciidoc[]
diff --git a/docs/en/stack/ml/limitations.asciidoc b/docs/en/stack/ml/limitations.asciidoc
index 48c9feb67..0223a7c38 100644
--- a/docs/en/stack/ml/limitations.asciidoc
+++ b/docs/en/stack/ml/limitations.asciidoc
@@ -1,6 +1,10 @@
[role="xpack"]
[[ml-limitations]]
== Machine learning limitations
+[subs="attributes"]
+++++
+Limitations
+++++
The following limitations and known problems apply to the {version} release of
the Elastic {ml-features}:
diff --git a/docs/en/stack/redirects.asciidoc b/docs/en/stack/redirects.asciidoc
index f4a70c4f1..1b095de62 100644
--- a/docs/en/stack/redirects.asciidoc
+++ b/docs/en/stack/redirects.asciidoc
@@ -32,3 +32,12 @@ See <>.
=== Security files
See {ref}/security-files.html[Security files].
+
+[role="exclude",id="limitations"]]
+=== Limitations
+
+* <>
+* <>
+* <>
+* <>
+
diff --git a/docs/en/stack/security/index.asciidoc b/docs/en/stack/security/index.asciidoc
index 0d7d8516f..f222721cb 100644
--- a/docs/en/stack/security/index.asciidoc
+++ b/docs/en/stack/security/index.asciidoc
@@ -88,29 +88,22 @@ Head over to our {security-forum}[Security Discussion Forum]
to share your experience, questions, and suggestions.
--
-:edit_url: https://github.com/elastic/stack-docs/edit/{branch}/docs/en/stack/security/how-security-works.asciidoc
include::how-security-works.asciidoc[]
-:edit_url: https://github.com/elastic/stack-docs/edit/{branch}/docs/en/stack/security/authentication/index.asciidoc
include::authentication/index.asciidoc[]
-:edit_url: https://github.com/elastic/stack-docs/edit/{branch}/docs/en/stack/security/authorization/index.asciidoc
include::authorization/index.asciidoc[]
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/security/auditing.asciidoc
include::{xes-repo-dir}/security/auditing/index.asciidoc[]
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/security/securing-communications.asciidoc
include::{xes-repo-dir}/security/securing-communications.asciidoc[]
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/security/using-ip-filtering.asciidoc
include::{xes-repo-dir}/security/using-ip-filtering.asciidoc[]
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/security/ccs-clients-integrations.asciidoc
include::{xes-repo-dir}/security/ccs-clients-integrations.asciidoc[]
-:edit_url: https://github.com/elastic/stack-docs/edit/{branch}/docs/en/stack/security/get-started-security.asciidoc
include::get-started-security.asciidoc[]
-:edit_url: https://github.com/elastic/stack-docs/edit/{branch}/docs/en/stack/security/securing-communications/tutorial-tls-internode.asciidoc
include::securing-communications/tutorial-tls-intro.asciidoc[]
+
+include::limitations.asciidoc[]
diff --git a/docs/en/stack/security/limitations.asciidoc b/docs/en/stack/security/limitations.asciidoc
index 1c7c39809..d3cd6e589 100644
--- a/docs/en/stack/security/limitations.asciidoc
+++ b/docs/en/stack/security/limitations.asciidoc
@@ -1,6 +1,10 @@
[role="xpack"]
[[security-limitations]]
== Security limitations
+[subs="attributes"]
+++++
+Limitations
+++++
[float]
=== Plugins
diff --git a/docs/en/stack/watcher/limitations.asciidoc b/docs/en/stack/watcher/limitations.asciidoc
deleted file mode 100644
index 1f00d7f1b..000000000
--- a/docs/en/stack/watcher/limitations.asciidoc
+++ /dev/null
@@ -1,29 +0,0 @@
-[role="xpack"]
-[[watcher-limitations]]
-== Watcher limitations
-
-[float]
-=== Watches are not updated when file based scripts change
-
-When you refer to a file script in a watch, the watch itself is not updated
-if you change the script on the filesystem.
-
-Currently, the only way to reload a file script in a watch is to delete
-the watch and recreate it.
-
-[float]
-=== Watcher UI
-
-When you create a new watch or edit an existing watch, if you navigate away
-from the page without saving your changes they will be lost without warning.
-Make sure to save your changes before leaving the page.
-
-image::images/watcher-ui-edit-watch.png[Editing a watch in Kibana]
-
-[float]
-=== Security integration
-
-When the {security-features} are enabled, a watch stores information about what
-the user who stored the watch is allowed to execute **at that time**. This means,
-if those permissions change over time, the watch will still be able to execute
-with the permissions that existed when the watch was created.