Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DOCS] Change 'X-Pack APIs' section to 'REST APIs' #43451

Merged
merged 5 commits into from
Jun 26, 2019
Merged

[DOCS] Change 'X-Pack APIs' section to 'REST APIs' #43451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7afb1ba
[DOCS] Change 'X-Pack APIs' section to 'RESTful APIs'
jrodewig Jun 20, 2019
e08ae7f
[DOCS] Add redirect for [[xpack-api]] anchor
jrodewig Jun 20, 2019
27b742f
[DOCS] Update comment in REST High Level Java client
jrodewig Jun 20, 2019
d1afd10
[DOCS] Change "RESTful" to "REST"
jrodewig Jun 21, 2019
6589374
[DOCS] Resolve merge conflicts
jrodewig Jun 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/rest-high-level/src/main/java/org/elasticsearch/client/XPackClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
* default distribution of Elasticsearch. All of these APIs will 404 if run
* against the OSS distribution of Elasticsearch.
* <p>
* See the <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/xpack-api.html">
* X-Pack APIs on elastic.co</a> for more information.
* See the <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/rest-apis.html">
* REST APIs on elastic.co</a> for more information.
*/
public final class XPackClient {

Expand Down
4 changes: 2 additions & 2 deletions docs/reference/index.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,6 @@ include::frozen-indices.asciidoc[]

include::administering.asciidoc[]

include::rest-api/index.asciidoc[]

include::commands/index.asciidoc[]

:edit_url:
Expand All @@ -76,6 +74,8 @@ include::testing.asciidoc[]

include::glossary.asciidoc[]

include::rest-api/index.asciidoc[]

include::release-notes/highlights.asciidoc[]

include::migration/index.asciidoc[]
Expand Down
7 changes: 6 additions & 1 deletion docs/reference/redirects.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,4 +615,9 @@ the steps needed to migrate.

The `common` terms query is deprecated. Use the <<query-dsl-match-query, `match`
query>> instead. The `match` query skips blocks of documents efficiently,
without any configuration, if the total number of hits is not tracked.
without any configuration, if the total number of hits is not tracked.

[role="exclude",id="xpack-api"]
=== X-Pack APIs

{es} {xpack} APIs are now documented in <<rest-apis, REST APIs>>.
13 changes: 8 additions & 5 deletions docs/reference/rest-api/index.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
[role="xpack"]
[[xpack-api]]
= {xpack} APIs
[[rest-apis]]
= REST APIs

[partintro]
--
{xpack} exposes REST APIs that are used by the UI components and can be called
directly to configure and access {xpack} features.
{es} exposes REST APIs that are used by the UI components and can be called
directly to configure and access {es} features.

[NOTE]
We are working on including more {es} APIs in this section. Some content might
not be included yet.

* <<info-api,Info API>>
* <<ccr-apis,{ccr-cap} APIs>>
Expand Down