Skip to content

Commit 044b95e

Browse files
author
Docs User
committed
Updated docs
1 parent 92c6a45 commit 044b95e

File tree

4 files changed

+5243
-5243
lines changed

4 files changed

+5243
-5243
lines changed

‎html/branches.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -556,12 +556,12 @@ elasticsearch:
556556
Installation and Upgrade Guide/docs/6.0: 96338cfc8f0af6e6a17d538bf1370a3a3b144da7
557557
Installation and Upgrade Guide/docs/6.1: 42d9bbf6b0c96581d81bbcb88f7a1c0ce0406f28
558558
Installation and Upgrade Guide/docs/6.2: 042ef3e096ce8e44ba852966d638e51fd0516e27
559-
Installation and Upgrade Guide/docs/6.x: f501139934b9cfa6ebcf6a7cf602efda5a3ede70
559+
Installation and Upgrade Guide/docs/6.x: 48325ecb5f55593330379674135cf6822bdb5c28
560560
Installation and Upgrade Guide/docs/master: ae912cbde4ceee4f2d4f33e33364241c18c1c266
561561
Java API/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/6.0: 96338cfc8f0af6e6a17d538bf1370a3a3b144da7
562562
Java API/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/6.1: 42d9bbf6b0c96581d81bbcb88f7a1c0ce0406f28
563563
Java API/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/6.2: 042ef3e096ce8e44ba852966d638e51fd0516e27
564-
Java API/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/6.x: 6de5818552b218bfdcebfb2eda6ddbe6cb82d872
564+
Java API/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/6.x: 48325ecb5f55593330379674135cf6822bdb5c28
565565
Java API/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/master: ae912cbde4ceee4f2d4f33e33364241c18c1c266
566566
Java API/docs/Versions.asciidoc/5.0: c77f63e460348aac40b404fe241b020a4b830bd3
567567
Java API/docs/Versions.asciidoc/5.1: 28f4e57296e17cf8ce92b67069ea51d64e6b9611
@@ -573,7 +573,7 @@ elasticsearch:
573573
Java API/docs/Versions.asciidoc/6.0: 96338cfc8f0af6e6a17d538bf1370a3a3b144da7
574574
Java API/docs/Versions.asciidoc/6.1: 42d9bbf6b0c96581d81bbcb88f7a1c0ce0406f28
575575
Java API/docs/Versions.asciidoc/6.2: 042ef3e096ce8e44ba852966d638e51fd0516e27
576-
Java API/docs/Versions.asciidoc/6.x: 6de5818552b218bfdcebfb2eda6ddbe6cb82d872
576+
Java API/docs/Versions.asciidoc/6.x: 48325ecb5f55593330379674135cf6822bdb5c28
577577
Java API/docs/Versions.asciidoc/master: ae912cbde4ceee4f2d4f33e33364241c18c1c266
578578
Java API/docs/java-api/0.90: 2f99ae3bf2eef3b61e57d95a58d815cc861b5e13
579579
Java API/docs/java-api/1.3: 597499a9886e14e3d5c57fe5df479d4d18ed1700
@@ -596,9 +596,9 @@ elasticsearch:
596596
Java API/docs/java-api/6.0: 96338cfc8f0af6e6a17d538bf1370a3a3b144da7
597597
Java API/docs/java-api/6.1: 42d9bbf6b0c96581d81bbcb88f7a1c0ce0406f28
598598
Java API/docs/java-api/6.2: 042ef3e096ce8e44ba852966d638e51fd0516e27
599-
Java API/docs/java-api/6.x: 6de5818552b218bfdcebfb2eda6ddbe6cb82d872
599+
Java API/docs/java-api/6.x: 48325ecb5f55593330379674135cf6822bdb5c28
600600
Java API/docs/java-api/master: ae912cbde4ceee4f2d4f33e33364241c18c1c266
601-
Java API/server/src/test/java/org/elasticsearch/client/documentation/6.x: 6de5818552b218bfdcebfb2eda6ddbe6cb82d872
601+
Java API/server/src/test/java/org/elasticsearch/client/documentation/6.x: 48325ecb5f55593330379674135cf6822bdb5c28
602602
Java API/server/src/test/java/org/elasticsearch/client/documentation/master: ae912cbde4ceee4f2d4f33e33364241c18c1c266
603603
Java REST Client/client/5.6: 924247d48f6723d707a1cd692ee8bf4ae429f1f7
604604
Java REST Client/client/6.0: 20ea1cd4faf96a2892e9e88564ba2bf78cdb1269

