You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/06/27 23:41:42 UTC

svn commit: r914179 [5/34] - in /websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST: ./ apidocs/ apidocs/org/apache/maven/doxia/docrenderer/ apidocs/org/apache/maven/doxia/docrenderer/class-use/ apidocs/org/apache/m...

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/constant-values.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/constant-values.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/constant-values.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Constant Field Values (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Constant Field Values (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Constant Field Values (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Constant Field Values (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>
@@ -64,6 +64,42 @@
 <div class="header">
 <h1 title="Constant Field Values" class="title">Constant Field Values</h1>
 <h2 title="Contents">Contents</h2>
+<ul>
+<li><a href="#org.apache">org.apache.*</a></li>
+</ul>
+</div>
+<div class="constantValuesContainer"><a name="org.apache">
+<!--   -->
+</a>
+<h2 title="org.apache">org.apache.*</h2>
+<ul class="blockList">
+<li class="blockList">
+<table border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>org.apache.maven.doxia.site.decoration.<a href="org/apache/maven/doxia/site/decoration/DecorationModel.html" title="class in org.apache.maven.doxia.site.decoration">DecorationModel</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="org.apache.maven.doxia.site.decoration.DecorationModel.MERGE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/maven/doxia/site/decoration/DecorationModel.html#MERGE">MERGE</a></code></td>
+<td class="colLast"><code>"merge"</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="org.apache.maven.doxia.site.decoration.DecorationModel.OVERRIDE">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;<a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td><code><a href="org/apache/maven/doxia/site/decoration/DecorationModel.html#OVERRIDE">OVERRIDE</a></code></td>
+<td class="colLast"><code>"override"</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
 </div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar_bottom">

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/deprecated-list.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/deprecated-list.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/deprecated-list.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Deprecated List (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Deprecated List (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Deprecated List (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Deprecated List (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/help-doc.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/help-doc.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/help-doc.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>API Help (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>API Help (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="API Help (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="API Help (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/index-all.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/index-all.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/index-all.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Index (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Index (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="./stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Index (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Index (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>
@@ -315,6 +315,12 @@
 <dd>
 <div class="block">Method getBreadcrumbs.</div>
 </dd>
+<dt><span class="strong"><a href="./org/apache/maven/doxia/site/decoration/DecorationModel.html#getCombineSelf()">getCombineSelf()</a></span> - Method in class org.apache.maven.doxia.site.decoration.<a href="./org/apache/maven/doxia/site/decoration/DecorationModel.html" title="class in org.apache.maven.doxia.site.decoration">DecorationModel</a></dt>
+<dd>
+<div class="block">Get whether to inherit configuration from a parent project
+ site descriptor (<code>merge</code>)
+            or not (<code>override</code>).</div>
+</dd>
 <dt><span class="strong"><a href="./org/apache/maven/doxia/site/decoration/DecorationModel.html#getCustom()">getCustom()</a></span> - Method in class org.apache.maven.doxia.site.decoration.<a href="./org/apache/maven/doxia/site/decoration/DecorationModel.html" title="class in org.apache.maven.doxia.site.decoration">DecorationModel</a></dt>
 <dd>
 <div class="block">Get custom configuration for use with customized Velocity
@@ -606,7 +612,7 @@
 <dt><span class="strong"><a href="./org/apache/maven/doxia/site/decoration/inheritance/PathDescriptor.html#isFile()">isFile()</a></span> - Method in class org.apache.maven.doxia.site.decoration.inheritance.<a href="./org/apache/maven/doxia/site/decoration/inheritance/PathDescriptor.html" title="class in org.apache.maven.doxia.site.decoration.inheritance">PathDescriptor</a></dt>
 <dd>
 <div class="block"><span class="strong">Deprecated.</span></div>
-<div class="block">Check if this PathDescriptor decribes a file.</div>
+<div class="block">Check if this PathDescriptor describes a file.</div>
 </dd>
 <dt><span class="strong"><a href="./org/apache/maven/doxia/site/decoration/Menu.html#isInheritAsRef()">isInheritAsRef()</a></span> - Method in class org.apache.maven.doxia.site.decoration.<a href="./org/apache/maven/doxia/site/decoration/Menu.html" title="class in org.apache.maven.doxia.site.decoration">Menu</a></dt>
 <dd>
@@ -616,10 +622,12 @@
              in the project, whereas if it is false, it is
  populated in the parent and then inherited.</div>
 </dd>
+<dt><span class="strong"><a href="./org/apache/maven/doxia/site/decoration/DecorationModel.html#isMergeParent()">isMergeParent()</a></span> - Method in class org.apache.maven.doxia.site.decoration.<a href="./org/apache/maven/doxia/site/decoration/DecorationModel.html" title="class in org.apache.maven.doxia.site.decoration">DecorationModel</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="strong"><a href="./org/apache/maven/doxia/site/decoration/inheritance/PathDescriptor.html#isRelative()">isRelative()</a></span> - Method in class org.apache.maven.doxia.site.decoration.inheritance.<a href="./org/apache/maven/doxia/site/decoration/inheritance/PathDescriptor.html" title="class in org.apache.maven.doxia.site.decoration.inheritance">PathDescriptor</a></dt>
 <dd>
 <div class="block"><span class="strong">Deprecated.</span></div>
-<div class="block">Check if this PathDescriptor decribes a relative path.</div>
+<div class="block">Check if this PathDescriptor describes a relative path.</div>
 </dd>
 </dl>
 <a name="_L_">
@@ -657,6 +665,8 @@
 </dd>
 <dt><span class="strong"><a href="./org/apache/maven/doxia/site/decoration/MenuItem.html#MenuItem()">MenuItem()</a></span> - Constructor for class org.apache.maven.doxia.site.decoration.<a href="./org/apache/maven/doxia/site/decoration/MenuItem.html" title="class in org.apache.maven.doxia.site.decoration">MenuItem</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./org/apache/maven/doxia/site/decoration/DecorationModel.html#MERGE">MERGE</a></span> - Static variable in class org.apache.maven.doxia.site.decoration.<a href="./org/apache/maven/doxia/site/decoration/DecorationModel.html" title="class in org.apache.maven.doxia.site.decoration">DecorationModel</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <a name="_O_">
 <!--   -->
@@ -669,6 +679,8 @@
 <dd>&nbsp;</dd>
 <dt><a href="./org/apache/maven/doxia/site/decoration/io/xpp3/package-summary.html">org.apache.maven.doxia.site.decoration.io.xpp3</a> - package org.apache.maven.doxia.site.decoration.io.xpp3</dt>
 <dd>&nbsp;</dd>
+<dt><span class="strong"><a href="./org/apache/maven/doxia/site/decoration/DecorationModel.html#OVERRIDE">OVERRIDE</a></span> - Static variable in class org.apache.maven.doxia.site.decoration.<a href="./org/apache/maven/doxia/site/decoration/DecorationModel.html" title="class in org.apache.maven.doxia.site.decoration">DecorationModel</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <a name="_P_">
 <!--   -->
@@ -839,6 +851,12 @@
 <div class="block">Set whether to collapse children elements of an item menu
  (by default).</div>
 </dd>
+<dt><span class="strong"><a href="./org/apache/maven/doxia/site/decoration/DecorationModel.html#setCombineSelf(java.lang.String)">setCombineSelf(String)</a></span> - Method in class org.apache.maven.doxia.site.decoration.<a href="./org/apache/maven/doxia/site/decoration/DecorationModel.html" title="class in org.apache.maven.doxia.site.decoration">DecorationModel</a></dt>
+<dd>
+<div class="block">Set whether to inherit configuration from a parent project
+ site descriptor (<code>merge</code>)
+            or not (<code>override</code>).</div>
+</dd>
 <dt><span class="strong"><a href="./org/apache/maven/doxia/site/decoration/DecorationModel.html#setCustom(java.lang.Object)">setCustom(Object)</a></span> - Method in class org.apache.maven.doxia.site.decoration.<a href="./org/apache/maven/doxia/site/decoration/DecorationModel.html" title="class in org.apache.maven.doxia.site.decoration">DecorationModel</a></dt>
 <dd>
 <div class="block">Set custom configuration for use with customized Velocity

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/index.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/index.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/index.html Fri Jun 27 21:41:29 2014
@@ -3,7 +3,7 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Doxia :: Decoration Model 1.6-SNAPSHOT API</title>
+<title>Doxia :: Decoration Model 1.6 API</title>
 <script type="text/javascript">
     targetPage = "" + window.location.search;
     if (targetPage != "" && targetPage != "undefined")

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Banner.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Banner.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Banner.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Banner (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Banner (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Banner (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Banner (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Body.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Body.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Body.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Body (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Body (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Body (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Body (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/DecorationModel.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/DecorationModel.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/DecorationModel.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>DecorationModel (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>DecorationModel (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="DecorationModel (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="DecorationModel (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>
@@ -61,13 +61,13 @@
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method_detail">Method</a></li>
 </ul>
@@ -103,9 +103,7 @@
 extends <a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
 implements <a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>, <a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/Cloneable.html?is-external=true" title="class or interface in java.lang">Cloneable</a></pre>
 <div class="block">The <code>&lt;project&gt;</code> element is the root of
- the site decoration descriptor.
-          The following table lists all of the possible child
- elements.</div>
+ the site decoration descriptor.</div>
 <dl><dt><span class="strong">Version:</span></dt>
   <dd>$Revision$ $Date$</dd>
 <dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../../serialized-form.html#org.apache.maven.doxia.site.decoration.DecorationModel">Serialized Form</a></dd></dl>
@@ -115,6 +113,29 @@ implements <a href="http://docs.oracle.c
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field_summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="overviewSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#MERGE">MERGE</a></strong></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#OVERRIDE">OVERRIDE</a></strong></code>&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor_summary">
@@ -181,91 +202,103 @@ implements <a href="http://docs.oracle.c
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code><a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#getCombineSelf()">getCombineSelf</a></strong>()</code>
+<div class="block">Get whether to inherit configuration from a parent project
+ site descriptor (<code>merge</code>)
+            or not (<code>override</code>).</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#getCustom()">getCustom</a></strong>()</code>
 <div class="block">Get custom configuration for use with customized Velocity
  templates.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#getGoogleAdSenseClient()">getGoogleAdSenseClient</a></strong>()</code>
 <div class="block">Get your Google AdSense client id.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#getGoogleAdSenseSlot()">getGoogleAdSenseSlot</a></strong>()</code>
 <div class="block">Get your Google AdSense slot id.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#getGoogleAnalyticsAccountId()">getGoogleAnalyticsAccountId</a></strong>()</code>
 <div class="block">Get the id for your Google Analytics account.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>long</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#getLastModified()">getLastModified</a></strong>()</code>
 <div class="block">Get timestamp of the last modification of this decoration
  model.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/maven/doxia/site/decoration/Menu.html" title="class in org.apache.maven.doxia.site.decoration">Menu</a></code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#getMenuRef(java.lang.String)">getMenuRef</a></strong>(<a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/maven/doxia/site/decoration/Menu.html" title="class in org.apache.maven.doxia.site.decoration">Menu</a>&gt;</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#getMenus()">getMenus</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#getModelEncoding()">getModelEncoding</a></strong>()</code>
 <div class="block">Get the modelEncoding field.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#getName()">getName</a></strong>()</code>
 <div class="block">Get the full name of the project.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/maven/doxia/site/decoration/Logo.html" title="class in org.apache.maven.doxia.site.decoration">Logo</a>&gt;</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#getPoweredBy()">getPoweredBy</a></strong>()</code>
 <div class="block">Method getPoweredBy.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/maven/doxia/site/decoration/PublishDate.html" title="class in org.apache.maven.doxia.site.decoration">PublishDate</a></code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#getPublishDate()">getPublishDate</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/maven/doxia/site/decoration/Skin.html" title="class in org.apache.maven.doxia.site.decoration">Skin</a></code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#getSkin()">getSkin</a></strong>()</code>
 <div class="block">Get the artifact containing the skin for the site.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/maven/doxia/site/decoration/Version.html" title="class in org.apache.maven.doxia.site.decoration">Version</a></code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#getVersion()">getVersion</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#hashCode()">hashCode</a></strong>()</code>
 <div class="block">Method hashCode.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#isDefaultPublishDate()">isDefaultPublishDate</a></strong>()</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#isDefaultVersion()">isDefaultVersion</a></strong>()</code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#isMergeParent()">isMergeParent</a></strong>()</code>&nbsp;</td>
+</tr>
 <tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#removeMenuRef(java.lang.String)">removeMenuRef</a></strong>(<a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;key)</code>&nbsp;</td>
@@ -296,73 +329,81 @@ implements <a href="http://docs.oracle.c
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#setCombineSelf(java.lang.String)">setCombineSelf</a></strong>(<a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;combineSelf)</code>
+<div class="block">Set whether to inherit configuration from a parent project
+ site descriptor (<code>merge</code>)
+            or not (<code>override</code>).</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#setCustom(java.lang.Object)">setCustom</a></strong>(<a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>&nbsp;custom)</code>
 <div class="block">Set custom configuration for use with customized Velocity
  templates.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#setGoogleAdSenseClient(java.lang.String)">setGoogleAdSenseClient</a></strong>(<a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;googleAdSenseClient)</code>
 <div class="block">Set your Google AdSense client id.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#setGoogleAdSenseSlot(java.lang.String)">setGoogleAdSenseSlot</a></strong>(<a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;googleAdSenseSlot)</code>
 <div class="block">Set your Google AdSense slot id.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#setGoogleAnalyticsAccountId(java.lang.String)">setGoogleAnalyticsAccountId</a></strong>(<a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;googleAnalyticsAccountId)</code>
 <div class="block">Set the id for your Google Analytics account.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#setLastModified(long)">setLastModified</a></strong>(long&nbsp;lastModified)</code>
 <div class="block">Set timestamp of the last modification of this decoration
  model.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#setModelEncoding(java.lang.String)">setModelEncoding</a></strong>(<a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;modelEncoding)</code>
 <div class="block">Set the modelEncoding field.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#setName(java.lang.String)">setName</a></strong>(<a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;name)</code>
 <div class="block">Set the full name of the project.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#setPoweredBy(java.util.List)">setPoweredBy</a></strong>(<a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a>&lt;<a href="../../../../../../org/apache/maven/doxia/site/decoration/Logo.html" title="class in org.apache.maven.doxia.site.decoration">Logo</a>&gt;&nbsp;poweredBy)</code>
 <div class="block">Set powered by logos list.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#setPublishDate(org.apache.maven.doxia.site.decoration.PublishDate)">setPublishDate</a></strong>(<a href="../../../../../../org/apache/maven/doxia/site/decoration/PublishDate.html" title="class in org.apache.maven.doxia.site.decoration">PublishDate</a>&nbsp;publishDate)</code>
 <div class="block">Set modify the date published display properties.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#setSkin(org.apache.maven.doxia.site.decoration.Skin)">setSkin</a></strong>(<a href="../../../../../../org/apache/maven/doxia/site/decoration/Skin.html" title="class in org.apache.maven.doxia.site.decoration">Skin</a>&nbsp;skin)</code>
 <div class="block">Set the artifact containing the skin for the site.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#setVersion(org.apache.maven.doxia.site.decoration.Version)">setVersion</a></strong>(<a href="../../../../../../org/apache/maven/doxia/site/decoration/Version.html" title="class in org.apache.maven.doxia.site.decoration">Version</a>&nbsp;version)</code>
 <div class="block">Set modify the version published display properties.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code><a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td class="colLast"><code><strong><a href="../../../../../../org/apache/maven/doxia/site/decoration/DecorationModel.html#toString()">toString</a></strong>()</code>
 <div class="block">Method toString.</div>
@@ -384,6 +425,34 @@ implements <a href="http://docs.oracle.c
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<ul class="blockList">
+<li class="blockList"><a name="field_detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a name="MERGE">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>MERGE</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> MERGE</pre>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../../constant-values.html#org.apache.maven.doxia.site.decoration.DecorationModel.MERGE">Constant Field Values</a></dd></dl>
+</li>
+</ul>
+<a name="OVERRIDE">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>OVERRIDE</h4>
+<pre>public static final&nbsp;<a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> OVERRIDE</pre>
+<dl><dt><span class="strong">See Also:</span></dt><dd><a href="../../../../../../constant-values.html#org.apache.maven.doxia.site.decoration.DecorationModel.OVERRIDE">Constant Field Values</a></dd></dl>
+</li>
+</ul>
+</li>
+</ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 <ul class="blockList">
 <li class="blockList"><a name="constructor_detail">
@@ -480,6 +549,19 @@ implements <a href="http://docs.oracle.c
 <dl><dt><span class="strong">Returns:</span></dt><dd>Body</dd></dl>
 </li>
 </ul>
+<a name="getCombineSelf()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCombineSelf</h4>
+<pre>public&nbsp;<a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;getCombineSelf()</pre>
+<div class="block">Get whether to inherit configuration from a parent project
+ site descriptor (<code>merge</code>)
+            or not (<code>override</code>).</div>
+<dl><dt><span class="strong">Returns:</span></dt><dd>String</dd></dl>
+</li>
+</ul>
 <a name="getCustom()">
 <!--   -->
 </a>
@@ -643,6 +725,19 @@ implements <a href="http://docs.oracle.c
 <dl><dt><span class="strong">Parameters:</span></dt><dd><code>body</code> - </dd></dl>
 </li>
 </ul>
+<a name="setCombineSelf(java.lang.String)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setCombineSelf</h4>
+<pre>public&nbsp;void&nbsp;setCombineSelf(<a href="http://docs.oracle.com/javase/1.5.0/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;combineSelf)</pre>
+<div class="block">Set whether to inherit configuration from a parent project
+ site descriptor (<code>merge</code>)
+            or not (<code>override</code>).</div>
+<dl><dt><span class="strong">Parameters:</span></dt><dd><code>combineSelf</code> - </dd></dl>
+</li>
+</ul>
 <a name="setCustom(java.lang.Object)">
 <!--   -->
 </a>
@@ -784,6 +879,15 @@ implements <a href="http://docs.oracle.c
 <dt><span class="strong">Returns:</span></dt><dd>String</dd></dl>
 </li>
 </ul>
+<a name="isMergeParent()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isMergeParent</h4>
+<pre>public&nbsp;boolean&nbsp;isMergeParent()</pre>
+</li>
+</ul>
 <a name="getPublishDate()">
 <!--   -->
 </a>
@@ -903,13 +1007,13 @@ implements <a href="http://docs.oracle.c
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field_summary">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor_summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method_summary">Method</a></li>
 </ul>
 <ul class="subNavList">
 <li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#field_detail">Field</a>&nbsp;|&nbsp;</li>
 <li><a href="#constructor_detail">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method_detail">Method</a></li>
 </ul>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/LinkItem.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/LinkItem.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/LinkItem.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>LinkItem (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>LinkItem (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="LinkItem (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="LinkItem (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Logo.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Logo.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Logo.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Logo (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Logo (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Logo (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Logo (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Menu.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Menu.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Menu.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Menu (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Menu (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Menu (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Menu (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/MenuItem.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/MenuItem.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/MenuItem.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>MenuItem (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>MenuItem (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="MenuItem (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="MenuItem (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/PublishDate.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/PublishDate.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/PublishDate.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>PublishDate (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>PublishDate (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="PublishDate (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="PublishDate (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Skin.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Skin.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Skin.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Skin (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Skin (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Skin (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Skin (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Version.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Version.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/Version.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Version (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Version (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Version (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Version (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Banner.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Banner.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Banner.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Uses of Class org.apache.maven.doxia.site.decoration.Banner (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Uses of Class org.apache.maven.doxia.site.decoration.Banner (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.Banner (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.Banner (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Body.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Body.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Body.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Uses of Class org.apache.maven.doxia.site.decoration.Body (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Uses of Class org.apache.maven.doxia.site.decoration.Body (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.Body (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.Body (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/DecorationModel.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/DecorationModel.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/DecorationModel.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Uses of Class org.apache.maven.doxia.site.decoration.DecorationModel (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Uses of Class org.apache.maven.doxia.site.decoration.DecorationModel (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.DecorationModel (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.DecorationModel (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/LinkItem.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/LinkItem.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/LinkItem.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Uses of Class org.apache.maven.doxia.site.decoration.LinkItem (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Uses of Class org.apache.maven.doxia.site.decoration.LinkItem (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.LinkItem (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.LinkItem (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Logo.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Logo.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Logo.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Uses of Class org.apache.maven.doxia.site.decoration.Logo (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Uses of Class org.apache.maven.doxia.site.decoration.Logo (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.Logo (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.Logo (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Menu.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Menu.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Menu.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Uses of Class org.apache.maven.doxia.site.decoration.Menu (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Uses of Class org.apache.maven.doxia.site.decoration.Menu (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.Menu (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.Menu (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/MenuItem.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/MenuItem.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/MenuItem.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Uses of Class org.apache.maven.doxia.site.decoration.MenuItem (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Uses of Class org.apache.maven.doxia.site.decoration.MenuItem (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.MenuItem (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.MenuItem (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/PublishDate.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/PublishDate.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/PublishDate.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Uses of Class org.apache.maven.doxia.site.decoration.PublishDate (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Uses of Class org.apache.maven.doxia.site.decoration.PublishDate (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.PublishDate (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.PublishDate (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Skin.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Skin.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Skin.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Uses of Class org.apache.maven.doxia.site.decoration.Skin (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Uses of Class org.apache.maven.doxia.site.decoration.Skin (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.Skin (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.Skin (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Version.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Version.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/class-use/Version.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Uses of Class org.apache.maven.doxia.site.decoration.Version (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Uses of Class org.apache.maven.doxia.site.decoration.Version (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.Version (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.Version (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>DecorationModelInheritanceAssembler (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>DecorationModelInheritanceAssembler (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="DecorationModelInheritanceAssembler (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="DecorationModelInheritanceAssembler (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.URLContainer.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.URLContainer.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.URLContainer.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>DefaultDecorationModelInheritanceAssembler.URLContainer (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>DefaultDecorationModelInheritanceAssembler.URLContainer (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="DefaultDecorationModelInheritanceAssembler.URLContainer (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="DefaultDecorationModelInheritanceAssembler.URLContainer (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>DefaultDecorationModelInheritanceAssembler (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>DefaultDecorationModelInheritanceAssembler (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="DefaultDecorationModelInheritanceAssembler (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="DefaultDecorationModelInheritanceAssembler (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>
@@ -105,7 +105,7 @@ extends <a href="http://docs.oracle.com/
 implements <a href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.html" title="interface in org.apache.maven.doxia.site.decoration.inheritance">DecorationModelInheritanceAssembler</a></pre>
 <div class="block">Manage inheritance of the decoration model.</div>
 <dl><dt><span class="strong">Version:</span></dt>
-  <dd>$Id: DefaultDecorationModelInheritanceAssembler.java 1452051 2013-03-03 15:06:42Z olamy $</dd>
+  <dd>$Id: DefaultDecorationModelInheritanceAssembler.java 1606231 2014-06-27 21:05:44Z hboutemy $</dd>
 <dt><span class="strong">Author:</span></dt>
   <dd><a href="mailto:brett@apache.org">Brett Porter</a>, <a href="mailto:henning@apache.org">Henning P. Schmiedehausen</a></dd></dl>
 </li>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/PathDescriptor.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/PathDescriptor.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/PathDescriptor.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>PathDescriptor (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>PathDescriptor (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="PathDescriptor (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="PathDescriptor (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>
@@ -104,7 +104,7 @@ extends <a href="http://docs.oracle.com/
  base reference which can also be a relative path (e.g. '.' or '../doxia') or an URL that is used for an absolute
  anchor.</div>
 <dl><dt><span class="strong">Version:</span></dt>
-  <dd>$Id: PathDescriptor.java 1438392 2013-01-25 08:54:48Z olamy $</dd>
+  <dd>$Id: PathDescriptor.java 1606231 2014-06-27 21:05:44Z hboutemy $</dd>
 <dt><span class="strong">Author:</span></dt>
   <dd><a href="mailto:henning@apache.org">Henning P. Schmiedehausen</a></dd></dl>
 </li>
@@ -191,14 +191,14 @@ extends <a href="http://docs.oracle.com/
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/PathDescriptor.html#isFile()">isFile</a></strong>()</code>
 <div class="block"><strong>Deprecated.</strong>&nbsp;</div>
-<div class="block">Check if this PathDescriptor decribes a file.</div>
+<div class="block">Check if this PathDescriptor describes a file.</div>
 </td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><strong><a href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/PathDescriptor.html#isRelative()">isRelative</a></strong>()</code>
 <div class="block"><strong>Deprecated.</strong>&nbsp;</div>
-<div class="block">Check if this PathDescriptor decribes a relative path.</div>
+<div class="block">Check if this PathDescriptor describes a relative path.</div>
 </td>
 </tr>
 <tr class="altColor">
@@ -292,7 +292,7 @@ extends <a href="http://docs.oracle.com/
 <h4>isFile</h4>
 <pre>public&nbsp;boolean&nbsp;isFile()</pre>
 <div class="block"><span class="strong">Deprecated.</span>&nbsp;</div>
-<div class="block">Check if this PathDescriptor decribes a file.</div>
+<div class="block">Check if this PathDescriptor describes a file.</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>true for file, false otherwise.</dd></dl>
 </li>
 </ul>
@@ -304,7 +304,7 @@ extends <a href="http://docs.oracle.com/
 <h4>isRelative</h4>
 <pre>public&nbsp;boolean&nbsp;isRelative()</pre>
 <div class="block"><span class="strong">Deprecated.</span>&nbsp;</div>
-<div class="block">Check if this PathDescriptor decribes a relative path.</div>
+<div class="block">Check if this PathDescriptor describes a relative path.</div>
 <dl><dt><span class="strong">Returns:</span></dt><dd>true if <a href="../../../../../../../org/apache/maven/doxia/site/decoration/inheritance/PathDescriptor.html#getPathUrl()"><code>getPathUrl()</code></a> returns null.</dd></dl>
 </li>
 </ul>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/PathUtils.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/PathUtils.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/PathUtils.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>PathUtils (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>PathUtils (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="PathUtils (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="PathUtils (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>URIPathDescriptor (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>URIPathDescriptor (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="URIPathDescriptor (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="URIPathDescriptor (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/DecorationModelInheritanceAssembler.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/DecorationModelInheritanceAssembler.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/DecorationModelInheritanceAssembler.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Uses of Interface org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Uses of Interface org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Interface org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Uses of Interface org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/DefaultDecorationModelInheritanceAssembler.URLContainer.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/DefaultDecorationModelInheritanceAssembler.URLContainer.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/DefaultDecorationModelInheritanceAssembler.URLContainer.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Uses of Class org.apache.maven.doxia.site.decoration.inheritance.DefaultDecorationModelInheritanceAssembler.URLContainer (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Uses of Class org.apache.maven.doxia.site.decoration.inheritance.DefaultDecorationModelInheritanceAssembler.URLContainer (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.inheritance.DefaultDecorationModelInheritanceAssembler.URLContainer (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.inheritance.DefaultDecorationModelInheritanceAssembler.URLContainer (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/DefaultDecorationModelInheritanceAssembler.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/DefaultDecorationModelInheritanceAssembler.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/DefaultDecorationModelInheritanceAssembler.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Uses of Class org.apache.maven.doxia.site.decoration.inheritance.DefaultDecorationModelInheritanceAssembler (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Uses of Class org.apache.maven.doxia.site.decoration.inheritance.DefaultDecorationModelInheritanceAssembler (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.inheritance.DefaultDecorationModelInheritanceAssembler (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.inheritance.DefaultDecorationModelInheritanceAssembler (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/PathDescriptor.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/PathDescriptor.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/PathDescriptor.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Uses of Class org.apache.maven.doxia.site.decoration.inheritance.PathDescriptor (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Uses of Class org.apache.maven.doxia.site.decoration.inheritance.PathDescriptor (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.inheritance.PathDescriptor (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.inheritance.PathDescriptor (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/PathUtils.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/PathUtils.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/PathUtils.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Uses of Class org.apache.maven.doxia.site.decoration.inheritance.PathUtils (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Uses of Class org.apache.maven.doxia.site.decoration.inheritance.PathUtils (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.inheritance.PathUtils (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.inheritance.PathUtils (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/URIPathDescriptor.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/URIPathDescriptor.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/class-use/URIPathDescriptor.html Fri Jun 27 21:41:29 2014
@@ -3,13 +3,13 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>Uses of Class org.apache.maven.doxia.site.decoration.inheritance.URIPathDescriptor (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>Uses of Class org.apache.maven.doxia.site.decoration.inheritance.URIPathDescriptor (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>
 <script type="text/javascript"><!--
     if (location.href.indexOf('is-external=true') == -1) {
-        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.inheritance.URIPathDescriptor (Doxia :: Decoration Model 1.6-SNAPSHOT API)";
+        parent.document.title="Uses of Class org.apache.maven.doxia.site.decoration.inheritance.URIPathDescriptor (Doxia :: Decoration Model 1.6 API)";
     }
 //-->
 </script>

Modified: websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/package-frame.html
==============================================================================
--- websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/package-frame.html (original)
+++ websites/production/maven-doxia/content/doxia-sitetools-archives/doxia-sitetools-LATEST/doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/inheritance/package-frame.html Fri Jun 27 21:41:29 2014
@@ -3,7 +3,7 @@
 <html lang="fr">
 <head>
 <meta http-equiv="Content-Type" content="text/html" charset="UTF-8">
-<title>org.apache.maven.doxia.site.decoration.inheritance (Doxia :: Decoration Model 1.6-SNAPSHOT API)</title>
+<title>org.apache.maven.doxia.site.decoration.inheritance (Doxia :: Decoration Model 1.6 API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
 </head>
 <body>