diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/XPackClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/XPackClient.java
index a20dfd1ba32..69cdd329e39 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/XPackClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/XPackClient.java
@@ -35,8 +35,8 @@ import static java.util.Collections.emptySet;
  * 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 {
 
diff --git a/docs/reference/index.asciidoc b/docs/reference/index.asciidoc
index b47d721517e..03264c43cb1 100644
--- a/docs/reference/index.asciidoc
+++ b/docs/reference/index.asciidoc
@@ -69,8 +69,6 @@ include::frozen-indices.asciidoc[]
 
 include::administering.asciidoc[]
 
-include::rest-api/index.asciidoc[]
-
 include::commands/index.asciidoc[]
 
 :edit_url:
@@ -80,6 +78,8 @@ include::testing.asciidoc[]
 
 include::glossary.asciidoc[]
 
+include::rest-api/index.asciidoc[]
+
 include::release-notes/highlights.asciidoc[]
 
 include::migration/index.asciidoc[]
diff --git a/docs/reference/redirects.asciidoc b/docs/reference/redirects.asciidoc
index 1c6850542a9..66cfcc18e60 100644
--- a/docs/reference/redirects.asciidoc
+++ b/docs/reference/redirects.asciidoc
@@ -601,4 +601,9 @@ See <<faster-phrase-queries>>.
 
 [role="exclude",id="_faster_prefix_queries_with_literal_index_prefixes_literal.html"]
 
-See <<faster-prefix-queries>>.
\ No newline at end of file
+See <<faster-prefix-queries>>.
+
+[role="exclude",id="xpack-api"]
+=== X-Pack APIs
+
+{es} {xpack} APIs are now documented in <<rest-apis, REST APIs>>. 
\ No newline at end of file
diff --git a/docs/reference/rest-api/index.asciidoc b/docs/reference/rest-api/index.asciidoc
index a5b93747dfa..dc73ac134d5 100644
--- a/docs/reference/rest-api/index.asciidoc
+++ b/docs/reference/rest-api/index.asciidoc
@@ -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>>