From 017f5e685315916ebc6c047fc61d08a15b428bc0 Mon Sep 17 00:00:00 2001 From: Joe Di Pol Date: Tue, 12 May 2020 12:19:06 -0700 Subject: [PATCH] Fix formatting issues with included guides --- docs/common/guides/graalnative.adoc | 9 --------- docs/common/guides/gradle_build.adoc | 9 --------- docs/common/guides/jlink_image.adoc | 11 ----------- docs/common/guides/maven_build.adoc | 9 --------- docs/mp/guides/25_maven_build.adoc | 2 ++ docs/mp/guides/26_gradle_build.adoc | 2 ++ docs/mp/guides/36_graalnative.adoc | 3 +++ docs/mp/guides/37_jlink_image.adoc | 3 +++ docs/se/guides/25_maven_build.adoc | 2 ++ docs/se/guides/26_gradle_build.adoc | 2 ++ docs/se/guides/36_graalnative.adoc | 2 ++ docs/se/guides/37_jlink_image.adoc | 3 +++ docs/sitegen.yaml | 1 + 13 files changed, 20 insertions(+), 38 deletions(-) diff --git a/docs/common/guides/graalnative.adoc b/docs/common/guides/graalnative.adoc index d798b42a199..29199af4175 100644 --- a/docs/common/guides/graalnative.adoc +++ b/docs/common/guides/graalnative.adoc @@ -16,15 +16,6 @@ /////////////////////////////////////////////////////////////////////////////// -= GraalVM Native Images - -//:description: Helidon Native Images -//:keywords: helidon, guide, graalvm -//:docker-multi-stage-url: https://docs.docker.com/develop/develop-images/multistage-build/ -// :helidon-uc-flavor: MP-or-SE -// :helidon-lc-flavor: mp-or-se - -This guide describes how to build a GraalVM native image for a Helidon SE application. == Introduction diff --git a/docs/common/guides/gradle_build.adoc b/docs/common/guides/gradle_build.adoc index 875cdfc34e9..14cf0055bcf 100644 --- a/docs/common/guides/gradle_build.adoc +++ b/docs/common/guides/gradle_build.adoc @@ -16,15 +16,6 @@ /////////////////////////////////////////////////////////////////////////////// -= Gradle Guide - -// :description: Gradle Guide -// :keywords: helidon, guide, gradle -// :helidon-uc-flavor: MP-or-SE -// :helidon-lc-flavor: mp-or-se - -This guide describes Helidon's support for Gradle projects. - == Introduction While most of Helidon's examples use Maven, you can also use Helidon diff --git a/docs/common/guides/jlink_image.adoc b/docs/common/guides/jlink_image.adoc index ea4e6d65d21..d1319621cb3 100644 --- a/docs/common/guides/jlink_image.adoc +++ b/docs/common/guides/jlink_image.adoc @@ -16,17 +16,6 @@ /////////////////////////////////////////////////////////////////////////////// -= Custom Runtime Images with `jlink` - -// :description: Helidon Custom Runtime Images -// :keywords: helidon, guide, jlink, image -// :helidon-uc-flavor: MP-or-SE -// :helidon-lc-flavor: mp-or-se -// :docker-multi-stage-url: https://docs.docker.com/develop/develop-images/multistage-build/ - -This guide describes how to build a custom runtime image for your Helidon application -using Helidon's support for the JDK's `jlink` tool. - == Introduction JDK 9 introduced the https://docs.oracle.com/en/java/javase/11/tools/jlink.html[`jlink`] diff --git a/docs/common/guides/maven_build.adoc b/docs/common/guides/maven_build.adoc index 94a9debedd6..ccb5f2a5dae 100644 --- a/docs/common/guides/maven_build.adoc +++ b/docs/common/guides/maven_build.adoc @@ -16,15 +16,6 @@ /////////////////////////////////////////////////////////////////////////////// -= Maven Guide - -// :description: Maven Guide -// :keywords: helidon, guide, maven -// :helidon-uc-flavor: MP-or-SE -// :helidon-lc-flavor: mp-or-se - -This guide describes Helidon's support for Maven projects. - == Introduction Helidon supports Maven by providing the following: diff --git a/docs/mp/guides/25_maven_build.adoc b/docs/mp/guides/25_maven_build.adoc index 20ffc328234..7f0774eace6 100644 --- a/docs/mp/guides/25_maven_build.adoc +++ b/docs/mp/guides/25_maven_build.adoc @@ -22,4 +22,6 @@ :helidon-uc-flavor: MP :helidon-lc-flavor: mp +This guide describes Helidon's support for Maven projects. + include::../../common/guides/maven_build.adoc[] diff --git a/docs/mp/guides/26_gradle_build.adoc b/docs/mp/guides/26_gradle_build.adoc index d444b158360..60cbf7c01d5 100644 --- a/docs/mp/guides/26_gradle_build.adoc +++ b/docs/mp/guides/26_gradle_build.adoc @@ -22,4 +22,6 @@ :helidon-uc-flavor: MP :helidon-lc-flavor: mp +This guide describes Helidon's support for Gradle projects. + include::../../common/guides/gradle_build.adoc[] diff --git a/docs/mp/guides/36_graalnative.adoc b/docs/mp/guides/36_graalnative.adoc index ce49d6e4a42..35f823b5520 100644 --- a/docs/mp/guides/36_graalnative.adoc +++ b/docs/mp/guides/36_graalnative.adoc @@ -23,4 +23,7 @@ :helidon-lc-flavor: mp :docker-multi-stage-url: https://docs.docker.com/develop/develop-images/multistage-build/ +This guide describes how to build a GraalVM native image for a Helidon MP application. + + include::../../common/guides/graalnative.adoc[] diff --git a/docs/mp/guides/37_jlink_image.adoc b/docs/mp/guides/37_jlink_image.adoc index a0b6f254161..1b3d73ddd76 100644 --- a/docs/mp/guides/37_jlink_image.adoc +++ b/docs/mp/guides/37_jlink_image.adoc @@ -23,4 +23,7 @@ :helidon-lc-flavor: mp :docker-multi-stage-url: https://docs.docker.com/develop/develop-images/multistage-build/ +This guide describes how to build a custom runtime image for your Helidon application +using Helidon's support for the JDK's `jlink` tool. + include::../../common/guides/jlink_image.adoc[] diff --git a/docs/se/guides/25_maven_build.adoc b/docs/se/guides/25_maven_build.adoc index 1b85f2da49b..ca08b9de20f 100644 --- a/docs/se/guides/25_maven_build.adoc +++ b/docs/se/guides/25_maven_build.adoc @@ -22,4 +22,6 @@ :helidon-uc-flavor: SE :helidon-lc-flavor: se +This guide describes Helidon's support for Maven projects. + include::../../common/guides/maven_build.adoc[] diff --git a/docs/se/guides/26_gradle_build.adoc b/docs/se/guides/26_gradle_build.adoc index 18126cecdca..2af6096d0cc 100644 --- a/docs/se/guides/26_gradle_build.adoc +++ b/docs/se/guides/26_gradle_build.adoc @@ -22,4 +22,6 @@ :helidon-uc-flavor: SE :helidon-lc-flavor: se +This guide describes Helidon's support for Gradle projects. + include::../../common/guides/gradle_build.adoc[] diff --git a/docs/se/guides/36_graalnative.adoc b/docs/se/guides/36_graalnative.adoc index 10f23298298..f0d0ed4c80c 100644 --- a/docs/se/guides/36_graalnative.adoc +++ b/docs/se/guides/36_graalnative.adoc @@ -23,4 +23,6 @@ :helidon-lc-flavor: se :docker-multi-stage-url: https://docs.docker.com/develop/develop-images/multistage-build/ +This guide describes how to build a GraalVM native image for a Helidon SE application. + include::../../common/guides/graalnative.adoc[] diff --git a/docs/se/guides/37_jlink_image.adoc b/docs/se/guides/37_jlink_image.adoc index 02171b1898f..a3094d0e91b 100644 --- a/docs/se/guides/37_jlink_image.adoc +++ b/docs/se/guides/37_jlink_image.adoc @@ -23,4 +23,7 @@ :helidon-lc-flavor: se :docker-multi-stage-url: https://docs.docker.com/develop/develop-images/multistage-build/ +This guide describes how to build a custom runtime image for your Helidon application +using Helidon's support for the JDK's `jlink` tool. + include::../../common/guides/jlink_image.adoc[] diff --git a/docs/sitegen.yaml b/docs/sitegen.yaml index 27a30430212..28f56d016d9 100644 --- a/docs/sitegen.yaml +++ b/docs/sitegen.yaml @@ -45,6 +45,7 @@ pages: - "**/*.adoc" excludes: - "se/grpc/09_marshalling.adoc" + - "common/**" backend: name: "vuetify" homePage: "about/01_overview.adoc"