‎html/en/elasticsearch/client/java-api/6.x/java-admin-indices.html

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -659,29 +659,29 @@ <h2 class="page-title">Guide template</h2>
659659
</p></td></tr><tr><td width="5%" valign="top" align="left"><p><a href="#CO53-2"><span><img src="images/icons/callouts/2.png" alt="" /></span></a> </p></td><td valign="top" align="left"><p>
660660
It also adds a <code class="literal">tweet</code> mapping type.
661661
</p></td></tr></table></div><p>The PUT mapping API also allows to add a new type to an existing index:</p><div class="pre_wrapper"><pre class="programlisting prettyprint lang-java">client.admin().indices().preparePutMapping("twitter") <a id="CO54-1"></a><span><img src="images/icons/callouts/1.png" alt="" /></span>
662-
.setType("user") <a id="CO54-2"></a><span><img src="images/icons/callouts/2.png" alt="" /></span>
663-
.setSource("{\n" + <a id="CO54-3"></a><span><img src="images/icons/callouts/3.png" alt="" /></span>
664-
" \"properties\": {\n" +
665-
" \"name\": {\n" +
666-
" \"type\": \"text\"\n" +
667-
" }\n" +
668-
" }\n" +
669-
"}")
670-
.get();
662+
.setType("user") <a id="CO54-2"></a><span><img src="images/icons/callouts/2.png" alt="" /></span>
663+
.setSource("{\n" + <a id="CO54-3"></a><span><img src="images/icons/callouts/3.png" alt="" /></span>
664+
" \"properties\": {\n" +
665+
" \"name\": {\n" +
666+
" \"type\": \"text\"\n" +
667+
" }\n" +
668+
" }\n" +
669+
"}", XContentType.JSON)
670+
.get();
671671

672672
// You can also provide the type in the source document
673673
client.admin().indices().preparePutMapping("twitter")
674-
.setType("user")
675-
.setSource("{\n" +
676-
" \"user\":{\n" + <a id="CO54-4"></a><span><img src="images/icons/callouts/4.png" alt="" /></span>
677-
" \"properties\": {\n" +
678-
" \"name\": {\n" +
679-
" \"type\": \"text\"\n" +
680-
" }\n" +
681-
" }\n" +
682-
" }\n" +
683-
"}")
684-
.get();</pre></div><div class="calloutlist"><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><p><a href="#CO54-1"><span><img src="images/icons/callouts/1.png" alt="" /></span></a> </p></td><td valign="top" align="left"><p>
674+
.setType("user")
675+
.setSource("{\n" +
676+
" \"user\":{\n" + <a id="CO54-4"></a><span><img src="images/icons/callouts/4.png" alt="" /></span>
677+
" \"properties\": {\n" +
678+
" \"name\": {\n" +
679+
" \"type\": \"text\"\n" +
680+
" }\n" +
681+
" }\n" +
682+
" }\n" +
683+
"}", XContentType.JSON)
684+
.get();</pre></div><div class="calloutlist"><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><p><a href="#CO54-1"><span><img src="images/icons/callouts/1.png" alt="" /></span></a> </p></td><td valign="top" align="left"><p>
685685
Puts a mapping on existing index called <code class="literal">twitter</code>
686686
</p></td></tr><tr><td width="5%" valign="top" align="left"><p><a href="#CO54-2"><span><img src="images/icons/callouts/2.png" alt="" /></span></a> </p></td><td valign="top" align="left"><p>
687687
Adds a <code class="literal">user</code> mapping type.
@@ -690,15 +690,15 @@ <h2 class="page-title">Guide template</h2>
690690
</p></td></tr><tr><td width="5%" valign="top" align="left"><p><a href="#CO54-4"><span><img src="images/icons/callouts/4.png" alt="" /></span></a> </p></td><td valign="top" align="left"><p>
691691
type can be also provided within the source
692692
</p></td></tr></table></div><p>You can use the same API to update an existing mapping:</p><div class="pre_wrapper"><pre class="programlisting prettyprint lang-java">client.admin().indices().preparePutMapping("twitter") <a id="CO55-1"></a><span><img src="images/icons/callouts/1.png" alt="" /></span>
693-
.setType("user") <a id="CO55-2"></a><span><img src="images/icons/callouts/2.png" alt="" /></span>
694-
.setSource("{\n" + <a id="CO55-3"></a><span><img src="images/icons/callouts/3.png" alt="" /></span>
695-
" \"properties\": {\n" +
696-
" \"user_name\": {\n" +
697-
" \"type\": \"text\"\n" +
698-
" }\n" +
699-
" }\n" +
700-
"}")
701-
.get();</pre></div><div class="calloutlist"><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><p><a href="#CO55-1"><span><img src="images/icons/callouts/1.png" alt="" /></span></a> </p></td><td valign="top" align="left"><p>
693+
.setType("user") <a id="CO55-2"></a><span><img src="images/icons/callouts/2.png" alt="" /></span>
694+
.setSource("{\n" + <a id="CO55-3"></a><span><img src="images/icons/callouts/3.png" alt="" /></span>
695+
" \"properties\": {\n" +
696+
" \"user_name\": {\n" +
697+
" \"type\": \"text\"\n" +
698+
" }\n" +
699+
" }\n" +
700+
"}", XContentType.JSON)
701+
.get();</pre></div><div class="calloutlist"><table border="0" summary="Callout list"><tr><td width="5%" valign="top" align="left"><p><a href="#CO55-1"><span><img src="images/icons/callouts/1.png" alt="" /></span></a> </p></td><td valign="top" align="left"><p>
702702
Puts a mapping on existing index called <code class="literal">twitter</code>
703703
</p></td></tr><tr><td width="5%" valign="top" align="left"><p><a href="#CO55-2"><span><img src="images/icons/callouts/2.png" alt="" /></span></a> </p></td><td valign="top" align="left"><p>
704704
Updates the <code class="literal">user</code> mapping type.

