Merge branch '1.0.x'

Author: wilkinsona

docs/src/docs/asciidoc/getting-started.adoc

@@ -82,7 +82,7 @@ the configuration are described below.
 <executions>
 <execution>
 <id>generate-docs</id>
-<phase>package</phase> <6>
+<phase>prepare-package</phase> <6>
 <goals>
 <goal>process-asciidoc</goal>
 </goals>
@@ -108,9 +108,8 @@ the configuration are described below.
 <4> Add the Asciidoctor plugin
 <5> Define an attribute named `snippets` that can be used when including the generated
 snippets in your documentation.
-<6> [[getting-started-build-configuration-maven-plugin-phase]] If you want to
-<<getting-started-build-configuration-maven-packaging, package the documentation>> in your
-project's jar you should use the `prepare-package` phase.
+<6> Using `prepare-package` allows the documentation to be
+<<getting-started-build-configuration-maven-packaging, included in the package>>.
 
 [source,groovy,indent=0,subs="verbatim,attributes",role="secondary"]
 .Gradle