You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-commits@maven.apache.org by bu...@apache.org on 2014/07/01 01:33:18 UTC

svn commit: r914510 [6/6] - in /websites/staging/maven/trunk/content: ./ apache-resource-bundles/ archives/maven-2.x/ background/ developers/ developers/conventions/ developers/release/ developers/website/ docs/ docs/2.0.1/ docs/2.0.10/ docs/2.0.11/ do...

Modified: websites/staging/maven/trunk/content/pom/index.html
==============================================================================
--- websites/staging/maven/trunk/content/pom/index.html (original)
+++ websites/staging/maven/trunk/content/pom/index.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -15,7 +15,7 @@
         <meta name="author" content="Hervé Boutemy
 Dennis Lundberg" />
         <meta name="Date-Creation-yyyymmdd" content="20140331" />
-    <meta name="Date-Revision-yyyymmdd" content="20140628" />
+    <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -45,7 +45,7 @@ Dennis Lundberg" />
         Parent POMs
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>

Modified: websites/staging/maven/trunk/content/privacy-policy.html
==============================================================================
--- websites/staging/maven/trunk/content/privacy-policy.html (original)
+++ websites/staging/maven/trunk/content/privacy-policy.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -12,9 +12,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-        <meta name="author" content="Vincent Siveton" />
-        <meta name="Date-Creation-yyyymmdd" content="20081203" />
-    <meta name="Date-Revision-yyyymmdd" content="20140628" />
+        <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -44,7 +42,7 @@
         Privacy Policy
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>
@@ -241,15 +239,22 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance --><!-- with the License.  You may obtain a copy of the License at --><!--  --><!-- http://www.apache.org/licenses/LICENSE-2.0 --><!--  --><!-- Unless required by applicable law or agreed to in writing, --><!-- software distributed under the License is distributed on an --><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --><!-- KIND, either express or implied.  See the License for the --><!-- specific language governing permissions and limitations --><!-- under the License. --><div class="section">
+        <div class="section">
 <h2>Privacy Policy<a name="Privacy_Policy"></a></h2>
 <p>Information about your use of this website is collected using server access logs and a tracking cookie. The collected information consists of the following:</p>
+
 <ol style="list-style-type: decimal">
+  
 <li>The IP address from which you access the website;</li>
+  
 <li>The type of browser and operating system you use to access our site;</li>
+  
 <li>The date and time you access our site;</li>
+  
 <li>The pages you visit; and</li>
-<li>The addresses of pages from where you followed a link to our site.</li></ol>
+  
+<li>The addresses of pages from where you followed a link to our site.</li>
+</ol>
 <p>Part of this information is gathered using a tracking cookie set by the <a class="externalLink" href="http://www.google.com/analytics/">Google Analytics</a> service and handled by Google as described in their <a class="externalLink" href="http://www.google.com/privacy.html">privacy policy</a>. See your browser documentation for instructions on how to disable the cookie if you prefer not to share this data with Google.</p>
 <p>We use the gathered information to help us make our site more useful to visitors and to better understand how and when our site is used. We do not track or collect personally identifiable information or associate gathered data with any personally identifying information from other sources.</p>
 <p>By using this website, you consent to the collection of this data in the manner and for the purpose described above.</p></div>

Modified: websites/staging/maven/trunk/content/project-faq.html
==============================================================================
--- websites/staging/maven/trunk/content/project-faq.html (original)
+++ websites/staging/maven/trunk/content/project-faq.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -12,7 +12,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-        <meta name="Date-Revision-yyyymmdd" content="20140628" />
+        <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -42,7 +42,7 @@
         Frequently Asked Questions About Project Metadata
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>

Modified: websites/staging/maven/trunk/content/project-info.html
==============================================================================
--- websites/staging/maven/trunk/content/project-info.html (original)
+++ websites/staging/maven/trunk/content/project-info.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -12,7 +12,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-        <meta name="Date-Revision-yyyymmdd" content="20140628" />
+        <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -42,7 +42,7 @@
         Project Information
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>

Modified: websites/staging/maven/trunk/content/project-roles.html
==============================================================================
--- websites/staging/maven/trunk/content/project-roles.html (original)
+++ websites/staging/maven/trunk/content/project-roles.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -12,7 +12,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-        <meta name="Date-Revision-yyyymmdd" content="20140628" />
+        <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -42,7 +42,7 @@
         Apache Maven Project Roles
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>

Modified: websites/staging/maven/trunk/content/project-summary.html
==============================================================================
--- websites/staging/maven/trunk/content/project-summary.html (original)
+++ websites/staging/maven/trunk/content/project-summary.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -12,7 +12,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-        <meta name="Date-Revision-yyyymmdd" content="20140628" />
+        <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -42,7 +42,7 @@
         Project Summary
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>

Modified: websites/staging/maven/trunk/content/release-notes-all.html
==============================================================================
--- websites/staging/maven/trunk/content/release-notes-all.html (original)
+++ websites/staging/maven/trunk/content/release-notes-all.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -12,7 +12,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-        <meta name="Date-Revision-yyyymmdd" content="20140628" />
+        <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -42,7 +42,7 @@
         Release Notes
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>

Modified: websites/staging/maven/trunk/content/repository-management.html
==============================================================================
--- websites/staging/maven/trunk/content/repository-management.html (original)
+++ websites/staging/maven/trunk/content/repository-management.html Mon Jun 30 23:33:14 2014
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <title>Maven - Repository Management with Maven Repository Managers</title>
+    <title>Maven - Why do I need a Repository Manager?</title>
     <style type="text/css" media="all">
       @import url("./css/maven-base.css");
       @import url("./css/maven-theme.css");
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-        <meta name="Date-Revision-yyyymmdd" content="20140628" />
+        <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -39,10 +39,10 @@
         &gt;
                   <a href="index.html">Maven</a>
         &gt;
-        Repository Management with Maven Repository Managers
+        Why do I need a Repository Manager?
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>
@@ -239,11 +239,11 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance --><!-- with the License.  You may obtain a copy of the License at --><!--  --><!-- http://www.apache.org/licenses/LICENSE-2.0 --><!--  --><!-- Unless required by applicable law or agreed to in writing, --><!-- software distributed under the License is distributed on an --><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --><!-- KIND, either express or implied.  See the License for the --><!-- specific language governing permissions and limitations --><!-- under the License. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/references/apt-
 format.html --><div class="section">
+        <div class="section">
 <h2>Why do I need a Repository Manager?<a name="Why_do_I_need_a_Repository_Manager"></a></h2>
 <p>Maven Repository managers serve two purposes: they act as highly configurable proxies between your organization and the public Maven repositories and they also provide an organization with a deployment destination for your own generated artifacts.</p>
