reverting previous changes in docs.xml because we need velocity 1.4 to maintain these pages.

updating generated html pages

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@906296 13f79535-47bb-0310-9956-ffa450edef68

docs.xml

@@ -22,23 +22,15 @@
         
         For building XDocs, edit xdocs/**/*.xml first.
         If ../jakarta-site2 does not exist, set -Dsite.dir=... for it,
-        or just use -Danakia.dir=.../anakia-1.0.x if you have downloaded Anakia somewhere.
-    	Anakia can be downloaded from http://velocity.apache.org/download.cgi
+        or just use -Dvelocity.dir=.../velocity-1.4.x if you have downloaded Velocity somewhere.
 
         XXX for no apparent reason, your CWD must be the main Ant source dir, or this will fail:
         .../docs.xml:64: org.apache.velocity.exception.ResourceNotFoundException: Unable to find resource './site.vsl'
-
-        After this generation the pages in docs/ should be up-to-date and need to be committed.
         
-        http://www.apache.org/dev/project-site.html#intro describes the routine of
-        updating the online homepage:
-        * log in to people.apache.org and run 'svn up' in /www/ant.apache.org/
-          (make sure your umask is 002 before you do that so the pages remain group writable).
-          
-        people.apache.org is not the live site, it is rsynced to the public site regularly
-        (once an hour ?). You can view your changes before they go into production by using
-        a trick with your web browser. Temporarily set the preferences to use 140.211.11.10:80
-        as your HTTP proxy.
+        After this generation the pages in docs/ should be up-to-date and need to be committed.
+        Since I don't remember whether there is a cron job updating the site I
+        usually log in to people.apache.org and run 'svn up' in /www/ant.apache.org/
+        (make sure your umask is 002 before you do that so the pages remain group writable).
     </description>
 
     <!-- Initialization properties -->
@@ -50,16 +42,19 @@
     <property name="velocity.props"   location="${docs.src}/velocity.properties" />
     <property name="include.xml"  value="**/*.xml" />
 
-    <target name="setup-explicit-classpath" if="anakia.dir">
+    <target name="setup-explicit-classpath" if="velocity.dir">
         <path id="anakia.classpath">
-            <fileset dir="${anakia.dir}">
-                <include name="anakia-*.jar"/>
-                <include name="lib/*.jar"/>
+            <fileset dir="${velocity.dir}">
+                <include name="velocity-dep-*.jar"/>
+                <include name="velocity-*-dep.jar"/>
+                <!-- XXX why is this needed separately? -->
+                <include name="build/lib/jdom-*.jar"/>
+                <include name="lib/jdom-*.jar"/>
             </fileset>
         </path>
     </target>
 
-    <target name="setup-implicit-classpath" unless="anakia.dir">
+    <target name="setup-implicit-classpath" unless="velocity.dir">
         <property name="site.dir" location="../jakarta-site2"/>
         <path id="anakia.classpath">
             <fileset dir="${site.dir}/lib">

docs/antlibs/proper.html

@@ -490,86 +490,6 @@
       valign="top" align="left">
           None
       </td>
-      </tr>
-          </table>
-                                                    <a name="svn" />
-                                      <h4 class="subsection">
-        <a name="SVN - Subversion Support"></a>
-        SVN - Subversion Support
-      </h4>
-                        <p>Contains tasks that correspond to Ant's &lt;cvs&gt;,
-        &lt;cvschangelog&gt; and &lt;cvstagdiff&gt; tasks.  Requires
-        Subversion's command line client.</p>
-                                      <table class="ForrestTable" cellspacing="1" cellpadding="4">
-              <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          Homepage:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          <a href="./svn/index.html">http://ant.apache.org/antlibs/svn/</a>
-      </td>
-      </tr>
-                  <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          SVN URL:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          <a href="https://svn.apache.org/repos/asf/ant/antlibs/svn/trunk/">https://svn.apache.org/repos/asf/ant/antlibs/svn/trunk/</a>
-      </td>
-      </tr>
-                  <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          ViewSVN:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          <a href="http://svn.apache.org/viewcvs.cgi/ant/antlibs/svn/trunk/">http://svn.apache.org/viewcvs.cgi/ant/antlibs/svn/trunk/</a>
-      </td>
-      </tr>
-                  <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          Ant compatibility:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          Ant 1.7.x
-      </td>
-      </tr>
-                  <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          Added to sandbox:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          2005-04-15
-      </td>
-      </tr>
-                  <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          Promoted from sandbox:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          2005-11-22
-      </td>
-      </tr>
-                  <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          Latest Release:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          None
-      </td>
       </tr>
           </table>