浏览代码

Tidied up the breaking changes docs

Clinton Gormley 8 年之前
父节点
当前提交
ddbbe9f7cc

+ 23 - 37
docs/reference/migration/migrate_6_0.asciidoc

@@ -24,54 +24,40 @@ way to reindex old indices is to use the `reindex` API.
 [float]
 [float]
 === Also see:
 === Also see:
 
 
-* <<breaking_60_cat_changes>>
-* <<breaking_60_stats_changes>>
-* <<breaking_60_rest_changes>>
-* <<breaking_60_search_changes>>
 * <<breaking_60_aggregations_changes>>
 * <<breaking_60_aggregations_changes>>
-* <<breaking_60_mappings_changes>>
-* <<breaking_60_docs_changes>>
-* <<breaking_60_reindex_changes>>
+* <<breaking_60_cat_changes>>
 * <<breaking_60_cluster_changes>>
 * <<breaking_60_cluster_changes>>
-* <<breaking_60_settings_changes>>
-* <<breaking_60_plugins_changes>>
+* <<breaking_60_docs_changes>>
 * <<breaking_60_indices_changes>>
 * <<breaking_60_indices_changes>>
-* <<breaking_60_scripting_changes>>
 * <<breaking_60_ingest_changes>>
 * <<breaking_60_ingest_changes>>
-* <<breaking_60_percolator_changes>>
 * <<breaking_60_java_changes>>
 * <<breaking_60_java_changes>>
+* <<breaking_60_mappings_changes>>
 * <<breaking_60_packaging_changes>>
 * <<breaking_60_packaging_changes>>
+* <<breaking_60_percolator_changes>>
+* <<breaking_60_plugins_changes>>
+* <<breaking_60_reindex_changes>>
+* <<breaking_60_rest_changes>>
+* <<breaking_60_stats_changes>>
+* <<breaking_60_search_changes>>
+* <<breaking_60_settings_changes>>
+* <<breaking_60_scripting_changes>>
 
 
-include::migrate_6_0/cat.asciidoc[]
-
-include::migrate_6_0/stats.asciidoc[]
-
-include::migrate_6_0/rest.asciidoc[]
-
-include::migrate_6_0/search.asciidoc[]
 
 
 include::migrate_6_0/aggregations.asciidoc[]
 include::migrate_6_0/aggregations.asciidoc[]
-
-include::migrate_6_0/mappings.asciidoc[]
-
-include::migrate_6_0/docs.asciidoc[]
-
-include::migrate_6_0/reindex.asciidoc[]
-
+include::migrate_6_0/analysis.asciidoc[]
+include::migrate_6_0/cat.asciidoc[]
 include::migrate_6_0/cluster.asciidoc[]
 include::migrate_6_0/cluster.asciidoc[]
-
-include::migrate_6_0/settings.asciidoc[]
-
-include::migrate_6_0/plugins.asciidoc[]
-
+include::migrate_6_0/docs.asciidoc[]
 include::migrate_6_0/indices.asciidoc[]
 include::migrate_6_0/indices.asciidoc[]
-
-include::migrate_6_0/scripting.asciidoc[]
-
 include::migrate_6_0/ingest.asciidoc[]
 include::migrate_6_0/ingest.asciidoc[]
-
-include::migrate_6_0/percolator.asciidoc[]
-
 include::migrate_6_0/java.asciidoc[]
 include::migrate_6_0/java.asciidoc[]
-
+include::migrate_6_0/mappings.asciidoc[]
 include::migrate_6_0/packaging.asciidoc[]
 include::migrate_6_0/packaging.asciidoc[]
+include::migrate_6_0/percolator.asciidoc[]
+include::migrate_6_0/plugins.asciidoc[]
+include::migrate_6_0/reindex.asciidoc[]
+include::migrate_6_0/rest.asciidoc[]
+include::migrate_6_0/scripting.asciidoc[]
+include::migrate_6_0/search.asciidoc[]
+include::migrate_6_0/settings.asciidoc[]
+include::migrate_6_0/stats.asciidoc[]

