diff --git a/docs.xml b/docs.xml
index 777c7bc66..1e62f510d 100644
--- a/docs.xml
+++ b/docs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-     Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You under the Apache License, Version 2.0
diff --git a/docs/antlibs/antunit/index.html b/docs/antlibs/antunit/index.html
index 77320aa02..91f197276 100755
--- a/docs/antlibs/antunit/index.html
+++ b/docs/antlibs/antunit/index.html
@@ -298,7 +298,6 @@ Total time: 1 second
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/antlibs/bindownload.html b/docs/antlibs/bindownload.html
index c68973b20..541ed6eec 100644
--- a/docs/antlibs/bindownload.html
+++ b/docs/antlibs/bindownload.html
@@ -167,7 +167,6 @@ SHA1.</p>
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/antlibs/charter.html b/docs/antlibs/charter.html
index 3a29e5e98..f0ea42137 100644
--- a/docs/antlibs/charter.html
+++ b/docs/antlibs/charter.html
@@ -285,7 +285,6 @@ Note:
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/antlibs/dotnet/index.html b/docs/antlibs/dotnet/index.html
index 2815bcfde..9b85d2b85 100755
--- a/docs/antlibs/dotnet/index.html
+++ b/docs/antlibs/dotnet/index.html
@@ -239,7 +239,6 @@ Total time: 0 seconds
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/antlibs/index.html b/docs/antlibs/index.html
index 87a85eaad..f5b340b85 100644
--- a/docs/antlibs/index.html
+++ b/docs/antlibs/index.html
@@ -128,7 +128,6 @@
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/antlibs/proper.html b/docs/antlibs/proper.html
index 4bbb59fa8..893bae99d 100644
--- a/docs/antlibs/proper.html
+++ b/docs/antlibs/proper.html
@@ -362,7 +362,6 @@
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/antlibs/sandbox.html b/docs/antlibs/sandbox.html
index 3d8cde44c..d77071e6f 100644
--- a/docs/antlibs/sandbox.html
+++ b/docs/antlibs/sandbox.html
@@ -302,7 +302,6 @@
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/antlibs/srcdownload.html b/docs/antlibs/srcdownload.html
index 7973814fe..db56a672e 100644
--- a/docs/antlibs/srcdownload.html
+++ b/docs/antlibs/srcdownload.html
@@ -167,7 +167,6 @@ SHA1.</p>
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/antlibs/svn/index.html b/docs/antlibs/svn/index.html
index 728013e48..18eeba5e8 100755
--- a/docs/antlibs/svn/index.html
+++ b/docs/antlibs/svn/index.html
@@ -155,7 +155,6 @@
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/antnews.html b/docs/antnews.html
index aaac8c2ef..70b809c7f 100644
--- a/docs/antnews.html
+++ b/docs/antnews.html
@@ -477,7 +477,6 @@ did) or could be explained better, feel free to help us out in the
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/bindownload.html b/docs/bindownload.html
index 7b15c7720..cb2515850 100644
--- a/docs/bindownload.html
+++ b/docs/bindownload.html
@@ -304,7 +304,6 @@ SHA1.</p>
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/bugs.html b/docs/bugs.html
index 82e07d1ca..ce2dfc6f7 100644
--- a/docs/bugs.html
+++ b/docs/bugs.html
@@ -321,7 +321,6 @@
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/bylaws.html b/docs/bylaws.html
index 1443ecf50..44aa6ddd7 100644
--- a/docs/bylaws.html
+++ b/docs/bylaws.html
@@ -772,7 +772,6 @@
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/contributors.html b/docs/contributors.html
index b3c197edc..942464f6b 100644
--- a/docs/contributors.html
+++ b/docs/contributors.html
@@ -494,7 +494,6 @@ and EJB runtime environments -- in that order.
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/external.html b/docs/external.html
index ee7300412..d4f4dd9e3 100644
--- a/docs/external.html
+++ b/docs/external.html
@@ -6643,7 +6643,6 @@
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/faq.html b/docs/faq.html
index fa145007e..81abb1ae2 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -1636,7 +1636,9 @@ mv /tmp/foo $ANT_HOME/bin/antRun
       &lt;style&gt; or &lt;junit&gt; ignores my
       &lt;classpath&gt;
     </p>
