Docs: Changed breaking docs in master to correspond with 1.x for easier merging

docs/reference/migration/index.asciidoc

@@ -19,7 +19,7 @@ See <<setup-upgrade>> for more info.
 
 include::migrate_2_0.asciidoc[]
 
-include::migrate_1_x.asciidoc[]
+include::migrate_1_4.asciidoc[]
 
 include::migrate_1_0.asciidoc[]
 

docs/reference/migration/migrate_1_4.asciidoc

@@ -1,19 +1,11 @@
-[[breaking-changes-1.x]]
+[[breaking-changes-1.4]]
-== Breaking changes in 1.x
+== Breaking changes in 1.4
 
 This section discusses the changes that you need to be aware of when migrating
-your application from Elasticsearch 1.x to Elasticsearch 1.y.
+your application from Elasticsearch 1.x to Elasticsearch 1.4.
 
 [float]
-=== Facets
+=== Percolator
-
-Facets are deprecated and will be removed in a future release. You are
-encouraged to migrate to <<search-aggregations, aggregations>> instead.
-
-[[breaking-changes-1.4]]
-=== 1.4
-
-==== Percolator
 
 In indices created with version `1.4.0` or later, percolation queries can only
 refer to fields that already exist in the mappings in that index. There are
@@ -25,7 +17,8 @@ two ways to make sure that a field mapping exist:
   add field mappings dynamically, in the same way as happens when indexing a
   document.
 
-==== Aliases
+[float]
+=== Aliases
 
 <<indices-aliases,Aliases>> can include <<query-dsl-filters,filters>> which
 are automatically applied to any search performed via the alias.
@@ -36,9 +29,10 @@ pointed to by the alias.
 Add or update a mapping via the <<indices-create-index,create index>> or
 <<indices-put-mapping,put mapping>> apis.
 
-==== Indices APIs
+[float]
+=== Indices APIs
 
-The <<warmer-retrieving, get warmer api>> will return a section for `warmers` even if there are 
+The <<warmer-retrieving, get warmer api>> will return a section for `warmers` even if there are
 no warmers.  This ensures that the following two examples are equivalent:
 
 [source,js]
@@ -48,7 +42,7 @@ curl -XGET 'http://localhost:9200/_all/_warmers'
 curl -XGET 'http://localhost:9200/_warmers'
 --------------------------------------------------
 
-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,7 +52,7 @@ 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 
+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]
@@ -68,12 +62,31 @@ curl -XGET 'http://localhost:9200/_all/_mappings'
 curl -XGET 'http://localhost:9200/_mappings'
 --------------------------------------------------
 
-==== Zen discovery
+[float]
+=== Bulk UDP
 
+<<docs-bulk-udp,Bulk UDP>> has been deprecated and will be removed in 2.0.
+You should use <<docs-bulk,the standard bulk API>> instead.
 Each cluster must have an elected master node in order to be fully operational. Once a node loses its elected master
 node it will reject some or all operations.
 
+[float]
+=== Zen discovery
+
 On versions before `1.4.0.Beta1` all operations are rejected when a node loses its elected master. From `1.4.0.Beta1`
 only write operations will be rejected by default. Read operations will still be served based on the information available
 to the node, which may result in being partial and possibly also stale. If the default is undesired then the
-pre `1.4.0.Beta1` behaviour can be enabled, see: <<modules-discovery-zen,no-master-block>>
+pre `1.4.0.Beta1` behaviour can be enabled, see: <<modules-discovery-zen,no-master-block>>
+
+[float]
+=== More Like This Field
+
+The More Like This Field query has been deprecated in favor of the <<query-dsl-mlt-query, More Like This Query>>
+restrained set to a specific `field`. It will be removed in 2.0.
+
+[float]
+=== MVEL is deprecated
+
+Groovy is the new default scripting language in Elasticsearch, and is enabled in `sandbox` mode
+by default.  MVEL has been removed from core, but is available as a plugin:
+https://github.com/elasticsearch/elasticsearch-lang-mvel