Some more cleanup for install guides

Author: chkal

src/ozark/docs/install-javaee.adoc

@@ -3,80 +3,63 @@ title: Install Guide for Java EE
 template: page.html
 ---
 
-[[install-guide-for-java-ee]]
-Install Guide for Java EE
-~~~~~~~~~~~~~~~~~~~~~~~~~
+== Install Guide for Java EE
 
-MVC is built on top of JAX-RS. This means that Ozark can be run on most
-application servers without any additional configuration. You will just
-need to include the MVC API JAR as well as the Ozark module for the
-JAX-RS implementation shipped with your application server.
+MVC is built on top of JAX-RS. This means that Ozark can be run on most application servers without 
+any additional configuration. You will just need to include the MVC API JAR as well as the Ozark module 
+for the JAX-RS implementation shipped with your application server.
 
-Ozark requires at least the Java EE 8 Web-Profile or the Eclipse
-MicroProfile.
+Ozark requires at least the Java EE 8 Web-Profile or the Eclipse MicroProfile.
 
-Note: The MVC specification and Ozark are under active development.
-Therefore, you will have to add the Sonatype OSS snapshot repository to
-your POM to get the latest and greatest version. Please refer to
-link:install-snapshots.html[Setting up the snapshot repository] for
-details.
+NOTE: The MVC specification and Ozark are under active development. Therefore, we recommend to use the latest 
+snapshots for your experiments. This will ensure, that you are using the latest version of both the API 
+and the implementation. Please refer to link:install-snapshots.html[Using the latest snapshots] to learn more. 
 
-[[required-dependencies]]
-Required dependencies
-^^^^^^^^^^^^^^^^^^^^^
+=== Required dependencies
 
-The dependencies you need to add to your `pom.xml` file depend on which
-application server your are using.
+The dependencies you need to add to your `pom.xml` file depend on which application server your are using.
 
-[[glassfishpayara]]
-Glassfish/Payara
-++++++++++++++++
+==== Glassfish/Payara
 
-Glassfish comes with Jersey as its JAX-RS implementation. Please add the
-following dependencies to your application:
+Glassfish comes with Jersey as its JAX-RS implementation. Please add the following dependencies to your 
+application:
 
 [source,xml]
 ----
 <dependency>
     <groupId>javax.mvc</groupId>
     <artifactId>javax.mvc-api</artifactId>
-    <version>{{versions.spec.develop}}</version>
+    <version>{{versions.spec.latest}}</version>
 </dependency>
 <dependency>
     <groupId>org.mvc-spec.ozark</groupId>
     <artifactId>ozark-jersey</artifactId>
-    <version>{{versions.ozark.develop}}</version>
+    <version>{{versions.ozark.latest}}</version>
 </dependency>
 ----
 
-[[wildfly-and-jboss-eap]]
-Wildfly and JBoss EAP
-+++++++++++++++++++++
+==== Wildfly and JBoss EAP
 
-Wildfly is using RESTEasy for JAX-RS. So you need to Ozark RESTEasy
-integration module:
+Wildfly is using RESTEasy for JAX-RS. So you need to Ozark RESTEasy integration module:
 
 [source,xml]
 ----
 <dependency>
     <groupId>javax.mvc</groupId>
     <artifactId>javax.mvc-api</artifactId>
-    <version>{{versions.spec.develop}}</version>
+    <version>{{versions.spec.latest}}</version>
 </dependency>
 <dependency>
     <groupId>org.mvc-spec.ozark</groupId>
     <artifactId>ozark-resteasy</artifactId>
-    <version>{{versions.ozark.develop}}</version>
+    <version>{{versions.ozark.latest}}</version>
 </dependency>
 ----
 
-[[wildfly-swarm]]
-Wildfly Swarm
-+++++++++++++
+==== Wildfly Swarm
 
