Merge branch 'master' of github.com:spring-guides/getting-started-macros

Author: gregturn

build_system_intro_yarn.adoc

@@ -0,0 +1,7 @@
+
+:linkattrs:
+
+We also have additional guides having specific instructions using
+build systems with Spring YARN. If you're not familiar with either, refer to
+link:/guides/gs/gradle-yarn[Building Spring YARN Projects with Gradle] or
+link:/guides/gs/maven-yarn[Building Spring YARN Projects with Maven].

build_yarn_application.adoc

@@ -7,7 +7,7 @@ ifndef::yarn_base_dist[:yarn_base_dist: dist]
 
 == Build the Application
 
-For gradle simply execute a `clean` and `build` commands.
+For gradle simply execute the `clean` and `build` tasks.
 [source,text]
 ----
 ./gradlew clean build
@@ -19,7 +19,7 @@ To skip existing tests if any:
 ./gradlew clean build -x test
 ----
 
-For maven simply execute a `clean` and `package` commands.
+For maven simply execute the `clean` and `package` goals.
 [source,text]
 ----
 mvn clean package

create_both_builds_multi.adoc

@@ -0,0 +1,2 @@
+=== Create the Gradle build files
+Below is the https://github.com/spring-guides/{project_id}/blob/master/initial/build.gradle[initial Gradle build file] and the https://github.com/spring-guides/{project_id}/blob/master/initial/settings.gradle[initial Gradle settings file]. But you can also use Maven. The pom.xml file is included https://github.com/spring-guides/{project_id}/blob/master/initial/pom.xml[right here]. If you are using link:/guides/gs/sts[Spring Tool Suite (STS)], you can import the guide directly.

create_directory_structure_yarn_hello.adoc

@@ -13,30 +13,30 @@ subdirectory structure:
 [subs="attributes"]
 ```
 ├── {yarn_base_appmaster}
-├   └── src
-├       └── main
-├           ├── resources
-├           └── java
-├               └── hello
-├                   └── appmaster
+│   └── src
+│       └── main
+│           ├── resources
+│           └── java
+│               └── hello
+│                   └── appmaster
 ├── {yarn_base_container}
-├   └── src
-├       └── main
-├           ├── resources
-├           └── java
-├               └── hello
-├                   └── container
+│   └── src
+│       └── main
+│           ├── resources
+│           └── java
+│               └── hello
+│                   └── container
 ├── {yarn_base_client}
-├   └── src
-├       └── main
-├           ├── resources
-├           └── java
-├               └── hello
-├                   └── client
+│   └── src
+│       └── main
+│           ├── resources
+│           └── java
+│               └── hello
+│                   └── client
 └── {yarn_base_dist}
 ```
 
-for example, with
+for example, on *nix systems, with:
 
 [subs="attributes"]
 ```
@@ -48,5 +48,5 @@ mkdir -p {yarn_base_client}/src/main/resources
 mkdir -p {yarn_base_client}/src/main/java/hello/client
 mkdir -p {yarn_base_dist}
 ```
-on *nix systems:
+
 

create_directory_structure_yarn_test_hello.adoc

@@ -13,26 +13,26 @@ subdirectory structure:
 [subs="attributes"]
 ```
 ├── {yarn_base_appmaster}
-├   └── src
-├       └── main
-├           ├── resources
-├           └── java
-├               └── hello
-├                   └── appmaster
+│   └── src
+│       └── main
+│           ├── resources
+│           └── java
+│               └── hello
+│                   └── appmaster
 ├── {yarn_base_container}
-├   └── src
-├       └── main
-├           ├── resources
-├           └── java
-├               └── hello
-├                   └── container
+│   └── src
+│       └── main
+│           ├── resources
+│           └── java
+│               └── hello
+│                   └── container
 ├── {yarn_base_client}
-├   └── src
-├       └── main
-├           ├── resources
-├           └── java
-├               └── hello
-├                   └── client
+│   └── src
+│       └── main
+│           ├── resources
+│           └── java
+│               └── hello
+│                   └── client
 └── {yarn_base_dist}
     └── src
         └── test