diff --git a/docs/build.gradle b/docs/build.gradle
index 5073078c55c..bda00ed119a 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -362,8 +362,7 @@ setups['server_metrics_datafeed'] = setups['server_metrics_job'] + '''
         body:  >
           {
           "job_id":"total-requests",
-          "indexes":"server-metrics",
-          "types":"metric"
+          "indexes":"server-metrics"
           }
 '''
 setups['server_metrics_openjob'] = setups['server_metrics_datafeed'] + '''
@@ -495,7 +494,7 @@ setups['sensor_started_rollup_job'] = '''
                   type: float
                 node:
                   type: keyword
-                  
+
   - do:
       bulk:
         index: sensor-1
@@ -652,5 +651,5 @@ setups['sensor_prefab_data'] = '''
           {"node.terms.value":"b","temperature.sum.value":198.0,"temperature.max.value":198.0,"timestamp.date_histogram.time_zone":"UTC","temperature.min.value":198.0,"timestamp.date_histogram._count":1,"timestamp.date_histogram.interval":"1h","_rollup.computed":["temperature.sum","temperature.min","voltage.avg","temperature.max","node.terms","timestamp.date_histogram"],"voltage.avg.value":5.599999904632568,"node.terms._count":1,"_rollup.version":1,"timestamp.date_histogram.timestamp":1516467600000,"voltage.avg._count":1.0,"_rollup.id":"sensor"}
           {"index":{}}
           {"node.terms.value":"c","temperature.sum.value":202.0,"temperature.max.value":202.0,"timestamp.date_histogram.time_zone":"UTC","temperature.min.value":202.0,"timestamp.date_histogram._count":1,"timestamp.date_histogram.interval":"1h","_rollup.computed":["temperature.sum","temperature.min","voltage.avg","temperature.max","node.terms","timestamp.date_histogram"],"voltage.avg.value":4.0,"node.terms._count":1,"_rollup.version":1,"timestamp.date_histogram.timestamp":1516294800000,"voltage.avg._count":1.0,"_rollup.id":"sensor"}
-        
+
 '''
diff --git a/docs/en/rest-api/ml/datafeedresource.asciidoc b/docs/en/rest-api/ml/datafeedresource.asciidoc
index 109538eaf5d..0ffeb6bc89d 100644
--- a/docs/en/rest-api/ml/datafeedresource.asciidoc
+++ b/docs/en/rest-api/ml/datafeedresource.asciidoc
@@ -59,8 +59,9 @@ A {dfeed} resource has the following properties:
   The default value is `1000`.
 
 `types`::
-  (array) A list of types to search for within the specified indices.
-  For example: `["network","sql","kpi"]`.
+  (array) A list of types to search for within the specified indices. For
+  example: `[]`. This property is provided for backwards compatibility with
+  releases earlier than 6.0.0. For more information, see <<removal-of-types>>.  
 
 [[ml-datafeed-chunking-config]]
 ==== Chunking Configuration Objects
diff --git a/docs/en/rest-api/ml/get-datafeed.asciidoc b/docs/en/rest-api/ml/get-datafeed.asciidoc
index 154956e4cef..8d582ed672a 100644
--- a/docs/en/rest-api/ml/get-datafeed.asciidoc
+++ b/docs/en/rest-api/ml/get-datafeed.asciidoc
@@ -75,9 +75,7 @@ The API returns the following results:
       "indices": [
         "server-metrics"
       ],
-      "types": [
-        "metric"
-      ],
+      "types": [],
       "query": {
         "match_all": {
           "boost": 1.0
diff --git a/docs/en/rest-api/ml/put-datafeed.asciidoc b/docs/en/rest-api/ml/put-datafeed.asciidoc
index 8276a184e41..f1e41cad8b3 100644
--- a/docs/en/rest-api/ml/put-datafeed.asciidoc
+++ b/docs/en/rest-api/ml/put-datafeed.asciidoc
@@ -72,9 +72,10 @@ You must create a job before you create a {dfeed}.  You can associate only one
   (unsigned integer) The `size` parameter that is used in {es} searches.
   The default value is `1000`.
 
-`types` (required)::
+`types`::
   (array) A list of types to search for within the specified indices.
-  For example: `["network","sql","kpi"]`.
+  For example: `[]`. This property is provided for backwards compatibility with
+  releases earlier than 6.0.0. For more information, see <<removal-of-types>>.
 
 For more information about these properties,
 see <<ml-datafeed-resource>>.
@@ -85,7 +86,6 @@ see <<ml-datafeed-resource>>.
 You must have `manage_ml`, or `manage` cluster privileges to use this API.
 For more information, see
 {xpack-ref}/security-privileges.html[Security Privileges].
-//<<privileges-list-cluster>>.
 
 
 ==== Security Integration
@@ -103,8 +103,7 @@ The following example creates the `datafeed-total-requests` {dfeed}:
 PUT _xpack/ml/datafeeds/datafeed-total-requests
 {
   "job_id": "total-requests",
-  "indices": ["server-metrics"],
-  "types": ["metric"]
+  "indices": ["server-metrics"]
 }
 --------------------------------------------------
 // CONSOLE
@@ -120,9 +119,7 @@ When the {dfeed} is created, you receive the following results:
   "indices": [
     "server-metrics"
   ],
-  "types": [
-    "metric"
-  ],
+  "types": [],
   "query": {
     "match_all": {
       "boost": 1.0
diff --git a/docs/en/rest-api/ml/update-datafeed.asciidoc b/docs/en/rest-api/ml/update-datafeed.asciidoc
index 0db40b60fbe..277a9ce3177 100644
--- a/docs/en/rest-api/ml/update-datafeed.asciidoc
+++ b/docs/en/rest-api/ml/update-datafeed.asciidoc
@@ -69,7 +69,8 @@ The following properties can be updated after the {dfeed} is created:
 
 `types`::
   (array) A list of types to search for within the specified indices.
-  For example: `["network","sql","kpi"]`.
+  For example: `[]`. This property is provided for backwards compatibility with
+  releases earlier than 6.0.0. For more information, see <<removal-of-types>>.
 
 For more information about these properties,
 see <<ml-datafeed-resource>>.
@@ -117,7 +118,7 @@ with the updated values:
   "job_id": "total-requests",
   "query_delay": "83474ms",
   "indices": ["server-metrics"],
-  "types": ["metric"],
+  "types": [],
   "query": {
     "term": {
       "level": {