diff --git a/src/site/apt/examples/rapid-testing-jetty6-plugin.apt b/src/site/apt/examples/rapid-testing-jetty6-plugin.apt index a500a933..c2db3edf 100644 --- a/src/site/apt/examples/rapid-testing-jetty6-plugin.apt +++ b/src/site/apt/examples/rapid-testing-jetty6-plugin.apt @@ -72,4 +72,4 @@ Rapid Testing Using the Jetty Plugin The command will block with Jetty listening on port 8080. - Check the {{{http://docs.codehaus.org/display/JETTY/Maven+Jetty+Plugin}Jetty Plugin documentation}} for more details. + Check the {{{https://jetty.org/docs/jetty/12/programming-guide/maven-jetty/jetty-maven-plugin.html}Jetty Plugin documentation}} for more details. diff --git a/src/site/apt/examples/war-manifest-guide.apt.vm b/src/site/apt/examples/war-manifest-guide.apt.vm index a3aadb30..fe4e33ab 100644 --- a/src/site/apt/examples/war-manifest-guide.apt.vm +++ b/src/site/apt/examples/war-manifest-guide.apt.vm @@ -66,7 +66,7 @@ WAR Manifest Customization Now, you can control which dependencies are included in <<>> and in the manifest classpath by following these examples. Maven will follow the transitive dependency tree until it gets to artifacts scoped as "provided". - <> No way is shown how to include a dependency in <<>> but not in the manifest classpath. + <> No example is shown for including a dependency in <<>> while excluding it from the manifest classpath. +--------------------+ diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm index 8ebdac0a..70a585aa 100644 --- a/src/site/apt/index.apt.vm +++ b/src/site/apt/index.apt.vm @@ -38,11 +38,11 @@ ${project.name} <<>> phase for projects with a packaging type of <<>>. It builds a WAR file. - * {{{./exploded-mojo.html}war:exploded}} is generally used to speed up - testing during the developement phase by creating an exploded webapp + * {{{./exploded-mojo.html}war:exploded}} speeds up + testing during the development phase by creating an exploded webapp in a specified directory. - * {{{./inplace-mojo.html}war:inplace}} another variation of <<>> + * {{{./inplace-mojo.html}war:inplace}} is another variation of <<>> where the webapp is instead generated in the web application source directory, which is <<>> by default. diff --git a/src/site/apt/overlays.apt.vm b/src/site/apt/overlays.apt.vm index 741a80e5..924c368b 100644 --- a/src/site/apt/overlays.apt.vm +++ b/src/site/apt/overlays.apt.vm @@ -157,7 +157,7 @@ documentedprojectdependency-1.0-SNAPSHOT.war configure. Default value is: <<>>. * <> - the classifier of the overlay artifact you want to - configure if multiple artifacts matches the groupId/artifactId. + configure if multiple artifacts match the groupId/artifactId. * <> - the files to include. By default, all files are included. @@ -255,8 +255,8 @@ documentedprojectdependency-1.0-SNAPSHOT.war since they have not been configured in the <<<\>>> element. To perform an even more fine grained overwriting policy, overlays can be packaged multiple times - with different includes/excludes. For instance if the <<>> file of the - overlay <<>> <> be set in the webapp but other files can be controlled the + with different includes/excludes. For example, if the <<>> file of the + overlay <<>> <> be set in the webapp but other files can be controlled in the regular way, define two overlay configurations for <<>>: +-----------------+ diff --git a/src/site/apt/usage.apt.vm b/src/site/apt/usage.apt.vm index 3e3b1cc0..c88c27d4 100644 --- a/src/site/apt/usage.apt.vm +++ b/src/site/apt/usage.apt.vm @@ -129,7 +129,7 @@ documentedproject-1.0-SNAPSHOT.war *Invocation of <<>> goal - To speed up testing during the developement phase, <<>> can be used to generate the WAR in exploded + To speed up testing during the development phase, <<>> can generate the WAR in exploded form. Use the same project as above and invoke: