diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml
index 7919dbde2..9bfd550a3 100644
--- a/assembly/src/main/assembly/docs.xml
+++ b/assembly/src/main/assembly/docs.xml
@@ -22,131 +22,132 @@
 -->
 
 <assembly>
-  <id>docs</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <fileSets>
 
-    <!-- Include the XWork Javadoc in the assembly -->
-    <fileSet>
-      <directory>../xwork-core/target/site/apidocs</directory>
-      <outputDirectory>docs/xwork-apidocs</outputDirectory>
-    </fileSet>
+    <id>docs</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
 
-      <!-- Include the website in the assembly -->
-      <fileSet>
-        <directory>../target/site</directory>
-        <outputDirectory>docs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../api/target/site</directory>
-        <outputDirectory>docs/struts2-api</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../core/target/site</directory>
-        <outputDirectory>docs/struts2-core</outputDirectory>
-      </fileSet>
+        <!-- Include the XWork Javadoc in the assembly -->
+        <fileSet>
+            <directory>../xwork-core/target/apidocs</directory>
+            <outputDirectory>docs/xwork-core/apidocs</outputDirectory>
+        </fileSet>
 
-      <!-- Include the Confluence docs in the assembly -->
-      <fileSet>
-        <directory>target/cwiki/WW</directory>
-        <outputDirectory>docs</outputDirectory>
-      </fileSet>
+        <!-- Include the website in the assembly -->
+        <fileSet>
+            <directory>../target/site</directory>
+            <outputDirectory>docs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../core/target/apidocs</directory>
+            <outputDirectory>docs/struts2-core/apidocs</outputDirectory>
+        </fileSet>
 
-      <!-- Plugins -->
-      <fileSet>
-        <directory>../plugins/codebehind/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-codebehind-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/config-browser/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-config-browser-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/dojo/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-dojo-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/dojo/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-dwr-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/jasperreports/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-jasperreports-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/jfreechart/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-jfreechart-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/jsf/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-jsf-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/junit/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-junit-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/pell-multipart/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-pell-multipart-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/plexus/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-plexus-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/portlet/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-portlet-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/rest/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-rest-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/struts1/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-struts1-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/sitegraph/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-sitegraph-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/spring/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-spring-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/sitemesh/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-sitemesh-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/testng/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-testng-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/tiles/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/oval/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-oval-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/osgi/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-osgi-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/json/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-json-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/embeddedjsp/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-embeddedjsp-plugin</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/gxp/target/site</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-gxp-plugin</outputDirectory>
-      </fileSet>
+        <!-- Include the Confluence docs in the assembly -->
+        <fileSet>
+            <directory>target/cwiki/WW</directory>
+            <outputDirectory>docs/docs</outputDirectory>
+        </fileSet>
 
-  </fileSets>
+        <!-- Plugins -->
+        <fileSet>
+            <directory>../plugins/codebehind/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-codebehind-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/config-browser/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-config-browser-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/convention/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-convention-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/dwr/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-dwr-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/dojo/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-dojo-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/embeddedjsp/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-embeddedjsp-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/gxp/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-gxp-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/jasperreports/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-jasperreports-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/jfreechart/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-jfreechart-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/jsf/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-jsf-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/json/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-json-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/junit/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-junit-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/osgi/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-osgi-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/oval/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-oval-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/pell-multipart/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-pell-multipart-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/plexus/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-plexus-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/portlet/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-portlet-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/rest/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-rest-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/sitegraph/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-sitegraph-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/sitemesh/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-sitemesh-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/spring/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-spring-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/struts1/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-struts1-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/testng/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-testng-plugin/apidocs</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../plugins/tiles/target/apidocs</directory>
+            <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin/apidocs</outputDirectory>
+        </fileSet>
+
+    </fileSets>
 </assembly>