Author: devinhan
Date: Thu Feb  2 09:16:39 2012
New Revision: 803788

Log:
Publishing merge to odftoolkit site by devinhan

Modified:
    websites/production/odftoolkit/   (props changed)
    websites/production/odftoolkit/content/odftoolkit/simple/downloads.html

Propchange: websites/production/odftoolkit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  2 09:16:39 2012
@@ -1 +1 @@
-/websites/staging/odftoolkit/trunk:794771-803784
+/websites/staging/odftoolkit/trunk:794771-803787

Modified: websites/production/odftoolkit/content/odftoolkit/simple/downloads.html
==============================================================================
--- websites/production/odftoolkit/content/odftoolkit/simple/downloads.html (original)
+++ websites/production/odftoolkit/content/odftoolkit/simple/downloads.html Thu Feb  2 09:16:39 2012
@@ -80,16 +80,11 @@
   <div id="contenta">
   
     
-    <h2 id="downloads"><strong>Downloads</strong></h2>
+    <h2 id="the-earlier-releases-downloads"><strong>The Earlier Releases Downloads</strong></h2>
 <p>In this page, you can download different release versions of Simple API before moved to Apache.</p>
-<p><strong>Current Version</strong></p>
-<p>The current release of Simple API is version 0.6.6( <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.6.6.jar">Binary</a>| <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.6.6-javadoc.jar">Java Doc</a>| <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.6.6-sources.jar">Source Code</a>).</p>
-<p>We released the Simple API version 0.6.6 on Auguest 12th, 2011.
-The improvements in this version focus on bug fix and increasing unit test coverage rate.
-Simple API has been accepted as Apache incubator project and the move process has been started. The security features (encryption and digital signatures) will be included in Apache version. Thanks all of the contributors and users, please continue to pay attention to us in Apache.</p>
-<p>The full release notes can be found <a href="ReleaseNotes.html">here</a>.</p>
-<p><strong>Older Versions</strong></p>
 <ul>
+<li>version 0.6.6( <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.6.6.jar">Binary</a>| <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.6.6-javadoc.jar">Java Doc</a>| <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.6.6-sources.jar">Source Code</a>)<br />
+</li>
 <li>version 0.6.5( <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.6.5.jar">Binary</a>| <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.6.5-javadoc.jar">Java Doc</a>| <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.6.5-sources.jar">Source Code</a>)<br />
 </li>
 <li>version 0.6( <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.6.jar">Binary</a>| <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.6-javadoc.jar">Java Doc</a>| <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.6-sources.jar">Source Code</a>)<br />
@@ -106,9 +101,10 @@ Simple API has been accepted as Apache i
 </li>
 <li>version 0.3( <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.3.jar">Binary</a>| <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.3-javadoc.zip">Java Doc</a>| <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.3-sources.zip">Source Code</a>)<br />
 </li>
-<li>version 0.2( <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.2.jar">Binary</a>| <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.2-javadoc.zip">Java Doc</a>| <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.2-sources.zip">Source Code</a>)<br />
+<li>version 0.2( <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.2.jar">Binary</a>| <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.2-javadoc.zip">Java Doc</a>| <a href="http://odftoolkit-extra.apache-extras.org.codespot.com/files/simple-odf-0.2-sources.zip">Source Code</a>) <br />
 </li>
 </ul>
+<p>The full release notes log can be found <a href="ReleaseNotes.html">here</a>.</p>
 <p><strong>Project roadmap and schedule(Update)</strong></p>
 <p>The Simple ODF API adhears to the "Release Early and Often" development philosophy. We will target a monthly release, for the end of each month. Code that is ready makes it into that month's release. Code that is not yet ready will wait. Proposed Roadmap:</p>
 <ul>