-<p>Proxying a Maven repository brings a number of benefits. Proxying speeds up builds throughout your organization by installing a local cache for all artifacts from the Central Maven repository. If a developer in your organization needs to download version 2.5 of the Spring Framework and you are using a Maven Repository Manager, the dependencies (and the dependency's dependencies) only need to be downloaded from the remote repository once. With a high-speed connection to the Internet this might seem like a minor concern, but if you are constantly asking your developers to download hundreds of megabytes of third-party dependencies, the real cost savings are going to be the time it takes Maven to check for new versions of dependencies and to download dependencies. Serving Maven dependencies from a local repository can save you hundreds of requests over HTTP, and, in very large multi-project builds, this can shave minutes from a build.</p>
-<p>If your project is relying on a number of SNAPSHOT dependencies, Maven will need to check for updated version of these snapshots. Depending on the configuration of your remote repositories, Maven will check for SNAPSHOT updates periodically, or it might be checking for SNAPSHOT updates on every build. When Maven checks for a snapshot update it needs to interrogate the remote repository for the latest version of the SNAPSHOT dependency. Depending on your connection to the public Internet and the load on the central Maven repository, a SNAPSHOT update can add seconds to your project's build for each SNAPSHOT update. When you host a local repository proxy with a repository manager, your repository manager is going to check for SNAPSHOT updates on a regular schedule, and your applications will be able to interact with a local repository. If you develop software with a lot of SNAPSHOT dependencies, using a local repository manager can often shave minutes from a large multi-module proj
 ect build, your 5-10 second SNAPSHOT update checks against the public central repository are going to execute in hundreds of milliseconds (or less).</p>
+<p>Proxying a Maven repository brings a number of benefits. Proxying speeds up builds throughout your organization by installing a local cache for all artifacts from the Central Maven repository. If a developer in your organization needs to download version 2.5 of the Spring Framework and you are using a Maven Repository Manager, the dependencies (and the dependency&#x2019;s dependencies) only need to be downloaded from the remote repository once. With a high-speed connection to the Internet this might seem like a minor concern, but if you are constantly asking your developers to download hundreds of megabytes of third-party dependencies, the real cost savings are going to be the time it takes Maven to check for new versions of dependencies and to download dependencies. Serving Maven dependencies from a local repository can save you hundreds of requests over HTTP, and, in very large multi-project builds, this can shave minutes from a build.</p>
+<p>If your project is relying on a number of SNAPSHOT dependencies, Maven will need to check for updated version of these snapshots. Depending on the configuration of your remote repositories, Maven will check for SNAPSHOT updates periodically, or it might be checking for SNAPSHOT updates on every build. When Maven checks for a snapshot update it needs to interrogate the remote repository for the latest version of the SNAPSHOT dependency. Depending on your connection to the public Internet and the load on the central Maven repository, a SNAPSHOT update can add seconds to your project&#x2019;s build for each SNAPSHOT update. When you host a local repository proxy with a repository manager, your repository manager is going to check for SNAPSHOT updates on a regular schedule, and your applications will be able to interact with a local repository. If you develop software with a lot of SNAPSHOT dependencies, using a local repository manager can often shave minutes from a large multi-modu
 le project build, your 5-10 second SNAPSHOT update checks against the public central repository are going to execute in hundreds of milliseconds (or less).</p>
 <p>In addition to the simple savings in time and bandwidth, a repository manager provides an organization with control over what is downloaded by Maven. You can include or exclude specific artifacts from the public repository, and having this level of control over what is downloaded from the central Maven repository is a prerequisite for organizations which need strict control over what dependencies are used throughout an organization. An organization which wants to standardize on a specific version of a dependency like Hibernate or Spring can enforce this standardization by only providing access to a specific version of an artifact in a repository manager. Other organizations might be concerned with making sure that every external dependency has a license compatible with the legal standards of that organization. If a corporation is producing a application which is distributed, they might want to make sure that no one inadvertently adds a dependency on a third-party library which is
  covered under a copy-left license like the GPL. Repository managers provide for the level of control that an organization needs to make sure that overall architecture and policy can be enforced.</p>
 <p>Aside from the benefits of mediating access to remote repositories, a repository manager also provides something essential to full adoption of Maven. Unless you expect every member of your organization to download and build every single internal project, you will want to provide a mechanism for developers and departments to share both SNAPSHOT and releases for internal project artifacts. A Maven repository manager provides your organization with such a deployment target. Once you install a Maven repository manager, you can start using Maven to deploy snapshots and releases to a custom repository managed by the repository manager. Over time, this central deployment point for internal projects becomes the fabric for collaboration between different development teams.</p></div>
 <div class="section">
@@ -252,19 +252,24 @@
 <div class="section">
 <h3><a class="externalLink" href="http://archiva.apache.org/">Apache Archiva</a><a name="Apache_Archiva"></a></h3>
 <p>Apache Archiva is an extensible repository management software that helps taking care of your own personal or enterprise-wide build artifact repository. It is the perfect companion for build tools such as Maven, Continuum, and ANT.</p>
-<p>Archiva offers several capabilities, amongst which remote repository proxying, security access management, build artifact storage, delivery, browsing, indexing and usage reporting, extensible scanning functionality... and many more!</p></div>
+<p>Archiva offers several capabilities, amongst which remote repository proxying, security access management, build artifact storage, delivery, browsing, indexing and usage reporting, extensible scanning functionality&#x2026; and many more!</p></div>
 <div class="section">
 <h3><a class="externalLink" href="http://www.jfrog.org/sites/artifactory/latest/">Artifactory</a><a name="Artifactory"></a></h3>
-<p>Artifactory is a Maven 2 enterprise repository. It offers advanced proxying, caching and security facilities to provide a robust, reproducible and independent build environment when using Maven. Artifactory is being used by clients ranging from small startup teams to international corporate teams employing distributed development, thus improving the development experience for tens of thousands of developers. Artifactory exposes a robust artifacts management platform using rich Ajax web UI and can be run out-of-the-box with a simple &quot;unzip and launch&quot;.</p></div>
+<p>Artifactory is a Maven 2 enterprise repository. It offers advanced proxying, caching and security facilities to provide a robust, reproducible and independent build environment when using Maven. Artifactory is being used by clients ranging from small startup teams to international corporate teams employing distributed development, thus improving the development experience for tens of thousands of developers. Artifactory exposes a robust artifacts management platform using rich Ajax web UI and can be run out-of-the-box with a simple &#x201c;unzip and launch&#x201d;.</p></div>
 <div class="section">
 <h3><a class="externalLink" href="http://nexus.sonatype.org">Sonatype Nexus (previously Proximity)</a><a name="Sonatype_Nexus_previously_Proximity"></a></h3>
-<p>Sonatype Nexus is the repository manager used as the input channel for the <a class="externalLink" href="http://search.maven.org">Central Repository</a> running the Sonatype Open Source Repository Hosting OSSRH service. Nexus is available in an open source as well as a commercial edition and runs <a class="externalLink" href="http://www.sonatype.com/about/customers">large enterprise</a> as well as open source forge sites such as <a class="externalLink" href="https://repository.jboss.org/nexus/index.html">JBoss</a> or <a class="externalLink" href="https://repository.apache.org/">Apache</a>. It provides robust features and performance with the open source version and scales to the high demands of large enterprises with the pro edition. Find out more details on the <a class="externalLink" href="http://links.sonatype.com/products/nexus/pro/home">website</a>} or by using the <a class="externalLink" href="http://links.sonatype.com/products/nexus/pro/trial">trial version</a>.</p><!-- TO
 DO Link to instructions for configuring repositories and mirrors --></div>
+<p>Sonatype Nexus is the repository manager used as the input channel for the <a class="externalLink" href="http://search.maven.org">Central Repository</a> running the Sonatype Open Source Repository Hosting OSSRH service. Nexus is available in an open source as well as a commercial edition and runs <a class="externalLink" href="http://www.sonatype.com/about/customers">large enterprise</a> as well as open source forge sites such as <a class="externalLink" href="https://repository.jboss.org/nexus/index.html">JBoss</a> or <a class="externalLink" href="https://repository.apache.org/">Apache</a>. It provides robust features and performance with the open source version and scales to the high demands of large enterprises with the pro edition. Find out more details on the <a class="externalLink" href="http://links.sonatype.com/products/nexus/pro/home">website</a>} or by using the <a class="externalLink" href="http://links.sonatype.com/products/nexus/pro/trial">trial version</a>.</p></div>
 <div class="section">
 <h3>Other resources<a name="Other_resources"></a></h3>
+
 <ul>
