diff --git a/xdocs/antlibs/antunit/index.xml b/xdocs/antlibs/antunit/index.xml
index 3fdf76fe7..a089dabe4 100644
--- a/xdocs/antlibs/antunit/index.xml
+++ b/xdocs/antlibs/antunit/index.xml
@@ -61,7 +61,7 @@
       soon it was clear that most tests needed to perform common tasks
       like reading a build file, initializing a project instance with
       it and executing a target.  At this point <a
-      href="http://svn.apache.org/viewcvs.cgi/ant/core/trunk/src/testcases/org/apache/tools/ant/BuildFileTest.java">BuildFileTest</a>
+      href="http://svn.apache.org/viewvc/ant/core/trunk/src/testcases/org/apache/tools/ant/BuildFileTest.java">BuildFileTest</a>
       was invented, a base class for almost all task test cases.</p>
 
       <p>BuildFileTest works fine and in fact has been picked up by <a
diff --git a/xdocs/antlibs/proper.xml b/xdocs/antlibs/proper.xml
index 599f8ddd6..8b0290010 100644
--- a/xdocs/antlibs/proper.xml
+++ b/xdocs/antlibs/proper.xml
@@ -45,7 +45,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/antlibs/antunit/trunk/">http://svn.apache.org/viewcvs.cgi/ant/antlibs/antunit/trunk/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/">http://svn.apache.org/viewvc/ant/antlibs/antunit/trunk/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -83,7 +83,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/antlibs/compress/trunk/">http://svn.apache.org/viewcvs.cgi/ant/antlibs/compress/trunk/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/">http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -126,7 +126,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/antlibs/dotnet/trunk/">http://svn.apache.org/viewcvs.cgi/ant/antlibs/dotnet/trunk/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/">http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -164,7 +164,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/antlibs/props/trunk/">http://svn.apache.org/viewcvs.cgi/ant/antlibs/props/trunk/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/antlibs/props/trunk/">http://svn.apache.org/viewvc/ant/antlibs/props/trunk/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
diff --git a/xdocs/antlibs/sandbox.xml b/xdocs/antlibs/sandbox.xml
index bf6402808..03a784173 100644
--- a/xdocs/antlibs/sandbox.xml
+++ b/xdocs/antlibs/sandbox.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-     Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You under the Apache License, Version 2.0
@@ -50,7 +50,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/dbpatch/">http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/dbpatch/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/sandbox/antlibs/dbpatch/">http://svn.apache.org/viewvc/ant/sandbox/antlibs/dbpatch/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -78,7 +78,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/debian/trunk/">http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/debian/trunk/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/sandbox/antlibs/debian/trunk/">http://svn.apache.org/viewvc/ant/sandbox/antlibs/debian/trunk/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -108,7 +108,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/fscache/trunk/">http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/fscache/trunk/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/sandbox/antlibs/fscache/trunk/">http://svn.apache.org/viewvc/ant/sandbox/antlibs/fscache/trunk/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -195,7 +195,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/manual4eclipse/trunk/">http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/manual4eclipse/trunk/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/sandbox/antlibs/manual4eclipse/trunk/">http://svn.apache.org/viewvc/ant/sandbox/antlibs/manual4eclipse/trunk/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -226,7 +226,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/minify/">http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/minify/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/sandbox/antlibs/minify/">http://svn.apache.org/viewvc/ant/sandbox/antlibs/minify/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -252,7 +252,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/starteam/">http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/starteam/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/sandbox/antlibs/starteam/">http://svn.apache.org/viewvc/ant/sandbox/antlibs/starteam/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -308,7 +308,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/weblogic/">http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/weblogic/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/sandbox/antlibs/weblogic/">http://svn.apache.org/viewvc/ant/sandbox/antlibs/weblogic/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>
@@ -341,7 +341,7 @@
           </tr>
           <tr>
             <th>ViewSVN:</th>
-            <td><a href="http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/antunit/trunk/">http://svn.apache.org/viewcvs.cgi/ant/sandbox/antlibs/antunit/trunk/</a></td>
+            <td><a href="http://svn.apache.org/viewvc/ant/sandbox/antlibs/antunit/trunk/">http://svn.apache.org/viewvc/ant/sandbox/antlibs/antunit/trunk/</a></td>
           </tr>
           <tr>
             <th>Ant compatibility:</th>