Updated docs

Author: Docs User

html/branches.yaml

@@ -365,13 +365,13 @@ elasticsearch:
   Elasticsearch Reference/docs/Versions.asciidoc/5.5: 9c215dcb726f32dbb5bb532b7c793ec997a853b2
   Elasticsearch Reference/docs/Versions.asciidoc/5.6: 4d117d42c4bc57cb8def4184e990c37bc2fa1697
   Elasticsearch Reference/docs/Versions.asciidoc/6.0: e915f5ce9c6faa5e325cb65760476f6e6eca9d2b
-  Elasticsearch Reference/docs/Versions.asciidoc/6.x: 1001b4edb0418e78afbe96d86b88a1ce684a885a
-  Elasticsearch Reference/docs/Versions.asciidoc/master: 075c77fc81f9c1ebf243e23ca248c3bd863ae28d
+  Elasticsearch Reference/docs/Versions.asciidoc/6.x: fbf1344586295bb80b8ba8cf677834e4101fddec
+  Elasticsearch Reference/docs/Versions.asciidoc/master: cc3be6ddda0e58ff36eef0e58e6573242c5d1d65
   Elasticsearch Reference/docs/painless/5.5: 9c215dcb726f32dbb5bb532b7c793ec997a853b2
   Elasticsearch Reference/docs/painless/5.6: 4d117d42c4bc57cb8def4184e990c37bc2fa1697
   Elasticsearch Reference/docs/painless/6.0: e915f5ce9c6faa5e325cb65760476f6e6eca9d2b
-  Elasticsearch Reference/docs/painless/6.x: 1001b4edb0418e78afbe96d86b88a1ce684a885a
-  Elasticsearch Reference/docs/painless/master: 075c77fc81f9c1ebf243e23ca248c3bd863ae28d
+  Elasticsearch Reference/docs/painless/6.x: fbf1344586295bb80b8ba8cf677834e4101fddec
+  Elasticsearch Reference/docs/painless/master: cc3be6ddda0e58ff36eef0e58e6573242c5d1d65
   Elasticsearch Reference/docs/reference/0.90: 42855750d0a5ddba29e1af34ad1ea537dbdeb346
   Elasticsearch Reference/docs/reference/1.3: 26c6e809cd24ace3502089281bc213b7de76dbf1
   Elasticsearch Reference/docs/reference/1.4: 847fa8be2463cb625c2174b0afdfc050a42743f7
@@ -391,20 +391,20 @@ elasticsearch:
   Elasticsearch Reference/docs/reference/5.5: 9c215dcb726f32dbb5bb532b7c793ec997a853b2
   Elasticsearch Reference/docs/reference/5.6: 4d117d42c4bc57cb8def4184e990c37bc2fa1697
   Elasticsearch Reference/docs/reference/6.0: e915f5ce9c6faa5e325cb65760476f6e6eca9d2b
-  Elasticsearch Reference/docs/reference/6.x: 1001b4edb0418e78afbe96d86b88a1ce684a885a
-  Elasticsearch Reference/docs/reference/master: 075c77fc81f9c1ebf243e23ca248c3bd863ae28d
+  Elasticsearch Reference/docs/reference/6.x: fbf1344586295bb80b8ba8cf677834e4101fddec
+  Elasticsearch Reference/docs/reference/master: cc3be6ddda0e58ff36eef0e58e6573242c5d1d65
   Elasticsearch Reference/docs/src/test/cluster/config/5.3: b16899e7ecf163de03275d0d81b4824f7d925c8d
   Elasticsearch Reference/docs/src/test/cluster/config/5.4: 36fcd77ff910d10933a6be1ceed5732f93e708b5
   Elasticsearch Reference/docs/src/test/cluster/config/5.5: 9c215dcb726f32dbb5bb532b7c793ec997a853b2
   Elasticsearch Reference/docs/src/test/cluster/config/5.6: 4d117d42c4bc57cb8def4184e990c37bc2fa1697
   Elasticsearch Reference/docs/src/test/cluster/config/6.0: e915f5ce9c6faa5e325cb65760476f6e6eca9d2b