-We currently don't have a dedicated fraction for wildfly Swarm, but you
-can use the JAX-RS fraction and add the same dependencies as required
-for Wildfly:
+We currently don't have a dedicated fraction for wildfly Swarm, but you can use the JAX-RS fraction and add
+the same dependencies as required for Wildfly:
 
 [source,xml]
 ----
@@ -87,56 +70,51 @@ for Wildfly:
 <dependency>
     <groupId>javax.mvc</groupId>
     <artifactId>javax.mvc-api</artifactId>
-    <version>{{versions.spec.develop}}</version>
+    <version>{{versions.spec.latest}}</version>
 </dependency>
 <dependency>
     <groupId>org.mvc-spec.ozark</groupId>
     <artifactId>ozark-resteasy</artifactId>
-    <version>{{versions.ozark.develop}}</version>
+    <version>{{versions.ozark.latest}}</version>
 </dependency>
 ----
 
-[[apache-tomee]]
-Apache TomEE
-++++++++++++
+==== Apache TomEE
 
-Apache TomEE uses CXF as the JAX-RS implementation. Unfortunately there
-are some known bugs in CXF which are causing trouble for Ozark. The
-latest CXF release should fix these issues, but Apache TomEE currently
-ships with an older CXF release.
+Apache TomEE uses CXF as the JAX-RS implementation. Unfortunately there are some known bugs in CXF 
+which are causing trouble for Ozark. The latest CXF release should fix these issues, but 
+Apache TomEE currently ships with an older CXF release.
 
-If you want to give Ozark on Apache TomEE a try, add the following
-dependencies to your `pom.xml`:
+If you want to give Ozark on Apache TomEE a try, add the following dependencies to your `pom.xml`:
 
 [source,xml]
 ----
 <dependency>
     <groupId>javax.mvc</groupId>
     <artifactId>javax.mvc-api</artifactId>
-    <version>{{versions.spec.develop}}</version>
+    <version>{{versions.spec.latest}}</version>
 </dependency>
 <dependency>
     <groupId>org.mvc-spec.ozark</groupId>
     <artifactId>ozark-core</artifactId>
-    <version>{{versions.ozark.develop}}</version>
+    <version>{{versions.ozark.latest}}</version>
 </dependency>
 ----
 
-If using CXF with Ozark is causing trouble, you can also manually add
-RESTEasy to your application and use this instead of CXF. To do so, use
-the following depndencies instead.
+If using CXF with Ozark is causing trouble, you can also manually add RESTEasy to your application and 
+use this instead of CXF. To do so, use the following depndencies instead.
 
 [source,xml]
 ----
 <dependency>
     <groupId>javax.mvc</groupId>
     <artifactId>javax.mvc-api</artifactId>
-    <version>{{versions.spec.develop}}</version>
+    <version>{{versions.spec.latest}}</version>
 </dependency>
 <dependency>
     <groupId>org.mvc-spec.ozark</groupId>
     <artifactId>ozark-resteasy</artifactId>
-    <version>{{versions.ozark.develop}}</version>
+    <version>{{versions.ozark.latest}}</version>
 </dependency>
 <dependency>
     <groupId>org.jboss.resteasy</groupId>

src/ozark/docs/install-servlet.adoc

@@ -3,36 +3,26 @@ title: Install Guide for Servlet Containers
 template: page.html
 ---
 
-[[install-guide-for-servlet-containers]]
-Install Guide for Servlet Containers
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The simplest way to get started with MVC is to deploy your app to a
-JavaEE 7 application server. In this setup the application server will
-provider JAX-RS, CDI and Beań Validation implemnetations for you. Please
-refer to link:install-javaee.html[Install Guide for Java EE] for details
+== Install Guide for Servlet Containers
+
+The simplest way to get started with MVC is to deploy your app to a JavaEE 7 application server. 
+In this setup the application server will provider JAX-RS, CDI and Beań Validation implemnetations 
+for you. Please refer to link:install-javaee.html[Install Guide for Java EE] for details
 about this setup.
 
