From ca5891c93caf9fc9a2f4460501863428595261f0 Mon Sep 17 00:00:00 2001 From: lcawl Date: Thu, 17 May 2018 16:06:08 -0700 Subject: [PATCH 1/4] [DOCS] Removed OSS-only doc build command aliases --- doc_build_aliases.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index d80028e790f72..f20c7007dec2b 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -11,28 +11,28 @@ # Elasticsearch -alias docbldes='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/elasticsearch/docs/reference/index.asciidoc --chunk 1' - alias docbldesx='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/elasticsearch/docs/reference/index.x.asciidoc --resource=$GIT_HOME/elasticsearch/x-pack/docs/ --chunk 1' +alias docbldes=docbldesx + # Elasticsearch 6.2 and earlier alias docbldesold='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/elasticsearch/docs/reference/index.x.asciidoc --resource=$GIT_HOME/elasticsearch-extra/x-pack-elasticsearch/docs/ --chunk 1' # Kibana -alias docbldkb='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/kibana/docs/index.asciidoc --chunk 1' - alias docbldkbx='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/kibana/docs/index.x.asciidoc --resource=$GIT_HOME/kibana/x-pack/docs/ --chunk 1' +alias docbldkb=docbldkbx + # Kibana 6.2 and earlier alias docbldkbold='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/kibana/docs/index.x.asciidoc --resource=$GIT_HOME/kibana-extra/x-pack-kibana/docs/ --chunk 1' # Logstash -alias docbldls='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/logstash/docs/index.asciidoc --resource=$GIT_HOME/logstash-docs/docs/ --chunk 1' - alias docbldlsx='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/logstash/docs/index.x.asciidoc --resource=$GIT_HOME/logstash-docs/docs/ --resource=$GIT_HOME/logstash/x-pack/docs/ --chunk 1' +alias docbldls=docbldlsx + # Logstash 6.2 and earlier alias docbldlsold='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/logstash/docs/index.x.asciidoc --resource=$GIT_HOME/logstash-docs/docs/ --resource=$GIT_HOME/logstash-extra/x-pack-logstash/docs/ --chunk 1' From e66bfe11e9bda3fa8d2038356b07afae28c85731 Mon Sep 17 00:00:00 2001 From: lcawl Date: Thu, 17 May 2018 16:34:07 -0700 Subject: [PATCH 2/4] [DOCS] Updated docbldkbx to use index.asciidoc --- doc_build_aliases.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index f20c7007dec2b..64bdc23c3e8ad 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -20,7 +20,7 @@ alias docbldes=docbldesx alias docbldesold='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/elasticsearch/docs/reference/index.x.asciidoc --resource=$GIT_HOME/elasticsearch-extra/x-pack-elasticsearch/docs/ --chunk 1' # Kibana -alias docbldkbx='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/kibana/docs/index.x.asciidoc --resource=$GIT_HOME/kibana/x-pack/docs/ --chunk 1' +alias docbldkbx='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/kibana/docs/index.asciidoc --resource=$GIT_HOME/kibana/x-pack/docs/ --chunk 1' alias docbldkb=docbldkbx From 4d80f84d03102916321519cfb5eca7027cd5d04f Mon Sep 17 00:00:00 2001 From: lcawl Date: Thu, 17 May 2018 17:19:58 -0700 Subject: [PATCH 3/4] [DOCS] Updates docbldlsx to use index.asciidoc --- doc_build_aliases.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 64bdc23c3e8ad..588d9e8c0cde1 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -29,7 +29,7 @@ alias docbldkb=docbldkbx alias docbldkbold='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/kibana/docs/index.x.asciidoc --resource=$GIT_HOME/kibana-extra/x-pack-kibana/docs/ --chunk 1' # Logstash -alias docbldlsx='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/logstash/docs/index.x.asciidoc --resource=$GIT_HOME/logstash-docs/docs/ --resource=$GIT_HOME/logstash/x-pack/docs/ --chunk 1' +alias docbldlsx='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/logstash/docs/index.asciidoc --resource=$GIT_HOME/logstash-docs/docs/ --resource=$GIT_HOME/logstash/x-pack/docs/ --chunk 1' alias docbldls=docbldlsx From b94480d7f143aa42dbe85d1d0bd54d4049e88337 Mon Sep 17 00:00:00 2001 From: lcawl Date: Fri, 18 May 2018 10:25:08 -0700 Subject: [PATCH 4/4] [DOCS] Updates docbldesx to use index.asciidoc --- doc_build_aliases.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 588d9e8c0cde1..31ab51b359958 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -17,7 +17,7 @@ alias docbldes=docbldesx # Elasticsearch 6.2 and earlier -alias docbldesold='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/elasticsearch/docs/reference/index.x.asciidoc --resource=$GIT_HOME/elasticsearch-extra/x-pack-elasticsearch/docs/ --chunk 1' +alias docbldesold='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/elasticsearch/docs/reference/index.asciidoc --resource=$GIT_HOME/elasticsearch-extra/x-pack-elasticsearch/docs/ --chunk 1' # Kibana alias docbldkbx='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/kibana/docs/index.asciidoc --resource=$GIT_HOME/kibana/x-pack/docs/ --chunk 1'