-  Elasticsearch Reference/docs/src/test/cluster/config/6.x: 1001b4edb0418e78afbe96d86b88a1ce684a885a
-  Elasticsearch Reference/docs/src/test/cluster/config/master: 075c77fc81f9c1ebf243e23ca248c3bd863ae28d
+  Elasticsearch Reference/docs/src/test/cluster/config/6.x: fbf1344586295bb80b8ba8cf677834e4101fddec
+  Elasticsearch Reference/docs/src/test/cluster/config/master: cc3be6ddda0e58ff36eef0e58e6573242c5d1d65
   Elasticsearch Reference/plugins/examples/5.5: 9c215dcb726f32dbb5bb532b7c793ec997a853b2
   Elasticsearch Reference/plugins/examples/5.6: 4d117d42c4bc57cb8def4184e990c37bc2fa1697
   Elasticsearch Reference/plugins/examples/6.0: e915f5ce9c6faa5e325cb65760476f6e6eca9d2b
-  Elasticsearch Reference/plugins/examples/6.x: 1001b4edb0418e78afbe96d86b88a1ce684a885a
-  Elasticsearch Reference/plugins/examples/master: 075c77fc81f9c1ebf243e23ca248c3bd863ae28d
+  Elasticsearch Reference/plugins/examples/6.x: fbf1344586295bb80b8ba8cf677834e4101fddec
+  Elasticsearch Reference/plugins/examples/master: cc3be6ddda0e58ff36eef0e58e6573242c5d1d65
   Elasticsearch Resiliency Status/docs/resiliency/master: c8598fd573e8545cf620278185e99c1b631ee432
   Elasticsearch 참조/docs/5.3: b16899e7ecf163de03275d0d81b4824f7d925c8d
   Elasticsearch 참조/docs/5.4: 36fcd77ff910d10933a6be1ceed5732f93e708b5
@@ -453,7 +453,7 @@ elasticsearch:
   Installation and Upgrade Guide/docs/5.5: 9c215dcb726f32dbb5bb532b7c793ec997a853b2
   Installation and Upgrade Guide/docs/5.6: 4d117d42c4bc57cb8def4184e990c37bc2fa1697
   Installation and Upgrade Guide/docs/6.0: e915f5ce9c6faa5e325cb65760476f6e6eca9d2b
-  Installation and Upgrade Guide/docs/6.x: 1001b4edb0418e78afbe96d86b88a1ce684a885a
+  Installation and Upgrade Guide/docs/6.x: fbf1344586295bb80b8ba8cf677834e4101fddec
   Installation and Upgrade Guide/docs/master: 075c77fc81f9c1ebf243e23ca248c3bd863ae28d
   Java API/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/6.0: d3ff6de001dd971edb0c431bbd8e5146b93e57ee
   Java API/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/6.x: 0f2ba28f87908dab36ad43caba32210bada7e305
@@ -491,7 +491,7 @@ elasticsearch:
   Java API/docs/java-api/master: c8598fd573e8545cf620278185e99c1b631ee432
   Java REST Client/client/5.6: 2d2715a16ce5cee1da3ac87bafd13fa80d66d076
   Java REST Client/client/6.0: d3ff6de001dd971edb0c431bbd8e5146b93e57ee
-  Java REST Client/client/6.x: 0f2ba28f87908dab36ad43caba32210bada7e305
+  Java REST Client/client/6.x: fbf1344586295bb80b8ba8cf677834e4101fddec
   Java REST Client/client/master: 075c77fc81f9c1ebf243e23ca248c3bd863ae28d
   Java REST Client/docs/Versions.asciidoc/5.0: 90ed3ca6a98a0bd4d48cdc96434a3fb49592ee68
   Java REST Client/docs/Versions.asciidoc/5.1: 2e5e8815e9345f8a78838d8cca4eef89ddbc32e0
@@ -501,7 +501,7 @@ elasticsearch:
   Java REST Client/docs/Versions.asciidoc/5.5: 9c215dcb726f32dbb5bb532b7c793ec997a853b2
   Java REST Client/docs/Versions.asciidoc/5.6: 2d2715a16ce5cee1da3ac87bafd13fa80d66d076
   Java REST Client/docs/Versions.asciidoc/6.0: d3ff6de001dd971edb0c431bbd8e5146b93e57ee
