diff --git a/build.xml b/build.xml
index c4e29a597..1280447f1 100644
--- a/build.xml
+++ b/build.xml
@@ -1,19 +1,29 @@
 <?xml version="1.0"?>
 
 <!--
-    In order to build this project you need Ant 1.4 or higher.  The following
-    optional jar files should be installed into the ant lib directory:
+    POI Build System.  Written by:
+
+        Glen Stampoultzis   glens at apache.org
+
+
+    This build was tested with and 1.5.3 although it will probably work with
+    other versions.  The following optional jar files should be installed
+    into the ant lib directory:
 
     LIBRARY         LOCATION
     =======         ========
-    junit           TODO
-    xerces
-    jdepend
+    junit           http://www.ibiblio.org/maven/junit/jars/
+    xerces          http://www.ibiblio.org/maven/xerces/jars/
+    jdepend         http://www.ibiblio.org/maven/jdepend/jars/
+
+    To build the documentation you will need to install forrest and set
+    the FORREST_HOME environment variable.
 
 
     TO BE COMPLETED:
 
-    NONE
+    Convert book.xml files to a sitemap.
+
  -->
 <project name="POI Build" default="compile" basedir=".">
 
@@ -64,11 +74,13 @@
     <property name="build.site.src" value="build/tmp/site"/>
     <property name="junit.report.dir" value="${build.site}/junit"/>
     <property name="jdepend.report.dir" value="${build.site}/jdepend"/>
+    <property name="jdepend.report.out.dir" value="${build.site.src}/src/documentation/content/jdepend"/>
     <property name="apidocs.report.dir" value="${build.site}/apidocs"/>
     <property name="changelog.file" value="${build.site}/changelog.html"/>
     <property name="dist.dir" value="build/dist"/>
     <property name="jar.name" value="poi"/>
     <property name="version.id" value="1.10.0-dev"/>
+    <property name="halt.on.test.failure" value="true"/>
 
     <path id="main.classpath">
         <pathelement location="${main.jar1.dir}"/>
@@ -109,6 +121,7 @@
         <mkdir dir="${contrib.reports.test}"/>
         <mkdir dir="${junit.report.dir}"/>
         <mkdir dir="${jdepend.report.dir}"/>
+        <mkdir dir="${jdepend.report.out.dir}"/>
         <mkdir dir="${apidocs.report.dir}"/>
         <mkdir dir="${dist.dir}"/>
         <mkdir dir="${build.site.src}/${main.documentation}"/>
@@ -199,7 +212,8 @@
     </target>
 
     <target name="test-main" depends="compile-main,-test-main-check" unless="main.test.notRequired">
-        <junit printsummary="yes" fork="no" haltonfailure="no" failureproperty="main.test.failed">
+        <junit printsummary="yes" showoutput="true" filtertrace="no" fork="no"
+            haltonfailure="${halt.on.test.failure}" failureproperty="main.test.failed">
             <classpath>
                 <path refid="main.classpath"/>
                 <pathelement location="${main.output.dir}"/>
@@ -208,6 +222,7 @@
             </classpath>
             <sysproperty key="HSSF.testdata.path" value="${main.src.test}/org/apache/poi/hssf/data"/>
             <sysproperty key="HPSF.testdata.path" value="${main.src.test}/org/apache/poi/hpsf/data"/>
+            <formatter type="plain"/>
             <formatter type="xml"/>
             <batchtest todir="${main.reports.test}">
                 <fileset dir="${main.src.test}">
@@ -232,7 +247,7 @@
     </target>
 
     <target name="test-scratchpad" depends="compile-scratchpad,-test-scratchpad-check" unless="scratchpad.test.notRequired">
-        <junit printsummary="yes" fork="no" haltonfailure="no">
+        <junit printsummary="yes" fork="no" haltonfailure="${halt.on.test.failure}">
             <classpath>
                 <path refid="scratchpad.classpath"/>
                 <pathelement location="${main.output.dir}"/>
@@ -266,7 +281,7 @@
     </target>
 
     <target name="test-contrib" depends="compile-contrib,-test-contrib-check" unless="contrib.test.notRequired">
-        <junit printsummary="yes" fork="no" haltonfailure="no">
+        <junit printsummary="yes" fork="no" haltonfailure="${halt.on.test.failure}">
             <classpath>
                 <path refid="contrib.classpath"/>
                 <pathelement location="${main.output.dir}"/>
@@ -325,10 +340,16 @@
             <fileset dir="${junit.report.dir}"/>
         </copy>
 
+        <move file="${build.site.src}/src/documentation/content/xdocs/status.xml" tofile="${build.site.src}/status.xml"/>
+
+
         <ant antfile="${forrest.home}/forrest.antproxy.xml" target="site">
             <property name="project.home" value="${build.site.src}"/>
         </ant>
 
+        <echo>Broken links:</echo>
+        <echo file="${build.site}/../tmp/brokenlinks.txt"/>
+
         <touch>
             <fileset dir="${build.site}"/>
         </touch>
@@ -345,8 +366,11 @@
         </condition>
     </target>
 
-    <target name="reports" depends="test,-check-reports" unless="reports.notRequired"
+    <target name="reports" depends="-check-reports" unless="reports.notRequired"
         description="Creates junit,jdepend and javadoc reports">
+        <antcall target="test">
+            <param name="${halt.on.test.failure}" value="false"/>
+        </antcall>
         <junitreport todir="${junit.report.dir}">
             <fileset dir="${main.reports.test}">
                 <include name="TEST-*.xml"/>
@@ -378,7 +402,7 @@
 
         <style basedir="${jdepend.report.dir}"
             in="${jdepend.report.dir}/jdepend.xml"
-            out="${jdepend.report.dir}/index.html"
+            out="${jdepend.report.out.dir}/index.html"
             style="jdepend.xsl"/>
 
         <cvschangelog destfile="${changelog.file}" daysinpast="30"/>
@@ -424,6 +448,51 @@
             <group title="Record Generator" packages="org.apache.poi.record*"/>
             <group title="Utils" packages="org.apache.poi.util*"/>
         </javadoc>
+
+
+    </target>
+
+    <!-- ================================== -->
+    <!--       Generate records                -->
+    <!-- ================================== -->
+
+    <target name="generate-records" depends="init"
+        description="generate-records">
+        <java classname="org.apache.poi.dev.RecordGenerator" fork="yes">
+            <arg value="src/records/definitions"/>
+            <arg value="src/records/styles"/>
+            <arg value="src/java"/>
+            <arg value="src/testcases"/>
+            <classpath>
+                <path refid="scratchpad.classpath">
+                </path>
+                <pathelement location="${main.output.dir}"/>
+                <pathelement location="${scratchpad.output.dir}"/>
+            </classpath>
+        </java>
+
+    </target>
+
+    <!-- ================================== -->
+    <!--       Generate types                -->
+    <!-- ================================== -->
+
+    <target name="generate-types" depends="init"
+        description="generate-types">
+
+        <java classname="org.apache.poi.dev.RecordGenerator" fork="yes">
+            <arg value="src/types/definitions"/>
+            <arg value="src/types/styles"/>
+            <arg value="src/scratchpad/src"/>
+            <arg value="src/scratchpad/testcases"/>
+            <classpath>
+                <path refid="scratchpad.classpath">
+                </path>
+                <pathelement location="${main.output.dir}"/>
+                <pathelement location="${scratchpad.output.dir}"/>
+            </classpath>
+        </java>
+
     </target>
 
     <target name="site" depends="reports,docs"
@@ -479,4 +548,4 @@
 
     <target name="clean-dist" depends="clean,dist" description="Cleans the build directory then creates a distribution"/>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/index.html b/index.html
