diff --git a/x-pack/docs/en/watcher/images/watcher-ui-edit-watch.png b/x-pack/docs/en/watcher/images/watcher-ui-edit-watch.png
new file mode 100644
index 00000000000..f6a3ab4354a
Binary files /dev/null and b/x-pack/docs/en/watcher/images/watcher-ui-edit-watch.png differ
diff --git a/x-pack/docs/en/watcher/index.asciidoc b/x-pack/docs/en/watcher/index.asciidoc
index 5f51c948ebf..dba714e6956 100644
--- a/x-pack/docs/en/watcher/index.asciidoc
+++ b/x-pack/docs/en/watcher/index.asciidoc
@@ -65,35 +65,26 @@ from the query, whether the condition was met, and what actions were taken.
 
 --
 
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/getting-started.asciidoc
 include::getting-started.asciidoc[]
 
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/how-watcher-works.asciidoc
 include::how-watcher-works.asciidoc[]
 
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/encrypting-data.asciidoc
 include::encrypting-data.asciidoc[]
 
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/input.asciidoc
 include::input.asciidoc[]
 
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/trigger.asciidoc
 include::trigger.asciidoc[]
 
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/condition.asciidoc
 include::condition.asciidoc[]
 
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/actions.asciidoc
 include::actions.asciidoc[]
 
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/transform.asciidoc
 include::transform.asciidoc[]
 
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/java.asciidoc
 include::java.asciidoc[]
 
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/managing-watches.asciidoc
 include::managing-watches.asciidoc[]
 
-:edit_url: https://github.com/elastic/elasticsearch/edit/{branch}/x-pack/docs/en/watcher/example-watches.asciidoc
 include::example-watches.asciidoc[]
+
+include::limitations.asciidoc[]
diff --git a/x-pack/docs/en/watcher/limitations.asciidoc b/x-pack/docs/en/watcher/limitations.asciidoc
new file mode 100644
index 00000000000..57a3718d32d
--- /dev/null
+++ b/x-pack/docs/en/watcher/limitations.asciidoc
@@ -0,0 +1,33 @@
+[role="xpack"]
+[[watcher-limitations]]
+== Watcher limitations
+[subs="attributes"]
+++++
+<titleabbrev>Limitations</titleabbrev>
+++++
+
+[discrete]
+=== 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.
+
+[discrete]
+=== 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]
+
+[discrete]
+=== 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.