Updated docs for CVS -> SVN migration.

Issue: http://issues.apache.org/bugzilla/show_bug.cgi?id=32402
Submitted by: Shinobu Kawai


git-svn-id: https://svn.apache.org/repos/asf/jakarta/velocity/trunk@106848 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/docs/anakia.html b/docs/anakia.html
index f48d7dc..f99d688 100644
--- a/docs/anakia.html
+++ b/docs/anakia.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -764,7 +748,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/casestudy1.html b/docs/casestudy1.html
index 961820a..6510d05 100644
--- a/docs/casestudy1.html
+++ b/docs/casestudy1.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -359,7 +343,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/casestudy2.html b/docs/casestudy2.html
index 4d7479e..0f7c3fc 100644
--- a/docs/casestudy2.html
+++ b/docs/casestudy2.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -274,7 +258,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/changes.html b/docs/changes.html
index 479c308..fca75bc 100644
--- a/docs/changes.html
+++ b/docs/changes.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -1400,7 +1384,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/code-standards.html b/docs/code-standards.html
index b573fa4..2ba6c4e 100644
--- a/docs/code-standards.html
+++ b/docs/code-standards.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -263,8 +247,8 @@
                                                 <p>
 3. 4 spaces. <strong>NO</strong> tabs. Period. We understand that a lot of you
 like to use tabs, but the fact of the matter is that in a distributed
-development enviroment, when the cvs commit messages get sent to a mailing list,
-they are almost impossible to read if you use tabs.
+development environment, when the svn commit messages get sent to a mailing
+list, they are almost impossible to read if you use tabs.
 </p>
                                                 <p>
 In Emacs-speak, this translates to the following command:
@@ -403,7 +387,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/contributors.html b/docs/contributors.html
index 868d0c4..77f6998 100644
--- a/docs/contributors.html
+++ b/docs/contributors.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -375,7 +359,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/design.html b/docs/design.html
index 9056616..22905b0 100644
--- a/docs/design.html
+++ b/docs/design.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -235,7 +219,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/developer-guide.html b/docs/developer-guide.html
index 8bdd4c8..d2970b9 100644
--- a/docs/developer-guide.html
+++ b/docs/developer-guide.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -334,7 +318,7 @@
 <ol>
   <li>
     Get the Velocity distribution. This is available as a release, nightly snapshot or
-    directly from the CVS code repository. Any are fine, although for the latest
+    directly from the Subversion code repository. Any are fine, although for the latest
     features, the nightly snapshot is most likely the best way. For more
     information, go <a href="index.html">here</a>.
   </li>
@@ -3972,7 +3956,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/devtools.html b/docs/devtools.html
index 53a7e46..5cf34f0 100644
--- a/docs/devtools.html
+++ b/docs/devtools.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -225,8 +209,8 @@
  </p>
                                                 <p>
  They can  be found
- <a href="http://cvs.apache.org/viewcvs/jakarta-velocity/contrib/tools/intellij/">
- here</a> in the Velocity CVS, or can be found in the /contrib/tools directory
+ <a href="http://svn.apache.org/repos/asf/jakarta/velocity/trunk/contrib/tools/intellij/">
+ here</a> in the Velocity Subversion, or can be found in the /contrib/tools directory
  of the source tree.
 </p>
                             </blockquote>
@@ -248,8 +232,8 @@
 </p>
                                                 <p>
  It can  be found
- <a href="http://cvs.apache.org/viewcvs/jakarta-velocity/contrib/tools/ultraedit/">
- here</a> in the Velocity CVS, or can be found in the /contrib/tools directory
+ <a href="http://svn.apache.org/repos/asf/jakarta/velocity/trunk/contrib/tools/ultraedit/">
+ here</a> in the Velocity Subversion, or can be found in the /contrib/tools directory
  of the source tree.
 </p>
                                                 <p>
@@ -278,7 +262,7 @@
                                     <p>
 Saimon Moore (smoore@serikat.es) contributed a Velocity mode for the java-based
 editor <a href="http://www.jedit.org">JEdit</a>, and can be found here in
-<a href="http://cvs.apache.org/viewcvs/jakarta-velocity/contrib/tools/jedit/">
+<a href="http://svn.apache.org/repos/asf/jakarta/velocity/trunk/contrib/tools/jedit/">
 velocity.xml</a>.
 </p>
                                                 <p>
@@ -324,7 +308,7 @@
 does font-locking (syntax coloring) of VTL in <a href="http://xemacs.org/">XEmacs</a> and <a href="http://www.gnu.org/software/emacs/emacs.html">GNU Emacs</a>.  As
 a minor mode, it insinuates itself into whatever major mode you're
 using, so you don't lose the major mode's goodness. It can be found
-<a href="http://cvs.apache.org/viewcvs/jakarta-velocity/contrib/tools/emacs/">
+<a href="http://svn.apache.org/repos/asf/jakarta/velocity/trunk/contrib/tools/emacs/">
 here</a>.</p>
                             </blockquote>
       </td></tr>
@@ -344,7 +328,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/differences.html b/docs/differences.html
index 6d010cd..9746b57 100644
--- a/docs/differences.html
+++ b/docs/differences.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -98,7 +82,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -307,7 +291,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/getting-started.html b/docs/getting-started.html
index d6dac07..e6f0117 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -259,7 +243,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/index.html b/docs/index.html
index a7cf382..80269be 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -413,7 +397,7 @@
 </p>
                                                 <p>
 If you are willing to risk getting dirty, we invite you to try the
-nightly snapshot to see the current state of affairs (and help out!) <a href="http://jakarta.apache.org/site/cvsindex.html">Public CVS
+nightly snapshot to see the current state of affairs (and help out!) <a href="http://www.apache.org/dev/version-control.html">Public Subversion
 access</a> is also available.
 </p>
                             </blockquote>
@@ -443,9 +427,9 @@
         Discussion occurs on the <a href="http://jakarta.apache.org/getinvolved/mail.html">Velocity
         mailing list</a>.</li>
     <li>
-        Access to the CVS <strong>jakarta-velocity</strong> repository is available both
-        <a href="http://cvs.apache.org/viewcvs/jakarta-velocity/">online</a>
-        and with a <a href="http://jakarta.apache.org/getinvolved/cvsindex.html">cvs client</a>.</li>
+        Access to the Subversion <strong>jakarta-velocity</strong> repository is available both
+        <a href="http://svn.apache.org/repos/asf/jakarta/velocity/trunk/">online</a>
+        and with a <a href="http://www.apache.org/dev/version-control.html">Subversion client</a>.</li>
 </ul>
                             </blockquote>
         </p>
@@ -461,7 +445,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/install.html b/docs/install.html
index e8ef10a..ae626ad 100644
--- a/docs/install.html
+++ b/docs/install.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -170,7 +154,7 @@
 </p>
                                                 <p>
 Everything required to build Velocity comes with the distribution, which
-can be obtained from <a href="http://jakarta.apache.org/getinvolved/cvsindex.html">CVS</a> or
+can be obtained from <a href="http://www.apache.org/dev/version-control.html">Subversion</a> or
 from the <a href="http://jakarta.apache.org/builds/jakarta-velocity/nightly/">nightly
 builds</a>.  However, you will need to install Ant, an excellent
 Java-based build tool.  Ant is also a Jakarta project, and can be
@@ -232,7 +216,7 @@
 </p>
                                                 <p>
 In each case below, it is assumed that you were successful in getting
-the distribution from CVS or as a nightly build, and with the latter,
+the distribution from Subversion or as a nightly build, and with the latter,
 were successful in unpacking.  Also, it is assumed that you are starting
 in the 'jakarta-velocity' directory, the root of the distribution tree. 
 All directory references will be relative to 'jakarta-velocity'.
@@ -301,9 +285,9 @@
                                                 <p>
 Velocity should build 'out of the box', independent of your classpath.
 If you get an error building Velocity, try a different nightly build (as
-sometimes we make a mistake and the CVS at the time of the nightly
-snapshot isn't complete) or refresh from CVS (you might have gotten a
-CVS snapshot while a developer was checking things in.)
+sometimes we make a mistake and the Subversion at the time of the nightly
+snapshot isn't complete) or refresh from Subversion (you might have gotten a
+Subversion snapshot while a developer was checking things in.)
 </p>
                                                 <p>
 If the problems persist, do not hesitate to ask the Velocity community