-                  <p>These tasks don't ignore your classpath setting, you
+                  <p>Starting with Ant 1.7.0, &lt;junit&gt; will honor your
+        nested &lt;classpath&gt;.</p>
+                        <p>These tasks don't ignore your classpath setting, you
         are facing a common problem with delegating classloaders.</p>
                         <p>This question collects a common type of problem: A task
         needs an external library and it has a nested classpath
@@ -1813,7 +1815,8 @@ mv /tmp/foo $ANT_HOME/bin/antRun
         "offending" jar out of <code>ANT_HOME/lib</code>.  For the
         <code>&lt;junit&gt;</code> task it would be
         <code>ant-junit.jar</code> and for <code>&lt;style&gt;</code>
-        it would be <code>ant-trax.jar</code> or <code>ant-xslp.jar</code> -
+        it would be <code>ant-trax.jar</code>
+        or <code>ant-xslp.jar</code> - 
         depending on the processor you use.</p>
                         <p>If you do so, you will have to <code>&lt;taskdef&gt;</code>
         all optional tasks that need the external library and use
@@ -1981,7 +1984,6 @@ mv /tmp/foo $ANT_HOME/bin/antRun
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/index.html b/docs/index.html
index ee286a010..446ed9831 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -269,7 +269,6 @@ Comprehensive documentation is included in the source and binary distributions.
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/legal.html b/docs/legal.html
index 1bbdc53e4..c98ed3dc1 100644
--- a/docs/legal.html
+++ b/docs/legal.html
@@ -187,7 +187,6 @@
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/license.html b/docs/license.html
index cc50946a3..7cca8c823 100644
--- a/docs/license.html
+++ b/docs/license.html
@@ -461,7 +461,6 @@
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/mail.html b/docs/mail.html
index 2bdfb395d..27eb22373 100644
--- a/docs/mail.html
+++ b/docs/mail.html
@@ -251,7 +251,6 @@
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/mission.html b/docs/mission.html
index 1be910da5..ef90e19ce 100644
--- a/docs/mission.html
+++ b/docs/mission.html
@@ -241,7 +241,6 @@ hereby created.
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/problems.html b/docs/problems.html
index 6bec4685f..813c45410 100644
--- a/docs/problems.html
+++ b/docs/problems.html
@@ -346,7 +346,6 @@ D:\src\java\Unset.java<br />
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/projects.html b/docs/projects.html
index ec9deb492..455d66128 100644
--- a/docs/projects.html
+++ b/docs/projects.html
@@ -1218,7 +1218,6 @@
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/projects/index.html b/docs/projects/index.html
index 165099c8f..a7919e55a 100644
--- a/docs/projects/index.html
+++ b/docs/projects/index.html
@@ -124,7 +124,6 @@
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/resources.html b/docs/resources.html
index 69d1b1e44..4eb638a6d 100644
--- a/docs/resources.html
+++ b/docs/resources.html
@@ -1368,7 +1368,6 @@
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/srcdownload.html b/docs/srcdownload.html
index 4de0678ce..ec9e604ab 100644
--- a/docs/srcdownload.html
+++ b/docs/srcdownload.html
@@ -302,7 +302,6 @@ SHA1.</p>
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/svn.html b/docs/svn.html
index 7b00dcab0..6238ddfda 100644
--- a/docs/svn.html
+++ b/docs/svn.html
@@ -200,7 +200,6 @@ svn co http://svn.apache.org/repos/asf/ant/[project]/trunk/ ant-[project]</pre>
   </div>
 
         <p class="copyright">
-        Copyright &copy; 2000-2006&nbsp;The Apache Software Foundation. All rights reserved.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/xdocs/stylesheets/site.vsl b/xdocs/stylesheets/site.vsl
index 8d76b0118..ce9973bf0 100644
--- a/xdocs/stylesheets/site.vsl
+++ b/xdocs/stylesheets/site.vsl
@@ -1,5 +1,5 @@
 #*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
  *  contributor license agreements.  See the NOTICE file distributed with
  *  this work for additional information regarding copyright ownership.
  *  The ASF licenses this file to You under the Apache License, Version 2.0