diff --git a/LICENSE b/LICENSE
index ccaa0989f..f820d4bd3 100644
--- a/LICENSE
+++ b/LICENSE
@@ -187,7 +187,7 @@
  *      same "printed page" as the copyright notice for easier
  *      identification within third-party archives.
  *
- *   Copyright [yyyy] Apache Software Foundation
+ *   Copyright [yyyy] [name of copyright owner]
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
diff --git a/docs/LICENSE b/docs/LICENSE
index ccaa0989f..f820d4bd3 100644
--- a/docs/LICENSE
+++ b/docs/LICENSE
@@ -187,7 +187,7 @@
  *      same "printed page" as the copyright notice for easier
  *      identification within third-party archives.
  *
- *   Copyright [yyyy] Apache Software Foundation
+ *   Copyright [yyyy] [name of copyright owner]
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.
diff --git a/proposal/xdocs/build.xml b/proposal/xdocs/build.xml
index c39278ffa..5be8df790 100644
--- a/proposal/xdocs/build.xml
+++ b/proposal/xdocs/build.xml
@@ -408,7 +408,10 @@
       <fileset dir="lib" includes="*.jar"/>
     </path>
     <path>
-      <fileset dir="${ant.home}/lib" includes="*.jar"/>
+      <!-- <fileset dir="${ant.home}/lib" includes="*.jar"/> -->
+      <fileset dir="../../lib" includes="*.jar"/>
+      <fileset dir="../../lib/optional" includes="*.jar"/>
+      <pathelement location="../../build/classes"/>
     </path>
   </path>
 
diff --git a/proposal/xdocs/dvsl/build.xml b/proposal/xdocs/dvsl/build.xml
index 00e947c16..939884cad 100644
--- a/proposal/xdocs/dvsl/build.xml
+++ b/proposal/xdocs/dvsl/build.xml
@@ -36,7 +36,7 @@
     <dvsl basedir="${taskdocs.src}" destdir="${manual.dest}"
           style="task.dvsl" extension=".html"
           toolboxfile="toolbox.props"
-          includes="**/*.xml">
+          includes="property/property.xml">
       <velconfig name="velocimacro.library" value="" />
     </dvsl>
   </target>
diff --git a/proposal/xdocs/dvsl/lib/velocity-dvsl-0.42.jar b/proposal/xdocs/dvsl/lib/velocity-dvsl-0.42.jar
index 2fcc8af7b..5662ec4da 100644
Binary files a/proposal/xdocs/dvsl/lib/velocity-dvsl-0.42.jar and b/proposal/xdocs/dvsl/lib/velocity-dvsl-0.42.jar differ
diff --git a/proposal/xdocs/dvsl/task.dvsl b/proposal/xdocs/dvsl/task.dvsl
index 6176331e4..782232ec7 100644
--- a/proposal/xdocs/dvsl/task.dvsl
+++ b/proposal/xdocs/dvsl/task.dvsl
@@ -463,6 +463,7 @@ $word.substring(0,1).toUpperCase()$word.substring(1)
           </td>
           <td bgcolor="#ffffff" height="1">
           <font size="$source-font-size"><pre>$toolbox.htmlescape.getText( $node.value() )</pre></font>
+#*      *#$context.applyTemplates("*")
           </td>
           <td bgcolor="$source-color" width="1">
             <img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/>
@@ -482,7 +483,14 @@ $word.substring(0,1).toUpperCase()$word.substring(1)
       </table>
     </div>
 #end
-
+#match("ant:*")
+&lt;$node.name()
+#foreach ( $item in $node.getAttributes() )
+  $item.=$qq$node.getAttributeValue($item)$qq
+#end
+&gt;
+&lt;$node.name()/&gt;
+#end
 
 #match("table")
 <table>
diff --git a/proposal/xdocs/src/org/apache/tools/ant/taskdefs/Property.xml b/proposal/xdocs/src/org/apache/tools/ant/taskdefs/Property.xml
index 29e2f2dca..a64fa6e9a 100644
--- a/proposal/xdocs/src/org/apache/tools/ant/taskdefs/Property.xml
+++ b/proposal/xdocs/src/org/apache/tools/ant/taskdefs/Property.xml
@@ -1,5 +1,5 @@
 <!-- property task -->