+ 13 - 0
docs/reference/migration/migrate_6_0/analysis.asc

@@ -0,0 +1,13 @@
+[[breaking_60_analysis_changes]]
+=== Analysis changes
+
+==== Synonym Token Filter
+
+In 6.0, Synonym Token Filter tokenizes synonyms with whatever
+tokenizer and token filters appear before it in the chain.
+
+The `tokenizer` and `ignore_case` parameters are deprecated
+and will be ignored when used in new indices.  These parameters
+will continue to function as before when used in indices
+created in 5.x.
+

+ 0 - 10
docs/reference/migration/migrate_6_0/mappings.asciidoc

@@ -30,13 +30,3 @@ Previously Elasticsearch would silently ignore any dynamic templates that
 included a `match_mapping_type` type that was unrecognized. An exception is now
 included a `match_mapping_type` type that was unrecognized. An exception is now
 thrown on an unrecognized type.
 thrown on an unrecognized type.
 
 
-==== Synonym Token Filter
-
-In 6.0, Synonym Token Filter tokenize synonyms with whatever
-tokenizer and token filters appear before it in the chain.
-
-`tokenizer` and `ignore_case` are deprecated.
-These parameters are still left for backwards compatibility
-for indices that created before 6.0.
-And elasticsearch ignores these properties for new indices.
-

+ 1 - 1
docs/reference/migration/migrate_6_0/scripting.asciidoc

@@ -18,7 +18,7 @@ milliseconds since epoch as a `long`. The same is true for
 `doc.some_date_field[some_number]`. Use `doc.some_date_field.value.millis` to
 `doc.some_date_field[some_number]`. Use `doc.some_date_field.value.millis` to
 fetch the milliseconds since epoch if you need it.
 fetch the milliseconds since epoch if you need it.
 
 
-==== Removed access to index internal via the _index variable
+==== Removed access to index internal via the `_index` variable
 
 
 The `_index` variable has been removed. If you used it for advanced scoring, consider writing a `Similarity` plugin.
 The `_index` variable has been removed. If you used it for advanced scoring, consider writing a `Similarity` plugin.
 
 

+ 5 - 5
docs/reference/migration/migrate_6_0/search.asciidoc

@@ -63,9 +63,9 @@ have any effect in previous versions.
 
 
 ==== Changes to the Profile API
 ==== Changes to the Profile API
 
 
-* The `"time"` field showing human readable timing output has been replaced by the `"time_in_nanos"`
-  field which displays the elapsed time in nanoseconds. The `"time"` field can be turned on by adding
-  `"?human=true"` to the request url. It will display a rounded, human readable time value.
+The `"time"` field showing human readable timing output has been replaced by the `"time_in_nanos"`
+field which displays the elapsed time in nanoseconds. The `"time"` field can be turned on by adding
+`"?human=true"` to the request url. It will display a rounded, human readable time value.
 
 
 ==== Scoring changes
 ==== Scoring changes
 
 
@@ -94,12 +94,12 @@ produces. BM25 is recommended instead.
 See https://issues.apache.org/jira/browse/LUCENE-7347[`LUCENE-7347`] for more
 See https://issues.apache.org/jira/browse/LUCENE-7347[`LUCENE-7347`] for more
 information.
 information.
 
 
-==== Fielddata on _uid
+==== Fielddata on `_uid`
 
 
 Fielddata on `_uid` is deprecated. It is possible to switch to `_id` instead
 Fielddata on `_uid` is deprecated. It is possible to switch to `_id` instead
 but the only reason why it has not been deprecated too is because it is used
 but the only reason why it has not been deprecated too is because it is used
 for the `random_score` function. If you really need access to the id of
 for the `random_score` function. If you really need access to the id of
-documents for sorting, aggregations or search scripts, the recommandation is
+documents for sorting, aggregations or search scripts, the recommendation is
 to duplicate the id as a field in the document.
 to duplicate the id as a field in the document.
 
 
 ==== Highlighers
 ==== Highlighers