-  Java REST Client/docs/Versions.asciidoc/6.x: 0f2ba28f87908dab36ad43caba32210bada7e305
+  Java REST Client/docs/Versions.asciidoc/6.x: fbf1344586295bb80b8ba8cf677834e4101fddec
   Java REST Client/docs/Versions.asciidoc/master: 075c77fc81f9c1ebf243e23ca248c3bd863ae28d
   Java REST Client/docs/java-rest/5.0: 90ed3ca6a98a0bd4d48cdc96434a3fb49592ee68
   Java REST Client/docs/java-rest/5.1: 2e5e8815e9345f8a78838d8cca4eef89ddbc32e0
@@ -511,7 +511,7 @@ elasticsearch:
   Java REST Client/docs/java-rest/5.5: 9c215dcb726f32dbb5bb532b7c793ec997a853b2
   Java REST Client/docs/java-rest/5.6: 2d2715a16ce5cee1da3ac87bafd13fa80d66d076
   Java REST Client/docs/java-rest/6.0: d3ff6de001dd971edb0c431bbd8e5146b93e57ee
-  Java REST Client/docs/java-rest/6.x: 0f2ba28f87908dab36ad43caba32210bada7e305
+  Java REST Client/docs/java-rest/6.x: fbf1344586295bb80b8ba8cf677834e4101fddec
   Java REST Client/docs/java-rest/master: 075c77fc81f9c1ebf243e23ca248c3bd863ae28d
   Painless Scripting Language/docs/Versions.asciidoc/5.5: 9c215dcb726f32dbb5bb532b7c793ec997a853b2
   Painless Scripting Language/docs/Versions.asciidoc/5.6: 2d2715a16ce5cee1da3ac87bafd13fa80d66d076
@@ -605,8 +605,8 @@ kibana:
   Kibana Reference/docs/5.5: b73eff4a03211a8f9792e424a929bdc2afc5e77e
   Kibana Reference/docs/5.6: 56d562487df9ff828e85615b6cf5b0b726341150
   Kibana Reference/docs/6.0: 7c52b5a32ad9a969585202b7b4e84c5708a1254f
-  Kibana Reference/docs/6.x: f26f5e0901406a11c37b6717cccf1428a6623883
-  Kibana Reference/docs/master: be54f367e9772ea1d50e4f45b9b73c9bf9102254
+  Kibana Reference/docs/6.x: b842651c9e8e9b5047252bde900adf29c3601fd5
+  Kibana Reference/docs/master: 237ee635a4b2fe8cdc555740510248b7dbc02f07
   Kibana 사용자 가이드/docs/kr/5.3: 819a08734659274fa4da4fd121891afd2fec0a79
   Kibana 사용자 가이드/docs/kr/5.4: eaf27f47f7c5658d5027f966388047a9172212cd
   Kibanaユーザーガイド/docs/jp/5.3: 819a08734659274fa4da4fd121891afd2fec0a79
@@ -718,20 +718,20 @@ x-pack-elasticsearch:
   Elasticsearch Reference/docs/en/5.4: 9e1cfdb8adc8378c218a0034c597e3ef565857a7
   Elasticsearch Reference/docs/en/5.5: 6135e0976ee8e5b9a5bb29651c226599a309c547
   Elasticsearch Reference/docs/en/5.6: 89e656e2d6ffd2a9fe0bbd5599d2591c5f785742
-  Elasticsearch Reference/docs/en/6.0: e50f03e5721de15fa8c34b3689640e0052d0ef06
-  Elasticsearch Reference/docs/en/6.x: 7c1eb6c2c801e9b651f09a3d246afff265908f98
-  Elasticsearch Reference/docs/en/master: 62b2d94ca076061de3dd7505fedfdba803e18385
+  Elasticsearch Reference/docs/en/6.0: dd7deaa4c2425336694a9f26c1214e74b2bd1423
+  Elasticsearch Reference/docs/en/6.x: fd8107f5480c47b7c0557479952144539d601acc
+  Elasticsearch Reference/docs/en/master: 31fd4c3668de90a14f9ede4b0990c0baefc34cd2
   Kibana Reference/docs/en/5.5: 6135e0976ee8e5b9a5bb29651c226599a309c547
   Kibana Reference/docs/en/5.6: 89e656e2d6ffd2a9fe0bbd5599d2591c5f785742