-<li><a class="externalLink" href="http://links.sonatype.com/products/nexus/oss/docs"> Free book from Sonatype - Repository Management with Nexus</a></li>
+  
+<li><a class="externalLink" href="http://links.sonatype.com/products/nexus/oss/docs">Free book from Sonatype - Repository Management with Nexus</a></li>
+  
 <li><a class="externalLink" href="http://docs.codehaus.org/display/MAVENUSER/Maven+Concepts+Repositories">Maven Concepts Repositories</a> from Maven wiki</li>
-<li><a class="externalLink" href="http://docs.codehaus.org/display/MAVENUSER/Maven+Repository+Manager+Feature+Matrix"> Continuously updated Feature matrix.</a></li></ul></div></div>
+  
+<li><a class="externalLink" href="http://docs.codehaus.org/display/MAVENUSER/Maven+Repository+Manager+Feature+Matrix">Continuously updated Feature matrix.</a></li>
+</ul></div></div>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/repository/index.html
==============================================================================
--- websites/staging/maven/trunk/content/repository/index.html (original)
+++ websites/staging/maven/trunk/content/repository/index.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -15,7 +15,7 @@
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
         <meta name="author" content="Brett Porter" />
         <meta name="author" content="Hervé Boutemy" />
-        <meta name="Date-Revision-yyyymmdd" content="20140628" />
+        <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -46,7 +46,7 @@
     Repository Centre
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>

Modified: websites/staging/maven/trunk/content/run-maven/index.html
==============================================================================
--- websites/staging/maven/trunk/content/run-maven/index.html (original)
+++ websites/staging/maven/trunk/content/run-maven/index.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -13,7 +13,7 @@
     </style>
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
         <meta name="author" content="Brett Porter" />
-        <meta name="Date-Revision-yyyymmdd" content="20140628" />
+        <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -43,7 +43,7 @@
         Running Maven
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>

Modified: websites/staging/maven/trunk/content/security.html
==============================================================================
--- websites/staging/maven/trunk/content/security.html (original)
+++ websites/staging/maven/trunk/content/security.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -12,7 +12,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-        <meta name="Date-Revision-yyyymmdd" content="20140628" />
+        <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -42,7 +42,7 @@
         Security Vulnerabilities
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>
@@ -239,21 +239,25 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <!-- Licensed to the Apache Software Foundation (ASF) under one --><!-- or more contributor license agreements.  See the NOTICE file --><!-- distributed with this work for additional information --><!-- regarding copyright ownership.  The ASF licenses this file --><!-- to you under the Apache License, Version 2.0 (the --><!-- "License"); you may not use this file except in compliance --><!-- with the License.  You may obtain a copy of the License at --><!--  --><!-- http://www.apache.org/licenses/LICENSE-2.0 --><!--  --><!-- Unless required by applicable law or agreed to in writing, --><!-- software distributed under the License is distributed on an --><!-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --><!-- KIND, either express or implied.  See the License for the --><!-- specific language governing permissions and limitations --><!-- under the License. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/guides/mini/guide-apt
 -format.html --><div class="section">
+        <div class="section">
 <h2>Security Vulnerabilities<a name="Security_Vulnerabilities"></a></h2>
 <p>Please note that binary patches are not produced for individual vulnerabilities. To obtain the binary fix for a particular vulnerability you should upgrade to an Apache Maven version where that vulnerability has been fixed.</p>
-<p>For more information about reporting vulnerabilities, see the <a class="externalLink" href="http://www.apache.org/security/"> Apache Security Team</a> page.</p>
+<p>For more information about reporting vulnerabilities, see the <a class="externalLink" href="http://www.apache.org/security/">Apache Security Team</a> page.</p>
 <div class="section">
 <h3>CVE-2013-0253 Apache Maven 3.0.4<a name="CVE-2013-0253_Apache_Maven_3.0.4"></a></h3>
 <p>Severity: Medium</p>
 <p>Vendor: The Apache Software Foundation</p>
 <p>Versions Affected:</p>
+
 <ul>
+  
 <li>Apache Maven 3.0.4</li>
-<li>Apache Maven Wagon 2.1, 2.2, 2.3</li></ul>
+  
+<li>Apache Maven Wagon 2.1, 2.2, 2.3</li>
+</ul>
 <p>Description: Apache Maven 3.0.4 (with Apache Maven Wagon 2.1) has introduced a non-secure SSL mode by default. This mode disables all SSL certificate checking, including: host name verification , date validity, and certificate chain. Not validating the certificate introduces the possibility of a man-in-the-middle attack.</p>
-<p><a class="externalLink" href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-0253"> CVE-2013-0253</a></p>
-<p>All users are recommended to upgrade to <a href="./download.cgi"> Apache Maven 3.0.5</a> and Apache Maven Wagon 2.4.</p>
+<p><a class="externalLink" href="http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-0253">CVE-2013-0253</a></p>
+<p>All users are recommended to upgrade to <a href="./download.cgi">Apache Maven 3.0.5</a> and Apache Maven Wagon 2.4.</p>
 <p>Credit: This issue was identified by Graham Leggett</p></div></div>
       </div>
     </div>

Modified: websites/staging/maven/trunk/content/settings.html
==============================================================================
--- websites/staging/maven/trunk/content/settings.html (original)
+++ websites/staging/maven/trunk/content/settings.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -12,8 +12,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-        <meta name="author" content="Eric Redmond" />
-        <meta name="Date-Revision-yyyymmdd" content="20140628" />
+        <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -43,7 +42,7 @@
         Settings Reference
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>
@@ -259,63 +258,106 @@
       <div id="contentBox">
         <div class="section">
 <h2>Settings Reference<a name="Settings_Reference"></a></h2>
+
 <ol style="list-style-type: decimal">
-<li><a href="#Introduction">Introduction</a>
+  
+<li>
+<p><a href="#Introduction">Introduction</a></p>
+  
 <ol style="list-style-type: decimal">
-<li><a href="#Quick_Overview">Quick Overview</a></li></ol></li>
-<li><a href="#Settings_Details">Settings Details</a>
+    
+<li><a href="#Quick_Overview">Quick Overview</a></li>
+  </ol></li>
+  
+<li>
+<p><a href="#Settings_Details">Settings Details</a></p>
+  
 <ol style="list-style-type: decimal">
+    
 <li><a href="#Simple_Values">Simple Values</a></li>
+    
 <li><a href="#Plugin_Groups">Plugin Groups</a></li>
+    
 <li><a href="#Servers">Servers</a>
+    
 <ol style="list-style-type: decimal">
-<li><a href="#Password_Encryption">Password Encryption</a></li></ol></li>
+      
+<li><a href="#Password_Encryption">Password Encryption</a></li>
+    </ol></li>
+  </ol>
+  
+<ol style="list-style-type: decimal">
+    
 <li><a href="#Mirrors">Mirrors</a></li>
+    
 <li><a href="#Proxies">Proxies</a></li>
+    
 <li><a href="#Profiles">Profiles</a>
+    
 <ol style="list-style-type: decimal">
+      
 <li><a href="#Activation">Activation</a></li>
+      
 <li><a href="#Repositories">Repositories</a></li>
-<li><a href="#Plugin_Repositories">Plugin Repositories</a></li></ol></li>
-<li><a href="#Active_Profiles">Active Profiles</a></li></ol></li></ol></div>
+      
+<li><a href="#Plugin_Repositories">Plugin Repositories</a></li>
+    </ol></li>
+  </ol>
+  
+<ol style="list-style-type: decimal">
+    
+<li><a href="#Active_Profiles">Active Profiles</a></li>
+  </ol></li>
+</ol></div>
 <div class="section">
-<h2><a name="Introduction">Introduction</a></h2>
+<h2>Introduction<a name="Introduction"></a></h2>
 <div class="section">