deleted file mode 100644
index 39e0a14fa..000000000
--- a/index.html
+++ /dev/null
@@ -1,119 +0,0 @@
-<html>
-  <head>
-    <title>Apache Jakarta POI</title>
-    <style type="text/css">
-
-body                    { color: #000000;
-                          background-color: #ffffff; }
-
-a:active                { color: #ff0000; }
-a:visited               { color: #551a8b; }
-a:link                  { color: #0000bb; }
-a.title { font-weight: bold; font-size: 110%; }
-
-h1, h2, h3, h4, h5, h6  { font-family: avantgarde, sans-serif;
-                          font-weight: bold }
-h1                      { font-size: 180% }
-h2                      { font-size: 150% }
-h3, h4                  { font-size: 120% }
-
-      ul { margin-left: 1em; padding: 0pt; border: 0pt; }
-    </style>
-  </head>
-  <body>
-	<table align="center" height="40" width="100%" cellpadding="0" cellspacing="2">
-	<tr>
-	  <td><img src="src/documentation/images/group-logo.gif"/></td>	
-	  <td align="center" width="100%"></td>
-	  <td><img src="src/documentation/images/poi-logo.png"/></td>
-	</tr>
-	</table>
-        <hr hr="hr"/>
-    <div align="center" class="titlepage">
-      <h1>Apache Jakarta POI</h1>
-
-      <p>
-	<strong>Version 1.5-dev</strong>
-	<br br="br"/>
-	<strong><script language="JavaScript">
-
-<!-- Begin
-var m = document.lastModified; 
-var p = m.length-8; 
-document.write(m.substring(p, 0)); 
-// End -->
-
-</script></strong>
-      </p>
-    </div>
-
-    <table align="center">
-      <tbody>
-      <tr><td>
-	  <ul>
-	    <li> <a href="status.xml" class="title">status.xml</a>
-	      <br br="br"/>(status of the project and community)</li>
-
-	    <li> <a href="module.xml" class="title">module.xml</a>
-	      <br br="br"/>(extended Gump descriptor of the software module)</li>
-
-	    <li> <a href="build.xml" class="title">build.xml</a>
-	      <br br="br"/>(main build file)</li>
-
-	    <li> <a href="layout.xml" class="title">layout.xml</a>
-	      <br br="br"/>(layout of the project directories)</li>
-
-	    <li> <a href="properties.xml" class="title">properties.xml</a>
-	      <br br="br"/>(properties used for building the project)</li>
-	  </ul>
-	  </td>
-	  <td>
-	  <ul>
-	    <li> <a href="build/docs/index.html" class="title">Documentation</a>
-	      <br br="br"/>(run "build docs" first)</li>
-
-	    <li> <a href="build/docs/javadocs/index.html" class="title">Javadocs</a>
-	      <br br="br"/>(run "build javadocs" first)</li>
-
-	    <li> <a href="build/docs/tests/junit/index.html" class="title">Unit test results</a>
-	      <br br="br"/>(run "build test" first)</li>
-
-	    <li> <a href="build/docs/metrics/jdepend/index.html" class="title">Code metrics</a>
-	      <br br="br"/>(run "build metrics" first)</li>
-
-	    <li> <a href="build.number" class="title">Local build number</a>
-	      <br br="br"/>(how many builds have been done locally)</li>
-	      
-	  </ul>
-	  </td>
-	</tr>
-        <tr>
-          <td>
-          <br/>
-          <ul>
-            <li> <a href="http://jakarta.apache.org/poi/" class="title"
-                >Project Site</a>
-              <br br="br"/>(online)</li>
-          </ul>
-          </td>
-          <td>
-          <br/>
-          <ul>
-            <li> <a href="http://www.krysalis.org/centipede/" class="title"
-                >Krysalis Centipede build system site</a>
-              <br br="br"/>(online)</li>
-          </ul>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-    
-    <br/>
-    
-    <address>
-      <hr hr="hr"/>
-       Copyright &#x00A9;2002 Apache Software Foundation. All Rights Reserved.
-    </address>
-
-  </body>
-</html>
diff --git a/newbuild.xml b/newbuild.xml
deleted file mode 100644
index 07496114a..000000000
--- a/newbuild.xml
+++ /dev/null
@@ -1,443 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-    In order to build this project you need Ant 1.4 or higher.  The following
-    optional jar files should be installed into the ant lib directory:
-
-    LIBRARY         LOCATION
-    =======         ========
-    junit           TODO
-    xerces
-    jdepend
-
-
-    TO BE COMPLETED:
-
-    * Fix logo's in site build.
-    * Add gump build
-    * Add jar target
- -->
-<project name="POI Build" default="compile" basedir=".">
-
-    <description>
-        The POI project Ant build.
-    </description>
-
-    <property environment="env"/>
-
-    <property name="repository" value="http://www.ibiblio.org/maven"/>
-    <property name="forrest.home" value="${env.FORREST_HOME}"/>
-
-    <property name="main.src" value="src/java"/>
-    <property name="main.src.test" value="src/testcases"/>
-    <property name="main.documentation" value="src/documentation"/>
-    <property name="main.output.dir" value="build/classes"/>
-    <property name="main.output.test.dir" value="build/test-classes"/>
-    <property name="main.lib" value="lib"/>
-    <property name="main.reports.test" value="build/test-results"/>
-    <property name="main.jar1.dir" value="${main.lib}/commongs-logging-1.0.1.jar"/>
-    <property name="main.jar1.url" value="${repository}/commons-logging/jars/commons-logging-1.0.1.jar"/>
-    <property name="main.jar2.dir" value="${main.lib}/log4j-1.2.8.jar"/>
-    <property name="main.jar2.url" value="${repository}/log4j/jars/log4j-1.2.8.jar"/>
-    <property name="main.testokfile" value="build/main-testokfile.txt"/>
-    <property name="scratchpad.src" value="src/scratchpad/src"/>
-    <property name="scratchpad.src.test" value="src/scratchpad/testcases"/>
-    <property name="scratchpad.lib" value="src/scratchpad/lib"/>
-    <property name="scratchpad.reports.test" value="build/scratchpad-test-results"/>
-    <property name="scratchpad.output.dir" value="build/scratchpad-classes"/>
-    <property name="scratchpad.output.test.dir" value="build/scratchpad-test-classes"/>
-    <property name="scratchpad.testokfile" value="build/scratchpad-testokfile.txt"/>
-    <property name="contrib.src" value="src/contrib/src"/>
-    <property name="contrib.src.test" value="src/contrib/testcases"/>
-    <property name="contrib.lib" value="src/contrib/lib"/>
-    <property name="contrib.reports.test" value="build/contrib-test-results"/>
-    <property name="contrib.output.dir" value="build/contrib-classes"/>
-    <property name="contrib.output.test.dir" value="build/contrib-test-classes"/>
-    <property name="contrib.jar1.dir" value="${contrib.lib}/commons-beanutils-1.6.jar"/>
-    <property name="contrib.jar1.url" value="${repository}/commons-beanutils/jars/commons-beanutils-1.6.jar"/>
-    <property name="contrib.jar2.dir" value="${contrib.lib}/commons-collections-2.1.jar"/>
-    <property name="contrib.jar2.url" value="${repository}/commons-collections/jars/commons-collections-2.1.jar"/>
-    <property name="contrib.jar3.dir" value="${contrib.lib}/commons-lang-1.0-b1.jar"/>
-    <property name="contrib.jar3.url" value="${repository}/commons-lang/jars/commons-lang-1.0-b1.jar"/>
-    <property name="contrib.testokfile" value="build/contrib-testokfile.txt"/>
-    <property name="junit.jar1.dir" value="${main.lib}/junit-3.8.1.jar"/>
-    <property name="junit.jar1.url" value="${repository}/junit/jars/junit-3.8.1.jar"/>
-    <property name="build.site" value="build/tmp/site/build/site"/>
-    <property name="build.tmp.site" value="build/tmp/site"/>
-    <property name="junit.report.dir" value="${build.site}/junit"/>
-    <property name="jdepend.report.dir" value="${build.site}/jdepend"/>
-    <property name="apidocs.report.dir" value="${build.site}/apidocs"/>
-    <property name="dist.dir" value="build/dist"/>
-    <property name="jar.name" value="poi"/>
-    <property name="version.id" value="1.10.0-dev"/>
-
-    <path id="main.classpath">
-        <pathelement location="${main.jar1.dir}"/>
-        <pathelement location="${main.jar2.dir}"/>
-    </path>
-
-    <path id="scratchpad.classpath">
-        <path refid="main.classpath"/>
-        <pathelement location="${main.output.dir}"/>
-    </path>
-
-    <path id="contrib.classpath">
-        <path refid="main.classpath"/>
-        <pathelement location="${contrib.jar1.dir}"/>
-        <pathelement location="${contrib.jar2.dir}"/>
-        <pathelement location="${contrib.jar3.dir}"/>
-        <pathelement location="${main.output.dir}"/>
-        <pathelement location="${main.output.test.dir}"/>
-        <pathelement location="${scratchpad.output.dir}"/>
-        <pathelement location="${scratchpad.output.test.dir}"/>
-        <pathelement location="${contrib.output.dir}"/>
-        <pathelement location="${contrib.output.test.dir}"/>
-    </path>
-
-    <target name="init" depends="check-jars,fetch-jars">
-        <mkdir dir="build"/>
-        <mkdir dir="${main.output.dir}"/>
-        <mkdir dir="${contrib.output.dir}"/>
-        <mkdir dir="${scratchpad.output.dir}"/>
-        <mkdir dir="${main.output.test.dir}"/>
-        <mkdir dir="${contrib.output.test.dir}"/>
-        <mkdir dir="${scratchpad.output.test.dir}"/>
-        <mkdir dir="${main.reports.test}"/>
-        <mkdir dir="${scratchpad.reports.test}"/>
-        <mkdir dir="${contrib.reports.test}"/>
-        <mkdir dir="${junit.report.dir}"/>
-        <mkdir dir="${jdepend.report.dir}"/>
-        <mkdir dir="${apidocs.report.dir}"/>
-        <mkdir dir="${dist.dir}"/>
-        <mkdir dir="${build.tmp.site}/${main.documentation}"/>
-
-        <copy todir="${build.tmp.site}/${main.documentation}" preservelastmodified="true">
-            <fileset dir="${main.documentation}" />
-        </copy>
-        <copy file="forrest.properties" tofile="${build.tmp.site}/forrest.properties"
-            preservelastmodified="true" />
-    </target>
-
-    <target name="clean">
-        <delete dir="build"/>
-    </target>
-
-    <target name="check-jars">
-        <condition property="jars.present">
-            <and>
-                <available file="${main.jar1.dir}"/>
-                <available file="${main.jar2.dir}"/>
-                <available file="${contrib.jar1.dir}"/>
-                <available file="${contrib.jar2.dir}"/>
-                <available file="${contrib.jar3.dir}"/>
-                <available file="${junit.jar1.dir}"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="fetch-jars" unless="jars.present">
-        <get src="${main.jar1.url}" dest="${main.jar1.dir}"/>
-        <get src="${main.jar2.url}" dest="${main.jar2.dir}"/>
-        <get src="${contrib.jar1.url}" dest="${contrib.jar1.dir}"/>
-        <get src="${contrib.jar2.url}" dest="${contrib.jar2.dir}"/>
-        <get src="${contrib.jar3.url}" dest="${contrib.jar3.dir}"/>
-        <get src="${junit.jar1.url}" dest="${junit.jar1.dir}"/>
-    </target>
-
-    <target name="compile" depends="init,compile-main,compile-scratchpad,compile-contrib">
-
-    </target>
-
-    <target name="compile-main" depends="init">
-        <javac srcdir="${main.src}" destdir="${main.output.dir}">
-            <classpath refid="main.classpath"/>
-        </javac>
-        <javac srcdir="${main.src.test}" destdir="${main.output.test.dir}">
-            <classpath>
-                <path refid="main.classpath"/>
-                <pathelement location="${main.output.dir}"/>
-                <pathelement location="${junit.jar1.dir}"/>
-            </classpath>
-        </javac>
-    </target>
-
-    <target name="compile-scratchpad" depends="init">
-        <javac srcdir="${scratchpad.src}" destdir="${scratchpad.output.dir}">
-            <classpath refid="scratchpad.classpath"/>
-        </javac>
-        <javac srcdir="${scratchpad.src.test}" destdir="${scratchpad.output.test.dir}">
-            <classpath>
-                <path refid="scratchpad.classpath"/>
-                <pathelement location="${scratchpad.output.dir}"/>
-                <pathelement location="${junit.jar1.dir}"/>
-            </classpath>
-        </javac>
-    </target>
-
-    <target name="compile-contrib" depends="init">
-        <javac srcdir="${contrib.src}" destdir="${contrib.output.dir}">
-            <classpath refid="contrib.classpath"/>
-        </javac>
-        <javac srcdir="${contrib.src.test}" destdir="${contrib.output.test.dir}">
-            <classpath>
-                <path refid="contrib.classpath"/>
-                <pathelement location="${contrib.output.dir}"/>
-                <pathelement location="${junit.jar1.dir}"/>
-            </classpath>
-        </javac>
-    </target>
-
-    <target name="test" depends="test-main,test-scratchpad,test-contrib"
-        description="Test main, contrib and scratchpad"/>
-
-    <target name="-test-main-check">
-        <uptodate property="main.test.notRequired" targetfile="${main.testokfile}" >
-            <srcfiles dir= "${main.src}"/>
-            <srcfiles dir= "${main.src.test}"/>
-        </uptodate>
-    </target>
-
-    <target name="test-main" depends="compile-main,-test-main-check" unless="main.test.notRequired">
-        <junit printsummary="yes" fork="no" haltonfailure="no" failureproperty="main.test.failed">
-            <classpath>
-                <path refid="main.classpath"/>
-                <pathelement location="${main.output.dir}"/>
-                <pathelement location="${main.output.test.dir}"/>
-                <pathelement location="${junit.jar1.dir}"/>
-            </classpath>
-            <sysproperty key="HSSF.testdata.path" value="${main.src.test}/org/apache/poi/hssf/data"/>
-            <sysproperty key="HPSF.testdata.path" value="${main.src.test}/org/apache/poi/hpsf/data"/>
-            <formatter type="xml"/>
-            <batchtest todir="${main.reports.test}">
-                <fileset dir="${main.src.test}">
-                    <include name="**/Test*.java"/>
-                    <exclude name="**/AllTests.java"/>
-                </fileset>
-            </batchtest>
-        </junit>
-        <delete file="${main.testokfile}"/>
-        <antcall target="-test-main-write-testfile"/>
-    </target>
-
-    <target name="-test-main-write-testfile" unless="main.test.failed">
-        <echo file="${main.testokfile}" append="false" message="testok"/>
-    </target>
-
-    <target name="-test-scratchpad-check">
-        <uptodate property="scratchpad.test.notRequired" targetfile="${scratchpad.testokfile}" >
-            <srcfiles dir= "${scratchpad.src}"/>
-            <srcfiles dir= "${scratchpad.src.test}"/>
-        </uptodate>
-    </target>
-
-    <target name="test-scratchpad" depends="compile-scratchpad,-test-scratchpad-check" unless="scratchpad.test.notRequired">
-        <junit printsummary="yes" fork="no" haltonfailure="no">
-            <classpath>
-                <path refid="scratchpad.classpath"/>
-                <pathelement location="${main.output.dir}"/>
-                <pathelement location="${scratchpad.output.dir}"/>
-                <pathelement location="${scratchpad.output.test.dir}"/>
-                <pathelement location="${junit.jar1.dir}"/>
-            </classpath>
-            <sysproperty key="HSSF.testdata.path" value="${scratchpad.src.test}/org/apache/poi/hssf/data"/>
-            <sysproperty key="HPSF.testdata.path" value="${scratchpad.src.test}/org/apache/poi/hpsf/data"/>
-            <formatter type="xml"/>
-            <batchtest todir="${scratchpad.reports.test}">
-                <fileset dir="${scratchpad.src.test}">
-                    <include name="**/Test*.java"/>
-                    <exclude name="**/AllTests.java"/>
-                </fileset>
-            </batchtest>
-        </junit>
-        <delete file="${scratchpad.testokfile}"/>
-        <antcall target="-test-scratchpad-write-testfile"/>
-    </target>
-
-    <target name="-test-scratchpad-write-testfile" unless="scratchpad.test.failed">
-        <echo file="${scratchpad.testokfile}" append="false" message="testok"/>
-    </target>
-
-    <target name="-test-contrib-check">
-        <uptodate property="contrib.test.notRequired" targetfile="${contrib.testokfile}" >
-            <srcfiles dir= "${contrib.src}"/>
-            <srcfiles dir= "${contrib.src.test}"/>
-        </uptodate>
-    </target>
-
-    <target name="test-contrib" depends="compile-contrib,-test-contrib-check" unless="contrib.test.notRequired">
-        <junit printsummary="yes" fork="no" haltonfailure="no">
-            <classpath>
-                <path refid="contrib.classpath"/>
-                <pathelement location="${main.output.dir}"/>
-                <pathelement location="${contrib.output.dir}"/>
-                <pathelement location="${contrib.output.test.dir}"/>
-                <pathelement location="${junit.jar1.dir}"/>
-            </classpath>
-            <sysproperty key="HSSF.testdata.path" value="${contrib.src.test}/org/apache/poi/hssf/data"/>
-            <sysproperty key="HPSF.testdata.path" value="${contrib.src.test}/org/apache/poi/hpsf/data"/>
-            <formatter type="xml"/>
-            <batchtest todir="${contrib.reports.test}">
-                <fileset dir="${contrib.src.test}">
-                    <include name="**/Test*.java"/>
-                    <exclude name="**/AllTests.java"/>
-                </fileset>
-            </batchtest>
-        </junit>
-        <delete file="${contrib.testokfile}"/>
-        <antcall target="-test-contrib-write-testfile"/>
-    </target>
-
-    <target name="-test-contrib-write-testfile" unless="contrib.test.failed">
-        <echo file="${contrib.testokfile}" append="false" message="testok"/>
-    </target>
-
-    <target name="-check-docs">
-        <uptodate property="main.docs.notRequired" targetfile="${build.site}/index.html" >
-            <srcfiles dir= "${build.tmp.site}"/>
-        </uptodate>
-    </target>
-
-    <target name="docs" depends="init,-check-docs" unless="main.docs.notRequired"
-        description="Builds the POI website">
-        <mkdir dir="${build.tmp.site}/src/documentation/content/apidocs"/>
-        <copy todir="${build.tmp.site}/src/documentation/content/apidocs">
-            <fileset dir="${apidocs.report.dir}" />
-        </copy>
-        <copy tofile="${build.tmp.site}/src/documentation/content/jdepend.ehtml" file="${jdepend.report.dir}/index.html"/>
-        <mkdir dir="${build.tmp.site}/src/documentation/content/junit"/>
-        <copy todir="${build.tmp.site}/src/documentation/content/junit">
-            <fileset dir="${junit.report.dir}"/>
-        </copy>
-
-        <ant antfile="${forrest.home}/forrest.antproxy.xml" target="site">
-            <property name="project.home" value="${build.tmp.site}"/>
-        </ant>
-    </target>
-
-    <!-- Checks whether reports are required to be run.  If nothing has changed then they dont. -->
-    <target name="-check-reports">
-        <condition property="reports.notRequired">
-            <and>
-                <equals arg1="${main.test.notRequired}" arg2="true"/>
-                <equals arg1="${scratchpad.test.notRequired}" arg2="true"/>
-                <equals arg1="${contrib.test.notRequired}" arg2="true"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="reports" depends="test,-check-reports" unless="reports.notRequired"
-        description="Creates junit,jdepend and javadoc reports">
-        <junitreport todir="${junit.report.dir}">
-            <fileset dir="${main.reports.test}">
-                <include name="TEST-*.xml"/>
-            </fileset>
-            <fileset dir="${scratchpad.reports.test}">
-                <include name="TEST-*.xml"/>
-            </fileset>
-            <fileset dir="${contrib.reports.test}">
-                <include name="TEST-*.xml"/>
-            </fileset>
-            <report format="frames" todir="${junit.report.dir}"/>
-        </junitreport>
-
-        <jdepend outputfile="${jdepend.report.dir}/jdepend.xml" format="xml">
-            <sourcespath>
-                <pathelement location="${main.src}"/>
-                <pathelement location="${contrib.src}"/>
-                <pathelement location="${scratchpad.src}"/>
-            </sourcespath>
-            <classpath>
-                <path refid="main.classpath"/>
-                <path refid="contrib.classpath"/>
-                <path refid="scratchpad.classpath"/>
-                <pathelement location="${main.output.dir}"/>
-                <pathelement location="${contrib.output.dir}"/>
-                <pathelement location="${scratchpad.output.dir}"/>
-            </classpath>
-        </jdepend>
-
-        <style basedir="${jdepend.report.dir}"
-            in="${jdepend.report.dir}/jdepend.xml"
-            out="${jdepend.report.dir}/index.html"
-            style="jdepend.xsl"/>
-
-        <javadoc
-            destdir="${apidocs.report.dir}"
-            author="true"
-            version="true"
-            use="true"
-            windowtitle="POI API">
-
-            <packageset dir="${main.src}" defaultexcludes="yes">
-                <include name="org/apache/poi/**"/>
-            </packageset>
-            <packageset dir="${scratchpad.src}" defaultexcludes="yes">
-                <include name="org/apache/poi/**"/>
-            </packageset>
-            <packageset dir="${contrib.src}" defaultexcludes="yes">
-                <include name="org/apache/poi/**"/>
-            </packageset>
-
-            <doctitle><![CDATA[<h1>POI Documentation</h1>]]></doctitle>
-            <bottom><![CDATA[<i>Copyright &#169; 2003 Apache Software Foundation.</i>]]></bottom>
-            <group title="HSSF" packages="org.apache.poi.hssf*"/>
-            <group title="HPSF" packages="org.apache.poi.hpsf*"/>
-            <group title="POIFS" packages="org.apache.poi.poifs*"/>
-            <group title="HDF" packages="org.apache.poi.hdf*"/>
-            <group title="Record Generator" packages="org.apache.poi.record*"/>
-            <group title="Utils" packages="org.apache.poi.util*"/>
-        </javadoc>
-    </target>
-
-    <target name="site" depends="reports,docs"
-        description="generate the documentation and reports"/>
-
-    <target name="jar" depends="compile" description="Creates jar files for distribution">
-        <jar basedir="${main.output.dir}" destfile="${dist.dir}/${jar.name}-${version.id}.jar"/>
-        <jar basedir="${contrib.output.dir}" destfile="${dist.dir}/${jar.name}-contrib-${version.id}.jar"/>
-        <jar basedir="${scratchpad.output.dir}" destfile="${dist.dir}/${jar.name}-scratchpad-${version.id}.jar"/>
-    </target>
-
-    <target name="dist" depends="clean,compile,site,jar" description="Creates the entire distribution into build/dist">
-
-        <zip destfile="${dist.dir}/${jar.name}-bin-${version.id}.zip">
-            <zipfileset dir="${build.site}" prefix="docs" />
-            <zipfileset file="${dist.dir}/${jar.name}-${version.id}.jar" />
-            <zipfileset file="${dist.dir}/${jar.name}-contrib-${version.id}.jar" />
-            <zipfileset file="${dist.dir}/${jar.name}-scratchpad-${version.id}.jar" />
-        </zip>
-
-        <zip destfile="${dist.dir}/${jar.name}-src-${version.id}.zip">
-            <zipfileset dir="${build.site}" prefix="docs" />
-            <zipfileset dir=".">
-                <exclude name="build/**" />
-                <exclude name="scripts/**" />
-                <exclude name="*.ipr" />
-                <exclude name="*.iml" />
-                <exclude name="*.iws" />
-            </zipfileset>
-        </zip>
-
-        <tar destfile="${dist.dir}/${jar.name}-bin-${version.id}.tar.gz" compression="gzip">
-            <tarfileset dir="${build.site}" prefix="docs" />
-            <tarfileset file="${dist.dir}/${jar.name}-${version.id}.jar" />
-            <tarfileset file="${dist.dir}/${jar.name}-contrib-${version.id}.jar" />
-            <tarfileset file="${dist.dir}/${jar.name}-scratchpad-${version.id}.jar" />
-        </tar>
-
-        <tar destfile="${dist.dir}/${jar.name}-src-${version.id}.tar.gz" compression="gzip">
-            <tarfileset dir="${build.site}" prefix="docs" />
-            <tarfileset dir=".">
-                <exclude name="build/**" />
-                <exclude name="scripts/**" />
-                <exclude name="*.ipr" />
-                <exclude name="*.iml" />
-                <exclude name="*.iws" />
-            </tarfileset>
-        </tar>
-
-        <echo>Distribution located in build/dist</echo>
-
-    </target>
-
-</project>
\ No newline at end of file
diff --git a/src/documentation/content/xdocs/book.xml b/src/documentation/content/xdocs/book.xml
index 555dfe0af..ed032c907 100644
--- a/src/documentation/content/xdocs/book.xml
+++ b/src/documentation/content/xdocs/book.xml
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE book PUBLIC "-//APACHE//DTD Cocoon Documentation Book V1.0//EN" "./dtd/book-cocoon-v10.dtd">
 
-<book software="Poi" 
-      title="Poi Project Documentation" 
-      copyright="@year@ Poi Project"
-      xmlns:xlink="http://www.w3.org/1999/xlink">
+<book software="Poi"
+    title="Poi Project Documentation"
+    copyright="@year@ Poi Project"
+    xmlns:xlink="http://www.w3.org/1999/xlink">
 
-  <menu label="Community">
-    <menu-item label="News" href="news.html"/>    
-    <menu-item label="Mirrors" href="mirrors.html"/>    
-    <menu-item label="Changes" href="changes.html"/> 
-    <menu-item label="To do" href="todo.html"/> 
-    <menu-item label="Get Involved" href="getinvolved/index.html"/>
-    <menu-item label="Mailing Lists" href="http://jakarta.apache.org/site/mail.html"/>
-    <menu-item label="Vision" href="plan/POI20Vision.html"/>
-    <menu-item label="History and Future" href="historyandfuture.html"/>
-    <menu-item label="Who we are" href="who.html"/> 
-    <menu-item label="Resolutions" href="resolutions/index.html"/>    
-  </menu>
-  
-  <menu label="Marketing">
-    <menu-item label="Case Studies" href="casestudies.html"/>
-  </menu>
+    <menu label="Community">
+        <menu-item label="News" href="news.html"/>
+        <menu-item label="Mirrors" href="mirrors.html"/>
+        <menu-item label="Changes" href="changes.html"/>
+        <menu-item label="To Do" href="todo.html"/>
+        <menu-item label="Get Involved" href="getinvolved/index.html"/>
+        <menu-item label="Mailing Lists" href="http://jakarta.apache.org/site/mail.html"/>
+        <menu-item label="Vision" href="plan/POI20Vision.html"/>
+        <menu-item label="History and Future" href="historyandfuture.html"/>
+        <menu-item label="Who We Are" href="who.html"/>
+        <menu-item label="Resolutions" href="resolutions/index.html"/>
+    </menu>
 
-  <menu label="Project">
-    <menu-item label="Overview" href="overview.html"/>
-    <menu-item label="POIFS" href="poifs/index.html"/>
-    <menu-item label="HSSF" href="hssf/index.html"/>
-    <menu-item label="HDF" href="hdf/index.html"/>
-    <menu-item label="HPSF" href="hpsf/index.html"/>
-    <menu-item label="POI-Utils" href="utils/index.html"/>  
-    <menu-item label="Download" href="http://jakarta.apache.org/builds/jakarta-poi/"/> 
-  </menu>
-  
-  <menu label="Docs">
-    <menu-item label="Javadocs" href="ext:javadoc"/>
-    <menu-item label="FAQ" href="faq.html"/>
-    <menu-item label="References" href="references/index.html"/>  
-  </menu>
-  
-  <menu label="Translations">
-    <menu-item label="Index" href="trans/index.html"/>
-    <menu-item label="Guidelines" href="trans/guidelines.html"/>
-    <menu-item label="German" href="trans/de/index.html"/>
-    <menu-item label="Spanish" href="trans/es/index.html"/>
-    <menu-item label="Japanese" href="http://www.terra-intl.com/jakarta/poi/"/>
-  </menu>
-  
-  <menu label="Code">
-<!--    <menu-item label="Source Code" href="http://jakarta.apache.org/poi/javadocs/javasrc/"/>       -->
-    <menu-item label="CVS" href="http://jakarta.apache.org/site/cvsindex.html"/>  
-    <menu-item label="CVS Changelog" href="changelog.html"/>
-    <menu-item label="Top Voted Bugs" href="http://nagoya.apache.org/bugzilla/buglist.cgi?votes=1&amp;product=POI&amp;order=bugs.votes"/>
-    <menu-item label="Bug Database" href="http://nagoya.apache.org/bugzilla/buglist.cgi?product=POI"/>  
-    <menu-item label="Patches" href="http://nagoya.apache.org/bugzilla/buglist.cgi?product=POI&amp;short_desc=%5BPATCH%5D&amp;short_desc_type=allwordssubstr"/>  
+    <menu label="Marketing">
+        <menu-item label="Case Studies" href="casestudies.html"/>
+    </menu>
 
-    <menu-item label="Junit Test Results" href="ext:junit"/>
-    <menu-item label="Dependency Metrics" href="ext:jdepend"/>
-<!--    <menu-item label="Checkstyle Metrics" href="http://jakarta.apache.org/poi/metrics/checkstyle/"/> -->
-  </menu>
+    <menu label="Project">
+        <menu-item label="Overview" href="overview.html"/>
+        <menu-item label="POIFS" href="poifs/index.html"/>
+        <menu-item label="HSSF" href="hssf/index.html"/>
+        <menu-item label="HDF" href="hdf/index.html"/>
+        <menu-item label="HPSF" href="hpsf/index.html"/>
+        <menu-item label="POI-Utils" href="utils/index.html"/>
+        <menu-item label="Download" href="http://jakarta.apache.org/builds/jakarta-poi/"/>
+    </menu>
+
+    <menu label="Docs">
+        <menu-item label="Javadocs" href="ext:javadoc"/>
+        <menu-item label="FAQ" href="faq.html"/>
+        <menu-item label="References" href="references/index.html"/>
+    </menu>
+
+    <menu label="Translations">
+        <menu-item label="Index" href="trans/index.html"/>
+        <menu-item label="Guidelines" href="trans/guidelines.html"/>
+        <menu-item label="German" href="trans/de/index.html"/>
+        <menu-item label="Spanish" href="trans/es/index.html"/>
+        <menu-item label="Japanese" href="http://www.terra-intl.com/jakarta/poi/"/>
+    </menu>
+
+    <menu label="Code">
+        <!--    <menu-item label="Source Code" href="http://jakarta.apache.org/poi/javadocs/javasrc/"/>       -->
+        <menu-item label="CVS" href="http://jakarta.apache.org/site/cvsindex.html"/>
+        <menu-item label="CVS Changelog" href="changelog.html"/>
+        <menu-item label="Top Voted Bugs" href="http://nagoya.apache.org/bugzilla/buglist.cgi?votes=1&amp;product=POI&amp;order=bugs.votes"/>
+        <menu-item label="Bug Database" href="http://nagoya.apache.org/bugzilla/buglist.cgi?product=POI"/>
+        <menu-item label="Patches" href="http://nagoya.apache.org/bugzilla/buglist.cgi?product=POI&amp;short_desc=%5BPATCH%5D&amp;short_desc_type=allwordssubstr"/>
+
+        <menu-item label="Junit Test Results" href="ext:junit"/>
+        <menu-item label="Dependency Metrics" href="ext:jdepend"/>
+        <!--    <menu-item label="Checkstyle Metrics" href="http://jakarta.apache.org/poi/metrics/checkstyle/"/> -->
+    </menu>
 
 </book>
diff --git a/src/documentation/content/xdocs/site.xml b/src/documentation/content/xdocs/site.xml
index 0a1a7bdb4..25fa58986 100644
--- a/src/documentation/content/xdocs/site.xml
+++ b/src/documentation/content/xdocs/site.xml
@@ -25,7 +25,7 @@ See http://xml.apache.org/forrest/linking.html for more info
             <cocoon href="cocoon/"/>
         </xml.apache.org>
         <junit href="junit/index.html"/>
-        <jdepend href="jdepend.ehtml"/>
+        <jdepend href="jdepend/index.html"/>
         <javadoc href="apidocs/index.html"/>
     </external-refs>
 
diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
new file mode 100644
index 000000000..6a21002c8
--- /dev/null
+++ b/src/documentation/content/xdocs/status.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+<status>
+    <devs>
+        <!-- in strict alphabetical order -->
+        <person id="AO" name="Andrew C. Oliver" email="acoliver2@users.sourceforge.net"/>
+        <person id="GS" name="Glen Stampoultzis" email="gstamp@iprimus.com.au"/>
+        <person id="MJ" name="Marc Johnson" email="mjohnson at apache dot org"/>
+        <person id="NKB" name="Nicola Ken Barozzi" email="barozzi@nicolaken.com"/>
+        <person id="open" name="Poi Developers" email="poi-dev@jakarta.apache.org"/>
+    </devs>
+
+    <todo>
+        <title>Things To Do for POI</title>
+
+        <actions priority="high">
+            <action context="code" dev="NKB">
+                Finish HDF
+            </action>
+            <action context="code" dev="GS">
+                Finish Charts
+            </action>
+            <action context="code" dev="open">
+                Finish Formulas.
+            </action>
+        </actions>
+
+        <actions priority="medium">
+            <action context="code" dev="open">
+                Expose functionality in low level records in higher level API
+            </action>
+            <action context="code" dev="open">
+                Implement more record types.
+            </action>
+            <action context="code" dev="open">
+                Add more dummy checks (for when API user's do things they
+                &quot;can't&quot; do).  This will involve exploring the various
+                upper limits on the things Excel can handle.
+            </action>
+            <action context="code" dev="open">
+                Add support for embedded graphics and other objects.
+            </action>
+            <action context="code" dev="open">
+                Create new adapter object for handling MulBlank, MulRk, Rk
+                records.
+            </action>
+            <action context="code" dev="open">
+                Add a way to copy sheets.
+            </action>
+        </actions>
+
+    </todo>
+
+    <changes>
+
+        <title>History of Changes</title>
+
+        <release version="1.10-dev" date="19 Feb 2003">
+            <action dev="POI-DEVELOPERS" type="add">Support for zoom level</action>
+            <action dev="POI-DEVELOPERS" type="add">Freeze and split pane support</action>
+            <action dev="POI-DEVELOPERS" type="add">Row and column headers on printouts</action>
+        </release>
+        <release version="1.8-dev" date="20 Sep 2002">
+            <action dev="POI-DEVELOPERS" type="add">Custom Data Format Support</action>
+            <action dev="POI-DEVELOPERS" type="add">Enhanced Unicode Support for Russian and Japanese</action>
+            <action dev="POI-DEVELOPERS" type="add">Enhanced formula support including read-only for
+                "optimized if" statements.</action>
+            <action dev="POI-DEVELOPERS" type="add">Support for cloning objects</action>
+            <action dev="POI-DEVELOPERS" type="add">Fixes for header/footer</action>
+            <action dev="POI-DEVELOPERS" type="add">Spanish Documentation translations</action>
+            <action dev="POI-DEVELOPERS" type="add">Support for preserving VBA macros</action>
+        </release>
+        <release version="1.7-dev" date="???">
+            <action dev="NKB" type="update">Removed runtime dependency on commons logging.</action>
+            <action dev="POI-DEVELOPERS" type="update">Formula support</action>
+        </release>
+        <release version="1.5.1" date="16 June 2002">
+            <action dev="GJS" type="update">Removed depedency on commons logging.  Now define poi.logging system property to enable logging to standard out.</action>
+            <action dev="GJS" type="fix">Fixed SST string handling so that spreadsheets with rich text or extended text will be read correctly.</action>
+        </release>
+        <release version="1.5" date="06 May 2002">
+            <action dev="NKB" type="update">New project build.</action>
+            <action dev="NKB" type="update">New project documentation system based on Cocoon.</action>
+            <action dev="POI-DEVELOPERS" type="update">Package rename</action>
+            <action dev="POI-DEVELOPERS" type="fix">Various bug fixes</action>
+            <action dev="POI-DEVELOPERS" type="add">Early stages of HSF development (not ready for development)</action>
+            <action dev="POI-DEVELOPERS" type="add">Initial low level record support for charting (not complete)</action>
+        </release>
+        <release version="1.1.0" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS">Created new event model</action>
+            <action dev="POI-DEVELOPERS">Optimizations made to HSSF including aggregate records for
+                values, rows, etc.</action>
+            <action dev="POI-DEVELOPERS">predictive sizing, offset based writing (instead of lots of
+                array copies)</action>
+            <action dev="POI-DEVELOPERS">minor re-factoring and bug fixes.</action>
+        </release>
+        <release version="1.0.0" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS">Minor documentation updates.</action>
+        </release>
+        <release version="0.14.0" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS">Added DataFormat helper class and exposed set and get format
+                on HSSFCellStyle</action>
+            <action dev="POI-DEVELOPERS">Fixed column width apis (unit wise) and various javadoc on
+                the subject</action>
+            <action dev="POI-DEVELOPERS">Fix for Dimensions record (again)... (one of these days I'll
+                write a unit test for this ;-p).</action>
+            <action dev="POI-DEVELOPERS">Some optimization on sheet creation.</action>
+        </release>
+        <release version="0.13.0" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS">Changes not recorded.</action>
+        </release>
+        <release version="0.12.0" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS">Added MulBlank, Blank, ColInfo</action>
+            <action dev="POI-DEVELOPERS">Added log4j facility and removed all sys.out type logging</action>
+            <action dev="POI-DEVELOPERS">Added support for adding font's, styles and corresponding
+                high level api for styling cells</action>
+            <action dev="POI-DEVELOPERS">added support for changing row height, cell width and default
+                row height/cell width.</action>
+            <action dev="POI-DEVELOPERS">Added fixes for internationalization (UTF-16 should work now
+                from HSSFCell.setStringValue, etc when the encoding is set)</action>
+            <action dev="POI-DEVELOPERS">added support for adding/removing and naming sheets.</action>
+        </release>
+        <release version="0.11.0" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS">Bugfix release. We were throwing an exception when reading
+                RKRecord objects.</action>
+        </release>
+        <release version="0.10.0" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS">Got continuation records to work (read/write)</action>
+            <action dev="POI-DEVELOPERS">Added various pre-support for formulas</action>
+            <action dev="POI-DEVELOPERS">Massive API reorganization, repackaging.</action>
+            <action dev="POI-DEVELOPERS">BiffViewer class added for validating HSSF &amp; POI and/or
+                HSSF Output.</action>
+            <action dev="POI-DEVELOPERS">Better API support for modification.</action>
+        </release>
+        <release version="0.7 (and interim releases)" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS">Added encoding flag to high and low level api to use utf-16
+                when needed (HSSFCell.setEncoding())</action>
+            <action dev="POI-DEVELOPERS">added read only support for Label records (which are
+                reinterpreted as LabelSST when written)</action>
+            <action dev="POI-DEVELOPERS">Broken continuation record implementation (oops)</action>
+            <action dev="POI-DEVELOPERS">BiffViewer class added for validating HSSF &amp; POI and/or
+                HSSF Output.</action>
+        </release>
+        <release version="0.6 (release)" date="Release date not recorded">
+            <action dev="POI-DEVELOPERS">Support for read/write and modify.</action>
+            <action dev="POI-DEVELOPERS">Read only support for MulRK records (converted to Number when
+                writing)
+            </action>
+        </release>
+
+    </changes>
+
+</status>
\ No newline at end of file
diff --git a/src/documentation/resouces/images/BlockClassDiagram.gif b/src/documentation/resources/images/BlockClassDiagram.gif
similarity index 100%
rename from src/documentation/resouces/images/BlockClassDiagram.gif
rename to src/documentation/resources/images/BlockClassDiagram.gif
diff --git a/src/documentation/resouces/images/POIFSAddDocument.gif b/src/documentation/resources/images/POIFSAddDocument.gif
similarity index 100%
rename from src/documentation/resouces/images/POIFSAddDocument.gif
rename to src/documentation/resources/images/POIFSAddDocument.gif
diff --git a/src/documentation/resouces/images/POIFSClassDiagram.gif b/src/documentation/resources/images/POIFSClassDiagram.gif
similarity index 100%
rename from src/documentation/resouces/images/POIFSClassDiagram.gif
rename to src/documentation/resources/images/POIFSClassDiagram.gif
diff --git a/src/documentation/resouces/images/POIFSInitialization.gif b/src/documentation/resources/images/POIFSInitialization.gif
similarity index 100%
rename from src/documentation/resouces/images/POIFSInitialization.gif
rename to src/documentation/resources/images/POIFSInitialization.gif
diff --git a/src/documentation/resouces/images/POIFSLifeCycle.gif b/src/documentation/resources/images/POIFSLifeCycle.gif
similarity index 100%
rename from src/documentation/resouces/images/POIFSLifeCycle.gif
rename to src/documentation/resources/images/POIFSLifeCycle.gif
diff --git a/src/documentation/resouces/images/POIFSPropertyTablePreWrite.gif b/src/documentation/resources/images/POIFSPropertyTablePreWrite.gif
similarity index 100%
rename from src/documentation/resouces/images/POIFSPropertyTablePreWrite.gif
rename to src/documentation/resources/images/POIFSPropertyTablePreWrite.gif
diff --git a/src/documentation/resouces/images/POIFSRootPropertyPreWrite.gif b/src/documentation/resources/images/POIFSRootPropertyPreWrite.gif
similarity index 100%
rename from src/documentation/resouces/images/POIFSRootPropertyPreWrite.gif
rename to src/documentation/resources/images/POIFSRootPropertyPreWrite.gif
diff --git a/src/documentation/resouces/images/POIFSWriteArchive.gif b/src/documentation/resources/images/POIFSWriteArchive.gif
similarity index 100%
rename from src/documentation/resouces/images/POIFSWriteArchive.gif
rename to src/documentation/resources/images/POIFSWriteArchive.gif
diff --git a/src/documentation/resouces/images/POIFSWriteFilesystem.gif b/src/documentation/resources/images/POIFSWriteFilesystem.gif
similarity index 100%
rename from src/documentation/resouces/images/POIFSWriteFilesystem.gif
rename to src/documentation/resources/images/POIFSWriteFilesystem.gif
diff --git a/src/documentation/resouces/images/PropertySet.jpg b/src/documentation/resources/images/PropertySet.jpg
similarity index 100%
rename from src/documentation/resouces/images/PropertySet.jpg
rename to src/documentation/resources/images/PropertySet.jpg
diff --git a/src/documentation/resouces/images/PropertyTableClassDiagram.gif b/src/documentation/resources/images/PropertyTableClassDiagram.gif
similarity index 100%
rename from src/documentation/resouces/images/PropertyTableClassDiagram.gif
rename to src/documentation/resources/images/PropertyTableClassDiagram.gif
diff --git a/src/documentation/resouces/images/add.jpg b/src/documentation/resources/images/add.jpg
similarity index 100%
rename from src/documentation/resouces/images/add.jpg
rename to src/documentation/resources/images/add.jpg
diff --git a/src/documentation/resouces/images/fix.jpg b/src/documentation/resources/images/fix.jpg
similarity index 100%
rename from src/documentation/resouces/images/fix.jpg
rename to src/documentation/resources/images/fix.jpg
diff --git a/src/documentation/resouces/images/group-logo.gif b/src/documentation/resources/images/group-logo.gif
similarity index 100%
rename from src/documentation/resouces/images/group-logo.gif
rename to src/documentation/resources/images/group-logo.gif
diff --git a/src/documentation/resouces/images/logoAdria1.png b/src/documentation/resources/images/logoAdria1.png
similarity index 100%
rename from src/documentation/resouces/images/logoAdria1.png
rename to src/documentation/resources/images/logoAdria1.png
diff --git a/src/documentation/resouces/images/logoAdria2.png b/src/documentation/resources/images/logoAdria2.png
similarity index 100%
rename from src/documentation/resouces/images/logoAdria2.png
rename to src/documentation/resources/images/logoAdria2.png
diff --git a/src/documentation/resouces/images/logoAdria3.png b/src/documentation/resources/images/logoAdria3.png
similarity index 100%
rename from src/documentation/resouces/images/logoAdria3.png
rename to src/documentation/resources/images/logoAdria3.png
diff --git a/src/documentation/resouces/images/logoAndrewClements.png b/src/documentation/resources/images/logoAndrewClements.png
similarity index 100%
rename from src/documentation/resouces/images/logoAndrewClements.png
rename to src/documentation/resources/images/logoAndrewClements.png
diff --git a/src/documentation/resouces/images/logoAndrewClements2.png b/src/documentation/resources/images/logoAndrewClements2.png
similarity index 100%
rename from src/documentation/resouces/images/logoAndrewClements2.png
rename to src/documentation/resources/images/logoAndrewClements2.png
diff --git a/src/documentation/resouces/images/logoDanielFernandez.png b/src/documentation/resources/images/logoDanielFernandez.png
similarity index 100%
rename from src/documentation/resouces/images/logoDanielFernandez.png
rename to src/documentation/resources/images/logoDanielFernandez.png
diff --git a/src/documentation/resouces/images/logoGlenStampoutlzis.png b/src/documentation/resources/images/logoGlenStampoutlzis.png
similarity index 100%
rename from src/documentation/resouces/images/logoGlenStampoutlzis.png
rename to src/documentation/resources/images/logoGlenStampoutlzis.png
diff --git a/src/documentation/resouces/images/logoGustafsson1.png b/src/documentation/resources/images/logoGustafsson1.png
similarity index 100%
rename from src/documentation/resouces/images/logoGustafsson1.png
rename to src/documentation/resources/images/logoGustafsson1.png
diff --git a/src/documentation/resouces/images/logoGustafsson2.png b/src/documentation/resources/images/logoGustafsson2.png
similarity index 100%
rename from src/documentation/resouces/images/logoGustafsson2.png
rename to src/documentation/resources/images/logoGustafsson2.png
diff --git a/src/documentation/resouces/images/logoJanssen1.png b/src/documentation/resources/images/logoJanssen1.png
similarity index 100%
rename from src/documentation/resouces/images/logoJanssen1.png
rename to src/documentation/resources/images/logoJanssen1.png
diff --git a/src/documentation/resouces/images/logoJanssen2.png b/src/documentation/resources/images/logoJanssen2.png
similarity index 100%
rename from src/documentation/resouces/images/logoJanssen2.png
rename to src/documentation/resources/images/logoJanssen2.png
diff --git a/src/documentation/resouces/images/logoKarmokar1.png b/src/documentation/resources/images/logoKarmokar1.png
similarity index 100%
rename from src/documentation/resouces/images/logoKarmokar1.png
rename to src/documentation/resources/images/logoKarmokar1.png
diff --git a/src/documentation/resouces/images/logoKarmokar1s.png b/src/documentation/resources/images/logoKarmokar1s.png
similarity index 100%
rename from src/documentation/resouces/images/logoKarmokar1s.png
rename to src/documentation/resources/images/logoKarmokar1s.png
diff --git a/src/documentation/resouces/images/logoKarmokar2.png b/src/documentation/resources/images/logoKarmokar2.png
similarity index 100%
rename from src/documentation/resouces/images/logoKarmokar2.png
rename to src/documentation/resources/images/logoKarmokar2.png
diff --git a/src/documentation/resouces/images/logoKarmokar2s.png b/src/documentation/resources/images/logoKarmokar2s.png
similarity index 100%
rename from src/documentation/resouces/images/logoKarmokar2s.png
rename to src/documentation/resources/images/logoKarmokar2s.png
diff --git a/src/documentation/resouces/images/logoKarmokar3.png b/src/documentation/resources/images/logoKarmokar3.png
similarity index 100%
rename from src/documentation/resouces/images/logoKarmokar3.png
rename to src/documentation/resources/images/logoKarmokar3.png
diff --git a/src/documentation/resouces/images/logoKarmokar3s.png b/src/documentation/resources/images/logoKarmokar3s.png
similarity index 100%
rename from src/documentation/resouces/images/logoKarmokar3s.png
rename to src/documentation/resources/images/logoKarmokar3s.png
diff --git a/src/documentation/resouces/images/logoKarmokar4.png b/src/documentation/resources/images/logoKarmokar4.png
similarity index 100%
rename from src/documentation/resouces/images/logoKarmokar4.png
rename to src/documentation/resources/images/logoKarmokar4.png
diff --git a/src/documentation/resouces/images/logoKarmokar4s.png b/src/documentation/resources/images/logoKarmokar4s.png
similarity index 100%
rename from src/documentation/resouces/images/logoKarmokar4s.png
rename to src/documentation/resources/images/logoKarmokar4s.png
diff --git a/src/documentation/resouces/images/logoKarmokar5.png b/src/documentation/resources/images/logoKarmokar5.png
similarity index 100%
rename from src/documentation/resouces/images/logoKarmokar5.png
rename to src/documentation/resources/images/logoKarmokar5.png
diff --git a/src/documentation/resouces/images/logoKarmokar5s.png b/src/documentation/resources/images/logoKarmokar5s.png
similarity index 100%
rename from src/documentation/resouces/images/logoKarmokar5s.png
rename to src/documentation/resources/images/logoKarmokar5s.png
diff --git a/src/documentation/resouces/images/logoKarmokar6.png b/src/documentation/resources/images/logoKarmokar6.png
similarity index 100%
rename from src/documentation/resouces/images/logoKarmokar6.png
rename to src/documentation/resources/images/logoKarmokar6.png
diff --git a/src/documentation/resouces/images/logoKarmokar6s.png b/src/documentation/resources/images/logoKarmokar6s.png
similarity index 100%
rename from src/documentation/resouces/images/logoKarmokar6s.png
rename to src/documentation/resources/images/logoKarmokar6s.png
diff --git a/src/documentation/resouces/images/logoLoicLefevre.png b/src/documentation/resources/images/logoLoicLefevre.png
similarity index 100%
rename from src/documentation/resouces/images/logoLoicLefevre.png
rename to src/documentation/resources/images/logoLoicLefevre.png
diff --git a/src/documentation/resouces/images/logoLoicLefevre2.png b/src/documentation/resources/images/logoLoicLefevre2.png
similarity index 100%
rename from src/documentation/resouces/images/logoLoicLefevre2.png
rename to src/documentation/resources/images/logoLoicLefevre2.png
diff --git a/src/documentation/resouces/images/logoMichaelMosmann.png b/src/documentation/resources/images/logoMichaelMosmann.png
similarity index 100%
rename from src/documentation/resouces/images/logoMichaelMosmann.png
rename to src/documentation/resources/images/logoMichaelMosmann.png
diff --git a/src/documentation/resouces/images/logoRaPiGmbH1.png b/src/documentation/resources/images/logoRaPiGmbH1.png
similarity index 100%
rename from src/documentation/resouces/images/logoRaPiGmbH1.png
rename to src/documentation/resources/images/logoRaPiGmbH1.png
diff --git a/src/documentation/resouces/images/logoRaPiGmbH10.png b/src/documentation/resources/images/logoRaPiGmbH10.png
similarity index 100%
rename from src/documentation/resouces/images/logoRaPiGmbH10.png
rename to src/documentation/resources/images/logoRaPiGmbH10.png
diff --git a/src/documentation/resouces/images/logoRaPiGmbH11.png b/src/documentation/resources/images/logoRaPiGmbH11.png
similarity index 100%
rename from src/documentation/resouces/images/logoRaPiGmbH11.png
rename to src/documentation/resources/images/logoRaPiGmbH11.png
diff --git a/src/documentation/resouces/images/logoRaPiGmbH12.png b/src/documentation/resources/images/logoRaPiGmbH12.png
similarity index 100%
rename from src/documentation/resouces/images/logoRaPiGmbH12.png
rename to src/documentation/resources/images/logoRaPiGmbH12.png
diff --git a/src/documentation/resouces/images/logoRaPiGmbH2.png b/src/documentation/resources/images/logoRaPiGmbH2.png
similarity index 100%
rename from src/documentation/resouces/images/logoRaPiGmbH2.png
rename to src/documentation/resources/images/logoRaPiGmbH2.png
diff --git a/src/documentation/resouces/images/logoRaPiGmbH5.png b/src/documentation/resources/images/logoRaPiGmbH5.png
similarity index 100%
rename from src/documentation/resouces/images/logoRaPiGmbH5.png
rename to src/documentation/resources/images/logoRaPiGmbH5.png
diff --git a/src/documentation/resouces/images/logoRaPiGmbH6.png b/src/documentation/resources/images/logoRaPiGmbH6.png
similarity index 100%
rename from src/documentation/resouces/images/logoRaPiGmbH6.png
rename to src/documentation/resources/images/logoRaPiGmbH6.png
diff --git a/src/documentation/resouces/images/logoRaPiGmbH7.png b/src/documentation/resources/images/logoRaPiGmbH7.png
similarity index 100%
rename from src/documentation/resouces/images/logoRaPiGmbH7.png
rename to src/documentation/resources/images/logoRaPiGmbH7.png
diff --git a/src/documentation/resouces/images/logoRaPiGmbH8.png b/src/documentation/resources/images/logoRaPiGmbH8.png
similarity index 100%
rename from src/documentation/resouces/images/logoRaPiGmbH8.png
rename to src/documentation/resources/images/logoRaPiGmbH8.png
diff --git a/src/documentation/resouces/images/logoRaPiGmbH9.png b/src/documentation/resources/images/logoRaPiGmbH9.png
similarity index 100%
rename from src/documentation/resouces/images/logoRaPiGmbH9.png
rename to src/documentation/resources/images/logoRaPiGmbH9.png
diff --git a/src/documentation/resouces/images/logoRandyStanard01.png b/src/documentation/resources/images/logoRandyStanard01.png
similarity index 100%
rename from src/documentation/resouces/images/logoRandyStanard01.png
rename to src/documentation/resources/images/logoRandyStanard01.png
diff --git a/src/documentation/resouces/images/logoRandyStanard02.png b/src/documentation/resources/images/logoRandyStanard02.png
similarity index 100%
rename from src/documentation/resouces/images/logoRandyStanard02.png
rename to src/documentation/resources/images/logoRandyStanard02.png
diff --git a/src/documentation/resouces/images/logoRandyStanard03.png b/src/documentation/resources/images/logoRandyStanard03.png
similarity index 100%
rename from src/documentation/resouces/images/logoRandyStanard03.png
rename to src/documentation/resources/images/logoRandyStanard03.png
diff --git a/src/documentation/resouces/images/logoRandyStanard04.png b/src/documentation/resources/images/logoRandyStanard04.png
similarity index 100%
rename from src/documentation/resouces/images/logoRandyStanard04.png
rename to src/documentation/resources/images/logoRandyStanard04.png
diff --git a/src/documentation/resouces/images/logoRandyStanard05.png b/src/documentation/resources/images/logoRandyStanard05.png
similarity index 100%
rename from src/documentation/resouces/images/logoRandyStanard05.png
rename to src/documentation/resources/images/logoRandyStanard05.png
diff --git a/src/documentation/resouces/images/logoRandyStanard06.png b/src/documentation/resources/images/logoRandyStanard06.png
similarity index 100%
rename from src/documentation/resouces/images/logoRandyStanard06.png
rename to src/documentation/resources/images/logoRandyStanard06.png
diff --git a/src/documentation/resouces/images/logoRandyStanard07.png b/src/documentation/resources/images/logoRandyStanard07.png
similarity index 100%
rename from src/documentation/resouces/images/logoRandyStanard07.png
rename to src/documentation/resources/images/logoRandyStanard07.png
diff --git a/src/documentation/resouces/images/logoRandyStanard08.png b/src/documentation/resources/images/logoRandyStanard08.png
similarity index 100%
rename from src/documentation/resouces/images/logoRandyStanard08.png
rename to src/documentation/resources/images/logoRandyStanard08.png
diff --git a/src/documentation/resouces/images/logoRussellBeattie1.png b/src/documentation/resources/images/logoRussellBeattie1.png
similarity index 100%
rename from src/documentation/resouces/images/logoRussellBeattie1.png
rename to src/documentation/resources/images/logoRussellBeattie1.png
diff --git a/src/documentation/resouces/images/logoRussellBeattie2.png b/src/documentation/resources/images/logoRussellBeattie2.png
similarity index 100%
rename from src/documentation/resouces/images/logoRussellBeattie2.png
rename to src/documentation/resources/images/logoRussellBeattie2.png
diff --git a/src/documentation/resouces/images/logoRussellBeattie3.png b/src/documentation/resources/images/logoRussellBeattie3.png
similarity index 100%
rename from src/documentation/resouces/images/logoRussellBeattie3.png
rename to src/documentation/resources/images/logoRussellBeattie3.png
diff --git a/src/documentation/resouces/images/logoRussellBeattie4.png b/src/documentation/resources/images/logoRussellBeattie4.png
similarity index 100%
rename from src/documentation/resouces/images/logoRussellBeattie4.png
rename to src/documentation/resources/images/logoRussellBeattie4.png
diff --git a/src/documentation/resouces/images/logoRussellBeattie5.png b/src/documentation/resources/images/logoRussellBeattie5.png
similarity index 100%
rename from src/documentation/resouces/images/logoRussellBeattie5.png
rename to src/documentation/resources/images/logoRussellBeattie5.png
diff --git a/src/documentation/resouces/images/logoWendyWise.png b/src/documentation/resources/images/logoWendyWise.png
similarity index 100%
rename from src/documentation/resouces/images/logoWendyWise.png
rename to src/documentation/resources/images/logoWendyWise.png
diff --git a/src/documentation/resouces/images/logoWendyWise2.png b/src/documentation/resources/images/logoWendyWise2.png
similarity index 100%
rename from src/documentation/resouces/images/logoWendyWise2.png
rename to src/documentation/resources/images/logoWendyWise2.png
diff --git a/src/documentation/resouces/images/poi-logo.png b/src/documentation/resources/images/poi-logo.png
similarity index 100%
rename from src/documentation/resouces/images/poi-logo.png
rename to src/documentation/resources/images/poi-logo.png
diff --git a/src/documentation/resouces/images/project-logo.gif b/src/documentation/resources/images/project-logo.gif
similarity index 100%
rename from src/documentation/resouces/images/project-logo.gif
rename to src/documentation/resources/images/project-logo.gif
diff --git a/src/documentation/resouces/images/remove.jpg b/src/documentation/resources/images/remove.jpg
similarity index 100%
rename from src/documentation/resouces/images/remove.jpg
rename to src/documentation/resources/images/remove.jpg
diff --git a/src/documentation/resouces/images/update.jpg b/src/documentation/resources/images/update.jpg
similarity index 100%
rename from src/documentation/resouces/images/update.jpg
rename to src/documentation/resources/images/update.jpg
diff --git a/src/documentation/resouces/images/usermodel.gif b/src/documentation/resources/images/usermodel.gif
similarity index 100%
rename from src/documentation/resouces/images/usermodel.gif
rename to src/documentation/resources/images/usermodel.gif
diff --git a/src/documentation/resouces/images/utilClasses.gif b/src/documentation/resources/images/utilClasses.gif
similarity index 100%
rename from src/documentation/resouces/images/utilClasses.gif
rename to src/documentation/resources/images/utilClasses.gif
diff --git a/src/documentation/skinconf.xml b/src/documentation/skinconf.xml
index 213d267e0..460668452 100644
--- a/src/documentation/skinconf.xml
+++ b/src/documentation/skinconf.xml
@@ -78,9 +78,9 @@ be used to configure the chosen Forrest skin.
   want these, set the attributes to blank. The DTD purposefully requires them.
   -->
   <trail>
-    <link1 name="apache" href="http://www.apache.org/"/>
-    <link2 name="jakarta" href="http://jakarta.apache.org/"/>
-    <link3 name="poi" href="http://jakarta.apache.org/poi/"/>
+    <link1 name="Apache" href="http://www.apache.org/"/>
+    <link2 name="Jakarta" href="http://jakarta.apache.org/"/>
+    <link3 name="POI" href="http://jakarta.apache.org/poi/"/>
   </trail>
 
   <!-- Credits are typically rendered as a set of small clickable images in the
diff --git a/src/java/org/apache/poi/hssf/record/DatRecord.java b/src/java/org/apache/poi/hssf/record/DatRecord.java
index 15dec8b55..7b15a23d3 100644
--- a/src/java/org/apache/poi/hssf/record/DatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DatRecord.java
@@ -70,7 +70,6 @@ import org.apache.poi.util.*;
 public class DatRecord
     extends Record
 {
-
     public final static short      sid                             = 0x1063;
     private  short      field_1_options;
     private  BitField   horizontalBorder                            = new BitField(0x1);