-  Kibana Reference/docs/en/6.0: 3da4ecb0c382882a7e782337a654e986e37b1bd6
-  Kibana Reference/docs/en/6.x: 7a6385020e6c5444dc647b48f13fa06a6a2830dc
-  Kibana Reference/docs/en/master: 338747887225d674b24f3b82a8e2a64a576eb2e3
+  Kibana Reference/docs/en/6.0: dd7deaa4c2425336694a9f26c1214e74b2bd1423
+  Kibana Reference/docs/en/6.x: fd8107f5480c47b7c0557479952144539d601acc
+  Kibana Reference/docs/en/master: 31fd4c3668de90a14f9ede4b0990c0baefc34cd2
   X-Pack Reference/docs/en/5.4: 9e1cfdb8adc8378c218a0034c597e3ef565857a7
   X-Pack Reference/docs/en/5.5: 6135e0976ee8e5b9a5bb29651c226599a309c547
   X-Pack Reference/docs/en/5.6: 89e656e2d6ffd2a9fe0bbd5599d2591c5f785742
-  X-Pack Reference/docs/en/6.0: 3da4ecb0c382882a7e782337a654e986e37b1bd6
-  X-Pack Reference/docs/en/6.x: 7a6385020e6c5444dc647b48f13fa06a6a2830dc
-  X-Pack Reference/docs/en/master: 338747887225d674b24f3b82a8e2a64a576eb2e3
+  X-Pack Reference/docs/en/6.0: dd7deaa4c2425336694a9f26c1214e74b2bd1423
+  X-Pack Reference/docs/en/6.x: fd8107f5480c47b7c0557479952144539d601acc
+  X-Pack Reference/docs/en/master: 31fd4c3668de90a14f9ede4b0990c0baefc34cd2
   X-Pack 참조/docs/kr/5.4: 9e1cfdb8adc8378c218a0034c597e3ef565857a7
   X-Packリファレンス/docs/jp/5.4: 9e1cfdb8adc8378c218a0034c597e3ef565857a7
 x-pack-kibana:
@@ -751,14 +751,14 @@ x-pack-kibana:
   Kibana Reference/docs/en/5.5: 16a408689e97f6f5eb3609764de49ae845785672
   Kibana Reference/docs/en/5.6: 432dd184b4a808515b137d58948dc5994d67f6ce
   Kibana Reference/docs/en/6.0: 39bfcc0c704ffe86786dfc13400228b16dc3761c
-  Kibana Reference/docs/en/6.x: cead85e67c1e02b4c80abf832d9184afe60c40e7
-  Kibana Reference/docs/en/master: b1932d9262859eee0659e92656ac412fe260da55
+  Kibana Reference/docs/en/6.x: f24c12446f96e0dc10edb3032a6066b309152371
+  Kibana Reference/docs/en/master: c8d912f11c4c6b77cb7a550d92c6e0cba3d6cb5c
   X-Pack Reference/docs/en/5.4: 8327d012d8152d084c74b3658f75c4b0fc29e559
   X-Pack Reference/docs/en/5.5: 16a408689e97f6f5eb3609764de49ae845785672
   X-Pack Reference/docs/en/5.6: 432dd184b4a808515b137d58948dc5994d67f6ce
   X-Pack Reference/docs/en/6.0: 39bfcc0c704ffe86786dfc13400228b16dc3761c