-<h3><a name="Quick_Overview">Quick Overview</a></h3>
+<h3>Quick Overview<a name="Quick_Overview"></a></h3>
 <p>The <tt>settings</tt> element in the <tt>settings.xml</tt> file contains elements used to define values which configure Maven execution in various ways, like the <tt>pom.xml</tt>, but should not be bundled to any specific project, or distributed to an audience. These include values such as the local repository location, alternate remote repository servers, and authentication information.</p>
 <p>There are two locations where a <tt>settings.xml</tt> file may live:</p>
+
 <ul>
+  
 <li>The Maven install: <tt>$M2_HOME/conf/settings.xml</tt></li>
-<li>A user's install: <tt>${user.home}/.m2/settings.xml</tt></li></ul>
+  
+<li>A user&#x2019;s install: <tt>${user.home}/.m2/settings.xml</tt></li>
+</ul>
 <p>The former <tt>settings.xml</tt> are also called global settings, the latter <tt>settings.xml</tt> are referred to as user settings. If both files exists, their contents gets merged, with the user-specific <tt>settings.xml</tt> being dominant.</p>
-<p>Tip: If you need to create user-specific settings from scratch, it's easiest to copy the global settings from your Maven installation to your <tt>${user.home}/.m2</tt> directory. Maven's default <tt>settings.xml</tt> is a template with comments and examples so you can quickly tweak it to match your needs.</p>
+<p>Tip: If you need to create user-specific settings from scratch, it&#x2019;s easiest to copy the global settings from your Maven installation to your <tt>${user.home}/.m2</tt> directory. Maven&#x2019;s default <tt>settings.xml</tt> is a template with comments and examples so you can quickly tweak it to match your needs.</p>
 <p>Here is an overview of the top elements under <tt>settings</tt>:</p>
+
 <div class="source">
-<pre>&lt;settings xmlns=&quot;http://maven.apache.org/SETTINGS/1.0.0&quot;
-  xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
-  xsi:schemaLocation=&quot;http://maven.apache.org/SETTINGS/1.0.0
-                      http://maven.apache.org/xsd/settings-1.0.0.xsd&quot;&gt;
-  &lt;localRepository/&gt;
-  &lt;interactiveMode/&gt;
-  &lt;usePluginRegistry/&gt;
-  &lt;offline/&gt;
-  &lt;pluginGroups/&gt;
-  &lt;servers/&gt;
-  &lt;mirrors/&gt;
-  &lt;proxies/&gt;
-  &lt;profiles/&gt;
-  &lt;activeProfiles/&gt;
-&lt;/settings&gt;</pre></div>
+<pre>    &lt;settings xmlns=&quot;http://maven.apache.org/SETTINGS/1.0.0&quot;
+      xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
+      xsi:schemaLocation=&quot;http://maven.apache.org/SETTINGS/1.0.0
+                          http://maven.apache.org/xsd/settings-1.0.0.xsd&quot;&gt;
+      &lt;localRepository/&gt;
+      &lt;interactiveMode/&gt;
+      &lt;usePluginRegistry/&gt;
+      &lt;offline/&gt;
+      &lt;pluginGroups/&gt;
+      &lt;servers/&gt;
+      &lt;mirrors/&gt;
+      &lt;proxies/&gt;
+      &lt;profiles/&gt;
+      &lt;activeProfiles/&gt;
+    &lt;/settings&gt;
+</pre></div>
 <p>The contents of the <tt>settings.xml</tt> can be interpolated using the following expressions:</p>
+
 <ol style="list-style-type: decimal">
+  
 <li><tt>${user.home}</tt> and all other system properties <i>(since Maven 3.0)</i></li>
-<li><tt>${env.HOME}</tt> etc. for environment variables</li></ol>
+  
+<li><tt>${env.HOME}</tt> etc. for environment variables</li>
+</ol>
 <p>Note that properties defined in profiles within the <tt>settings.xml</tt> cannot be used for interpolation.</p></div></div>
 <div class="section">
-<h2><a name="Settings_Details">Settings Details</a></h2>
+<h2>Settings Details<a name="Settings_Details"></a></h2>
 <div class="section">
-<h3><a name="Simple_Values">Simple Values</a></h3>
+<h3>Simple Values<a name="Simple_Values"></a></h3>
 <p>Half of the top-level <tt>settings</tt> elements are simple values, representing a range of values which describe elements of the build system that are active full-time.</p>
+
 <div class="source">
 <pre>&lt;settings xmlns=&quot;http://maven.apache.org/SETTINGS/1.0.0&quot;
   xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
@@ -326,15 +368,23 @@
   &lt;usePluginRegistry&gt;false&lt;/usePluginRegistry&gt;
   &lt;offline&gt;false&lt;/offline&gt;
   ...
-&lt;/settings&gt;</pre></div>
+&lt;/settings&gt;
+</pre></div>
+
 <ul>
-<li><b>localRepository</b>: This value is the path of this build system's local repository. The default value is <tt>${user.home}/.m2/repository</tt>. This element is especially useful for a main build server allowing all logged-in users to build from a common local repository.</li>
+  
+<li><b>localRepository</b>: This value is the path of this build system&#x2019;s local repository. The default value is <tt>${user.home}/.m2/repository</tt>. This element is especially useful for a main build server allowing all logged-in users to build from a common local repository.</li>
+  
 <li><b>interactiveMode</b>: <tt>true</tt> if Maven should attempt to interact with the user for input, <tt>false</tt> if not. Defaults to <tt>true</tt>.</li>
+  
 <li><b>usePluginRegistry</b>: <tt>true</tt> if Maven should use the <tt>${user.home}/.m2/plugin-registry.xml</tt> file to manage plugin versions, defaults to <tt>false</tt>. <i>Note that for the current version of Maven 2.0, the plugin-registry.xml file should not be depended upon. Consider it dormant for now.</i></li>
-<li><b>offline</b>: <tt>true</tt> if this build system should operate in offline mode, defaults to <tt>false</tt>. This element is useful for build servers which cannot connect to a remote repository, either because of network setup or security reasons.</li></ul></div>
+  
+<li><b>offline</b>: <tt>true</tt> if this build system should operate in offline mode, defaults to <tt>false</tt>. This element is useful for build servers which cannot connect to a remote repository, either because of network setup or security reasons.</li>
+</ul></div>
 <div class="section">
-<h3><a name="Plugin_Groups">Plugin Groups</a></h3>
+<h3>Plugin Groups<a name="Plugin_Groups"></a></h3>
 <p>This element contains a list of <tt>pluginGroup</tt> elements, each contains a groupId. The list is searched when a plugin is used and the groupId is not provided in the command line. This list automatically contains <tt>org.apache.maven.plugins</tt> and <tt>org.codehaus.mojo</tt>.</p>
+
 <div class="source">
 <pre>&lt;settings xmlns=&quot;http://maven.apache.org/SETTINGS/1.0.0&quot;
   xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
@@ -345,13 +395,17 @@
     &lt;pluginGroup&gt;org.mortbay.jetty&lt;/pluginGroup&gt;
   &lt;/pluginGroups&gt;
   ...
-&lt;/settings&gt;</pre></div>
+&lt;/settings&gt;
+</pre></div>
 <p>For example, given the above settings the Maven command line may execute <tt>org.mortbay.jetty:jetty-maven-plugin:run</tt> with the truncated command:</p>
-<div>
-<pre>mvn jetty:run</pre></div></div>
+
+<div class="source">
+<pre>mvn jetty:run
+</pre></div></div>
 <div class="section">
-<h3><a name="Servers">Servers</a></h3>
+<h3>Servers<a name="Servers"></a></h3>
 <p>The repositories for download and deployment are defined by the <a href="./pom.html#Repositories"><tt>repositories</tt></a> and <a href="./pom.html#Distribution_Management"><tt>distributionManagement</tt></a> elements of the POM. However, certain settings such as <tt>username</tt> and <tt>password</tt> should not be distributed along with the <tt>pom.xml</tt>. This type of information should exist on the build server in the <tt>settings.xml</tt>.</p>
+
 <div class="source">
 <pre>&lt;settings xmlns=&quot;http://maven.apache.org/SETTINGS/1.0.0&quot;
   xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
@@ -371,18 +425,26 @@
     &lt;/server&gt;
   &lt;/servers&gt;
   ...
-&lt;/settings&gt;</pre></div>
+&lt;/settings&gt;
+</pre></div>
+
 <ul>
+  
 <li><b>id</b>: This is the ID of the server <i>(not of the user to login as)</i> that matches the <tt>id</tt> element of the repository/mirror that Maven tries to connect to.</li>
+  
 <li><b>username</b>, <b>password</b>: These elements appear as a pair denoting the login and password required to authenticate to this server.</li>
+  
 <li><b>privateKey</b>, <b>passphrase</b>: Like the previous two elements, this pair specifies a path to a private key (default is <tt>${user.home}/.ssh/id_dsa</tt>) and a <tt>passphrase</tt>, if required. The <tt>passphrase</tt> and <tt>password</tt> elements may be externalized in the future, but for now they must be set plain-text in the <tt>settings.xml</tt> file.</li>
-<li><b>filePermissions</b>, <b>directoryPermissions</b>: When a repository file or directory is created on deployment, these are the permissions to use. The legal values of each is a three digit number corrosponding to *nix file permissions, ie. 664, or 775.</li></ul>
+  
+<li><b>filePermissions</b>, <b>directoryPermissions</b>: When a repository file or directory is created on deployment, these are the permissions to use. The legal values of each is a three digit number corrosponding to *nix file permissions, ie. 664, or 775.</li>
+</ul>
 <p><i>Note:</i> If you use a private key to login to the server, make sure you omit the <tt>&lt;password&gt;</tt> element. Otherwise, the key will be ignored.</p>
 <div class="section">
-<h4><a name="Password_Encryption">Password Encryption</a></h4>
+<h4>Password Encryption<a name="Password_Encryption"></a></h4>
 <p>A new feature - server password and passphrase encryption has been added to 2.1.0+. See details <a href="./guides/mini/guide-encryption.html">on this page</a></p></div></div>
 <div class="section">
-<h3><a name="Mirrors">Mirrors</a></h3>
+<h3>Mirrors<a name="Mirrors"></a></h3>
+
 <div class="source">
 <pre>&lt;settings xmlns=&quot;http://maven.apache.org/SETTINGS/1.0.0&quot;
   xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
@@ -398,14 +460,21 @@
     &lt;/mirror&gt;
   &lt;/mirrors&gt;
   ...
-&lt;/settings&gt;</pre></div>
+&lt;/settings&gt;
+</pre></div>
+
 <ul>
+  
 <li><b>id</b>, <b>name</b>: The unique identifier and user-friendly name of this mirror. The <tt>id</tt> is used to differentiate between <tt>mirror</tt> elements and to pick the corresponding credentials from the <a href="#Servers"><tt>&lt;servers&gt;</tt></a> section when connecting to the mirror.</li>
+  
 <li><b>url</b>: The base URL of this mirror. The build system will use this URL to connect to a repository rather than the original repository URL.</li>
-<li><b>mirrorOf</b>: The <tt>id</tt> of the repository that this is a mirror of. For example, to point to a mirror of the Maven <tt>central</tt> repository (<tt><a class="externalLink" href="http://repo.maven.apache.org/maven2/">http://repo.maven.apache.org/maven2/</a></tt>), set this element to <tt>central</tt>. More advanced mappings like <tt>repo1,repo2</tt> or <tt>*,!inhouse</tt> are also possible. This must not match the mirror <tt>id</tt>.</li></ul>
+  
+<li><b>mirrorOf</b>: The <tt>id</tt> of the repository that this is a mirror of. For example, to point to a mirror of the Maven <tt>central</tt> repository (<tt>http://repo.maven.apache.org/maven2/</tt>), set this element to <tt>central</tt>. More advanced mappings like <tt>repo1,repo2</tt> or <tt>*,!inhouse</tt> are also possible. This must not match the mirror <tt>id</tt>.</li>
+</ul>
 <p>For a more in-depth introduction of mirrors, please read the <a href="./guides/mini/guide-mirror-settings.html">Guide to Mirror Settings</a>.</p></div>
 <div class="section">
-<h3><a name="Proxies">Proxies</a></h3>
+<h3>Proxies<a name="Proxies"></a></h3>
+
 <div class="source">
 <pre>&lt;settings xmlns=&quot;http://maven.apache.org/SETTINGS/1.0.0&quot;
   xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
@@ -425,20 +494,29 @@
     &lt;/proxy&gt;
   &lt;/proxies&gt;
   ...
-&lt;/settings&gt;</pre></div>
+&lt;/settings&gt;
+</pre></div>
+
 <ul>
+  
 <li><b>id</b>: The unique identifier for this proxy. This is used to differentiate between <tt>proxy</tt> elements.</li>
+  
 <li><b>active</b>: <tt>true</tt> if this proxy is active. This is useful for declaring a set of proxies, but only one may be active at a time.</li>
+  
 <li><b>protocol</b>, <b>host</b>, <b>port</b>: The <tt>protocol://host:port</tt> of the proxy, seperated into discrete elements.</li>
+  
 <li><b>username</b>, <b>password</b>: These elements appear as a pair denoting the login and password required to authenticate to this proxy server.</li>
-<li><b>nonProxyHosts</b>: This is a list of hosts which should not be proxied. The delimiter of the list is the expected type of the proxy server; the example above is pipe delimited - comma delimited is also common.</li></ul></div>
+  
+<li><b>nonProxyHosts</b>: This is a list of hosts which should not be proxied. The delimiter of the list is the expected type of the proxy server; the example above is pipe delimited - comma delimited is also common.</li>
+</ul></div>
 <div class="section">
-<h3><a name="Profiles">Profiles</a></h3>
+<h3>Profiles<a name="Profiles"></a></h3>
 <p>The <tt>profile</tt> element in the <tt>settings.xml</tt> is a truncated version of the <tt>pom.xml</tt> <tt>profile</tt> element. It consists of the <tt>activation</tt>, <tt>repositories</tt>, <tt>pluginRepositories</tt> and <tt>properties</tt> elements. The <tt>profile</tt> elements only include these four elements because they concerns themselves with the build system as a whole (which is the role of the <tt>settings.xml</tt> file), not about individual project object model settings.</p>
-<p>If a profile is active from <tt>settings</tt>, its values will override any equivalently ID'd profiles in a POM or <tt>profiles.xml</tt> file.</p>
+<p>If a profile is active from <tt>settings</tt>, its values will override any equivalently ID&#x2019;d profiles in a POM or <tt>profiles.xml</tt> file.</p>
 <div class="section">
-<h4><a name="Activation">Activation</a></h4>
-<p>Activations are the key of a profile. Like the POM's profiles, the power of a profile comes from its ability to modify some values only under certain circumstances; those circumstances are specified via an <tt>activation</tt> element.</p>
+<h4>Activation<a name="Activation"></a></h4>
+<p>Activations are the key of a profile. Like the POM&#x2019;s profiles, the power of a profile comes from its ability to modify some values only under certain circumstances; those circumstances are specified via an <tt>activation</tt> element.</p>
+
 <div class="source">
 <pre>&lt;settings xmlns=&quot;http://maven.apache.org/SETTINGS/1.0.0&quot;
   xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
@@ -470,26 +548,44 @@
     &lt;/profile&gt;
   &lt;/profiles&gt;
   ...
-&lt;/settings&gt;</pre></div>
+&lt;/settings&gt;
+</pre></div>
 <p>Activation occurs when all specified criteria have been met, though not all are required at once.</p>
+
 <ul>
-<li><b>jdk</b>: <tt>activation</tt> has a built in, Java-centric check in the <tt>jdk</tt> element. This will activate if the test is run under a jdk version number that matches the prefix given. In the above example, <tt>1.5.0_06</tt> will match. Ranges are also supported as of Maven 2.1. See the <a class="externalLink" href="http://maven.apache.org/enforcer/enforcer-rules/versionRanges.html"> maven-enforcer-plugin</a> for more details about supported ranges.</li>
+  
+<li><b>jdk</b>: <tt>activation</tt> has a built in, Java-centric check in the <tt>jdk</tt> element. This will activate if the test is run under a jdk version number that matches the prefix given. In the above example, <tt>1.5.0_06</tt> will match. Ranges are also supported as of Maven 2.1. See the <a class="externalLink" href="http://maven.apache.org/enforcer/enforcer-rules/versionRanges.html">maven-enforcer-plugin</a> for more details about supported ranges.</li>
+  
 <li><b>os</b>: The <tt>os</tt> element can define some operating system specific properties shown above. See the <a class="externalLink" href="http://maven.apache.org/plugins/maven-enforcer-plugin/rules/requireOS.html">maven-enforcer-plugin</a> for more details about OS values.</li>
+  
 <li><b>property</b>: The <tt>profile</tt> will activate if Maven detects a property (a value which can be dereferenced within the POM by <tt>${name}</tt>) of the corresponding <tt>name=value</tt> pair.</li>
-<li><b>file</b>: Finally, a given filename may activate the <tt>profile</tt> by the <tt>existence</tt> of a file, or if it is <tt>missing</tt>.</li></ul>
-<p>The <tt>activation</tt> element is not the only way that a <tt>profile</tt> may be activated. The <tt>settings.xml</tt> file's <tt>activeProfile</tt> element may contain the profile's <tt>id</tt>. They may also be activated explicitly through the command line via a comma separated list after the <tt>-P</tt> flag (e.g. <tt>-P test</tt>).</p>
+  
+<li><b>file</b>: Finally, a given filename may activate the <tt>profile</tt> by the <tt>existence</tt> of a file, or if it is <tt>missing</tt>.</li>
+</ul>
+<p>The <tt>activation</tt> element is not the only way that a <tt>profile</tt> may be activated. The <tt>settings.xml</tt> file&#x2019;s <tt>activeProfile</tt> element may contain the profile&#x2019;s <tt>id</tt>. They may also be activated explicitly through the command line via a comma separated list after the <tt>-P</tt> flag (e.g. <tt>-P test</tt>).</p>
 <p><i>To see which profile will activate in a certain build, use the</i> <tt>maven-help-plugin</tt>.</p>
-<div>
-<pre>mvn help:active-profiles</pre></div></div>
+
+<div class="source">
+<pre>mvn help:active-profiles
+</pre></div></div>
 <div class="section">
 <h4>Properties<a name="Properties"></a></h4>
 <p>Maven properties are value placeholder, like properties in Ant. Their values are accessible anywhere within a POM by using the notation <tt>${X}</tt>, where <tt>X</tt> is the property. They come in five different styles, all accessible from the <tt>settings.xml</tt> file:</p>
+
 <ol style="list-style-type: decimal">
-<li><tt>env.X</tt>: Prefixing a variable with &quot;env.&quot; will return the shell's environment variable. For example, <tt>${env.PATH}</tt> contains the $path environment variable (<tt>%PATH%</tt> in Windows).</li>
-<li><tt>project.x</tt>: A dot (.) notated path in the POM will contain the corresponding element's value. For example: <tt>&lt;project&gt;&lt;version&gt;1.0&lt;/version&gt;&lt;/project&gt;</tt> is accessible via <tt>${project.version}</tt>.</li>
-<li><tt>settings.x</tt>: A dot (.) notated path in the <tt>settings.xml</tt> will contain the corresponding element's value. For example: <tt>&lt;settings&gt;&lt;offline&gt;false&lt;/offline&gt;&lt;/settings&gt;</tt> is accessible via <tt>${settings.offline}</tt>.</li>
+  
+<li><tt>env.X</tt>: Prefixing a variable with &#x201c;env.&#x201d; will return the shell&#x2019;s environment variable. For example, <tt>${env.PATH}</tt> contains the \$path environment variable (<tt>%PATH%</tt> in Windows).</li>
+  
+<li><tt>project.x</tt>: A dot (.) notated path in the POM will contain the corresponding element&#x2019;s value. For example: <tt>&lt;project&gt;&lt;version&gt;1.0&lt;/version&gt;&lt;/project&gt;</tt> is accessible via <tt>${project.version}</tt>.</li>
+  
+<li><tt>settings.x</tt>: A dot (.) notated path in the <tt>settings.xml</tt> will contain the corresponding element&#x2019;s value. For example: <tt>&lt;settings&gt;&lt;offline&gt;false&lt;/offline&gt;&lt;/settings&gt;</tt> is accessible via <tt>${settings.offline}</tt>.</li>
+  
 <li>Java System Properties: All properties accessible via <tt>java.lang.System.getProperties()</tt> are available as POM properties, such as <tt>${java.home}</tt>.</li>
-<li><tt>x</tt>: Set within a &lt;properties /&gt; element or an external files, the value may be used as <tt>${someVar}</tt>.</li></ol>
+  
+<li><tt>x</tt>: Set within a &lt;properties /&gt; element or an external files, the value may be used as <tt>${someVar}</tt>.</li>
+</ol>
+<!--  -->
+
 <div class="source">
 <pre>&lt;settings xmlns=&quot;http://maven.apache.org/SETTINGS/1.0.0&quot;
   xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
@@ -506,11 +602,13 @@
     &lt;/profile&gt;
   &lt;/profiles&gt;
   ...
-&lt;/settings&gt;</pre></div>
+&lt;/settings&gt;
+</pre></div>
 <p>The property <tt>${user.install}</tt> is accessible from a POM if this profile is active.</p></div>
 <div class="section">
-<h4><a name="Repositories">Repositories</a></h4>
+<h4>Repositories<a name="Repositories"></a></h4>
 <p>Repositories are remote collections of projects from which Maven uses to populate the local repository of the build system. It is from this local repository that Maven calls it plugins and dependencies. Different remote repositories may contain different projects, and under the active profile they may be searched for a matching release or snapshot artifact.</p>
+
 <div class="source">
 <pre>&lt;settings xmlns=&quot;http://maven.apache.org/SETTINGS/1.0.0&quot;
   xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
@@ -545,18 +643,27 @@
     &lt;/profile&gt;
   &lt;/profiles&gt;
   ...
-&lt;/settings&gt;</pre></div>
+&lt;/settings&gt;
+</pre></div>
+
 <ul>
+  
 <li><b>releases</b>, <b>snapshots</b>: These are the policies for each type of artifact, Release or snapshot. With these two sets, a POM has the power to alter the policies for each type independent of the other within a single repository. For example, one may decide to enable only snapshot downloads, possibly for development purposes.</li>
+  
 <li><b>enabled</b>: <tt>true</tt> or <tt>false</tt> for whether this repository is enabled for the respective type (<tt>releases</tt> or <tt>snapshots</tt>).</li>
-<li><b>updatePolicy</b>: This element specifies how often updates should attempt to occur. Maven will compare the local POM's timestamp (stored in a repository's maven-metadata file) to the remote. The choices are: <tt>always</tt>, <tt>daily</tt> (default), <tt>interval:X</tt> (where X is an integer in minutes) or <tt>never</tt>.</li>
+  
+<li><b>updatePolicy</b>: This element specifies how often updates should attempt to occur. Maven will compare the local POM&#x2019;s timestamp (stored in a repository&#x2019;s maven-metadata file) to the remote. The choices are: <tt>always</tt>, <tt>daily</tt> (default), <tt>interval:X</tt> (where X is an integer in minutes) or <tt>never</tt>.</li>
+  
 <li><b>checksumPolicy</b>: When Maven deploys files to the repository, it also deploys corresponding checksum files. Your options are to <tt>ignore</tt>, <tt>fail</tt>, or <tt>warn</tt> on missing or incorrect checksums.</li>
-<li><b>layout</b>: In the above description of repositories, it was mentioned that they all follow a common layout. This is mostly correct. Maven 2 has a default layout for its repositories; however, Maven 1.x had a different layout. Use this element to specify which if it is <tt>default</tt> or <tt>legacy</tt>.</li></ul></div>
+  
+<li><b>layout</b>: In the above description of repositories, it was mentioned that they all follow a common layout. This is mostly correct. Maven 2 has a default layout for its repositories; however, Maven 1.x had a different layout. Use this element to specify which if it is <tt>default</tt> or <tt>legacy</tt>.</li>
+</ul></div>
 <div class="section">
-<h4><a name="Plugin_Repositories">Plugin Repositories</a></h4>
+<h4>Plugin Repositories<a name="Plugin_Repositories"></a></h4>
 <p>Repositories are home to two major types of artifacts. The first are artifacts that are used as dependencies of other artifacts. These are the majority of plugins that reside within central. The other type of artifact is plugins. Maven plugins are themselves a special type of artifact. Because of this, plugin repositories may be separated from other repositories (although, I have yet to hear a convincing argument for doing so). In any case, the structure of the <tt>pluginRepositories</tt> element block is similar to the <tt>repositories</tt> element. The <tt>pluginRepository</tt> elements each specify a remote location of where Maven can find new plugins.</p></div></div>
 <div class="section">
-<h3><a name="Active_Profiles">Active Profiles</a></h3>
+<h3>Active Profiles<a name="Active_Profiles"></a></h3>
+
 <div class="source">
 <pre>&lt;settings xmlns=&quot;http://maven.apache.org/SETTINGS/1.0.0&quot;
   xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
@@ -566,7 +673,8 @@
   &lt;activeProfiles&gt;
     &lt;activeProfile&gt;env-test&lt;/activeProfile&gt;
   &lt;/activeProfiles&gt;
-&lt;/settings&gt;</pre></div>
+&lt;/settings&gt;
+</pre></div>
 <p>The final piece of the <tt>settings.xml</tt> puzzle is the <tt>activeProfiles</tt> element. This contains a set of <tt>activeProfile</tt> elements, which each have a value of a <tt>profile</tt> <tt>id</tt>. Any <tt>profile</tt> <tt>id</tt> defined as an <tt>activeProfile</tt> will be active, reguardless of any environment settings. If no matching profile is found nothing will happen. For example, if <tt>env-test</tt> is an <tt>activeProfile</tt>, a profile in a <tt>pom.xml</tt> (or <tt>profile.xml</tt> with a corrosponding <tt>id</tt> will be active. If no such profile is found then execution will continue as normal.</p></div></div>
       </div>
     </div>

Modified: websites/staging/maven/trunk/content/shared/index.html
==============================================================================
--- websites/staging/maven/trunk/content/shared/index.html (original)
+++ websites/staging/maven/trunk/content/shared/index.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -15,7 +15,7 @@
         <meta name="author" content="Dennis Lundberg
 John Casey" />
         <meta name="Date-Creation-yyyymmdd" content="20121119" />
-    <meta name="Date-Revision-yyyymmdd" content="20140628" />
+    <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -45,7 +45,7 @@ John Casey" />
         Shared Components
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>

Modified: websites/staging/maven/trunk/content/skins/index.html
==============================================================================
--- websites/staging/maven/trunk/content/skins/index.html (original)
+++ websites/staging/maven/trunk/content/skins/index.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -14,7 +14,7 @@
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
         <meta name="author" content="Dennis Lundberg" />
         <meta name="Date-Creation-yyyymmdd" content="20120405" />
-    <meta name="Date-Revision-yyyymmdd" content="20140628" />
+    <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -44,7 +44,7 @@
         Skins
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>

Modified: websites/staging/maven/trunk/content/source-repository.html
==============================================================================
--- websites/staging/maven/trunk/content/source-repository.html (original)
+++ websites/staging/maven/trunk/content/source-repository.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -14,7 +14,7 @@
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
         <meta name="author" content="Benjamin Bentmann" />
-        <meta name="Date-Revision-yyyymmdd" content="20140628" />
+        <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -45,7 +45,7 @@
     Source Repository
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>

Modified: websites/staging/maven/trunk/content/team-list.html
==============================================================================
--- websites/staging/maven/trunk/content/team-list.html (original)
+++ websites/staging/maven/trunk/content/team-list.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -12,7 +12,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-        <meta name="Date-Revision-yyyymmdd" content="20140628" />
+        <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -42,7 +42,7 @@
         Team list
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>

Modified: websites/staging/maven/trunk/content/testimonials.html
==============================================================================
--- websites/staging/maven/trunk/content/testimonials.html (original)
+++ websites/staging/maven/trunk/content/testimonials.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -12,8 +12,7 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-        <meta name="author" content="Brett Porter" />
-        <meta name="Date-Revision-yyyymmdd" content="20140628" />
+        <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -43,7 +42,7 @@
         Testimonials
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>
@@ -240,10 +239,11 @@
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
-        <p>Keep on going with Maven 2.0 as it really rocks! Yesterday, I started experimenting with it and it's such a breeze, I'm becoming already productive with Maven, converting our hand-written Ant scripts to POM (which means throwing most of the Ant stuff away and replacing it with tiny pom.xml files, actually). We have a web application consisting of many components which need to be configured for different environments and customers. After one day of work (including the learning curve) I already have the complete code base with &gt;1000 java files in ~20 modules compiling.</p>
+        <h1>Testimonials</h1>
+<p>Keep on going with Maven 2.0 as it really rocks! Yesterday, I started experimenting with it and it&#x2019;s such a breeze, I&#x2019;m becoming already productive with Maven, converting our hand-written Ant scripts to POM (which means throwing most of the Ant stuff away and replacing it with tiny pom.xml files, actually). We have a web application consisting of many components which need to be configured for different environments and customers. After one day of work (including the learning curve) I already have the complete code base with &gt;1000 java files in ~20 modules compiling.</p>
 <p>An hour ago or so after I finally got the Castor stuff working I began to see just how marvellous Maven works with my multi-module project. Seems you guys are able to keep the promises you make in the Maven introduction. :-)</p>
 <p>Once again, thanks for creating this great tool!</p>
-<p>-- <i>Christoph Schonfeld</i></p>
+<p>&#x2013; <i>Christoph Schonfeld</i></p>
       </div>
     </div>
     <div class="clear">

Modified: websites/staging/maven/trunk/content/users/getting-help.html
==============================================================================
--- websites/staging/maven/trunk/content/users/getting-help.html (original)
+++ websites/staging/maven/trunk/content/users/getting-help.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -14,7 +14,7 @@
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
         <meta name="author" content="Dennis Lundberg" />
         <meta name="Date-Creation-yyyymmdd" content="20070724" />
-    <meta name="Date-Revision-yyyymmdd" content="20140628" />
+    <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -44,7 +44,7 @@
         Getting Help
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>

Modified: websites/staging/maven/trunk/content/users/index.html
==============================================================================
--- websites/staging/maven/trunk/content/users/index.html (original)
+++ websites/staging/maven/trunk/content/users/index.html Mon Jun 30 23:33:14 2014
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -13,7 +13,7 @@
     </style>
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
         <meta name="author" content="Brett Porter" />
-        <meta name="Date-Revision-yyyymmdd" content="20140628" />
+        <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -43,7 +43,7 @@
         Users Centre
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>

Modified: websites/staging/maven/trunk/content/what-is-maven.html
==============================================================================
--- websites/staging/maven/trunk/content/what-is-maven.html (original)
+++ websites/staging/maven/trunk/content/what-is-maven.html Mon Jun 30 23:33:14 2014
@@ -1,19 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
- | Generated by Apache Maven Doxia at 2014-06-28
+ | Generated by Apache Maven Doxia at 2014-06-30
  | Rendered using Apache Maven Stylus Skin 1.5
 -->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <title>Maven - What is Maven?</title>
+    <title>Maven - Introduction</title>
     <style type="text/css" media="all">
       @import url("./css/maven-base.css");
       @import url("./css/maven-theme.css");
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-        <meta name="author" content="Jason van Zyl" />
-        <meta name="Date-Revision-yyyymmdd" content="20140628" />
+        <meta name="Date-Revision-yyyymmdd" content="20140630" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
@@ -40,10 +39,10 @@
         &gt;
                   <a href="index.html">Maven</a>
         &gt;
-        What is Maven?
+        Introduction
         </div>
             <div class="xright">        
-                                    Last Published: 2014-06-28
+                                    Last Published: 2014-06-30
             </div>
       <div class="clear">
         <hr/>
@@ -245,41 +244,60 @@
 <p>Maven, a <a class="externalLink" href="http://en.wikipedia.org/wiki/Maven">Yiddish word</a> meaning <i>accumulator of knowledge</i>, was originally started as an attempt to simplify the build processes in the Jakarta Turbine project. There were several projects each with their own Ant build files that were all slightly different and JARs were checked into CVS. We wanted a standard way to build the projects, a clear definition of what the project consisted of, an easy way to publish project information and a way to share JARs across several projects.</p>
 <p>The result is a tool that can now be used for building and managing any Java-based project. We hope that we have created something that will make the day-to-day work of Java developers easier and generally help with the comprehension of any Java-based project.</p></div>
 <div class="section">
-<h2>Maven's Objectives<a name="Mavens_Objectives"></a></h2>
-<p>Maven's primary goal is to allow a developer to comprehend the complete state of a development effort in the shortest period of time. In order to attain this goal there are several areas of concern that Maven attempts to deal with:</p>
+<h2>Maven&#x2019;s Objectives<a name="Mavens_Objectives"></a></h2>
+<p>Maven&#x2019;s primary goal is to allow a developer to comprehend the complete state of a development effort in the shortest period of time. In order to attain this goal there are several areas of concern that Maven attempts to deal with:</p>
+
 <ul>
+  
 <li>Making the build process easy</li>
+  
 <li>Providing a uniform build system</li>
+  
 <li>Providing quality project information</li>
+  
 <li>Providing guidelines for best practices development</li>
-<li>Allowing transparent migration to new features</li></ul>
+  
+<li>Allowing transparent migration to new features</li>
+</ul>
 <div class="section">
 <h3>Making the build process easy<a name="Making_the_build_process_easy"></a></h3>
-<p>While using Maven doesn't eliminate the need to know about the underlying mechanisms, Maven does provide a lot of shielding from the details.</p></div>
+<p>While using Maven doesn&#x2019;t eliminate the need to know about the underlying mechanisms, Maven does provide a lot of shielding from the details.</p></div>
 <div class="section">
 <h3>Providing a uniform build system<a name="Providing_a_uniform_build_system"></a></h3>
 <p>Maven allows a project to build using its project object model (POM) and a set of plugins that are shared by all projects using Maven, providing a uniform build system. Once you familiarize yourself with how one Maven project builds you automatically know how all Maven projects build saving you immense amounts of time when trying to navigate many projects.</p></div>
 <div class="section">
 <h3>Providing quality project information<a name="Providing_quality_project_information"></a></h3>
-<p>Maven provides plenty of useful project information that is in part taken from your POM and in part generated from your project's sources. For example, Maven can provide:</p>
+<p>Maven provides plenty of useful project information that is in part taken from your POM and in part generated from your project&#x2019;s sources. For example, Maven can provide:</p>
+
 <ul>
+  
 <li>Change log document created directly from source control</li>
+  
 <li>Cross referenced sources</li>
+  
 <li>Mailing lists</li>
+  
 <li>Dependency list</li>
-<li>Unit test reports including coverage</li></ul>
+  
+<li>Unit test reports including coverage</li>
+</ul>
 <p>As Maven improves the information set provided will improve, all of which will be transparent to users of Maven.</p>
 <p>Other products can also provide Maven plugins to allow their set of project information alongside some of the standard information given by Maven, all still based on the POM.</p></div>
 <div class="section">
 <h3>Providing guidelines for best practices development<a name="Providing_guidelines_for_best_practices_development"></a></h3>
 <p>Maven aims to gather current principles for best practices development, and make it easy to guide a project in that direction.</p>
 <p>For example, specification, execution, and reporting of unit tests are part of the normal build cycle using Maven. Current unit testing best practices were used as guidelines:</p>
+
 <ul>
+  
 <li>Keeping your test source code in a separate, but parallel source tree</li>
+  
 <li>Using test case naming conventions to locate and execute tests</li>
-<li>Have test cases setup their environment and don't rely on customizing the build for test preparation.</li></ul>
+  
+<li>Have test cases setup their environment and don&#x2019;t rely on customizing the build for test preparation.</li>
+</ul>
 <p>Maven also aims to assist in project workflow such as release management and issue tracking.</p>
-<p>Maven also suggests some guidelines on how to layout your project's directory structure so that once you learn the layout you can easily navigate any other project that uses Maven and the same defaults.</p></div>
+<p>Maven also suggests some guidelines on how to layout your project&#x2019;s directory structure so that once you learn the layout you can easily navigate any other project that uses Maven and the same defaults.</p></div>
 <div class="section">
 <h3>Allowing transparent migration to new features<a name="Allowing_transparent_migration_to_new_features"></a></h3>
 <p>Maven provides an easy way for Maven clients to update their installations so that they can take advantage of any changes that been made to Maven itself.</p>
@@ -287,11 +305,16 @@
 <div class="section">
 <h2>What is Maven Not?<a name="What_is_Maven_Not"></a></h2>
 <p>You may have heard some of the following things about Maven:</p>
+
 <ul>
+  
 <li>Maven is a site and documentation tool</li>
+  
 <li>Maven extends Ant to let you download dependencies</li>
-<li>Maven is a set of reusable Ant scriptlets</li></ul>
-<p>While Maven does these things, as you can read above in the &quot;What is Maven?&quot; section, these are not the only features Maven has, and its objectives are quite different.</p>
+  
+<li>Maven is a set of reusable Ant scriptlets</li>
+</ul>
+<p>While Maven does these things, as you can read above in the &#x201c;What is Maven?&#x201d; section, these are not the only features Maven has, and its objectives are quite different.</p>
 <p>Maven does encourage best practices, but we realise that some projects may not fit with these ideals for historical reasons. While Maven is designed to be flexible, to an extent, in these situations and to the needs of different projects, it can not cater to every situation without making compromises to the integrity of its objectives.</p>
 <p>If you decide to use Maven, and have an unusual build structure that you cannot reorganise, you may have to forgo some features or the use of Maven altogether.</p></div>
       </div>