diff --git a/docs/reference/indices/get-mapping.asciidoc b/docs/reference/indices/get-mapping.asciidoc
index 317a708f13a..452ea45edff 100644
--- a/docs/reference/indices/get-mapping.asciidoc
+++ b/docs/reference/indices/get-mapping.asciidoc
@@ -29,6 +29,8 @@ curl -XGET 'http://localhost:9200/_all/_mapping/tweet,book'
 If you want to get mappings of all indices and types then the following
 two examples are equivalent:
 
+coming[1.4.0,The API will always include a `mappings` section, even if there aren't any mappings. Previous versions would not return the `mappings` section]
+
 [source,js]
 --------------------------------------------------
 curl -XGET 'http://localhost:9200/_all/_mapping'
diff --git a/docs/reference/migration/migrate_1_x.asciidoc b/docs/reference/migration/migrate_1_x.asciidoc
index 72378087e62..400898ffa9b 100644
--- a/docs/reference/migration/migrate_1_x.asciidoc
+++ b/docs/reference/migration/migrate_1_x.asciidoc
@@ -48,7 +48,7 @@ curl -XGET 'http://localhost:9200/_all/_warmers'
 curl -XGET 'http://localhost:9200/_warmers'
 --------------------------------------------------
 
-Similarly, the <<alias-retrieving, get alias api>> will return a section for `aliases` even if there are 
+The <<alias-retrieving, get alias api>> will return a section for `aliases` even if there are 
 no aliases.  This ensures that the following two examples are equivalent:
 
 [source,js]
@@ -58,3 +58,14 @@ curl -XGET 'http://localhost:9200/_all/_aliases'
 curl -XGET 'http://localhost:9200/_aliases'
 --------------------------------------------------
 
+The <<indices-get-mapping, get mapping api>> will return a section for `mappings` even if there are 
+no mappings.  This ensures that the following two examples are equivalent:
+
+[source,js]
+--------------------------------------------------
+curl -XGET 'http://localhost:9200/_all/_mappings'
+
+curl -XGET 'http://localhost:9200/_mappings'
+--------------------------------------------------
+
+