From 79ffe02bec6c13ad84dd442e868672d6824a05e5 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Mon, 11 Mar 2019 14:10:29 -0400 Subject: [PATCH 1/3] Switch the groovy API to Asciidoctor Switches the groovy API for Elasticsearch to Asciidoctor. The html has a few spacing differences but is otherwise the same. --- conf.yaml | 1 + doc_build_aliases.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conf.yaml b/conf.yaml index 742b85a25842d..a00cba6c22321 100644 --- a/conf.yaml +++ b/conf.yaml @@ -310,6 +310,7 @@ contents: index: docs/groovy-api/index.asciidoc tags: Clients/Groovy subject: Clients + asciidoctor: true sources: - repo: elasticsearch diff --git a/doc_build_aliases.sh b/doc_build_aliases.sh index e271638d5f072..29a9ab9b7850d 100644 --- a/doc_build_aliases.sh +++ b/doc_build_aliases.sh @@ -114,7 +114,7 @@ alias docbldejv='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/elasticsearch/docs alias docbldejs='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/elasticsearch-js/docs/index.asciidoc' -alias docbldegr='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/elasticsearch/docs/groovy-api/index.asciidoc' +alias docbldegr='$GIT_HOME/docs/build_docs --asciidoctor --doc $GIT_HOME/elasticsearch/docs/groovy-api/index.asciidoc' alias docbldnet='$GIT_HOME/docs/build_docs.pl --doc $GIT_HOME/elasticsearch-net/docs/index.asciidoc --chunk 1' From 9117ebc1e66aba9bfd691ed58821018de95296ab Mon Sep 17 00:00:00 2001 From: lcawl Date: Mon, 11 Mar 2019 12:32:45 -0700 Subject: [PATCH 2/3] Moves groovy client to legacy documentation --- conf.yaml | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/conf.yaml b/conf.yaml index a00cba6c22321..f068cd8040eb6 100644 --- a/conf.yaml +++ b/conf.yaml @@ -301,25 +301,7 @@ contents: - repo: elasticsearch-js path: docs/ - - - - title: Groovy API - prefix: groovy-api - current: 2.4 - branches: [ master, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - index: docs/groovy-api/index.asciidoc - tags: Clients/Groovy - subject: Clients - asciidoctor: true - sources: - - - repo: elasticsearch - path: docs/groovy-api - - - repo: elasticsearch - path: docs/Versions.asciidoc - exclude_branches: [ 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] - + - title: .NET API prefix: net-api @@ -1294,6 +1276,23 @@ contents: - repo: x-pack path: docs/public/graph + - + title: Groovy API + prefix: groovy-api + current: 2.4 + branches: [ master, 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] + index: docs/groovy-api/index.asciidoc + tags: Clients/Groovy + subject: Clients + asciidoctor: true + sources: + - + repo: elasticsearch + path: docs/groovy-api + - + repo: elasticsearch + path: docs/Versions.asciidoc + exclude_branches: [ 2.4, 2.3, 2.2, 2.1, 2.0, 1.7, 1.6, 1.5, 1.4, 1.3, 0.90 ] redirects: - From 18e6e81d63617e70ac205a3abcae0b4c4bbc113f Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Tue, 12 Mar 2019 09:48:52 -0400 Subject: [PATCH 3/3] Merge gunk --- conf.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf.yaml b/conf.yaml index de41bd6f7d949..71e9cf5e8d983 100644 --- a/conf.yaml +++ b/conf.yaml @@ -1285,10 +1285,7 @@ contents: index: docs/groovy-api/index.asciidoc tags: Clients/Groovy subject: Clients -<<<<<<< HEAD asciidoctor: true -======= ->>>>>>> master sources: - repo: elasticsearch