-<external>
+<external xmlns:ant="http://ant.apache.org">
 <description>
 
 <p>Sets a property (by name and value), or set of properties (from file or resource) in the project.</p>
@@ -26,23 +26,23 @@
 </description>
 
 <section anchor="examples" name="Examples">
-    <source><![CDATA[
-    <property name="foo.dist" value="dist"/>
-        ]]></source>
+    <source>
+    <ant:property name="foo.dist" value="dist"/>
+        </source>
 <p>sets the property <code>foo.dist</code> to the value &quot;dist&quot;.</p>
-    <source><![CDATA[
-    <property file="foo.properties"/>
-        ]]></source>
+    <source>
+    <ant:property file="foo.properties"/>
+        </source>
 <p>reads a set of properties from a file called &quot;foo.properties&quot;.</p>
-    <source><![CDATA[
-    <property resource="foo.properties"/>
-        ]]></source>
+    <source>
+    <ant:property resource="foo.properties"/>
+       </source>
 <p>reads a set of properties from a resource called &quot;foo.properties&quot;.</p>
 <p>Note that you can reference a global properties file for all of your Ant
 builds using the following:</p>
-    <source><![CDATA[
-    <property file="${user.home}/.ant-global.properties"/>
-        ]]></source>
+    <source>
+    <ant:property file="${user.home}/.ant-global.properties"/>
+        </source>
 <p>since the &quot;user.home&quot; property is defined by the Java virtual machine
 to be your home directory.  Where the &quot;user.home&quot; property resolves to in
 the file system depends on the operating system version and the JVM implementation.
@@ -51,11 +51,11 @@ variants, this will most likely resolve to the user's directory in the &quot;Doc
 and Settings&quot; folder. Older windows variants such as Windows 98/ME are less 
 predictable, as are other operating system/JVM combinations.</p>
 
-<source><![CDATA[
-  <property environment="env">
-  <echo message="Number of Processors = ${env.NUMBER_OF_PROCESSORS}">
-  <echo message="ANT_HOME is set to = ${env.ANT_HOME}">
-]]></source>
+<source>
+  <ant:property environment="env"/>
+  <ant:echo message="Number of Processors = ${env.NUMBER_OF_PROCESSORS}"/>
+  <ant:echo message="ANT_HOME is set to = ${env.ANT_HOME}"/>
+</source>
 <p>reads the system environment variables and stores them in properties, prefixed with &quot;env&quot;.
 Note that this only works on <em>select</em> operating systems.
 Two of the values are shown being echoed. 
diff --git a/proposal/xdocs/src/org/apache/tools/ant/taskdefs/SubAnt.xml b/proposal/xdocs/src/org/apache/tools/ant/taskdefs/SubAnt.xml
index 6a268f0af..b79f89a2a 100644
--- a/proposal/xdocs/src/org/apache/tools/ant/taskdefs/SubAnt.xml
+++ b/proposal/xdocs/src/org/apache/tools/ant/taskdefs/SubAnt.xml
@@ -26,7 +26,10 @@
         </subsection>
      </description>
     <section anchor="examples" name="Examples">
-        <pre>
+                <source><![CDATA[
+shell-prompt> m4 foo.m4 > foo
+]]></source>
+<pre>
         &lt;project name="subant" default="subant1"&gt;
         &lt;property name="build.dir" value="subant.build"/&gt;
         &lt;target name="subant1"&gt;
diff --git a/xdocs/stylesheets/site.vsl b/xdocs/stylesheets/site.vsl
index fb82f25ea..d4bce057e 100644
--- a/xdocs/stylesheets/site.vsl
+++ b/xdocs/stylesheets/site.vsl
@@ -1,5 +1,5 @@
 #* 
- * Copyright  2003-2004 Apache Software Foundation
+ * Copyright  2003-2004 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/xdocs/stylesheets/templates.vm b/xdocs/stylesheets/templates.vm
index 66a522d74..c9c3955ff 100644
--- a/xdocs/stylesheets/templates.vm
+++ b/xdocs/stylesheets/templates.vm
@@ -1,5 +1,5 @@
 #* 
- * Copyright  2000-2004 Apache Software Foundation
+ * Copyright  2000-2004 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.