@@ -429,7 +413,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/license.html b/docs/license.html
index 0e4064b..5d469e0 100644
--- a/docs/license.html
+++ b/docs/license.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -97,7 +81,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -254,7 +238,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/migration.html b/docs/migration.html
index f1d0e83..f3adcc3 100644
--- a/docs/migration.html
+++ b/docs/migration.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -269,7 +253,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/newshistory.html b/docs/newshistory.html
index 7a1c2a3..fd28694 100644
--- a/docs/newshistory.html
+++ b/docs/newshistory.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -441,7 +425,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/powered.html b/docs/powered.html
index 73774e4..203b334 100644
--- a/docs/powered.html
+++ b/docs/powered.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -1515,7 +1499,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/specification-ast.html b/docs/specification-ast.html
index db78396..fa9c219 100644
--- a/docs/specification-ast.html
+++ b/docs/specification-ast.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -346,7 +330,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/specification-bnf.html b/docs/specification-bnf.html
index caac6fc..3170ea3 100644
--- a/docs/specification-bnf.html
+++ b/docs/specification-bnf.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -347,7 +331,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/specification.html b/docs/specification.html
index db634cf..fbc9cf7 100644
--- a/docs/specification.html
+++ b/docs/specification.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -186,7 +170,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/texen.html b/docs/texen.html
index 61fd278..cdc8847 100644
--- a/docs/texen.html
+++ b/docs/texen.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -361,7 +345,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/todo.html b/docs/todo.html
index a2803e4..9980b31 100644
--- a/docs/todo.html
+++ b/docs/todo.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -293,7 +277,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/toolsubproject.html b/docs/toolsubproject.html
index 5de7b02..d422e72 100644
--- a/docs/toolsubproject.html
+++ b/docs/toolsubproject.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -186,7 +170,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/user-guide.html b/docs/user-guide.html
index 31a153f..9c43800 100644
--- a/docs/user-guide.html
+++ b/docs/user-guide.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -98,7 +82,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -4032,7 +4016,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/user-guide_es.html b/docs/user-guide_es.html
index e4818cd..ee8a73b 100644
--- a/docs/user-guide_es.html
+++ b/docs/user-guide_es.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -100,7 +84,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -4074,7 +4058,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/user-guide_fi.html b/docs/user-guide_fi.html
index cc73af7..a19695c 100644
--- a/docs/user-guide_fi.html
+++ b/docs/user-guide_fi.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -100,7 +84,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -4157,7 +4141,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/user-guide_fr.html b/docs/user-guide_fr.html
index 6281459..65ec843 100644
--- a/docs/user-guide_fr.html
+++ b/docs/user-guide_fr.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -100,7 +84,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -3657,7 +3641,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/velocity_and_weblogic.html b/docs/velocity_and_weblogic.html
index b8836f5..e6094ef 100644
--- a/docs/velocity_and_weblogic.html
+++ b/docs/velocity_and_weblogic.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -586,7 +570,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/veltag.html b/docs/veltag.html
index ab42ea6..6abc53e 100644
--- a/docs/veltag.html
+++ b/docs/veltag.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -523,7 +507,7 @@
   Jakarta build tool, must be installed.
 </li>
 <li>
-   Get the Velocity distribution from CVS or a nightly snapshot.
+   Get the Velocity distribution from Subversion or a nightly snapshot.
 </li>
 <li>
    Change directory to the <code>/contrib/temporary/veltag</code>
@@ -667,7 +651,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/vtl-reference-guide.html b/docs/vtl-reference-guide.html
index b2f0441..c754a9d 100644
--- a/docs/vtl-reference-guide.html
+++ b/docs/vtl-reference-guide.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -98,7 +82,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -721,7 +705,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/ymtd/ymtd-changes.html b/docs/ymtd/ymtd-changes.html
index 5992fdf..6dd65a9 100644
--- a/docs/ymtd/ymtd-changes.html
+++ b/docs/ymtd/ymtd-changes.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -218,7 +202,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/ymtd/ymtd-conclusion.html b/docs/ymtd/ymtd-conclusion.html
index aeda32e..4e32c4f 100644
--- a/docs/ymtd/ymtd-conclusion.html
+++ b/docs/ymtd/ymtd-conclusion.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -201,7 +185,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/ymtd/ymtd-embedded.html b/docs/ymtd/ymtd-embedded.html
index 3e8baaf..4dee371 100644
--- a/docs/ymtd/ymtd-embedded.html
+++ b/docs/ymtd/ymtd-embedded.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -245,7 +229,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/ymtd/ymtd-error-handling.html b/docs/ymtd/ymtd-error-handling.html
index e296fef..787562d 100644
--- a/docs/ymtd/ymtd-error-handling.html
+++ b/docs/ymtd/ymtd-error-handling.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -454,7 +438,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/ymtd/ymtd-generation.html b/docs/ymtd/ymtd-generation.html
index b2e29de..983730f 100644
--- a/docs/ymtd/ymtd-generation.html
+++ b/docs/ymtd/ymtd-generation.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -383,7 +367,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/ymtd/ymtd-hosting.html b/docs/ymtd/ymtd-hosting.html
index 26d6e4a..3ee44b8 100644
--- a/docs/ymtd/ymtd-hosting.html
+++ b/docs/ymtd/ymtd-hosting.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -255,7 +239,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/ymtd/ymtd-implementation.html b/docs/ymtd/ymtd-implementation.html
index 3d7f5af..0fd6757 100644
--- a/docs/ymtd/ymtd-implementation.html
+++ b/docs/ymtd/ymtd-implementation.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -288,7 +272,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/ymtd/ymtd-javabeans.html b/docs/ymtd/ymtd-javabeans.html
index 27e1553..ae271ad 100644
--- a/docs/ymtd/ymtd-javabeans.html
+++ b/docs/ymtd/ymtd-javabeans.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -383,7 +367,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/ymtd/ymtd-sampleapp.html b/docs/ymtd/ymtd-sampleapp.html
index 85bee66..927505b 100644
--- a/docs/ymtd/ymtd-sampleapp.html
+++ b/docs/ymtd/ymtd-sampleapp.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -367,7 +351,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/ymtd/ymtd-saying-hello.html b/docs/ymtd/ymtd-saying-hello.html
index ced232f..000f565 100644
--- a/docs/ymtd/ymtd-saying-hello.html
+++ b/docs/ymtd/ymtd-saying-hello.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -390,7 +374,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/ymtd/ymtd-taglibs.html b/docs/ymtd/ymtd-taglibs.html
index 0f75edf..4cf9e05 100644
--- a/docs/ymtd/ymtd-taglibs.html
+++ b/docs/ymtd/ymtd-taglibs.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -540,7 +524,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/docs/ymtd/ymtd.html b/docs/ymtd/ymtd.html
index c5a99f2..b91ccf8 100644
--- a/docs/ymtd/ymtd.html
+++ b/docs/ymtd/ymtd.html
@@ -1,21 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
-<!--
-Copyright 1999-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.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-
 <!-- Content Stylesheet for Site -->
 
         
@@ -96,7 +80,7 @@
 </li>
                     <li>    <a href="http://jakarta.apache.org/site/mail.html">Mailing Lists</a>
 </li>
-                    <li>    <a href="http://jakarta.apache.org/site/cvsindex.html">CVS Repositories</a>
+                    <li>    <a href="http://www.apache.org/dev/version-control.html">Subversion Repositories</a>
 </li>
                 </ul>
             <p><strong>Docs</strong></p>
@@ -280,9 +264,9 @@
 It is very important to accurately compare these technologies.
 Therefore, a lot of effort has gone into this essay to state things as
 fairly and accurately as possible. Therefore, this entire essay is
-checked into CVS and it is possible for you to provide feedback, but
+checked into Subversion and it is possible for you to provide feedback, but
 also patches that fix any mistakes. In other words, this is a community
-driven document. It is currently stored in the <a href="http://jakarta.apache.org/site/cvsindex.html">CVS tree</a> for the
+driven document. It is currently stored in the <a href="http://www.apache.org/dev/version-control.html">Subversion tree</a> for the
 Velocity project in the xdocs directory.
 </p>
                                                 <p>
@@ -309,7 +293,7 @@
                 </td></tr>
                 <tr><td colspan="2">
                     <div align="center"><font color="#525D76" size="-1"><em>
-                    Copyright &#169; 1999-2004, The Apache Software Foundation
+                    Copyright &#169; 1999-2004, Apache Software Foundation
                     </em></font></div>
                 </td></tr>
             </table>
diff --git a/xdocs/code-standards.xml b/xdocs/code-standards.xml
index 8cac3e5..5c4d90a 100644
--- a/xdocs/code-standards.xml
+++ b/xdocs/code-standards.xml
@@ -1,180 +1,180 @@
-<?xml version="1.0"?>

-

-<document>

-

- <properties>

-  <title>Coding Standards</title>

-  <author email="jvanzyl@zenplex.com">Velocity Documentation Team</author>

- </properties>

-

-<body>

-

-<section name="Coding Standards">

-

-<p>

-This document describes a list of coding conventions that are required

-for code submissions to the project. By default, the coding conventions

-for most Open Source Projects should follow the existing coding conventions

-in the code that you are working on. For example, if the bracket is on

-the same line as the if statement, then you should write all your code

-to have that convention.

-</p>

-

-<p>

-<strong>If you commit code that does not follow these conventions and you

-are caught, you are responsible for also fixing your own code.</strong>

-</p>

-

-<p>

-Below is a list of coding conventions that are specific to Velocity,

-everything else not specificially mentioned here should follow the official