‎html/revision.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -572,12 +572,12 @@ Repo: elasticsearch
572572
Installation and Upgrade Guide/docs/6.0 96338cfc Removed outdated docs about shading Elasticsearch
573573
Installation and Upgrade Guide/docs/6.1 42d9bbf6 Fix typo in terminate after API docs
574574
Installation and Upgrade Guide/docs/6.2 042ef3e0 Fix typo in terminate after API docs
575-
Installation and Upgrade Guide/docs/6.x f5011399 [DOCS] Add monitoring upgrade details (#29041)
575+
Installation and Upgrade Guide/docs/6.x 48325ecb [Docs] Fix Java Api index administration usage (#28260)
576576
Installation and Upgrade Guide/docs/master ae912cbd [Docs] Fix Java Api index administration usage (#28260)
577577
Java API/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/6.0 96338cfc Removed outdated docs about shading Elasticsearch
578578
Java API/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/6.1 42d9bbf6 Fix typo in terminate after API docs
579579
Java API/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/6.2 042ef3e0 Fix typo in terminate after API docs
580-
Java API/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/6.x 6de58185 Decouple XContentBuilder from BytesReference (#28972)
580+
Java API/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/6.x 48325ecb [Docs] Fix Java Api index administration usage (#28260)
581581
Java API/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/master ae912cbd [Docs] Fix Java Api index administration usage (#28260)
582582
Java API/docs/Versions.asciidoc/5.0 c77f63e4 Grammar: "by geographically" → "geographically" (#28595)
583583
Java API/docs/Versions.asciidoc/5.1 28f4e572 Introduce Gradle wrapper
@@ -589,7 +589,7 @@ Repo: elasticsearch
589589
Java API/docs/Versions.asciidoc/6.0 96338cfc Removed outdated docs about shading Elasticsearch
590590
Java API/docs/Versions.asciidoc/6.1 42d9bbf6 Fix typo in terminate after API docs
591591
Java API/docs/Versions.asciidoc/6.2 042ef3e0 Fix typo in terminate after API docs
592-
Java API/docs/Versions.asciidoc/6.x 6de58185 Decouple XContentBuilder from BytesReference (#28972)
592+
Java API/docs/Versions.asciidoc/6.x 48325ecb [Docs] Fix Java Api index administration usage (#28260)
593593
Java API/docs/Versions.asciidoc/master ae912cbd [Docs] Fix Java Api index administration usage (#28260)
594594
Java API/docs/java-api/0.90 2f99ae3b [DOCS] Remove unnecessary X-Pack reference
595595
Java API/docs/java-api/1.3 597499a9 [DOCS] Remove unnecessary X-Pack reference
@@ -612,9 +612,9 @@ Repo: elasticsearch
612612
Java API/docs/java-api/6.0 96338cfc Removed outdated docs about shading Elasticsearch
613613
Java API/docs/java-api/6.1 42d9bbf6 Fix typo in terminate after API docs
614614
Java API/docs/java-api/6.2 042ef3e0 Fix typo in terminate after API docs
615-
Java API/docs/java-api/6.x 6de58185 Decouple XContentBuilder from BytesReference (#28972)
615+
Java API/docs/java-api/6.x 48325ecb [Docs] Fix Java Api index administration usage (#28260)
616616
Java API/docs/java-api/master ae912cbd [Docs] Fix Java Api index administration usage (#28260)
617-
Java API/server/src/test/java/org/elasticsearch/client/documentation/6.x 6de58185 Decouple XContentBuilder from BytesReference (#28972)
617+
Java API/server/src/test/java/org/elasticsearch/client/documentation/6.x 48325ecb [Docs] Fix Java Api index administration usage (#28260)
618618
Java API/server/src/test/java/org/elasticsearch/client/documentation/master ae912cbd [Docs] Fix Java Api index administration usage (#28260)
619619
Java REST Client/client/5.6 924247d4 [Docs] REST high-level client: Fix code for most basic search request (#28916)
620620
Java REST Client/client/6.0 20ea1cd4 [Docs] Add note to migration doc (#29017)

0 commit comments

Comments
 (0)