diff --git a/docs/reference/cat.asciidoc b/docs/reference/cat.asciidoc index 41d2ec85f15..7c4125a7f36 100644 --- a/docs/reference/cat.asciidoc +++ b/docs/reference/cat.asciidoc @@ -95,7 +95,7 @@ green wiki1 3 0 10000 413 103776272 103776272 green foo 1 0 227 0 2065131 2065131 -------------------------------------------------- - +[float] === Response as text, json, smile, yaml or cbor [source,sh] @@ -116,17 +116,17 @@ green foo 1 0 227 0 2065131 2065131 ] -------------------------------------------------- -Currently supported formats (for the ?format parameter): +Currently supported formats (for the `?format=` parameter): - text (default) - json - smile - yaml - cbor -alternatively you can set the "Accept" HTTP header to the appropriate media format. +Alternatively you can set the "Accept" HTTP header to the appropriate media format. All formats above are supported, the GET parameter takes precedence over the header. +For example: -For example [source,sh] -------------------------------------------------- % curl '192.168.56.10:9200/_cat/indices' -H "Accept: application/json" | jq . diff --git a/docs/reference/migration/migrate_3_0.asciidoc b/docs/reference/migration/migrate_3_0.asciidoc index 4f9cf68f0b4..bae484f4a13 100644 --- a/docs/reference/migration/migrate_3_0.asciidoc +++ b/docs/reference/migration/migrate_3_0.asciidoc @@ -314,7 +314,7 @@ On all types but `string`, the `index` property now only accepts `true`/`false` instead of `not_analyzed`/`no`. The `string` field still accepts `analyzed`/`not_analyzed`/`no`. -==== `_source`'s `format` option +==== ++_source++'s `format` option The `_source` mapping does not support the `format` option anymore. This option will still be accepted for indices created before the upgrade to 3.0 for backward