From 07031f59be6da592359e7905024afa0710b9535d Mon Sep 17 00:00:00 2001 From: delvedor Date: Tue, 12 Mar 2019 14:34:04 +0100 Subject: [PATCH 1/3] Updated configuration for js client --- conf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.yaml b/conf.yaml index 8d496826c3df4..c6b1fde0bce15 100644 --- a/conf.yaml +++ b/conf.yaml @@ -292,8 +292,8 @@ contents: - title: JavaScript API prefix: javascript-api - current: 15.x - branches: [ 15.x ] + current: 6.x + branches: [ master, 7.x, 6.x, 5.x ] index: docs/index.asciidoc tags: Clients/JavaScript subject: Clients From db2f8969eb9f4bff18dbb0eab129dfdd108ed999 Mon Sep 17 00:00:00 2001 From: delvedor Date: Wed, 27 Mar 2019 13:42:05 +0100 Subject: [PATCH 2/3] Updated current and added legacy doc --- conf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.yaml b/conf.yaml index c6b1fde0bce15..07087ef2593c3 100644 --- a/conf.yaml +++ b/conf.yaml @@ -292,8 +292,8 @@ contents: - title: JavaScript API prefix: javascript-api - current: 6.x - branches: [ master, 7.x, 6.x, 5.x ] + current: 7.x + branches: [ master, 7.x, 6.x, 5.x, 15.x ] index: docs/index.asciidoc tags: Clients/JavaScript subject: Clients From 32b8ee41669e5d70e6a5f0bcde9337168cd265a9 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Thu, 28 Mar 2019 09:51:03 -0400 Subject: [PATCH 3/3] Update and pick up asciidoctor This handles merging master into the PR branch and it sets up asciidoctor. All of the docs build with this but the link checking fails. You can test this with: ``` ./build_docs --all --target_repo git@github.com:elastic/built-docs.git --open ``` --- conf.yaml | 3 ++- doc_build_aliases.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/conf.yaml b/conf.yaml index 110b2cd890fc8..8d233cbced8c0 100644 --- a/conf.yaml +++ b/conf.yaml @@ -21,7 +21,7 @@ repos: curator: https://github.com/elastic/curator.git ecs: https://github.com/elastic/ecs.git elasticsearch-hadoop: https://github.com/elastic/elasticsearch-hadoop.git - elasticsearch-js: https://github.com/elastic/elasticsearch-js-legacy.git + elasticsearch-js: https://github.com/elastic/elasticsearch-js.git elasticsearch-net: https://github.com/elastic/elasticsearch-net.git elasticsearch-php: https://github.com/elastic/elasticsearch-php elasticsearch-php-cn: https://github.com/elasticsearch-cn/elasticsearch-php.git @@ -314,6 +314,7 @@ contents: index: docs/index.asciidoc tags: Clients/JavaScript subject: Clients + asciidoctor: true sources: - repo: elasticsearch-js diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index 6dd0385402e0d..92bcc9eb557d6 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -116,7 +116,7 @@ alias docbldjvr='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/elasticsearch/docs alias docbldejv='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/elasticsearch/docs/java-api/index.asciidoc --chunk 1' -alias docbldejs='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/elasticsearch-js/docs/index.asciidoc' +alias docbldejs='$GIT_HOME/docs/build_docs --asciidoctor --doc $GIT_HOME/elasticsearch-js/docs/index.asciidoc' alias docbldegr='$GIT_HOME/docs/build_docs --asciidoctor --doc $GIT_HOME/elasticsearch/docs/groovy-api/index.asciidoc'