SQL: Fix docs build and cleanup docs index for merge

relates elastic/x-pack-elasticsearch#3084

Original commit: elastic/x-pack-elasticsearch@a64de41fbc
This commit is contained in:
Nik Everett 2017-12-11 16:39:18 -05:00
parent 2d9ce6132b
commit c27332be4a
4 changed files with 4 additions and 4 deletions

View File

@ -25,6 +25,8 @@ include::{es-repo-dir}/reference/index-shared3.asciidoc[]
:edit_url!: :edit_url!:
include::sql/index.asciidoc[] include::sql/index.asciidoc[]
:edit_url!:
include::monitoring/index.asciidoc[] include::monitoring/index.asciidoc[]
:edit_url!: :edit_url!:

View File

@ -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 The cli jar is entirely stand alone and can be moved whereever it is
needed. 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: Elasticsearch supports:
[source,sqlcli] [source,sqlcli]

View File

@ -1,5 +1,4 @@
include::sql-rest.asciidoc[] include::sql-rest.asciidoc[]
include::sql-jdbc.asciidoc[]
include::sql-translate.asciidoc[] include::sql-translate.asciidoc[]
include::sql-cli.asciidoc[] include::sql-cli.asciidoc[]
include::sql-jdbc.asciidoc[] include::sql-jdbc.asciidoc[]

View File

@ -2,7 +2,7 @@
[[xpack-sql]] [[xpack-sql]]
= SQL Access = SQL Access
:sql-tests: {docdir}/../../../qa/sql :sql-tests: {docdir}/../../qa/sql
:sql-specs: {sql-tests}/src/main/resources :sql-specs: {sql-tests}/src/main/resources
:jdbc-tests: {sql-tests}/src/main/java/org/elasticsearch/xpack/qa/sql/jdbc :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 :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[] include::language/sql-language.asciidoc[]
:jdbc-tests!: :jdbc-tests!: