You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by bu...@apache.org on 2012/08/24 17:31:58 UTC

svn commit: r830030 [2/3] - in /websites/staging/maventest-doxia/trunk/content: ./ book/ css/ developers/ doxia-example-book/ doxia-ide/ issues/ macros/ modules/ references/

Modified: websites/staging/maventest-doxia/trunk/content/doxia-example-book/transport-and-channel-api.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/doxia-example-book/transport-and-channel-api.html (original)
+++ websites/staging/maventest-doxia/trunk/content/doxia-example-book/transport-and-channel-api.html Fri Aug 24 15:31:56 2012
@@ -1,5 +1,8 @@
 <!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 Apr 17, 2012 -->
+<!--
+ | Generated by Apache Maven Doxia at Aug 24, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>Transport and Channel API</title>
@@ -10,14 +13,14 @@
     </style>
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
         <meta name="author" content="XFire User&apos;s Guide" />
-        <meta name="Date-Revision-yyyymmdd" content="20120417" />
+        <meta name="Date-Revision-yyyymmdd" content="20120824" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
                                                         
 <script type="text/javascript">_uacct = "UA-140879-1";
         urchinTracker();</script>
-                    </head>
+                              </head>
   <body class="composite">
     <div id="banner">
                                       <a href="../../" id="bannerLeft">
@@ -32,17 +35,17 @@
     </div>
     <div id="breadcrumbs">
             
-                                <div class="xleft">
+                                   <div class="xleft">
                           <a href="http://www.apache.org/" class="externalLink">Apache</a>
         &gt;
                   <a href="../../index.html">Maven</a>
         &gt;
                   <a href="../index.html">Doxia</a>
         &gt;
-    Transport and Channel API
-      </div>
+        Transport and Channel API
+        </div>
             <div class="xright">        
-                                 Last Published: 2012-04-17
+                                    Last Published: 2012-08-24
             </div>
       <div class="clear">
         <hr/>
@@ -51,7 +54,7 @@
     <div id="leftColumn">
       <div id="navcolumn">
              
-                                                <h5>About Doxia</h5>
+                                                   <h5>About Doxia</h5>
                   <ul>
                   <li class="none">
                   <a href="../index.html">What is Doxia?</a>
@@ -164,10 +167,7 @@
                   <a href="../../maven-1.x/index.html">Maven 1.x</a>
             </li>
                   <li class="none">
-                  <a href="../../index.html">Maven 2</a>
-            </li>
-                  <li class="none">
-                  <a href="../../mercury/index.html">Mercury</a>
+                  <a href="../../index.html">Maven 2 & 3</a>
             </li>
                   <li class="none">
                   <a href="../../plugins/index.html">Plugins</a>
@@ -179,17 +179,35 @@
                   <a href="../../shared/index.html">Shared Components</a>
             </li>
                   <li class="none">
+                  <a href="../../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
                   <a href="../../surefire/index.html">Surefire</a>
             </li>
                   <li class="none">
                   <a href="../../wagon/index.html">Wagon</a>
             </li>
           </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
                                  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
           <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
         </a>
                        
-                            </div>
+                               </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
@@ -210,7 +228,7 @@ c.send(msg, context);</pre></div><p>Each
         &#169;            2005-2012
               The Apache Software Foundation
             
-                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
         Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
       </div>
       <div class="clear">

Modified: websites/staging/maventest-doxia/trunk/content/doxia-example-book/transports.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/doxia-example-book/transports.html (original)
+++ websites/staging/maventest-doxia/trunk/content/doxia-example-book/transports.html Fri Aug 24 15:31:56 2012
@@ -1,5 +1,8 @@
 <!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 Apr 17, 2012 -->
+<!--
+ | Generated by Apache Maven Doxia at Aug 24, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>Transports</title>
@@ -9,14 +12,14 @@
       @import url("../css/site.css");
     </style>
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
-        <meta name="Date-Revision-yyyymmdd" content="20120417" />
+        <meta name="Date-Revision-yyyymmdd" content="20120824" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
                                                         
 <script type="text/javascript">_uacct = "UA-140879-1";
         urchinTracker();</script>
-                    </head>
+                              </head>
   <body class="composite">
     <div id="banner">
                                       <a href="../../" id="bannerLeft">
@@ -31,17 +34,17 @@
     </div>
     <div id="breadcrumbs">
             
-                                <div class="xleft">
+                                   <div class="xleft">
                           <a href="http://www.apache.org/" class="externalLink">Apache</a>
         &gt;
                   <a href="../../index.html">Maven</a>
         &gt;
                   <a href="../index.html">Doxia</a>
         &gt;
-    Transports
-      </div>
+        Transports
+        </div>
             <div class="xright">        
-                                 Last Published: 2012-04-17
+                                    Last Published: 2012-08-24
             </div>
       <div class="clear">
         <hr/>
@@ -50,7 +53,7 @@
     <div id="leftColumn">
       <div id="navcolumn">
              
-                                                <h5>About Doxia</h5>
+                                                   <h5>About Doxia</h5>
                   <ul>
                   <li class="none">
                   <a href="../index.html">What is Doxia?</a>
@@ -163,10 +166,7 @@
                   <a href="../../maven-1.x/index.html">Maven 1.x</a>
             </li>
                   <li class="none">
-                  <a href="../../index.html">Maven 2</a>
-            </li>
-                  <li class="none">
-                  <a href="../../mercury/index.html">Mercury</a>
+                  <a href="../../index.html">Maven 2 & 3</a>
             </li>
                   <li class="none">
                   <a href="../../plugins/index.html">Plugins</a>
@@ -178,17 +178,35 @@
                   <a href="../../shared/index.html">Shared Components</a>
             </li>
                   <li class="none">
+                  <a href="../../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
                   <a href="../../surefire/index.html">Surefire</a>
             </li>
                   <li class="none">
                   <a href="../../wagon/index.html">Wagon</a>
             </li>
           </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
                                  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
           <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
         </a>
                        
-                            </div>
+                               </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
@@ -203,7 +221,7 @@
         &#169;            2005-2012
               The Apache Software Foundation
             
-                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
         Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
       </div>
       <div class="clear">

Modified: websites/staging/maventest-doxia/trunk/content/doxia-ide/index.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/doxia-ide/index.html (original)
+++ websites/staging/maventest-doxia/trunk/content/doxia-ide/index.html Fri Aug 24 15:31:56 2012
@@ -1,5 +1,8 @@
 <!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 Apr 17, 2012 -->
+<!--
+ | Generated by Apache Maven Doxia at Aug 24, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>Doxia IDE</title>
@@ -11,14 +14,14 @@
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
         <meta name="author" content="Hervé Boutemy" />
         <meta name="Date-Creation-yyyymmdd" content="20120417" />
-    <meta name="Date-Revision-yyyymmdd" content="20120417" />
+    <meta name="Date-Revision-yyyymmdd" content="20120824" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
                                                         
 <script type="text/javascript">_uacct = "UA-140879-1";
         urchinTracker();</script>
-                    </head>
+                              </head>
   <body class="composite">
     <div id="banner">
                                       <a href="../../" id="bannerLeft">
@@ -33,17 +36,17 @@
     </div>
     <div id="breadcrumbs">
             
-                                <div class="xleft">
+                                   <div class="xleft">
                           <a href="http://www.apache.org/" class="externalLink">Apache</a>
         &gt;
                   <a href="../../index.html">Maven</a>
         &gt;
                   <a href="../index.html">Doxia</a>
         &gt;
-    Doxia IDE
-      </div>
+        Doxia IDE
+        </div>
             <div class="xright">        
-                                 Last Published: 2012-04-17
+                                    Last Published: 2012-08-24
             </div>
       <div class="clear">
         <hr/>
@@ -52,7 +55,7 @@
     <div id="leftColumn">
       <div id="navcolumn">
              
-                                                <h5>About Doxia</h5>
+                                                   <h5>About Doxia</h5>
                   <ul>
                   <li class="none">
                   <a href="../index.html">What is Doxia?</a>
@@ -165,10 +168,7 @@
                   <a href="../../maven-1.x/index.html">Maven 1.x</a>
             </li>
                   <li class="none">
-                  <a href="../../index.html">Maven 2</a>
-            </li>
-                  <li class="none">
-                  <a href="../../mercury/index.html">Mercury</a>
+                  <a href="../../index.html">Maven 2 & 3</a>
             </li>
                   <li class="none">
                   <a href="../../plugins/index.html">Plugins</a>
@@ -180,17 +180,35 @@
                   <a href="../../shared/index.html">Shared Components</a>
             </li>
                   <li class="none">
+                  <a href="../../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
                   <a href="../../surefire/index.html">Surefire</a>
             </li>
                   <li class="none">
                   <a href="../../wagon/index.html">Wagon</a>
             </li>
           </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
                                  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
           <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
         </a>
                        
-                            </div>
+                               </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
@@ -205,7 +223,7 @@
         &#169;            2005-2012
               The Apache Software Foundation
             
-                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
         Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
       </div>
       <div class="clear">

Modified: websites/staging/maventest-doxia/trunk/content/faq.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/faq.html (original)
+++ websites/staging/maventest-doxia/trunk/content/faq.html Fri Aug 24 15:31:56 2012
@@ -1,5 +1,8 @@
 <!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 Apr 17, 2012 -->
+<!--
+ | Generated by Apache Maven Doxia at Aug 24, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>Frequently Asked Questions</title>
@@ -9,14 +12,14 @@
       @import url("./css/site.css");
     </style>
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-        <meta name="Date-Revision-yyyymmdd" content="20120417" />
+        <meta name="Date-Revision-yyyymmdd" content="20120824" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
                                                         
 <script type="text/javascript">_uacct = "UA-140879-1";
         urchinTracker();</script>
-                    </head>
+                              </head>
   <body class="composite">
     <div id="banner">
                                       <a href="../" id="bannerLeft">
@@ -31,17 +34,17 @@
     </div>
     <div id="breadcrumbs">
             
-                                <div class="xleft">
+                                   <div class="xleft">
                           <a href="http://www.apache.org/" class="externalLink">Apache</a>
         &gt;
                   <a href="../index.html">Maven</a>
         &gt;
                   <a href="index.html">Doxia</a>
         &gt;
-    Frequently Asked Questions
-      </div>
+        Frequently Asked Questions
+        </div>
             <div class="xright">        
-                                 Last Published: 2012-04-17
+                                    Last Published: 2012-08-24
             </div>
       <div class="clear">
         <hr/>
@@ -50,7 +53,7 @@
     <div id="leftColumn">
       <div id="navcolumn">
              
-                                                <h5>About Doxia</h5>
+                                                   <h5>About Doxia</h5>
                   <ul>
                   <li class="none">
                   <a href="index.html">What is Doxia?</a>
@@ -163,10 +166,7 @@
                   <a href="../maven-1.x/index.html">Maven 1.x</a>
             </li>
                   <li class="none">
-                  <a href="../index.html">Maven 2</a>
-            </li>
-                  <li class="none">
-                  <a href="../mercury/index.html">Mercury</a>
+                  <a href="../index.html">Maven 2 & 3</a>
             </li>
                   <li class="none">
                   <a href="../plugins/index.html">Plugins</a>
@@ -178,17 +178,35 @@
                   <a href="../shared/index.html">Shared Components</a>
             </li>
                   <li class="none">
+                  <a href="../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
                   <a href="../surefire/index.html">Surefire</a>
             </li>
                   <li class="none">
                   <a href="../wagon/index.html">Wagon</a>
             </li>
           </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
                                  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
           <img alt="Built by Maven" src="./images/logos/maven-feather.png"/>
         </a>
                        
-                            </div>
+                               </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
@@ -343,7 +361,7 @@ xsi:schemaLocation=&quot;http://maven.ap
         &#169;            2005-2012
               The Apache Software Foundation
             
-                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
         Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
       </div>
       <div class="clear">

Modified: websites/staging/maventest-doxia/trunk/content/index.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/index.html (original)
+++ websites/staging/maventest-doxia/trunk/content/index.html Fri Aug 24 15:31:56 2012
@@ -1,5 +1,8 @@
 <!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 Apr 17, 2012 -->
+<!--
+ | Generated by Apache Maven Doxia at Aug 24, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>Introduction</title>
@@ -12,14 +15,14 @@
         <meta name="author" content="Jason van Zyl
 Vincent Siveton" />
         <meta name="Date-Creation-yyyymmdd" content="20100528" />
-    <meta name="Date-Revision-yyyymmdd" content="20120417" />
+    <meta name="Date-Revision-yyyymmdd" content="20120824" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
                                                         
 <script type="text/javascript">_uacct = "UA-140879-1";
         urchinTracker();</script>
-                    </head>
+                              </head>
   <body class="composite">
     <div id="banner">
                                       <a href="../" id="bannerLeft">
@@ -34,17 +37,17 @@ Vincent Siveton" />
     </div>
     <div id="breadcrumbs">
             
-                                <div class="xleft">
+                                   <div class="xleft">
                           <a href="http://www.apache.org/" class="externalLink">Apache</a>
         &gt;
                   <a href="../index.html">Maven</a>
         &gt;
                   <a href="index.html">Doxia</a>
         &gt;
-    Introduction
-      </div>
+        Introduction
+        </div>
             <div class="xright">        
-                                 Last Published: 2012-04-17
+                                    Last Published: 2012-08-24
             </div>
       <div class="clear">
         <hr/>
@@ -53,7 +56,7 @@ Vincent Siveton" />
     <div id="leftColumn">
       <div id="navcolumn">
              
-                                                <h5>About Doxia</h5>
+                                                   <h5>About Doxia</h5>
                   <ul>
                   <li class="none">
             <strong>What is Doxia?</strong>
@@ -166,10 +169,7 @@ Vincent Siveton" />
                   <a href="../maven-1.x/index.html">Maven 1.x</a>
             </li>
                   <li class="none">
-                  <a href="../index.html">Maven 2</a>
-            </li>
-                  <li class="none">
-                  <a href="../mercury/index.html">Mercury</a>
+                  <a href="../index.html">Maven 2 & 3</a>
             </li>
                   <li class="none">
                   <a href="../plugins/index.html">Plugins</a>
@@ -181,17 +181,35 @@ Vincent Siveton" />
                   <a href="../shared/index.html">Shared Components</a>
             </li>
                   <li class="none">
+                  <a href="../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
                   <a href="../surefire/index.html">Surefire</a>
             </li>
                   <li class="none">
                   <a href="../wagon/index.html">Wagon</a>
             </li>
           </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
                                  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
           <img alt="Built by Maven" src="./images/logos/maven-feather.png"/>
         </a>
                        
-                            </div>
+                               </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
@@ -206,7 +224,7 @@ Vincent Siveton" />
         &#169;            2005-2012
               The Apache Software Foundation
             
-                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
         Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
       </div>
       <div class="clear">

Modified: websites/staging/maventest-doxia/trunk/content/issues/index.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/issues/index.html (original)
+++ websites/staging/maventest-doxia/trunk/content/issues/index.html Fri Aug 24 15:31:56 2012
@@ -1,5 +1,8 @@
 <!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 Apr 17, 2012 -->
+<!--
+ | Generated by Apache Maven Doxia at Aug 24, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>Doxia Issues</title>
@@ -11,14 +14,14 @@
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
         <meta name="author" content="Lukas Theussl" />
         <meta name="Date-Creation-yyyymmdd" content="20090302" />
-    <meta name="Date-Revision-yyyymmdd" content="20120417" />
+    <meta name="Date-Revision-yyyymmdd" content="20120824" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
                                                         
 <script type="text/javascript">_uacct = "UA-140879-1";
         urchinTracker();</script>
-                    </head>
+                              </head>
   <body class="composite">
     <div id="banner">
                                       <a href="../../" id="bannerLeft">
@@ -33,17 +36,17 @@
     </div>
     <div id="breadcrumbs">
             
-                                <div class="xleft">
+                                   <div class="xleft">
                           <a href="http://www.apache.org/" class="externalLink">Apache</a>
         &gt;
                   <a href="../../index.html">Maven</a>
         &gt;
                   <a href="../index.html">Doxia</a>
         &gt;
-    Doxia Issues
-      </div>
+        Doxia Issues
+        </div>
             <div class="xright">        
-                                 Last Published: 2012-04-17
+                                    Last Published: 2012-08-24
             </div>
       <div class="clear">
         <hr/>
@@ -52,7 +55,7 @@
     <div id="leftColumn">
       <div id="navcolumn">
              
-                                                <h5>About Doxia</h5>
+                                                   <h5>About Doxia</h5>
                   <ul>
                   <li class="none">
                   <a href="../index.html">What is Doxia?</a>
@@ -165,10 +168,7 @@
                   <a href="../../maven-1.x/index.html">Maven 1.x</a>
             </li>
                   <li class="none">
-                  <a href="../../index.html">Maven 2</a>
-            </li>
-                  <li class="none">
-                  <a href="../../mercury/index.html">Mercury</a>
+                  <a href="../../index.html">Maven 2 & 3</a>
             </li>
                   <li class="none">
                   <a href="../../plugins/index.html">Plugins</a>
@@ -180,17 +180,35 @@
                   <a href="../../shared/index.html">Shared Components</a>
             </li>
                   <li class="none">
+                  <a href="../../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
                   <a href="../../surefire/index.html">Surefire</a>
             </li>
                   <li class="none">
                   <a href="../../wagon/index.html">Wagon</a>
             </li>
           </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
                                  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
           <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
         </a>
                        
-                            </div>
+                               </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
@@ -216,7 +234,7 @@ sink.figure_();</pre></div><p>should out
         &#169;            2005-2012
               The Apache Software Foundation
             
-                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
         Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
       </div>
       <div class="clear">

Modified: websites/staging/maventest-doxia/trunk/content/macros/index.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/macros/index.html (original)
+++ websites/staging/maventest-doxia/trunk/content/macros/index.html Fri Aug 24 15:31:56 2012
@@ -1,5 +1,8 @@
 <!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 Apr 17, 2012 -->
+<!--
+ | Generated by Apache Maven Doxia at Aug 24, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>Doxia Macros Guide</title>
@@ -11,14 +14,14 @@
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
         <meta name="author" content="Vincent Siveton" />
         <meta name="Date-Creation-yyyymmdd" content="20090302" />
-    <meta name="Date-Revision-yyyymmdd" content="20120417" />
+    <meta name="Date-Revision-yyyymmdd" content="20120824" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
                                                         
 <script type="text/javascript">_uacct = "UA-140879-1";
         urchinTracker();</script>
-                    </head>
+                              </head>
   <body class="composite">
     <div id="banner">
                                       <a href="../../" id="bannerLeft">
@@ -33,17 +36,17 @@
     </div>
     <div id="breadcrumbs">
             
-                                <div class="xleft">
+                                   <div class="xleft">
                           <a href="http://www.apache.org/" class="externalLink">Apache</a>
         &gt;
                   <a href="../../index.html">Maven</a>
         &gt;
                   <a href="../index.html">Doxia</a>
         &gt;
-    Doxia Macros Guide
-      </div>
+        Doxia Macros Guide
+        </div>
             <div class="xright">        
-                                 Last Published: 2012-04-17
+                                    Last Published: 2012-08-24
             </div>
       <div class="clear">
         <hr/>
@@ -52,7 +55,7 @@
     <div id="leftColumn">
       <div id="navcolumn">
              
-                                                <h5>About Doxia</h5>
+                                                   <h5>About Doxia</h5>
                   <ul>
                   <li class="none">
                   <a href="../index.html">What is Doxia?</a>
@@ -165,10 +168,7 @@
                   <a href="../../maven-1.x/index.html">Maven 1.x</a>
             </li>
                   <li class="none">
-                  <a href="../../index.html">Maven 2</a>
-            </li>
-                  <li class="none">
-                  <a href="../../mercury/index.html">Mercury</a>
+                  <a href="../../index.html">Maven 2 & 3</a>
             </li>
                   <li class="none">
                   <a href="../../plugins/index.html">Plugins</a>
@@ -180,17 +180,35 @@
                   <a href="../../shared/index.html">Shared Components</a>
             </li>
                   <li class="none">
+                  <a href="../../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
                   <a href="../../surefire/index.html">Surefire</a>
             </li>
                   <li class="none">
                   <a href="../../wagon/index.html">Wagon</a>
             </li>
           </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
                                  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
           <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
         </a>
                        
-                            </div>
+                               </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
@@ -244,7 +262,7 @@
         &#169;            2005-2012
               The Apache Software Foundation
             
-                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
         Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
       </div>
       <div class="clear">

Modified: websites/staging/maventest-doxia/trunk/content/macros/swf-macro.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/macros/swf-macro.html (original)
+++ websites/staging/maventest-doxia/trunk/content/macros/swf-macro.html Fri Aug 24 15:31:56 2012
@@ -1,5 +1,8 @@
 <!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 Apr 17, 2012 -->
+<!--
+ | Generated by Apache Maven Doxia at Aug 24, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>Doxia - SWF Macro</title>
@@ -10,14 +13,14 @@
     </style>
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
         <meta name="author" content="The Maven Team" />
-        <meta name="Date-Revision-yyyymmdd" content="20120417" />
+        <meta name="Date-Revision-yyyymmdd" content="20120824" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
                                                         
 <script type="text/javascript">_uacct = "UA-140879-1";
         urchinTracker();</script>
-                    </head>
+                              </head>
   <body class="composite">
     <div id="banner">
                                       <a href="../../" id="bannerLeft">
@@ -32,17 +35,17 @@
     </div>
     <div id="breadcrumbs">
             
-                                <div class="xleft">
+                                   <div class="xleft">
                           <a href="http://www.apache.org/" class="externalLink">Apache</a>
         &gt;
                   <a href="../../index.html">Maven</a>
         &gt;
                   <a href="../index.html">Doxia</a>
         &gt;
-    Doxia - SWF Macro
-      </div>
+        Doxia - SWF Macro
+        </div>
             <div class="xright">        
-                                 Last Published: 2012-04-17
+                                    Last Published: 2012-08-24
             </div>
       <div class="clear">
         <hr/>
@@ -51,7 +54,7 @@
     <div id="leftColumn">
       <div id="navcolumn">
              
-                                                <h5>About Doxia</h5>
+                                                   <h5>About Doxia</h5>
                   <ul>
                   <li class="none">
                   <a href="../index.html">What is Doxia?</a>
@@ -164,10 +167,7 @@
                   <a href="../../maven-1.x/index.html">Maven 1.x</a>
             </li>
                   <li class="none">
-                  <a href="../../index.html">Maven 2</a>
-            </li>
-                  <li class="none">
-                  <a href="../../mercury/index.html">Mercury</a>
+                  <a href="../../index.html">Maven 2 & 3</a>
             </li>
                   <li class="none">
                   <a href="../../plugins/index.html">Plugins</a>
@@ -179,17 +179,35 @@
                   <a href="../../shared/index.html">Shared Components</a>
             </li>
                   <li class="none">
+                  <a href="../../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
                   <a href="../../surefire/index.html">Surefire</a>
             </li>
                   <li class="none">
                   <a href="../../wagon/index.html">Wagon</a>
             </li>
           </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
                                  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
           <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
         </a>
                        
-                            </div>
+                               </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
@@ -214,7 +232,7 @@
         &#169;            2005-2012
               The Apache Software Foundation
             
-                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
         Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
       </div>
       <div class="clear">

Modified: websites/staging/maventest-doxia/trunk/content/modules/index.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/modules/index.html (original)
+++ websites/staging/maventest-doxia/trunk/content/modules/index.html Fri Aug 24 15:31:56 2012
@@ -1,5 +1,8 @@
 <!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 Apr 17, 2012 -->
+<!--
+ | Generated by Apache Maven Doxia at Aug 24, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>Doxia Modules Guide</title>
@@ -11,14 +14,14 @@
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
         <meta name="author" content="Vincent Siveton" />
         <meta name="Date-Creation-yyyymmdd" content="20090615" />
-    <meta name="Date-Revision-yyyymmdd" content="20120417" />
+    <meta name="Date-Revision-yyyymmdd" content="20120824" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
                                                         
 <script type="text/javascript">_uacct = "UA-140879-1";
         urchinTracker();</script>
-                    </head>
+                              </head>
   <body class="composite">
     <div id="banner">
                                       <a href="../../" id="bannerLeft">
@@ -33,17 +36,17 @@
     </div>
     <div id="breadcrumbs">
             
-                                <div class="xleft">
+                                   <div class="xleft">
                           <a href="http://www.apache.org/" class="externalLink">Apache</a>
         &gt;
                   <a href="../../index.html">Maven</a>
         &gt;
                   <a href="../index.html">Doxia</a>
         &gt;
-    Doxia Modules Guide
-      </div>
+        Doxia Modules Guide
+        </div>
             <div class="xright">        
-                                 Last Published: 2012-04-17
+                                    Last Published: 2012-08-24
             </div>
       <div class="clear">
         <hr/>
@@ -52,7 +55,7 @@
     <div id="leftColumn">
       <div id="navcolumn">
              
-                                                <h5>About Doxia</h5>
+                                                   <h5>About Doxia</h5>
                   <ul>
                   <li class="none">
                   <a href="../index.html">What is Doxia?</a>
@@ -165,10 +168,7 @@
                   <a href="../../maven-1.x/index.html">Maven 1.x</a>
             </li>
                   <li class="none">
-                  <a href="../../index.html">Maven 2</a>
-            </li>
-                  <li class="none">
-                  <a href="../../mercury/index.html">Mercury</a>
+                  <a href="../../index.html">Maven 2 & 3</a>
             </li>
                   <li class="none">
                   <a href="../../plugins/index.html">Plugins</a>
@@ -180,17 +180,35 @@
                   <a href="../../shared/index.html">Shared Components</a>
             </li>
                   <li class="none">
+                  <a href="../../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
                   <a href="../../surefire/index.html">Surefire</a>
             </li>
                   <li class="none">
                   <a href="../../wagon/index.html">Wagon</a>
             </li>
           </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
                                  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
           <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
         </a>
                        
-                            </div>
+                               </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
@@ -205,7 +223,7 @@
         &#169;            2005-2012
               The Apache Software Foundation
             
-                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
         Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
       </div>
       <div class="clear">

Modified: websites/staging/maventest-doxia/trunk/content/overview.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/overview.html (original)
+++ websites/staging/maventest-doxia/trunk/content/overview.html Fri Aug 24 15:31:56 2012
@@ -1,5 +1,8 @@
 <!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 Apr 17, 2012 -->
+<!--
+ | Generated by Apache Maven Doxia at Aug 24, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>
@@ -12,14 +15,14 @@
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
         <meta name="author" content="Vincent Siveton" />
         <meta name="Date-Creation-yyyymmdd" content="20090302" />
-    <meta name="Date-Revision-yyyymmdd" content="20120417" />
+    <meta name="Date-Revision-yyyymmdd" content="20120824" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
                                                         
 <script type="text/javascript">_uacct = "UA-140879-1";
         urchinTracker();</script>
-                    </head>
+                              </head>
   <body class="composite">
     <div id="banner">
                                       <a href="../" id="bannerLeft">
@@ -34,18 +37,18 @@
     </div>
     <div id="breadcrumbs">
             
-                                <div class="xleft">
+                                   <div class="xleft">
                           <a href="http://www.apache.org/" class="externalLink">Apache</a>
         &gt;
                   <a href="../index.html">Maven</a>
         &gt;
                   <a href="index.html">Doxia</a>
         &gt;
-    
+        
     Overview Of The Doxia Framework
-      </div>
+        </div>
             <div class="xright">        
-                                 Last Published: 2012-04-17
+                                    Last Published: 2012-08-24
             </div>
       <div class="clear">
         <hr/>
@@ -54,7 +57,7 @@
     <div id="leftColumn">
       <div id="navcolumn">
              
-                                                <h5>About Doxia</h5>
+                                                   <h5>About Doxia</h5>
                   <ul>
                   <li class="none">
                   <a href="index.html">What is Doxia?</a>
@@ -167,10 +170,7 @@
                   <a href="../maven-1.x/index.html">Maven 1.x</a>
             </li>
                   <li class="none">
-                  <a href="../index.html">Maven 2</a>
-            </li>
-                  <li class="none">
-                  <a href="../mercury/index.html">Mercury</a>
+                  <a href="../index.html">Maven 2 & 3</a>
             </li>
                   <li class="none">
                   <a href="../plugins/index.html">Plugins</a>
@@ -182,17 +182,35 @@
                   <a href="../shared/index.html">Shared Components</a>
             </li>
                   <li class="none">
+                  <a href="../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
                   <a href="../surefire/index.html">Surefire</a>
             </li>
                   <li class="none">
                   <a href="../wagon/index.html">Wagon</a>
             </li>
           </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
                                  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
           <img alt="Built by Maven" src="./images/logos/maven-feather.png"/>
         </a>
                        
-                            </div>
+                               </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
@@ -339,7 +357,7 @@ void parse( Reader source, Sink sink )
         &#169;            2005-2012
               The Apache Software Foundation
             
-                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
         Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
       </div>
       <div class="clear">

Modified: websites/staging/maventest-doxia/trunk/content/references/apt-format.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/references/apt-format.html (original)
+++ websites/staging/maventest-doxia/trunk/content/references/apt-format.html Fri Aug 24 15:31:56 2012
@@ -1,5 +1,8 @@
 <!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 Apr 17, 2012 -->
+<!--
+ | Generated by Apache Maven Doxia at Aug 24, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>The APT format</title>
@@ -11,14 +14,14 @@
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
         <meta name="author" content="Jason van Zyl" />
         <meta name="Date-Creation-yyyymmdd" content="20090302" />
-    <meta name="Date-Revision-yyyymmdd" content="20120417" />
+    <meta name="Date-Revision-yyyymmdd" content="20120824" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
                                                         
 <script type="text/javascript">_uacct = "UA-140879-1";
         urchinTracker();</script>
-                    </head>
+                              </head>
   <body class="composite">
     <div id="banner">
                                       <a href="../../" id="bannerLeft">
@@ -33,17 +36,17 @@
     </div>
     <div id="breadcrumbs">
             
-                                <div class="xleft">
+                                   <div class="xleft">
                           <a href="http://www.apache.org/" class="externalLink">Apache</a>
         &gt;
                   <a href="../../index.html">Maven</a>
         &gt;
                   <a href="../index.html">Doxia</a>
         &gt;
-    The APT format
-      </div>
+        The APT format
+        </div>
             <div class="xright">        
-                                 Last Published: 2012-04-17
+                                    Last Published: 2012-08-24
             </div>
       <div class="clear">
         <hr/>
@@ -52,7 +55,7 @@
     <div id="leftColumn">
       <div id="navcolumn">
              
-                                                <h5>About Doxia</h5>
+                                                   <h5>About Doxia</h5>
                   <ul>
                   <li class="none">
                   <a href="../index.html">What is Doxia?</a>
@@ -181,10 +184,7 @@
                   <a href="../../maven-1.x/index.html">Maven 1.x</a>
             </li>
                   <li class="none">
-                  <a href="../../index.html">Maven 2</a>
-            </li>
-                  <li class="none">
-                  <a href="../../mercury/index.html">Mercury</a>
+                  <a href="../../index.html">Maven 2 & 3</a>
             </li>
                   <li class="none">
                   <a href="../../plugins/index.html">Plugins</a>
@@ -196,17 +196,35 @@
                   <a href="../../shared/index.html">Shared Components</a>
             </li>
                   <li class="none">
+                  <a href="../../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
                   <a href="../../surefire/index.html">Surefire</a>
             </li>
                   <li class="none">
                   <a href="../../wagon/index.html">Wagon</a>
             </li>
           </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
                                  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
           <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
         </a>
                        
-                            </div>
+                               </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
@@ -415,7 +433,7 @@ Table caption
         &#169;            2005-2012
               The Apache Software Foundation
             
-                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
         Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
       </div>
       <div class="clear">

Modified: websites/staging/maventest-doxia/trunk/content/references/doxia-apt.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/references/doxia-apt.html (original)
+++ websites/staging/maventest-doxia/trunk/content/references/doxia-apt.html Fri Aug 24 15:31:56 2012
@@ -1,5 +1,8 @@
 <!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 Apr 17, 2012 -->
+<!--
+ | Generated by Apache Maven Doxia at Aug 24, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>Doxia APT Enhancements</title>
@@ -11,14 +14,14 @@
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
         <meta name="author" content="Lukas Theussl" />
         <meta name="Date-Creation-yyyymmdd" content="20090527" />
-    <meta name="Date-Revision-yyyymmdd" content="20120417" />
+    <meta name="Date-Revision-yyyymmdd" content="20120824" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
                                                         
 <script type="text/javascript">_uacct = "UA-140879-1";
         urchinTracker();</script>
-                    </head>
+                              </head>
   <body class="composite">
     <div id="banner">
                                       <a href="../../" id="bannerLeft">
@@ -33,17 +36,17 @@
     </div>
     <div id="breadcrumbs">
             
-                                <div class="xleft">
+                                   <div class="xleft">
                           <a href="http://www.apache.org/" class="externalLink">Apache</a>
         &gt;
                   <a href="../../index.html">Maven</a>
         &gt;
                   <a href="../index.html">Doxia</a>
         &gt;
-    Doxia APT Enhancements
-      </div>
+        Doxia APT Enhancements
+        </div>
             <div class="xright">        
-                                 Last Published: 2012-04-17
+                                    Last Published: 2012-08-24
             </div>
       <div class="clear">
         <hr/>
@@ -52,7 +55,7 @@
     <div id="leftColumn">
       <div id="navcolumn">
              
-                                                <h5>About Doxia</h5>
+                                                   <h5>About Doxia</h5>
                   <ul>
                   <li class="none">
                   <a href="../index.html">What is Doxia?</a>
@@ -181,10 +184,7 @@
                   <a href="../../maven-1.x/index.html">Maven 1.x</a>
             </li>
                   <li class="none">
-                  <a href="../../index.html">Maven 2</a>
-            </li>
-                  <li class="none">
-                  <a href="../../mercury/index.html">Mercury</a>
+                  <a href="../../index.html">Maven 2 & 3</a>
             </li>
                   <li class="none">
                   <a href="../../plugins/index.html">Plugins</a>
@@ -196,17 +196,35 @@
                   <a href="../../shared/index.html">Shared Components</a>
             </li>
                   <li class="none">
+                  <a href="../../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
                   <a href="../../surefire/index.html">Surefire</a>
             </li>
                   <li class="none">
                   <a href="../../wagon/index.html">Wagon</a>
             </li>
           </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
                                  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
           <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
         </a>
                        
-                            </div>
+                               </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
@@ -232,7 +250,7 @@
         &#169;            2005-2012
               The Apache Software Foundation
             
-                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
         Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
       </div>
       <div class="clear">

Modified: websites/staging/maventest-doxia/trunk/content/references/fml-format.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/references/fml-format.html (original)
+++ websites/staging/maventest-doxia/trunk/content/references/fml-format.html Fri Aug 24 15:31:56 2012
@@ -1,5 +1,8 @@
 <!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 Apr 17, 2012 -->
+<!--
+ | Generated by Apache Maven Doxia at Aug 24, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>
@@ -11,14 +14,14 @@
     </style>
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
         <meta name="author" content="Lukas Theussl" />
-        <meta name="Date-Revision-yyyymmdd" content="20120417" />
+        <meta name="Date-Revision-yyyymmdd" content="20120824" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
                                                         
 <script type="text/javascript">_uacct = "UA-140879-1";
         urchinTracker();</script>
-                    </head>
+                              </head>
   <body class="composite">
     <div id="banner">
                                       <a href="../../" id="bannerLeft">
@@ -33,18 +36,18 @@
     </div>
     <div id="breadcrumbs">
             
-                                <div class="xleft">
+                                   <div class="xleft">
                           <a href="http://www.apache.org/" class="externalLink">Apache</a>
         &gt;
                   <a href="../../index.html">Maven</a>
         &gt;
                   <a href="../index.html">Doxia</a>
         &gt;
-    
+        
     The FML (FAQ Markup Language) format
-      </div>
+        </div>
             <div class="xright">        
-                                 Last Published: 2012-04-17
+                                    Last Published: 2012-08-24
             </div>
       <div class="clear">
         <hr/>
@@ -53,7 +56,7 @@
     <div id="leftColumn">
       <div id="navcolumn">
              
-                                                <h5>About Doxia</h5>
+                                                   <h5>About Doxia</h5>
                   <ul>
                   <li class="none">
                   <a href="../index.html">What is Doxia?</a>
@@ -177,10 +180,7 @@
                   <a href="../../maven-1.x/index.html">Maven 1.x</a>
             </li>
                   <li class="none">
-                  <a href="../../index.html">Maven 2</a>
-            </li>
-                  <li class="none">
-                  <a href="../../mercury/index.html">Mercury</a>
+                  <a href="../../index.html">Maven 2 & 3</a>
             </li>
                   <li class="none">
                   <a href="../../plugins/index.html">Plugins</a>
@@ -192,17 +192,35 @@
                   <a href="../../shared/index.html">Shared Components</a>
             </li>
                   <li class="none">
+                  <a href="../../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
                   <a href="../../surefire/index.html">Surefire</a>
             </li>
                   <li class="none">
                   <a href="../../wagon/index.html">Wagon</a>
             </li>
           </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
                                  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
           <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
         </a>
                        
-                            </div>
+                               </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
@@ -316,7 +334,7 @@ under the License. -->
         &#169;            2005-2012
               The Apache Software Foundation
             
-                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
         Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
       </div>
       <div class="clear">

Modified: websites/staging/maventest-doxia/trunk/content/references/index.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/references/index.html (original)
+++ websites/staging/maventest-doxia/trunk/content/references/index.html Fri Aug 24 15:31:56 2012
@@ -1,5 +1,8 @@
 <!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 Apr 17, 2012 -->
+<!--
+ | Generated by Apache Maven Doxia at Aug 24, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>
@@ -12,14 +15,14 @@
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
         <meta name="author" content="Lukas Theussl" />
         <meta name="author" content="Vincent Siveton" />
-        <meta name="Date-Revision-yyyymmdd" content="20120417" />
+        <meta name="Date-Revision-yyyymmdd" content="20120824" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
                                                         
 <script type="text/javascript">_uacct = "UA-140879-1";
         urchinTracker();</script>
-                    </head>
+                              </head>
   <body class="composite">
     <div id="banner">
                                       <a href="../../" id="bannerLeft">
@@ -34,18 +37,18 @@
     </div>
     <div id="breadcrumbs">
             
-                                <div class="xleft">
+                                   <div class="xleft">
                           <a href="http://www.apache.org/" class="externalLink">Apache</a>
         &gt;
                   <a href="../../index.html">Maven</a>
         &gt;
                   <a href="../index.html">Doxia</a>
         &gt;
-    
+        
     Doxia Markup Languages References
-      </div>
+        </div>
             <div class="xright">        
-                                 Last Published: 2012-04-17
+                                    Last Published: 2012-08-24
             </div>
       <div class="clear">
         <hr/>
@@ -54,7 +57,7 @@
     <div id="leftColumn">
       <div id="navcolumn">
              
-                                                <h5>About Doxia</h5>
+                                                   <h5>About Doxia</h5>
                   <ul>
                   <li class="none">
                   <a href="../index.html">What is Doxia?</a>
@@ -178,10 +181,7 @@
                   <a href="../../maven-1.x/index.html">Maven 1.x</a>
             </li>
                   <li class="none">
-                  <a href="../../index.html">Maven 2</a>
-            </li>
-                  <li class="none">
-                  <a href="../../mercury/index.html">Mercury</a>
+                  <a href="../../index.html">Maven 2 & 3</a>
             </li>
                   <li class="none">
                   <a href="../../plugins/index.html">Plugins</a>
@@ -193,17 +193,35 @@
                   <a href="../../shared/index.html">Shared Components</a>
             </li>
                   <li class="none">
+                  <a href="../../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
                   <a href="../../surefire/index.html">Surefire</a>
             </li>
                   <li class="none">
                   <a href="../../wagon/index.html">Wagon</a>
             </li>
           </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
                                  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
           <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
         </a>
                        
-                            </div>
+                               </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
@@ -401,7 +419,7 @@ under the License. -->
         &#169;            2005-2012
               The Apache Software Foundation
             
-                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
         Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
       </div>
       <div class="clear">

Modified: websites/staging/maventest-doxia/trunk/content/references/xdoc-format.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/references/xdoc-format.html (original)
+++ websites/staging/maventest-doxia/trunk/content/references/xdoc-format.html Fri Aug 24 15:31:56 2012
@@ -1,5 +1,8 @@
 <!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 Apr 17, 2012 -->
+<!--
+ | Generated by Apache Maven Doxia at Aug 24, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>
@@ -11,14 +14,14 @@
     </style>
     <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
         <meta name="author" content="Lukas Theussl" />