-  X-Pack Reference/docs/en/6.x: cead85e67c1e02b4c80abf832d9184afe60c40e7
-  X-Pack Reference/docs/en/master: b1932d9262859eee0659e92656ac412fe260da55
+  X-Pack Reference/docs/en/6.x: f24c12446f96e0dc10edb3032a6066b309152371
+  X-Pack Reference/docs/en/master: c8d912f11c4c6b77cb7a550d92c6e0cba3d6cb5c
   X-Pack 참조/docs/kr/5.4: 8327d012d8152d084c74b3658f75c4b0fc29e559
   X-Packリファレンス/docs/jp/5.4: 8327d012d8152d084c74b3658f75c4b0fc29e559
 x-pack-logstash:

html/en/elasticsearch/reference/6.x/docs-bulk.html

@@ -743,26 +743,26 @@ <h2 class="page-title">Guide template</h2>
 call. You should experiment with different settings to find the optimum
 size for your particular workload.</p><p>If using the HTTP API, make sure that the client does not send HTTP
 chunks, as this will slow things down.</p><h3><a id="bulk-versioning"></a>Versioning<a href="https://github.com/elastic/elasticsearch/edit/6.x/docs/reference/docs/bulk.asciidoc" class="edit_me" title="Edit this page on GitHub" rel="nofollow">edit</a></h3><p>Each bulk item can include the version value using the
-<code class="literal">_version</code>/<code class="literal">version</code> field. It automatically follows the behavior of the
+<code class="literal">version</code> field. It automatically follows the behavior of the
 index / delete operation based on the <code class="literal">_version</code> mapping. It also
-support the <code class="literal">version_type</code>/<code class="literal">_version_type</code> (see <a class="link" href="docs-index_.html#index-versioning" title="Versioningedit">versioning</a>)</p><h3><a id="bulk-routing"></a>Routing<a href="https://github.com/elastic/elasticsearch/edit/6.x/docs/reference/docs/bulk.asciidoc" class="edit_me" title="Edit this page on GitHub" rel="nofollow">edit</a></h3><p>Each bulk item can include the routing value using the
-<code class="literal">_routing</code>/<code class="literal">routing</code> field. It automatically follows the behavior of the
+support the <code class="literal">version_type</code> (see <a class="link" href="docs-index_.html#index-versioning" title="Versioningedit">versioning</a>)</p><h3><a id="bulk-routing"></a>Routing<a href="https://github.com/elastic/elasticsearch/edit/6.x/docs/reference/docs/bulk.asciidoc" class="edit_me" title="Edit this page on GitHub" rel="nofollow">edit</a></h3><p>Each bulk item can include the routing value using the
+<code class="literal">routing</code> field. It automatically follows the behavior of the
 index / delete operation based on the <code class="literal">_routing</code> mapping.</p><h3><a id="bulk-wait-for-active-shards"></a>Wait For Active Shards<a href="https://github.com/elastic/elasticsearch/edit/6.x/docs/reference/docs/bulk.asciidoc" class="edit_me" title="Edit this page on GitHub" rel="nofollow">edit</a></h3><p>When making bulk calls, you can set the <code class="literal">wait_for_active_shards</code>
 parameter to require a minimum number of shard copies to be active
 before starting to process the bulk request. See
 <a class="link" href="docs-index_.html#index-wait-for-active-shards" title="Wait For Active Shardsedit">here</a> for further details and a usage
 example.</p><h3><a id="bulk-refresh"></a>Refresh<a href="https://github.com/elastic/elasticsearch/edit/6.x/docs/reference/docs/bulk.asciidoc" class="edit_me" title="Edit this page on GitHub" rel="nofollow">edit</a></h3><p>Control when the changes made by this request are visible to search. See
