diff --git a/docs.xml b/docs.xml
index c515ef498..43898bef6 100644
--- a/docs.xml
+++ b/docs.xml
@@ -88,11 +88,13 @@
              templatePath="${templ.path}"
              velocityPropertiesFile="${velocity.props}">
         </anakia>
-        <fixcrlf srcdir="${docs.dest}" includes="**/*.html"/>
+        <fixcrlf srcdir="${docs.dest}" includes="**/*.html"
+                 encoding="iso-8859-1" outputencoding="iso-8859-1"/>
     </target>
 
     <target name="fixcrlf" if="onwindows">
-        <fixcrlf srcDir="${docs.dest}" eol="dos" includes="*.html"/>
+        <fixcrlf srcDir="${docs.dest}" eol="dos" includes="*.html"
+                 encoding="iso-8859-1" outputencoding="iso-8859-1"/>
     </target>
 
     <target name="docs" if="AnakiaTask.present" depends="anakia,fixcrlf" description="Create XDocs.">
diff --git a/docs/antlibs/proper.html b/docs/antlibs/proper.html
index da0097fbb..2c3a6c66e 100644
--- a/docs/antlibs/proper.html
+++ b/docs/antlibs/proper.html
@@ -330,6 +330,75 @@
       valign="top" align="left">
           1.0 released on November 6, 2006
       </td>
+      </tr>
+          </table>
+                                                    <a name="props" />
+                                      <h4 class="subsection">
+        <a name="Props - additional Property Resolver"></a>
+        Props - additional Property Resolver
+      </h4>
+                        <p>This is a library of supplementary handlers for Ant
+          properties resolution.</p>
+                                      <table class="ForrestTable" cellspacing="1" cellpadding="4">
+              <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          SVN URL:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          <a href="https://svn.apache.org/repos/asf/ant/antlibs/props/trunk/">https://svn.apache.org/repos/asf/ant/antlibs/props/trunk/</a>
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          ViewSVN:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          <a href="http://svn.apache.org/viewcvs.cgi/ant/antlibs/props/trunk/">http://svn.apache.org/viewcvs.cgi/ant/antlibs/props/trunk/</a>
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          Ant compatibility:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          Ant 1.8.x
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          Added to sandbox:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          2007-07-25
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          Promoted from sandbox:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          2009-10-06
+      </td>
+      </tr>
+                  <tr>
+                      <th colspan="1" rowspan="1"
+      valign="top" align="left">
+          Latest Release:
+      </th>
+                          <td colspan="1" rowspan="1"
+      valign="top" align="left">
+          None
+      </td>
       </tr>
           </table>
                                                     <a name="svn" />
diff --git a/docs/antlibs/sandbox.html b/docs/antlibs/sandbox.html
index 83904c9a7..054bf43b5 100644
--- a/docs/antlibs/sandbox.html
+++ b/docs/antlibs/sandbox.html
@@ -649,63 +649,6 @@
       valign="top" align="left">
           Kevin Jackson
       </td>
-      </tr>
-          </table>
-                                                          <h4 class="subsection">
-        <a name="Props - additional Property Resolver"></a>
-        Props - additional Property Resolver
-      </h4>
-                        <p>This is a library of supplementary handlers for Ant properties resolution.</p>
-                                      <table class="ForrestTable" cellspacing="1" cellpadding="4">
-              <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          SVN URL:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          <a href="https://svn.apache.org/repos/asf/ant/sandbox/antlibs/props/trunk/">https://svn.apache.org/repos/asf/ant/sandbox/antlibs/props/trunk/</a>
-      </td>
-      </tr>
-                  <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          ViewSVN:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          <a href="http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/props/trunk/">http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/props/trunk/</a>
-      </td>
-      </tr>
-                  <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          Ant compatibility:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          Ant 1.8.x
-      </td>
-      </tr>
-                  <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          Added to sandbox:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          2007-07-25
-      </td>
-      </tr>
-                  <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          Sponsoring Committers
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          Matt Benson
-      </td>
       </tr>
           </table>
                                                           <h4 class="subsection">