-        <meta name="Date-Revision-yyyymmdd" content="20120417" />
+        <meta name="Date-Revision-yyyymmdd" content="20120824" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
                                                         
 <script type="text/javascript">_uacct = "UA-140879-1";
         urchinTracker();</script>
-                    </head>
+                              </head>
   <body class="composite">
     <div id="banner">
                                       <a href="../../" id="bannerLeft">
@@ -33,18 +36,18 @@
     </div>
     <div id="breadcrumbs">
             
-                                <div class="xleft">
+                                   <div class="xleft">
                           <a href="http://www.apache.org/" class="externalLink">Apache</a>
         &gt;
                   <a href="../../index.html">Maven</a>
         &gt;
                   <a href="../index.html">Doxia</a>
         &gt;
-    
+        
     The Xdoc format
-      </div>
+        </div>
             <div class="xright">        
-                                 Last Published: 2012-04-17
+                                    Last Published: 2012-08-24
             </div>
       <div class="clear">
         <hr/>
@@ -53,7 +56,7 @@
     <div id="leftColumn">
       <div id="navcolumn">
              
-                                                <h5>About Doxia</h5>
+                                                   <h5>About Doxia</h5>
                   <ul>
                   <li class="none">
                   <a href="../index.html">What is Doxia?</a>
@@ -177,10 +180,7 @@
                   <a href="../../maven-1.x/index.html">Maven 1.x</a>
             </li>
                   <li class="none">
-                  <a href="../../index.html">Maven 2</a>
-            </li>
-                  <li class="none">
-                  <a href="../../mercury/index.html">Mercury</a>
+                  <a href="../../index.html">Maven 2 & 3</a>
             </li>
                   <li class="none">
                   <a href="../../plugins/index.html">Plugins</a>
@@ -192,17 +192,35 @@
                   <a href="../../shared/index.html">Shared Components</a>
             </li>
                   <li class="none">
+                  <a href="../../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
                   <a href="../../surefire/index.html">Surefire</a>
             </li>
                   <li class="none">
                   <a href="../../wagon/index.html">Wagon</a>
             </li>
           </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
                                  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
           <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
         </a>
                        
-                            </div>
+                               </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
@@ -527,7 +545,7 @@ code line 2
         &#169;            2005-2012
               The Apache Software Foundation
             
-                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
         Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
       </div>
       <div class="clear">

Modified: websites/staging/maventest-doxia/trunk/content/resources.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/resources.html (original)
+++ websites/staging/maventest-doxia/trunk/content/resources.html Fri Aug 24 15:31:56 2012
@@ -1,5 +1,8 @@
 <!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 Apr 17, 2012 -->
+<!--
+ | Generated by Apache Maven Doxia at Aug 24, 2012
+ | Rendered using Apache Maven Stylus Skin 1.5
+-->
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>External Resources</title>
@@ -11,14 +14,14 @@
     <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
         <meta name="author" content="Vincent Siveton" />
         <meta name="Date-Creation-yyyymmdd" content="20090302" />
-    <meta name="Date-Revision-yyyymmdd" content="20120417" />
+    <meta name="Date-Revision-yyyymmdd" content="20120824" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
                                                     
 <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
                                                         
 <script type="text/javascript">_uacct = "UA-140879-1";
         urchinTracker();</script>
-                    </head>
+                              </head>
   <body class="composite">
     <div id="banner">
                                       <a href="../" id="bannerLeft">
@@ -33,17 +36,17 @@
     </div>
     <div id="breadcrumbs">
             
-                                <div class="xleft">
+                                   <div class="xleft">
                           <a href="http://www.apache.org/" class="externalLink">Apache</a>
         &gt;
                   <a href="../index.html">Maven</a>
         &gt;
                   <a href="index.html">Doxia</a>
         &gt;
-    External Resources
-      </div>
+        External Resources
+        </div>
             <div class="xright">        
-                                 Last Published: 2012-04-17
+                                    Last Published: 2012-08-24
             </div>
       <div class="clear">
         <hr/>
@@ -52,7 +55,7 @@
     <div id="leftColumn">
       <div id="navcolumn">
              
-                                                <h5>About Doxia</h5>
+                                                   <h5>About Doxia</h5>
                   <ul>
                   <li class="none">
                   <a href="index.html">What is Doxia?</a>
@@ -165,10 +168,7 @@
                   <a href="../maven-1.x/index.html">Maven 1.x</a>
             </li>
                   <li class="none">
-                  <a href="../index.html">Maven 2</a>
-            </li>
-                  <li class="none">
-                  <a href="../mercury/index.html">Mercury</a>
+                  <a href="../index.html">Maven 2 & 3</a>
             </li>
                   <li class="none">
                   <a href="../plugins/index.html">Plugins</a>
@@ -180,17 +180,35 @@
                   <a href="../shared/index.html">Shared Components</a>
             </li>
                   <li class="none">
+                  <a href="../skins/index.html">Skins</a>
+            </li>
+                  <li class="none">
                   <a href="../surefire/index.html">Surefire</a>
             </li>
                   <li class="none">
                   <a href="../wagon/index.html">Wagon</a>
             </li>
           </ul>
+                       <h5>ASF</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/how-it-works.html" class="externalLink">How Apache Works</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/" class="externalLink">Foundation</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/sponsorship.html" class="externalLink">Sponsoring Apache</a>
+            </li>
+                  <li class="none">
+                  <a href="http://www.apache.org/foundation/thanks.html" class="externalLink">Thanks</a>
+            </li>
+          </ul>
                                  <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
           <img alt="Built by Maven" src="./images/logos/maven-feather.png"/>
         </a>
                        
-                            </div>
+                               </div>
     </div>
     <div id="bodyColumn">
       <div id="contentBox">
@@ -205,7 +223,7 @@
         &#169;            2005-2012
               The Apache Software Foundation
             
-                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+                          - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
         Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
       </div>
       <div class="clear">