From c27332be4a2b3d8a72d59332d5368e60cd00eefb Mon Sep 17 00:00:00 2001
From: Nik Everett <nik9000@gmail.com>
Date: Mon, 11 Dec 2017 16:39:18 -0500
Subject: [PATCH] SQL: Fix docs build and cleanup docs index for merge

relates elastic/x-pack-elasticsearch#3084

Original commit: elastic/x-pack-elasticsearch@a64de41fbcc4988c509e6430474dd48fc9871bd7
---
 docs/en/index.asciidoc                       | 2 ++
 docs/en/sql/endpoints/sql-cli.asciidoc       | 2 +-
 docs/en/sql/endpoints/sql-endpoints.asciidoc | 1 -
 docs/en/sql/index.asciidoc                   | 3 +--
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/index.asciidoc b/docs/en/index.asciidoc
index 5dc8771d1dd..5b90a23ed3b 100644
--- a/docs/en/index.asciidoc
+++ b/docs/en/index.asciidoc
@@ -25,6 +25,8 @@ include::{es-repo-dir}/reference/index-shared3.asciidoc[]
 
 :edit_url!:
 include::sql/index.asciidoc[]
+
+:edit_url!:
 include::monitoring/index.asciidoc[]
 
 :edit_url!:
diff --git a/docs/en/sql/endpoints/sql-cli.asciidoc b/docs/en/sql/endpoints/sql-cli.asciidoc
index b2b259aa02e..9701409c90d 100644
--- a/docs/en/sql/endpoints/sql-cli.asciidoc
+++ b/docs/en/sql/endpoints/sql-cli.asciidoc
@@ -21,7 +21,7 @@ $ java -jar cli-{version}.jar https://some.server:9200
 The cli jar is entirely stand alone and can be moved whereever it is
 needed.
 
-Once the CLI is running you can use any <<sql-query-dsl,query>> that
+Once the CLI is running you can use any <<sql-spec,query>> that
 Elasticsearch supports:
 
 [source,sqlcli]
diff --git a/docs/en/sql/endpoints/sql-endpoints.asciidoc b/docs/en/sql/endpoints/sql-endpoints.asciidoc
index 5ef2d7b39ac..d9bb59f3896 100644
--- a/docs/en/sql/endpoints/sql-endpoints.asciidoc
+++ b/docs/en/sql/endpoints/sql-endpoints.asciidoc
@@ -1,5 +1,4 @@
 include::sql-rest.asciidoc[]
-include::sql-jdbc.asciidoc[]
 include::sql-translate.asciidoc[]
 include::sql-cli.asciidoc[]
 include::sql-jdbc.asciidoc[]
diff --git a/docs/en/sql/index.asciidoc b/docs/en/sql/index.asciidoc
index 147cc18ed75..6a5600d6281 100644
--- a/docs/en/sql/index.asciidoc
+++ b/docs/en/sql/index.asciidoc
@@ -2,7 +2,7 @@
 [[xpack-sql]]
 = SQL Access
 
-:sql-tests: {docdir}/../../../qa/sql
+:sql-tests: {docdir}/../../qa/sql
 :sql-specs: {sql-tests}/src/main/resources
 :jdbc-tests: {sql-tests}/src/main/java/org/elasticsearch/xpack/qa/sql/jdbc
 :security-tests: {sql-tests}/security/src/test/java/org/elasticsearch/xpack/qa/sql/security
@@ -32,4 +32,3 @@ include::functions/sql-functions.asciidoc[]
 include::language/sql-language.asciidoc[]
 
 :jdbc-tests!:
-