From 2695df253a2acef05f53cb38ffc77110ecb9996a Mon Sep 17 00:00:00 2001 From: lcawl Date: Thu, 17 May 2018 18:24:55 -0700 Subject: [PATCH 1/3] [DOCS] Moves x-pack/docs/index.asciidoc info to index.asciidoc --- docs/reference/index.asciidoc | 31 ++++++++++++++++++++++++++----- docs/reference/index.x.asciidoc | 13 +------------ 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/docs/reference/index.asciidoc b/docs/reference/index.asciidoc index 8aa9eef32f8bf..f0784aa3ed162 100644 --- a/docs/reference/index.asciidoc +++ b/docs/reference/index.asciidoc @@ -1,12 +1,33 @@ [[elasticsearch-reference]] = Elasticsearch Reference +:include-xpack: true :es-test-dir: {docdir}/../src/test :plugins-examples-dir: {docdir}/../../plugins/examples +:xes-repo-dir: {docdir}/../../x-pack/docs/{lang} +:es-repo-dir: {docdir} + include::../Versions.asciidoc[] -include::index-shared1.asciidoc[] -include::index-shared2.asciidoc[] -include::index-shared3.asciidoc[] -include::index-shared4.asciidoc[] -include::index-shared5.asciidoc[] + +include::{es-repo-dir}/index-shared1.asciidoc[] + +include::{xes-repo-dir}/setup/setup-xes.asciidoc[] + +include::{es-repo-dir}/index-shared2.asciidoc[] + +include::{es-repo-dir}/index-shared3.asciidoc[] + +include::{xes-repo-dir}/sql/index.asciidoc[] + +include::{xes-repo-dir}/monitoring/index.asciidoc[] + +include::{xes-repo-dir}/rollup/index.asciidoc[] + +include::{xes-repo-dir}/rest-api/index.asciidoc[] + +include::{xes-repo-dir}/commands/index.asciidoc[] + +include::{es-repo-dir}/index-shared4.asciidoc[] + +include::{es-repo-dir}/index-shared5.asciidoc[] diff --git a/docs/reference/index.x.asciidoc b/docs/reference/index.x.asciidoc index 5be21cb004331..35204eef5b67e 100644 --- a/docs/reference/index.x.asciidoc +++ b/docs/reference/index.x.asciidoc @@ -1,12 +1 @@ -[[elasticsearch-reference]] -= Elasticsearch Reference - -:include-xpack: true -:es-test-dir: {docdir}/../src/test -:plugins-examples-dir: {docdir}/../../plugins/examples -:xes-repo-dir: {docdir}/../../x-pack/docs/{lang} -:es-repo-dir: {docdir} - - -include::../Versions.asciidoc[] -include::{xes-repo-dir}/index.asciidoc[] +include::index.asciidoc[] From db22adb0e619bcc135a7173657266a62aae3b40e Mon Sep 17 00:00:00 2001 From: lcawl Date: Thu, 17 May 2018 18:32:36 -0700 Subject: [PATCH 2/3] [DOCS] Moves info from index-shared to index.asciidoc --- docs/reference/index-shared1.asciidoc | 4 -- docs/reference/index-shared2.asciidoc | 4 -- docs/reference/index-shared3.asciidoc | 26 ------------- docs/reference/index-shared4.asciidoc | 10 ----- docs/reference/index-shared5.asciidoc | 2 - docs/reference/index.asciidoc | 56 ++++++++++++++++++++++++--- 6 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 docs/reference/index-shared1.asciidoc delete mode 100644 docs/reference/index-shared2.asciidoc delete mode 100644 docs/reference/index-shared3.asciidoc delete mode 100644 docs/reference/index-shared4.asciidoc delete mode 100644 docs/reference/index-shared5.asciidoc diff --git a/docs/reference/index-shared1.asciidoc b/docs/reference/index-shared1.asciidoc deleted file mode 100644 index 9325bd6e73e29..0000000000000 --- a/docs/reference/index-shared1.asciidoc +++ /dev/null @@ -1,4 +0,0 @@ - -include::getting-started.asciidoc[] - -include::setup.asciidoc[] diff --git a/docs/reference/index-shared2.asciidoc b/docs/reference/index-shared2.asciidoc deleted file mode 100644 index c0c3f8a6766ec..0000000000000 --- a/docs/reference/index-shared2.asciidoc +++ /dev/null @@ -1,4 +0,0 @@ - -include::upgrade.asciidoc[] - -include::migration/index.asciidoc[] diff --git a/docs/reference/index-shared3.asciidoc b/docs/reference/index-shared3.asciidoc deleted file mode 100644 index 4da338186b0c8..0000000000000 --- a/docs/reference/index-shared3.asciidoc +++ /dev/null @@ -1,26 +0,0 @@ - -include::api-conventions.asciidoc[] - -include::docs.asciidoc[] - -include::search.asciidoc[] - -include::aggregations.asciidoc[] - -include::indices.asciidoc[] - -include::cat.asciidoc[] - -include::cluster.asciidoc[] - -include::query-dsl.asciidoc[] - -include::mapping.asciidoc[] - -include::analysis.asciidoc[] - -include::modules.asciidoc[] - -include::index-modules.asciidoc[] - -include::ingest.asciidoc[] diff --git a/docs/reference/index-shared4.asciidoc b/docs/reference/index-shared4.asciidoc deleted file mode 100644 index 3dc9e4f5e07cf..0000000000000 --- a/docs/reference/index-shared4.asciidoc +++ /dev/null @@ -1,10 +0,0 @@ - -include::how-to.asciidoc[] - -include::testing.asciidoc[] - -include::glossary.asciidoc[] - -include::release-notes/highlights.asciidoc[] - -include::release-notes.asciidoc[] \ No newline at end of file diff --git a/docs/reference/index-shared5.asciidoc b/docs/reference/index-shared5.asciidoc deleted file mode 100644 index 572522f6c8e74..0000000000000 --- a/docs/reference/index-shared5.asciidoc +++ /dev/null @@ -1,2 +0,0 @@ - -include::redirects.asciidoc[] diff --git a/docs/reference/index.asciidoc b/docs/reference/index.asciidoc index f0784aa3ed162..c081441948d1c 100644 --- a/docs/reference/index.asciidoc +++ b/docs/reference/index.asciidoc @@ -10,13 +10,51 @@ include::../Versions.asciidoc[] -include::{es-repo-dir}/index-shared1.asciidoc[] +include::getting-started.asciidoc[] + +include::setup.asciidoc[] + +include::upgrade.asciidoc[] include::{xes-repo-dir}/setup/setup-xes.asciidoc[] -include::{es-repo-dir}/index-shared2.asciidoc[] +include::{xes-repo-dir}/monitoring/configuring-monitoring.asciidoc[] + +include::{xes-repo-dir}/security/configuring-es.asciidoc[] + +include::{xes-repo-dir}/setup/setup-xclient.asciidoc[] + +include::{xes-repo-dir}/settings/configuring-xes.asciidoc[] + +include::setup/bootstrap-checks-xes.asciidoc[] + +include::migration/index.asciidoc[] + +include::api-conventions.asciidoc[] + +include::docs.asciidoc[] + +include::search.asciidoc[] + +include::aggregations.asciidoc[] + +include::indices.asciidoc[] -include::{es-repo-dir}/index-shared3.asciidoc[] +include::cat.asciidoc[] + +include::cluster.asciidoc[] + +include::query-dsl.asciidoc[] + +include::mapping.asciidoc[] + +include::analysis.asciidoc[] + +include::modules.asciidoc[] + +include::index-modules.asciidoc[] + +include::ingest.asciidoc[] include::{xes-repo-dir}/sql/index.asciidoc[] @@ -28,6 +66,14 @@ include::{xes-repo-dir}/rest-api/index.asciidoc[] include::{xes-repo-dir}/commands/index.asciidoc[] -include::{es-repo-dir}/index-shared4.asciidoc[] +include::how-to.asciidoc[] + +include::testing.asciidoc[] + +include::glossary.asciidoc[] + +include::release-notes/highlights.asciidoc[] + +include::release-notes.asciidoc[] -include::{es-repo-dir}/index-shared5.asciidoc[] +include::redirects.asciidoc[] From 1fc40e653067031ac5c1f33ae89038237e552a01 Mon Sep 17 00:00:00 2001 From: lcawl Date: Fri, 18 May 2018 11:02:53 -0700 Subject: [PATCH 3/3] [DOCS] Rebased with master --- docs/reference/index.asciidoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/reference/index.asciidoc b/docs/reference/index.asciidoc index c081441948d1c..59f8d77a0c086 100644 --- a/docs/reference/index.asciidoc +++ b/docs/reference/index.asciidoc @@ -14,8 +14,6 @@ include::getting-started.asciidoc[] include::setup.asciidoc[] -include::upgrade.asciidoc[] - include::{xes-repo-dir}/setup/setup-xes.asciidoc[] include::{xes-repo-dir}/monitoring/configuring-monitoring.asciidoc[] @@ -26,7 +24,9 @@ include::{xes-repo-dir}/setup/setup-xclient.asciidoc[] include::{xes-repo-dir}/settings/configuring-xes.asciidoc[] -include::setup/bootstrap-checks-xes.asciidoc[] +include::{xes-repo-dir}/setup/bootstrap-checks-xes.asciidoc[] + +include::upgrade.asciidoc[] include::migration/index.asciidoc[]