-<a href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html">Sun

-Java Coding Conventions</a>.

-</p>

-

-<p>

-1. Brackets should begin and end on a new line. Examples:

-</p>

-

-<source test=""><![CDATA[

-

-if ( foo )

-{

-    // code here

-}

-

-try

-{

-    // code here

-}

-catch (Exception bar)

-{

-    // code here

-}

-finally

-{

-    // code here

-}

-

-while ( true )

-{

-    // code here

-}

-

-]]></source>

-

-<p>

-2. It is <strong>OK</strong> to have spaces between the parens or not. The

-preference is to not include the extra spaces. For example, both of these are

-ok:

-</p>

-

-<source test=""><![CDATA[

-

-if (foo)

-

-or

-

-if ( foo )

-

-]]></source>

-

-<p>

-3. 4 spaces. <strong>NO</strong> tabs. Period. We understand that a lot of you

-like to use tabs, but the fact of the matter is that in a distributed

-development enviroment, when the cvs commit messages get sent to a mailing list,

-they are almost impossible to read if you use tabs.

-</p>

-

-<p>

-In Emacs-speak, this translates to the following command:

-

-(setq-default tab-width 4 indent-tabs-mode nil)

-

-</p>

-

-<p>

-4. Unix linefeeds for all .java source code files. Other platform specific

-files should have the platform specific linefeeds.

-</p>

-

-<p>

-5. Javadoc <strong>MUST</strong> exist on all your methods. Also, if you are

-working on existing code and there currently isn't a javadoc for that

-method/class/variable or whatever, then you should contribute and add it.

-This will improve the project as a whole.

-</p>

-

-<p>

-6. The <a href="license.html">Apache Software License</a> <strong>MUST</strong> be placed at the top

-of each and every file.

-</p>

-

-<p>

-7. If you contribute to a file (code or documentation), add yourself to the

-top of the file. For java files the preferred Javadoc format is:

-</p>

-

-<source><![CDATA[

-@author <a href="mailto:user@domain.com">John Doe</a>

-]]></source>

-

-<p>

-Thanks for your cooperation.

-</p>

-

-</section>

-

-<section name="More Fun For Emacs">

-

-<p>

-  To make coding easier,  following bit of Emacs LISP does 

-  the 'right thing' with bracing, if you want.

- </p>

-<source><![CDATA[

-(defun apache-jakarta-mode ()

-  "The Java mode specialization for Apache Jakarta projects."

-  (if (not (assoc "apache-jakarta" c-style-alist))

-      ;; Define the Apache Jakarta cc-mode style.

-      (c-add-style "apache-jakarta" '("java" (indent-tabs-mode . nil))))

-

-  (c-set-style "apache-jakarta")

-  (c-set-offset 'substatement-open 0 nil)

-  (setq mode-name "Apache Jakarta")

-

-  ;; Turn on syntax highlighting when X is running.

-  (if (boundp 'window-system)

-      (progn (setq font-lock-support-mode 'lazy-lock-mode)

-             (font-lock-mode t))))

-

-;; Activate Jakarta mode.

-(if (fboundp 'jde-mode)

-    (add-hook 'jde-mode-hook 'apache-jakarta-mode)

-  (add-hook 'java-mode-hook 'apache-jakarta-mode))

-]]></source>

-

-  <p>

-  Note that  this will apply to all java in emacs. 

-  To control it :

-

-  <ul>

-  <li>

-      Turn off : <code>M-: (remove-hook 'java-mode 'apache-jakarta-mode)</code>

-  </li>

-  <li>

-     Turn on : <code>M-: (add-hook 'java-mode 'apache-jakarta-mode)</code>

-  </li>

-  </ul>

-   'M-:' is &lt;meta&gt; followed by ':', of course.  

-   It will be on by default at startup.

-  </p>

-  

-  <p>

-  This was stolen lock, stock and barrel from the contribution 

-  to the Turbine project by Daniel L. Rall. Thanks Daniel!

-  </p>

-

-</section>

-

-</body>

-</document>

+<?xml version="1.0"?>
+
+<document>
+
+ <properties>
+  <title>Coding Standards</title>
+  <author email="jvanzyl@zenplex.com">Velocity Documentation Team</author>
+ </properties>
+
+<body>
+
+<section name="Coding Standards">
+
+<p>
+This document describes a list of coding conventions that are required
+for code submissions to the project. By default, the coding conventions
+for most Open Source Projects should follow the existing coding conventions
+in the code that you are working on. For example, if the bracket is on
+the same line as the if statement, then you should write all your code
+to have that convention.
+</p>
+
+<p>
+<strong>If you commit code that does not follow these conventions and you
+are caught, you are responsible for also fixing your own code.</strong>
+</p>
+
+<p>
+Below is a list of coding conventions that are specific to Velocity,
+everything else not specificially mentioned here should follow the official
+<a href="http://java.sun.com/docs/codeconv/html/CodeConvTOC.doc.html">Sun
+Java Coding Conventions</a>.
+</p>
+
+<p>
+1. Brackets should begin and end on a new line. Examples:
+</p>
+
+<source test=""><![CDATA[
+
+if ( foo )
+{
+    // code here
+}
+
+try
+{
+    // code here
+}
+catch (Exception bar)
+{
+    // code here
+}
+finally
+{
+    // code here
+}
+
+while ( true )
+{
+    // code here
+}
+
+]]></source>
+
+<p>
+2. It is <strong>OK</strong> to have spaces between the parens or not. The
+preference is to not include the extra spaces. For example, both of these are
+ok:
+</p>
+
+<source test=""><![CDATA[
+
+if (foo)
+
+or
+
+if ( foo )
+
+]]></source>
+
+<p>
+3. 4 spaces. <strong>NO</strong> tabs. Period. We understand that a lot of you
+like to use tabs, but the fact of the matter is that in a distributed
+development environment, when the svn commit messages get sent to a mailing
+list, they are almost impossible to read if you use tabs.
+</p>
+
+<p>
+In Emacs-speak, this translates to the following command:
+
+(setq-default tab-width 4 indent-tabs-mode nil)
+
+</p>
+
+<p>
+4. Unix linefeeds for all .java source code files. Other platform specific
+files should have the platform specific linefeeds.
+</p>
+
+<p>
+5. Javadoc <strong>MUST</strong> exist on all your methods. Also, if you are
+working on existing code and there currently isn't a javadoc for that
+method/class/variable or whatever, then you should contribute and add it.
+This will improve the project as a whole.
+</p>
+
+<p>
+6. The <a href="license.html">Apache Software License</a> <strong>MUST</strong> be placed at the top
+of each and every file.
+</p>
+
+<p>
+7. If you contribute to a file (code or documentation), add yourself to the
+top of the file. For java files the preferred Javadoc format is:
+</p>
+
+<source><![CDATA[
+@author <a href="mailto:user@domain.com">John Doe</a>
+]]></source>
+
+<p>
+Thanks for your cooperation.
+</p>
+
+</section>
+
+<section name="More Fun For Emacs">
+
+<p>
+  To make coding easier,  following bit of Emacs LISP does 
+  the 'right thing' with bracing, if you want.
+ </p>
+<source><![CDATA[
+(defun apache-jakarta-mode ()
+  "The Java mode specialization for Apache Jakarta projects."
+  (if (not (assoc "apache-jakarta" c-style-alist))
+      ;; Define the Apache Jakarta cc-mode style.
+      (c-add-style "apache-jakarta" '("java" (indent-tabs-mode . nil))))
+
+  (c-set-style "apache-jakarta")
+  (c-set-offset 'substatement-open 0 nil)
+  (setq mode-name "Apache Jakarta")
+
+  ;; Turn on syntax highlighting when X is running.
+  (if (boundp 'window-system)
+      (progn (setq font-lock-support-mode 'lazy-lock-mode)
+             (font-lock-mode t))))
+
+;; Activate Jakarta mode.
+(if (fboundp 'jde-mode)
+    (add-hook 'jde-mode-hook 'apache-jakarta-mode)
+  (add-hook 'java-mode-hook 'apache-jakarta-mode))
+]]></source>
+
+  <p>
+  Note that  this will apply to all java in emacs. 
+  To control it :
+
+  <ul>
+  <li>
+      Turn off : <code>M-: (remove-hook 'java-mode 'apache-jakarta-mode)</code>
+  </li>
+  <li>
+     Turn on : <code>M-: (add-hook 'java-mode 'apache-jakarta-mode)</code>
+  </li>
+  </ul>
+   'M-:' is &lt;meta&gt; followed by ':', of course.  
+   It will be on by default at startup.
+  </p>
+  
+  <p>
+  This was stolen lock, stock and barrel from the contribution 
+  to the Turbine project by Daniel L. Rall. Thanks Daniel!
+  </p>
+
+</section>
+
+</body>
+</document>
diff --git a/xdocs/developer-guide.xml b/xdocs/developer-guide.xml
index b05767d..f30d092 100644
--- a/xdocs/developer-guide.xml
+++ b/xdocs/developer-guide.xml
@@ -176,7 +176,7 @@
 <ol>
   <li>
     Get the Velocity distribution. This is available as a release, nightly snapshot or
-    directly from the CVS code repository. Any are fine, although for the latest
+    directly from the Subversion code repository. Any are fine, although for the latest
     features, the nightly snapshot is most likely the best way. For more
     information, go <a href="index.html">here</a>.
   </li>
diff --git a/xdocs/devtools.xml b/xdocs/devtools.xml
index 0a7da8c..1af2392 100644
--- a/xdocs/devtools.xml
+++ b/xdocs/devtools.xml
@@ -55,8 +55,8 @@
 
  <p>
  They can  be found
- <a href="http://cvs.apache.org/viewcvs/jakarta-velocity/contrib/tools/intellij/">
- here</a> in the Velocity CVS, or can be found in the /contrib/tools directory
+ <a href="http://svn.apache.org/repos/asf/jakarta/velocity/trunk/contrib/tools/intellij/">
+ here</a> in the Velocity Subversion, or can be found in the /contrib/tools directory
  of the source tree.
 </p>
 
@@ -72,8 +72,8 @@
 
 <p>
  It can  be found
- <a href="http://cvs.apache.org/viewcvs/jakarta-velocity/contrib/tools/ultraedit/">
- here</a> in the Velocity CVS, or can be found in the /contrib/tools directory
+ <a href="http://svn.apache.org/repos/asf/jakarta/velocity/trunk/contrib/tools/ultraedit/">
+ here</a> in the Velocity Subversion, or can be found in the /contrib/tools directory
  of the source tree.
 </p>
 
@@ -97,7 +97,7 @@
 <p>
 Saimon Moore (smoore@serikat.es) contributed a Velocity mode for the java-based
 editor <a href="http://www.jedit.org">JEdit</a>, and can be found here in
-<a href="http://cvs.apache.org/viewcvs/jakarta-velocity/contrib/tools/jedit/">
+<a href="http://svn.apache.org/repos/asf/jakarta/velocity/trunk/contrib/tools/jedit/">
 velocity.xml</a>.
 </p>
 
@@ -132,7 +132,7 @@
 href="http://www.gnu.org/software/emacs/emacs.html">GNU Emacs</a>.  As
 a minor mode, it insinuates itself into whatever major mode you're
 using, so you don't lose the major mode's goodness. It can be found
-<a href="http://cvs.apache.org/viewcvs/jakarta-velocity/contrib/tools/emacs/">
+<a href="http://svn.apache.org/repos/asf/jakarta/velocity/trunk/contrib/tools/emacs/">
 here</a>.</p>
 
 </subsection>
diff --git a/xdocs/index.xml b/xdocs/index.xml
index 8312020..f6e2013 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -239,7 +239,7 @@
 <p>
 If you are willing to risk getting dirty, we invite you to try the
 nightly snapshot to see the current state of affairs (and help out!) <a
-href="http://jakarta.apache.org/site/cvsindex.html">Public CVS
+href="http://www.apache.org/dev/version-control.html">Public Subversion
 access</a> is also available.
 </p>
 
@@ -263,9 +263,9 @@
         href="http://jakarta.apache.org/getinvolved/mail.html">Velocity
         mailing list</a>.</li>
     <li>
-        Access to the CVS <strong>jakarta-velocity</strong> repository is available both
-        <a href="http://cvs.apache.org/viewcvs/jakarta-velocity/">online</a>
-        and with a <a href="http://jakarta.apache.org/getinvolved/cvsindex.html">cvs client</a>.</li>
+        Access to the Subversion <strong>jakarta-velocity</strong> repository is available both
+        <a href="http://svn.apache.org/repos/asf/jakarta/velocity/trunk/">online</a>
+        and with a <a href="http://www.apache.org/dev/version-control.html">Subversion client</a>.</li>
 </ul>
 
 </section>
diff --git a/xdocs/install.xml b/xdocs/install.xml
index c2f8aa0..c1070ab 100644
--- a/xdocs/install.xml
+++ b/xdocs/install.xml
@@ -1,181 +1,181 @@
-<?xml version="1.0"?>

-

-<document>

-

- <properties>

-  <title>Velocity Installation</title>

-  <author email="jvanzyl@zenplex.com">Velocity Documentation Team</author>

- </properties>

-

-<body>

-

-<section name="Installation">

-

-<p>

-Velocity runs on a variety of platforms that have installed the Java 2

-Virtual Machine. The J2SDK is required for users who want to compile

-Velocity from its source code.

-</p>

-

-<p>

-Everything required to build Velocity comes with the distribution, which

-can be obtained from <a

-href="http://jakarta.apache.org/getinvolved/cvsindex.html">CVS</a> or

-from the <a

-href="http://jakarta.apache.org/builds/jakarta-velocity/nightly/">nightly

-builds</a>.  However, you will need to install Ant, an excellent

-Java-based build tool.  Ant is also a Jakarta project, and can be

-found <a href="http://jakarta.apache.org/ant/">here</a>.

-</p>

-

-<p>

-The directory tree of the distribution looks like :

-</p>

-

-<source><![CDATA[

-jakarta-velocity

-  /build        - contains build scripts

-  /bin          - where the built jars / classes will go

-  /src          - sourcecode for Velocity, Anakia, and Texen

-  /docs         - documentation in HTML form

-  /docs/api     - Javadocs for Velocity source

-  /examples     - example/demonstration code

-  /convert      - tools to help convert WebMacro templates

-  /test         - test programs and templates

-  /xdocs        - source for our documentation

-]]></source>

-

-</section>

-

-<section name="Building">

-

-<p>

-To make building Velocity easy and consistant, we require a Jakarta project

-called <a href="http://jakarta.apache.org/ant/">Ant</a> version 1.3 or

-higher to perform the build process. We assume that you have followed

-Ant's installation instructions and have it properly installed.  It's not

-difficult, and I think that you will find it an excellent addition to

-your programmer's toolbox.

-</p>

-

-<p>

-In each case below, it is assumed that you were successful in getting

-the distribution from CVS or as a nightly build, and with the latter,

-were successful in unpacking.  Also, it is assumed that you are starting

-in the 'jakarta-velocity' directory, the root of the distribution tree. 

-All directory references will be relative to 'jakarta-velocity'.

-</p>

-

-<p>

-Change to the <filename>build</filename> directory (<code>cd

-build</code>). Then, to build the jar file, simply type:

-</p>

-

-<source><![CDATA[

-ant

-]]></source>

-

-<p>

-Executing this script will create a <filename>bin</filename> directory

-within the Velocity distribution directory. The <filename>bin</filename>

-directory will contain the compiled class files (inside a

-<filename>classes</filename> directory) as well as a

-<filename>velocity-XX.jar</filename> file, where XX is the current

-version number. Be sure to update your classpath to include Velocity's

-<filename>.jar</filename> file.

-</p>

-

-<p>

-Note that to build any of the specific build targets, as detailed in

-the <a href="developer-guide.html">developers guide</a>, simply add

-the target name to the command line.  For example, to build the Javadoc

-API documentation :

-</p>

-

-<source><![CDATA[

-ant javadocs

-]]></source>

-

-<p>

-Velocity should build 'out of the box', independent of your classpath.

-If you get an error building Velocity, try a different nightly build (as

-sometimes we make a mistake and the CVS at the time of the nightly

-snapshot isn't complete) or refresh from CVS (you might have gotten a

-CVS snapshot while a developer was checking things in.)

-</p>

-

-<p>

-If the problems persist, do not hesitate to ask the Velocity community

-via our mail lists. They can be found <a

-href="http://jakarta.apache.org/site/mail.html">here</a>. Please read

-and understand the the guidelines for participating in any Jakarta mail

-list.

-</p>

-

-</section>

-

-<section name="Testing Your Installation">

-

-<p>

-The Velocity developers use an automated test facility, and it is

-included in the distribution. You can use it to make sure that all is

-well with your build of Velocity.

-</p>

-

-<p>

-To run the test suite, simply use the build target

-<filename>test</filename> when you build :

-</p>

-<source><![CDATA[

-ant test

-]]></source>

-

-<p>

-If all is well, you should see output similar to :

-</p>

-

-<source><![CDATA[

-junittest:

-    [junit] Running org.apache.velocity.util.TestSimplePool

-    [junit] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.025 sec

-

-test:

-

-test-template:

-     [echo] Running Template tests...

-     [java] Adding TemplateTestCase : arithmetic

-     ...

-     ...

-     ...

-     [java] Adding TemplateTestCase : foreach-introspect

-     [java] Adding TemplateTestCase : settest

-     [java] .......................................

-     [java] Time: 1.999

-

-     [java] OK (39 tests)

-

-

-test-velocityapp:

-     [echo] Running app.Velocity tests...

-     [java] .

-     [java] Time: 0.004

-

-     [java] OK (1 tests)

-

-

-...

-

-BUILD SUCCESSFUL

-Total time: 42 seconds

-

-]]></source>

-

-<p>

-Note that the number of tests may vary from those shown above, but if

-you see 'OK' after the tests are run, all is well.  Now it's time to use

-Velocity.

-</p>

-</section>

-

-</body>

+<?xml version="1.0"?>
+
+<document>
+
+ <properties>
+  <title>Velocity Installation</title>
+  <author email="jvanzyl@zenplex.com">Velocity Documentation Team</author>
+ </properties>
+
+<body>
+
+<section name="Installation">
+
+<p>
+Velocity runs on a variety of platforms that have installed the Java 2
+Virtual Machine. The J2SDK is required for users who want to compile
+Velocity from its source code.
+</p>
+
+<p>
+Everything required to build Velocity comes with the distribution, which
+can be obtained from <a
+href="http://www.apache.org/dev/version-control.html">Subversion</a> or
+from the <a
+href="http://jakarta.apache.org/builds/jakarta-velocity/nightly/">nightly
+builds</a>.  However, you will need to install Ant, an excellent
+Java-based build tool.  Ant is also a Jakarta project, and can be
+found <a href="http://jakarta.apache.org/ant/">here</a>.
+</p>
+
+<p>
+The directory tree of the distribution looks like :
+</p>
+
+<source><![CDATA[
+jakarta-velocity
+  /build        - contains build scripts
+  /bin          - where the built jars / classes will go
+  /src          - sourcecode for Velocity, Anakia, and Texen
+  /docs         - documentation in HTML form
+  /docs/api     - Javadocs for Velocity source
+  /examples     - example/demonstration code
+  /convert      - tools to help convert WebMacro templates
+  /test         - test programs and templates
+  /xdocs        - source for our documentation
+]]></source>
+
+</section>
+
+<section name="Building">
+
+<p>
+To make building Velocity easy and consistant, we require a Jakarta project
+called <a href="http://jakarta.apache.org/ant/">Ant</a> version 1.3 or
+higher to perform the build process. We assume that you have followed
+Ant's installation instructions and have it properly installed.  It's not
+difficult, and I think that you will find it an excellent addition to
+your programmer's toolbox.
+</p>
+
+<p>
+In each case below, it is assumed that you were successful in getting
+the distribution from Subversion or as a nightly build, and with the latter,
+were successful in unpacking.  Also, it is assumed that you are starting
+in the 'jakarta-velocity' directory, the root of the distribution tree. 
+All directory references will be relative to 'jakarta-velocity'.
+</p>
+
+<p>
+Change to the <filename>build</filename> directory (<code>cd
+build</code>). Then, to build the jar file, simply type:
+</p>
+
+<source><![CDATA[
+ant
+]]></source>
+
+<p>
+Executing this script will create a <filename>bin</filename> directory
+within the Velocity distribution directory. The <filename>bin</filename>
+directory will contain the compiled class files (inside a
+<filename>classes</filename> directory) as well as a
+<filename>velocity-XX.jar</filename> file, where XX is the current
+version number. Be sure to update your classpath to include Velocity's
+<filename>.jar</filename> file.
+</p>
+
+<p>
+Note that to build any of the specific build targets, as detailed in
+the <a href="developer-guide.html">developers guide</a>, simply add
+the target name to the command line.  For example, to build the Javadoc
+API documentation :
+</p>
+
+<source><![CDATA[
+ant javadocs
+]]></source>
+
+<p>
+Velocity should build 'out of the box', independent of your classpath.
+If you get an error building Velocity, try a different nightly build (as
+sometimes we make a mistake and the Subversion at the time of the nightly
+snapshot isn't complete) or refresh from Subversion (you might have gotten a
+Subversion snapshot while a developer was checking things in.)
+</p>
+
+<p>
+If the problems persist, do not hesitate to ask the Velocity community
+via our mail lists. They can be found <a
+href="http://jakarta.apache.org/site/mail.html">here</a>. Please read
+and understand the the guidelines for participating in any Jakarta mail
+list.
+</p>
+
+</section>
+
+<section name="Testing Your Installation">
+
+<p>
+The Velocity developers use an automated test facility, and it is
+included in the distribution. You can use it to make sure that all is
+well with your build of Velocity.
+</p>
+
+<p>
+To run the test suite, simply use the build target
+<filename>test</filename> when you build :
+</p>
+<source><![CDATA[
+ant test
+]]></source>
+
+<p>
+If all is well, you should see output similar to :
+</p>
+
+<source><![CDATA[
+junittest:
+    [junit] Running org.apache.velocity.util.TestSimplePool
+    [junit] Tests run: 1, Failures: 0, Errors: 0, Time elapsed: 0.025 sec
+
+test:
+
+test-template:
+     [echo] Running Template tests...
+     [java] Adding TemplateTestCase : arithmetic
+     ...
+     ...
+     ...
+     [java] Adding TemplateTestCase : foreach-introspect
+     [java] Adding TemplateTestCase : settest
+     [java] .......................................
+     [java] Time: 1.999
+
+     [java] OK (39 tests)
+
+
+test-velocityapp:
+     [echo] Running app.Velocity tests...
+     [java] .
+     [java] Time: 0.004
+
+     [java] OK (1 tests)
+
+
+...
+
+BUILD SUCCESSFUL
+Total time: 42 seconds
+
+]]></source>
+
+<p>
+Note that the number of tests may vary from those shown above, but if
+you see 'OK' after the tests are run, all is well.  Now it's time to use
+Velocity.
+</p>
+</section>
+
+</body>
 </document>
\ No newline at end of file
diff --git a/xdocs/stylesheets/project.xml b/xdocs/stylesheets/project.xml
index 3b1ea9f..8afb992 100644
--- a/xdocs/stylesheets/project.xml
+++ b/xdocs/stylesheets/project.xml
@@ -23,7 +23,7 @@
         <item name="Powered By Velocity"    href="/powered.html"/>
         <item name="Get Involved"           href="/site/getinvolved.html"/>
         <item name="Mailing Lists"          href="/site/mail.html"/>
-        <item name="CVS Repositories"       href="/site/cvsindex.html"/>
+        <item name="Subversion Repositories" href="http://www.apache.org/dev/version-control.html"/>
     </menu>
     <menu name="Docs">
         <item name="User's Guide (English)" href="/user-guide.html"/>
diff --git a/xdocs/veltag.xml b/xdocs/veltag.xml
index 036df2a..b2ded7e 100644
--- a/xdocs/veltag.xml
+++ b/xdocs/veltag.xml
@@ -1,456 +1,456 @@
-<?xml version="1.0"?>

-

-<document>

-

- <properties>

-  <title>The Velocity JSP Tag Library</title>

-  <author email="geirm@apache.org">Geir Magnusson Jr.</author>

- </properties>

-

-<body>

-

-<section name="Contents">

-

-<ol>

-<li>

-<a href="#So You Have To Use JSP...">So You Have To Use JSP...</a>

-<ul>

-  <li>

-    <a href="#What Are The Advantages">What Are The Advantages?</a>

-  </li>

-</ul>

-</li>

-

-<li>

- <a href="#Using The Velocity Taglib">Using The Velocity Taglib</a>

- <ul>

-  <li>

-    <a href="#Automatic Scope Access">Automatic Scope Access</a>

-  </li>

-  <li>

-    <a href="#Strict Scope Access">Strict Scope Access</a>

-  </li>

-</ul>

-</li>

-

-<li>

-<a href="#Building The Velocity Taglib">Building The Velocity Taglib</a>

-<ul>

-  <li>

-    <a href="#JJAR build">Build Using JJAR</a>

-  </li>

-  <li>

-    <a href="#nonJJAR build">Non-JJAR Traditional Build</a>

-  </li>

-</ul>

-</li>

-

-<li>

-<a href="#Configuration">Configuration</a>

-</li>

-</ol>

-

-</section>

-

-<section name="So You Have To Use JSP...">

-

-<p>

- Sometimes it appears you don't have a choice - technology decisions are 

- made based on all sorts of factors, ranging from network externalities

-("They're using it - I should too...") to legacy considerations

-("They used it - I have to...").

-</p>

-

-<p>

-In the event where the usage of JSP is mandatory, we offer a JSP tag library that lets 

-you take advantage of the simple control directives and powerful binding to the

-Java object model offered by Velocity.  Using Velocity in your JSPs is as 

-simple as :

-</p>

-

-<source><![CDATA[

-<%@ taglib uri="/WEB-INF/veltag.tld" prefix="vel" %>

-

-<html>

-<head>

-  <title> Velocity! </title>

-</head>

-

-<jsp:useBean id="mybean"  class="GeirBean" />

-

-<body>

-    <vel:velocity strictaccess="true">

-

-         #set($mybean = $scopetool.getPageScope("mybean"))

-

-         #if(true)

-            this is true!

-         #end

-

-         <br>

-

-         $mybean.string

-

-         <br>

-

-        #foreach($item in $mybean.array) 

-            $item <br>

-        #end

-

-    </vel:velocity>

-</body>

-</html>

-]]></source>

-

-<p>

-Not hard at all, is it?

-</p>

-

-<a name="What Are The Advantages"><strong>What Are The Advantages?</strong></a>

-

-<p>

-The first question asked when confronted with this subject is something 

-along the lines of "What advantage does this have over 'pure' Velocity?".  

-Generally, there are few reasons why one would take a Velocity-only 

-system, and convert it to a JSP system with Velocity embedded in the 

-JSP pages.  The only reason that you might want to do this is to use 

-an existing JSP taglib that you want to use that you don't have the 

-source code for, or don't wish to dig out the core functional classes 

-of a taglib you do have the source for.  Otherwise, you could just drop

-those core classes in the Context, and access them directly from within

-the Velocity template.

-</p>

-

-<p>

-The advantages, then, are found in a JSP-centric environment, where an

-existing application is already written in JSP and you wish to add or

-maintain functionality.  Some things that Velocity provides :

-</p>

-

-<ul>

-<li> 

-     Simple access to Java objects, without any need to create a taglib

-     shell.  If it has public methods on a public interface, you can 

-     drop it right into a scope and access directly (or use a tool to 

-     create an instances of the class for you.)

-</li>

-<li> 

-     Simple access to complicated Java objects.  It's not clear how to 

-     access an arbitrary call chain such as $foo.bar( $thing ).getIterator().hasNext() 

-     in JSP.

-</li>

-<li> 

-     Although this is a matter of personal taste, some people prefer the

-     control directives of Velocity ( #if(), #else(), #elseif(), #foreach() )

-     to the various taglibs that offer the same functionality.

-     <i>De gustibus non est disputandum!</i>.

-</li>

-<li> 

-     An easy bridge between complicated Java objects and JSP - for example

-     if you wished to dynamically choose/create an object at runtime, and

-     then poke into a scope for access in other parts of the JSP, you could

-     do that.

-     <pre>

-         &lt;vel:velocity strictaccess="true"&gt;

-             #set($reqbean = $scopetool.getRequestScope("beaninrequest"))

-             #set($newthing = $reqbean.getThing().makeBlue("azure"))

-             $request.getSession().setAttribute("bluething", $newthing)

-         &lt;/vel:velocity&gt;

-     </pre>

-     Or something like that :)

-</li>

-<li>

-     If nothing else, there are always the Velocimacros.

-</li>

-</ul>

-

-</section>

-

-<section name="Using The Velocity Taglib">

-

-<p>

-The biggest challenge in bringing together Velocity and JSP is the 

-'impedance matching' related to scope and bean access.  'Scope', 

-the fundamental storage mechanism in JSP, is a 

-concept that comes from the underlying servlet API, where data objects 

-are stored for later retrieval within the page, request, session or

-application.  Velocity organizes data in a non-hierachical mechanism 

-called the 'context', the expectation being that a controller servlet

-or other non-view code will manage and organize the data accessable 

-to the template.

-</p>

-

-<p>

-So to make data access in JSPs easy using the Velocity taglib, two 

-separate approaches are offered.  These two approaches, automatic

-access and strict access, allow two distinct ways of managing and 

-accessing data.  These two ways can also be used together.

-</p>

-

-<a name="Automatic Scope Access"><strong>Automatic Scope Access</strong></a>

-

-<p>

-The first way, automatic access, is the most convenient.  When an 

-object is referenced (via a VTL 'reference'), the scopes are searched

-to find an object with the same id.  The scopes are searched in the 

-order of :

-</p>

-

-<ol>

-<li> page scope </li>

-<li> request scope </li>

-<li> session scope </li>

-<li> application scope </li>

-</ol>

-

-<p> 

-Automatic scope access is enabled by default.  To use 

-automatic scope access, just access the bean by name. For example :

-</p>

-

-<source><![CDATA[

-<!-- place a bean in page scope -->

-<jsp:useBean id="mybean"  class="GeirBean" />

-

- <vel:velocity>

-

-    <!-- just access by id - the context -->

-    <!-- will find it automatically      -->

-

-    #foreach($item in $mybean.array) 

-       $item <br>

-    #end

-

-</vel:velocity>

-]]></source>

-

-<p>

-While automatic scope access is the easier of the two methods, 

-integrating with existing applications might require using the

-other access mode, strict scope access, or a combination of the

-two.

-</p>

-

-<a name="Strict Scope Access"><strong>Strict Scope Access</strong></a>

-  <p>

-   The alternative (or addition to) Automatic Scope Access is something called 

-   <i>Strict Scope Access</i>.  Strict Scope Acccess means that the Velocity

-   Context won't search the scopes for you - you must retrieve objects directly

-   using ScopeTool that is provided for your use in the template.  This is a 

-   closer model to that of regular JSP, where the designer must be aware of 

-   the scopes that objects are stored in.

-  </p>

-

-   <p>

-   For example, the following snippet of JSP shows how the scopetool is used to

-   access an object in the request scope, and add it to the Velocity context.

-   Note how the <code>strictaccess</code> property is set to true in the

-   <code>&lt;vel:velocity strictaccess="true"&gt;</code> tag.  This tells 

-   the Veltag taglib to not do any automatic scope searching.  Note that you can

-   mix the two modes, leaving off (or setting to false) <code>strictaccess</code>

-   and also using the scopetool to eliminate any question about the source

-   of an object.

-  </p>

-

-<source><![CDATA[

-<jsp:useBean id="beaninrequest" class="GeirBean" scope="request" />

-

-<vel:velocity strictaccess="true">

-

-         #set($reqbean = $scopetool.getRequestScope("beaninrequest"))

-

-         $reqbean.string

-

-         <br>

-

-        #foreach($item in $reqbean.array) 

-            $item <br>

-        #end

-

-</vel:velocity>

-]]></source>

-

-<p>

-Again, pretty straightforward.

-</p>

-

-</section>

-

-<section name="Building The Velocity Taglib">

-

-<p>

-To use the Velocity taglib, you need to build it, as it is not 

-yet included in the main Velocity jar.  In the Jakarta tradition,

-we made it very easy to build.  The code for the project is 

-located in the contrib section of the distribution under 

-<code>/contrib/temporary/veltag</code>.  It is under the 

-temporary directory as it is hoped this package will

-be accepted by the 

-<a href="http://jakarta.apache.org/taglibs/">Jakarta Taglibs</a>

-project.

-</p>

-

-<a name="JJAR build"><strong>The Easy, JJAR Way</strong></a>

-

-<p>

-The Veltag taglib can be built using a new, <b>experimental</b> 

-jar management tool called <em>JJAR</em>

-(Jakarta Jar Archive &amp; Repository) which makes finding and retrieving the

-dependencies to build the taglib simple.

-</p>

-

-<p>

- <i>Please note that JJAR is 

-currently a work in progress - while every effort will be made to ensure

-that the JJAR-based build works, it may not always be so.  In that case, 

-do it the regular way, listed below.</i>

-</p>

-

-<p>

-To build with JJAR :

-</p>

-

-<ol>

-<li> 

-  <a href="http://jakarta.apache.org/ant/">Ant</a>, the fabulous

-  Jakarta build tool, must be installed.

-</li>

-<li>

-   Get the Velocity distribution from CVS or a nightly snapshot.

-</li>

-<li>

-   Change directory to the <code>/contrib/temporary/veltag</code>

-   directory in the Velocity distribution.

-</li>

-<li>

-   Type :

-    <pre>

-      $ ant getjars

-    </pre>

-    This will fetch JJAR and then use JJAR to fetch the dependencies du

-    jour for Veltag.

-</li>

-<li>

-   Type :

-     <pre>

-      $ant jar

-     </pre>

-    which will build the veltag-XX.jar (XX = current version).

-</li>

-</ol>

-

-<p>

-That's it.  Pretty easy.

-</p>

-

-<a name="nonJJAR build"><strong>The JJAR-Is-A-Work-In-Progress Way</strong></a>

-

-<p>

-In the event the JJAR-based build is broken, or you just enjoy

-schlepping around finding jars, do the following to build Veltag.

-</p>

-

-<p>

-To build, you need the following :

-</p>

-

-<ul>

-<li> 

-  <a href="http://jakarta.apache.org/ant/">Ant</a>, the fabulous

-  Jakarta build tool, must be installed.

-</li>

-<li>

-  You will need a servlet API jar.  We recommend you get it from

-  <a href="http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.2.3/bin/">here</a> 

-  for servlet 2.2 and

-  <a href="http://jakarta.apache.org/builds/jakarta-servletapi-4/nightly/">here</a>

-  for the unreleased servlet 2.3 API.  Note - if you are a JSP user, you will have 

-  one included with your servlet engine.

-</li>

-<li> 

-   A velocity.jar.  This can be found, of course,

-  <a href="http://jakarta.apache.org/velocity/">here</a>.

-</li>

-<li> 

-  The build script expects to find the servlet and velocity jars in the

-  <code>/contrib/temporary/veltag/lib/</code>

-   directory.  Modification

-  of the build script is easy if they are in another location.  Look for

-  'servlet.home' and 'velocity.home' in the 

-  <code>/contrib/temporary/veltag/build.xml</code> file.

-</li>

-<li>

-  Once the above is complete, cd into 

-  <code>/contrib/temporary/veltag</code> in the Velocity

-  distribution and type 'ant'.  The jar should build

-  for you.

-</li>

-</ul>

-</section>

-

-<section name="Configuration">

-

-<p>

-Using the taglib is very straightforward.  The following assumes

-that you have setup a servlet container with JSP support, such as 

-<a href="http://jakarta.apache.org/tomcat/">Tomcat</a>, and know

-enough to write and view a simple JSP page.  Also, all directory 

-references are relative to the root of the veltag project, not 

-the Velocity distribution.

-</p>

-

-<p>

-To test the Velocity Taglib :

-</p>

-

-<blockquote>

-   You need to copy the veltag-XX.jar to the

-   <code>WEB-INF/lib</code> directory of your webapp. (Where XX 

-   is the current version number.

-</blockquote>

-<blockquote>

-   Take the example taglib descriptor,

-   <code> /examples/veltag.tld</code> and place in WEB-INF of your

-   webapp.

-</blockquote>

-<blockquote>

-  Finally, add 

-  <pre>

-    &lt;taglib&gt;

-      &lt;taglib-uri&gt;http://jakarta.apache.org/taglibs/veltag-1.0&lt;/taglib-uri&gt;

-      &lt;taglib-location&gt;/WEB-INF/veltag.tld&lt;/taglib-location&gt;

-    &lt;/taglib&gt;

-  </pre>

-  to your web.xml file, within the &lt;webapp&gt; section.

-</blockquote>

-

-<p>

-If you wish to use the included example JSP, you will also need to compile

-<code>examples/SimpleBean.java</code> and place the resulting 

-<code>SimpleBean.class</code> into the <code>WEB-INF/classes</code>

-directory in your webapp.

-</p>

-

-<p>

-  After that, try the example JSP found in <code>examples/</code>.  Drop it

-  into the root of your webapp and view it with your browser. Enjoy!

-</p>

-

-<p>

-Please direct all comments, questions, fixes and contributions to 

-<a href="mailto:geirm@apache.org?SUBJECT=Veltag">Geir Magnusson Jr.</a> or the

-Velocity user list.  To subscribe to the Velocity lists, read 

-<a href="http://jakarta.apache.org/site/mail.html">this</a> and follow the 

-instructions at the end.

-</p>

-

-<p>

-  Please note that this code is not an official part of the Velocity

-  distribution.

-</p>

-

-</section>

-

-</body>

-</document>

-

+<?xml version="1.0"?>
+
+<document>
+
+ <properties>
+  <title>The Velocity JSP Tag Library</title>
+  <author email="geirm@apache.org">Geir Magnusson Jr.</author>
+ </properties>
+
+<body>
+
+<section name="Contents">
+
+<ol>
+<li>
+<a href="#So You Have To Use JSP...">So You Have To Use JSP...</a>
+<ul>
+  <li>
+    <a href="#What Are The Advantages">What Are The Advantages?</a>
+  </li>
+</ul>
+</li>
+
+<li>
+ <a href="#Using The Velocity Taglib">Using The Velocity Taglib</a>
+ <ul>
+  <li>
+    <a href="#Automatic Scope Access">Automatic Scope Access</a>
+  </li>
+  <li>
+    <a href="#Strict Scope Access">Strict Scope Access</a>
+  </li>
+</ul>
+</li>
+
+<li>
+<a href="#Building The Velocity Taglib">Building The Velocity Taglib</a>
+<ul>
+  <li>
+    <a href="#JJAR build">Build Using JJAR</a>
+  </li>
+  <li>
+    <a href="#nonJJAR build">Non-JJAR Traditional Build</a>
+  </li>
+</ul>
+</li>
+
+<li>
+<a href="#Configuration">Configuration</a>
+</li>
+</ol>
+
+</section>
+
+<section name="So You Have To Use JSP...">
+
+<p>
+ Sometimes it appears you don't have a choice - technology decisions are 
+ made based on all sorts of factors, ranging from network externalities
+("They're using it - I should too...") to legacy considerations
+("They used it - I have to...").
+</p>
+
+<p>
+In the event where the usage of JSP is mandatory, we offer a JSP tag library that lets 
+you take advantage of the simple control directives and powerful binding to the
+Java object model offered by Velocity.  Using Velocity in your JSPs is as 
+simple as :
+</p>
+
+<source><![CDATA[
+<%@ taglib uri="/WEB-INF/veltag.tld" prefix="vel" %>
+
+<html>
+<head>
+  <title> Velocity! </title>
+</head>
+
+<jsp:useBean id="mybean"  class="GeirBean" />
+
+<body>
+    <vel:velocity strictaccess="true">
+
+         #set($mybean = $scopetool.getPageScope("mybean"))
+
+         #if(true)
+            this is true!
+         #end
+
+         <br>
+
+         $mybean.string
+
+         <br>
+
+        #foreach($item in $mybean.array) 
+            $item <br>
+        #end
+
+    </vel:velocity>
+</body>
+</html>
+]]></source>
+
+<p>
+Not hard at all, is it?
+</p>
+
+<a name="What Are The Advantages"><strong>What Are The Advantages?</strong></a>
+
+<p>
+The first question asked when confronted with this subject is something 
+along the lines of "What advantage does this have over 'pure' Velocity?".  
+Generally, there are few reasons why one would take a Velocity-only 
+system, and convert it to a JSP system with Velocity embedded in the 
+JSP pages.  The only reason that you might want to do this is to use 
+an existing JSP taglib that you want to use that you don't have the 
+source code for, or don't wish to dig out the core functional classes 
+of a taglib you do have the source for.  Otherwise, you could just drop
+those core classes in the Context, and access them directly from within
+the Velocity template.
+</p>
+
+<p>
+The advantages, then, are found in a JSP-centric environment, where an
+existing application is already written in JSP and you wish to add or
+maintain functionality.  Some things that Velocity provides :
+</p>
+
+<ul>
+<li> 
+     Simple access to Java objects, without any need to create a taglib
+     shell.  If it has public methods on a public interface, you can 
+     drop it right into a scope and access directly (or use a tool to 
+     create an instances of the class for you.)
+</li>
+<li> 
+     Simple access to complicated Java objects.  It's not clear how to 
+     access an arbitrary call chain such as $foo.bar( $thing ).getIterator().hasNext() 
+     in JSP.
+</li>
+<li> 
+     Although this is a matter of personal taste, some people prefer the
+     control directives of Velocity ( #if(), #else(), #elseif(), #foreach() )
+     to the various taglibs that offer the same functionality.
+     <i>De gustibus non est disputandum!</i>.
+</li>
+<li> 
+     An easy bridge between complicated Java objects and JSP - for example
+     if you wished to dynamically choose/create an object at runtime, and
+     then poke into a scope for access in other parts of the JSP, you could
+     do that.
+     <pre>
+         &lt;vel:velocity strictaccess="true"&gt;
+             #set($reqbean = $scopetool.getRequestScope("beaninrequest"))
+             #set($newthing = $reqbean.getThing().makeBlue("azure"))
+             $request.getSession().setAttribute("bluething", $newthing)
+         &lt;/vel:velocity&gt;
+     </pre>
+     Or something like that :)
+</li>
+<li>
+     If nothing else, there are always the Velocimacros.
+</li>
+</ul>
+
+</section>
+
+<section name="Using The Velocity Taglib">
+
+<p>
+The biggest challenge in bringing together Velocity and JSP is the 
+'impedance matching' related to scope and bean access.  'Scope', 
+the fundamental storage mechanism in JSP, is a 
+concept that comes from the underlying servlet API, where data objects 
+are stored for later retrieval within the page, request, session or
+application.  Velocity organizes data in a non-hierachical mechanism 
+called the 'context', the expectation being that a controller servlet
+or other non-view code will manage and organize the data accessable 
+to the template.
+</p>
+
+<p>
+So to make data access in JSPs easy using the Velocity taglib, two 
+separate approaches are offered.  These two approaches, automatic
+access and strict access, allow two distinct ways of managing and 
+accessing data.  These two ways can also be used together.
+</p>
+
+<a name="Automatic Scope Access"><strong>Automatic Scope Access</strong></a>
+
+<p>
+The first way, automatic access, is the most convenient.  When an 
+object is referenced (via a VTL 'reference'), the scopes are searched
+to find an object with the same id.  The scopes are searched in the 
+order of :
+</p>
+
+<ol>
+<li> page scope </li>
+<li> request scope </li>
+<li> session scope </li>
+<li> application scope </li>
+</ol>
+
+<p> 
+Automatic scope access is enabled by default.  To use 
+automatic scope access, just access the bean by name. For example :
+</p>
+
+<source><![CDATA[
+<!-- place a bean in page scope -->
+<jsp:useBean id="mybean"  class="GeirBean" />
+
+ <vel:velocity>
+
+    <!-- just access by id - the context -->
+    <!-- will find it automatically      -->
+
+    #foreach($item in $mybean.array) 
+       $item <br>
+    #end
+
+</vel:velocity>
+]]></source>
+
+<p>
+While automatic scope access is the easier of the two methods, 
+integrating with existing applications might require using the
+other access mode, strict scope access, or a combination of the
+two.
+</p>
+
+<a name="Strict Scope Access"><strong>Strict Scope Access</strong></a>
+  <p>
+   The alternative (or addition to) Automatic Scope Access is something called 
+   <i>Strict Scope Access</i>.  Strict Scope Acccess means that the Velocity
+   Context won't search the scopes for you - you must retrieve objects directly
+   using ScopeTool that is provided for your use in the template.  This is a 
+   closer model to that of regular JSP, where the designer must be aware of 
+   the scopes that objects are stored in.
+  </p>
+
+   <p>
+   For example, the following snippet of JSP shows how the scopetool is used to
+   access an object in the request scope, and add it to the Velocity context.
+   Note how the <code>strictaccess</code> property is set to true in the
+   <code>&lt;vel:velocity strictaccess="true"&gt;</code> tag.  This tells 
+   the Veltag taglib to not do any automatic scope searching.  Note that you can
+   mix the two modes, leaving off (or setting to false) <code>strictaccess</code>
+   and also using the scopetool to eliminate any question about the source
+   of an object.
+  </p>
+
+<source><![CDATA[
+<jsp:useBean id="beaninrequest" class="GeirBean" scope="request" />
+
+<vel:velocity strictaccess="true">
+
+         #set($reqbean = $scopetool.getRequestScope("beaninrequest"))
+
+         $reqbean.string
+
+         <br>
+
+        #foreach($item in $reqbean.array) 
+            $item <br>
+        #end
+
+</vel:velocity>
+]]></source>
+
+<p>
+Again, pretty straightforward.
+</p>
+
+</section>
+
+<section name="Building The Velocity Taglib">
+
+<p>
+To use the Velocity taglib, you need to build it, as it is not 
+yet included in the main Velocity jar.  In the Jakarta tradition,
+we made it very easy to build.  The code for the project is 
+located in the contrib section of the distribution under 
+<code>/contrib/temporary/veltag</code>.  It is under the 
+temporary directory as it is hoped this package will
+be accepted by the 
+<a href="http://jakarta.apache.org/taglibs/">Jakarta Taglibs</a>
+project.
+</p>
+
+<a name="JJAR build"><strong>The Easy, JJAR Way</strong></a>
+
+<p>
+The Veltag taglib can be built using a new, <b>experimental</b> 
+jar management tool called <em>JJAR</em>
+(Jakarta Jar Archive &amp; Repository) which makes finding and retrieving the
+dependencies to build the taglib simple.
+</p>
+
+<p>
+ <i>Please note that JJAR is 
+currently a work in progress - while every effort will be made to ensure
+that the JJAR-based build works, it may not always be so.  In that case, 
+do it the regular way, listed below.</i>
+</p>
+
+<p>
+To build with JJAR :
+</p>
+
+<ol>
+<li> 
+  <a href="http://jakarta.apache.org/ant/">Ant</a>, the fabulous
+  Jakarta build tool, must be installed.
+</li>
+<li>
+   Get the Velocity distribution from Subversion or a nightly snapshot.
+</li>
+<li>
+   Change directory to the <code>/contrib/temporary/veltag</code>
+   directory in the Velocity distribution.
+</li>
+<li>
+   Type :
+    <pre>
+      $ ant getjars
+    </pre>
+    This will fetch JJAR and then use JJAR to fetch the dependencies du
+    jour for Veltag.
+</li>
+<li>
+   Type :
+     <pre>
+      $ant jar
+     </pre>
+    which will build the veltag-XX.jar (XX = current version).
+</li>
+</ol>
+
+<p>
+That's it.  Pretty easy.
+</p>
+
+<a name="nonJJAR build"><strong>The JJAR-Is-A-Work-In-Progress Way</strong></a>
+
+<p>
+In the event the JJAR-based build is broken, or you just enjoy
+schlepping around finding jars, do the following to build Veltag.
+</p>
+
+<p>
+To build, you need the following :
+</p>
+
+<ul>
+<li> 
+  <a href="http://jakarta.apache.org/ant/">Ant</a>, the fabulous
+  Jakarta build tool, must be installed.
+</li>
+<li>
+  You will need a servlet API jar.  We recommend you get it from
+  <a href="http://jakarta.apache.org/builds/jakarta-tomcat/release/v3.2.3/bin/">here</a> 
+  for servlet 2.2 and
+  <a href="http://jakarta.apache.org/builds/jakarta-servletapi-4/nightly/">here</a>
+  for the unreleased servlet 2.3 API.  Note - if you are a JSP user, you will have 
+  one included with your servlet engine.
+</li>
+<li> 
+   A velocity.jar.  This can be found, of course,
+  <a href="http://jakarta.apache.org/velocity/">here</a>.
+</li>
+<li> 
+  The build script expects to find the servlet and velocity jars in the
+  <code>/contrib/temporary/veltag/lib/</code>
+   directory.  Modification
+  of the build script is easy if they are in another location.  Look for
+  'servlet.home' and 'velocity.home' in the 
+  <code>/contrib/temporary/veltag/build.xml</code> file.
+</li>
+<li>
+  Once the above is complete, cd into 
+  <code>/contrib/temporary/veltag</code> in the Velocity
+  distribution and type 'ant'.  The jar should build
+  for you.
+</li>
+</ul>
+</section>
+
+<section name="Configuration">
+
+<p>
+Using the taglib is very straightforward.  The following assumes
+that you have setup a servlet container with JSP support, such as 
+<a href="http://jakarta.apache.org/tomcat/">Tomcat</a>, and know
+enough to write and view a simple JSP page.  Also, all directory 
+references are relative to the root of the veltag project, not 
+the Velocity distribution.
+</p>
+
+<p>
+To test the Velocity Taglib :
+</p>
+
+<blockquote>
+   You need to copy the veltag-XX.jar to the
+   <code>WEB-INF/lib</code> directory of your webapp. (Where XX 
+   is the current version number.
+</blockquote>
+<blockquote>
+   Take the example taglib descriptor,
+   <code> /examples/veltag.tld</code> and place in WEB-INF of your
+   webapp.
+</blockquote>
+<blockquote>
+  Finally, add 
+  <pre>
+    &lt;taglib&gt;
+      &lt;taglib-uri&gt;http://jakarta.apache.org/taglibs/veltag-1.0&lt;/taglib-uri&gt;
+      &lt;taglib-location&gt;/WEB-INF/veltag.tld&lt;/taglib-location&gt;
+    &lt;/taglib&gt;
+  </pre>
+  to your web.xml file, within the &lt;webapp&gt; section.
+</blockquote>
+
+<p>
+If you wish to use the included example JSP, you will also need to compile
+<code>examples/SimpleBean.java</code> and place the resulting 
+<code>SimpleBean.class</code> into the <code>WEB-INF/classes</code>
+directory in your webapp.
+</p>
+
+<p>
+  After that, try the example JSP found in <code>examples/</code>.  Drop it
+  into the root of your webapp and view it with your browser. Enjoy!
+</p>
+
+<p>
+Please direct all comments, questions, fixes and contributions to 
+<a href="mailto:geirm@apache.org?SUBJECT=Veltag">Geir Magnusson Jr.</a> or the
+Velocity user list.  To subscribe to the Velocity lists, read 
+<a href="http://jakarta.apache.org/site/mail.html">this</a> and follow the 
+instructions at the end.
+</p>
+
+<p>
+  Please note that this code is not an official part of the Velocity
+  distribution.
+</p>
+
+</section>
+
+</body>
+</document>
+
diff --git a/xdocs/ymtd/ymtd.xml b/xdocs/ymtd/ymtd.xml
index 4f0f67f..8e3786a 100644
--- a/xdocs/ymtd/ymtd.xml
+++ b/xdocs/ymtd/ymtd.xml
@@ -111,10 +111,10 @@
 It is very important to accurately compare these technologies.
 Therefore, a lot of effort has gone into this essay to state things as
 fairly and accurately as possible. Therefore, this entire essay is
-checked into CVS and it is possible for you to provide feedback, but
+checked into Subversion and it is possible for you to provide feedback, but
 also patches that fix any mistakes. In other words, this is a community
 driven document. It is currently stored in the <a
-href="http://jakarta.apache.org/site/cvsindex.html">CVS tree</a> for the
+href="http://www.apache.org/dev/version-control.html">Subversion tree</a> for the
 Velocity project in the xdocs directory.
 </p>