-<a class="link" href="docs-refresh.html" title="?refresh">refresh</a>.</p><h3><a id="bulk-update"></a>Update<a href="https://github.com/elastic/elasticsearch/edit/6.x/docs/reference/docs/bulk.asciidoc" class="edit_me" title="Edit this page on GitHub" rel="nofollow">edit</a></h3><p>When using <code class="literal">update</code> action <code class="literal">_retry_on_conflict</code> can be used as field in
+<a class="link" href="docs-refresh.html" title="?refresh">refresh</a>.</p><h3><a id="bulk-update"></a>Update<a href="https://github.com/elastic/elasticsearch/edit/6.x/docs/reference/docs/bulk.asciidoc" class="edit_me" title="Edit this page on GitHub" rel="nofollow">edit</a></h3><p>When using <code class="literal">update</code> action <code class="literal">retry_on_conflict</code> can be used as field in
 the action itself (not in the extra payload line), to specify how many
 times an update should be retried in the case of a version conflict.</p><p>The <code class="literal">update</code> action payload, supports the following options: <code class="literal">doc</code>
 (partial document), <code class="literal">upsert</code>, <code class="literal">doc_as_upsert</code>, <code class="literal">script</code>, <code class="literal">params</code> (for
 script), <code class="literal">lang</code> (for script) and <code class="literal">_source</code>. See update documentation for details on
 the options. Example with update actions:</p><div class="pre_wrapper"><pre class="programlisting prettyprint lang-js">POST _bulk
-{ "update" : {"_id" : "1", "_type" : "type1", "_index" : "index1", "_retry_on_conflict" : 3} }
+{ "update" : {"_id" : "1", "_type" : "type1", "_index" : "index1", "retry_on_conflict" : 3} }
 { "doc" : {"field" : "value"} }
-{ "update" : { "_id" : "0", "_type" : "type1", "_index" : "index1", "_retry_on_conflict" : 3} }
+{ "update" : { "_id" : "0", "_type" : "type1", "_index" : "index1", "retry_on_conflict" : 3} }
 { "script" : { "source": "ctx._source.counter += params.param1", "lang" : "painless", "params" : {"param1" : 1}}, "upsert" : {"counter" : 1}}
-{ "update" : {"_id" : "2", "_type" : "type1", "_index" : "index1", "_retry_on_conflict" : 3} }
+{ "update" : {"_id" : "2", "_type" : "type1", "_index" : "index1", "retry_on_conflict" : 3} }
 { "doc" : {"field" : "value"}, "doc_as_upsert" : true }
 { "update" : {"_id" : "3", "_type" : "type1", "_index" : "index1", "_source" : true} }
 { "doc" : {"field" : "value"} }

html/en/elasticsearch/reference/6.x/docs-multi-get.html

@@ -746,7 +746,7 @@ <h2 class="page-title">Guide template</h2>
             "_index" : "test",
             "_type" : "type",
             "_id" : "1",
-            "_routing" : "key2"
+            "routing" : "key2"
         },
         {
             "_index" : "test",

html/en/elasticsearch/reference/6.x/snippets/docs-bulk/2.json

@@ -1,9 +1,9 @@
 POST _bulk
-{ "update" : {"_id" : "1", "_type" : "type1", "_index" : "index1", "_retry_on_conflict" : 3} }
+{ "update" : {"_id" : "1", "_type" : "type1", "_index" : "index1", "retry_on_conflict" : 3} }
 { "doc" : {"field" : "value"} }
-{ "update" : { "_id" : "0", "_type" : "type1", "_index" : "index1", "_retry_on_conflict" : 3} }
+{ "update" : { "_id" : "0", "_type" : "type1", "_index" : "index1", "retry_on_conflict" : 3} }
 { "script" : { "source": "ctx._source.counter += params.param1", "lang" : "painless", "params" : {"param1" : 1}}, "upsert" : {"counter" : 1}}
-{ "update" : {"_id" : "2", "_type" : "type1", "_index" : "index1", "_retry_on_conflict" : 3} }
+{ "update" : {"_id" : "2", "_type" : "type1", "_index" : "index1", "retry_on_conflict" : 3} }
 { "doc" : {"field" : "value"}, "doc_as_upsert" : true }
 { "update" : {"_id" : "3", "_type" : "type1", "_index" : "index1", "_source" : true} }
 { "doc" : {"field" : "value"} }

html/en/elasticsearch/reference/6.x/snippets/docs-multi-get/10.json

@@ -5,7 +5,7 @@ GET /_mget?routing=key1
             "_index" : "test",
             "_type" : "type",
             "_id" : "1",
-            "_routing" : "key2"
+            "routing" : "key2"
         },
         {
             "_index" : "test",