-However, there is a large number of users who prefer to run their
-applications on plain Servlet containers like Apache Tomcat and Jetty.
-In this setup you will have to provider JAX-RS, CDI and Bean Validations
+However, there is a large number of users who prefer to run their applications on plain Servlet containers 
+like Apache Tomcat and Jetty. In this setup you will have to provider JAX-RS, CDI and Bean Validations
 yourself.
 
-In this guide we will show you how to run Ozark on Apache Tomcat using
-Weld, RESTEasy and Hibernate Validator.
+In this guide we will show you how to run Ozark on Apache Tomcat using Weld, RESTEasy and Hibernate Validator.
 
-Note: The MVC specification and Ozark are under active development.
-Therefore, you will have to add the Sonatype OSS snapshot repository to
-your POM to get the latest and greatest version. Please refer to
-link:install-snapshots.html[Setting up the snapshot repository] for
-details.
+NOTE: The MVC specification and Ozark are under active development. Therefore, we recommend to use the latest 
+snapshots for your experiments. This will ensure, that you are using the latest version of both the API 
+and the implementation. Please refer to link:install-snapshots.html[Using the latest snapshots] to learn more. 
 
-[[required-dependencies]]
-Required dependencies
-^^^^^^^^^^^^^^^^^^^^^
+=== Required dependencies
 
-The following `pom.xml` example shows the dependency configuration for
-your application:
+The following `pom.xml` example shows the dependency configuration for your application:
 
 [source,xml]
 ----
@@ -73,21 +63,18 @@ your application:
 <dependency>
     <groupId>javax.mvc</groupId>
     <artifactId>javax.mvc-api</artifactId>
-    <version>{{versions.spec.develop}}</version>
+    <version>{{versions.spec.latest}}</version>
 </dependency>
 <dependency>
     <groupId>org.mvc-spec.ozark</groupId>
     <artifactId>ozark-resteasy</artifactId>
-    <version>{{versions.ozark.develop}}</version>
+    <version>{{versions.ozark.latest}}</version>
 </dependency>
 ----
 
-[[configuration-files]]
-Configuration files
-^^^^^^^^^^^^^^^^^^^
+=== Configuration files
 
-Make sure to add an empty `beans.xml` file in your
-`/src/main/webapp/WEB-INF` folder:
+Make sure to add an empty `beans.xml` file in your `/src/main/webapp/WEB-INF` folder:
 
 [source,xml]
 ----
@@ -100,8 +87,7 @@ Make sure to add an empty `beans.xml` file in your
 </beans>
 ----
 
-Please also add a file called `context.xml` to
-`src/main/resources/META-INF`:
+Please also add a file called `context.xml` to `src/main/resources/META-INF`:
 
 [source,xml]
 ----
@@ -115,13 +101,10 @@ Please also add a file called `context.xml` to
 </Context>
 ----
 
-This file `context.xml` is essential for the operation of the CDI in
-Tomcat as described in the
-http://docs.jboss.org/weld/reference/latest/en-US/html_single/#tomcat[Weld
-documentation].
+This file `context.xml` is essential for the operation of the CDI in Tomcat as described in the 
+link:http://docs.jboss.org/weld/reference/latest/en-US/html_single/#tomcat[Weld documentation].
 
-The file to create is called `web.xml` and should be placed in the
-`src/main/webapp/WEB-INF` directory:
+The file to create is called `web.xml` and should be placed in the `src/main/webapp/WEB-INF` directory:
 
 [source,xml]
 ----

src/ozark/docs/install-snapshots.adoc

@@ -3,8 +3,7 @@ title: Install Guide for Java EE
 template: page.html
 ---
 
-[[setting-up-the-snapshot-repository]]
-== Setting up the snapshot repository
+== Using the latest snapshots
 
 The MVC specification and Ozark are under active development. Therefore, we recommend to use the latest 
 snapshots for your experiments. This will ensure, that you are using the latest version of both the API