Some small doc updates.

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

proposal/myrmidon/docs/buildfile.html

@@ -490,9 +490,9 @@ Implicit tasks can be used to initialise the project.  For example:</p>
     </td></tr>
     <tr><td>
       <blockquote>
-                        <p>Targets have the same format as in Ant 1.x, though some of the behaviour
-is different.  A <code>&lt;target&gt;</code> element takes the following
-attributes:</p>
+                        <p>Targets have a similar format to targets in Ant 1.x, though some of the
+behaviour is different.  A <code>&lt;target&gt;</code> element takes the
+following attributes:</p>
                                   <table>
               <tr>
                   <td bgcolor="#039acc" colspan="" rowspan="" 
@@ -553,48 +553,6 @@ attributes:</p>
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
           None
         </font>
-  </td>
-      </tr>
-                  <tr>
-                  <td bgcolor="#a0ddf0" colspan="" rowspan="" 
-      valign="top" align="left">
-    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-          if
-        </font>
-  </td>
-                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
-      valign="top" align="left">
-    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-          Only execute this target if the specified property is set, and not
-        equal to <code>false</code>.
-        </font>
-  </td>
-                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
-      valign="top" align="left">
-    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-          None
-        </font>
-  </td>
-      </tr>
-                  <tr>
-                  <td bgcolor="#a0ddf0" colspan="" rowspan="" 
-      valign="top" align="left">
-    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-          unless
-        </font>
-  </td>
-                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
-      valign="top" align="left">
-    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-          Do not execute this target if the specified property is set, and not
-        equal to <code>false</code>.
-        </font>
-  </td>
-                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
-      valign="top" align="left">
-    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-          None
-        </font>
   </td>
       </tr>
         </table>

proposal/myrmidon/docs/todo.html

@@ -317,12 +317,6 @@
                     <li>Fire ProjectListener events projectStarted() and projectFinished()
                     events on start and finish of referenced projects, adding indicator methods
                     to ProjectEvent.</li>
-                    <li>Validate project and target names in DefaultProjectBuilder - reject dodgy
-                    names like "," or "", or "  ".  Probably want to reject names that start or
-                    end with white-space (though internal whitespace is probably fine).  We also
-                    want to reserve certain punctuation characters like , : ? $ [ ] { } &lt; &gt;, etc for
-                    future use.</li>
-                    <li>Similarly, validate property names, using the same rules.</li>
                     <li>Detect duplicate type names.</li>
                     <li>Add fully qualified type names, based on antlib name and type shorthand name.
                     Allow these to be used in build files in addition to the shorthand names.</li>
@@ -333,6 +327,10 @@
                     <li>Split up <code>&lt;is-set&gt;</code> condition into is-set and is-true conditions.</li>
                     <li>Allow the <code>&lt;if&gt;</code> task to take any condition implementation.</li>
                     <li>Add an else block to the <code>&lt;if&gt;</code> task.</li>
+                    <li>Split the <code>&lt;available&gt;</code> condition into separate conditions
+                    that test for the availability of a class, or a resource.</li>
+                    <li>Move <code>crimson.jar</code> to <code>bin/lib</code> in the distribution,
+                    and make to other jars via the extension mechanism.</li>
                     <li>Unit tests.</li>
                 </ul>
                     </blockquote>

proposal/myrmidon/docs/vfs.html

@@ -136,14 +136,13 @@
       valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
           The contents of Zip files (and Jar, War, and Ear files).
-                    Currently, the VFS supports read-only access to Zip file contents,
-                    and only for local Zip files.
+                    Currently, the VFS supports read-only access to Zip file contents.
         </font>
   </td>
                       <td bgcolor="#a0ddf0" colspan="" rowspan="" 
       valign="top" align="left">
     <font color="#000000" size="-1" face="arial,helvetica,sanserif">
-          <code>zip://</code> <i>zip-file-path</i> [<code>!</code><i>absolute-path</i>]
+          <code>zip:</code> <i>zip-file-uri</i> [<code>!</code><i>absolute-path</i>]
         </font>
   </td>
       </tr>
@@ -188,12 +187,14 @@
   </td>
       </tr>
         </table>
+                                <p>Both forward or backward slashes can be used to separate the elements of
+            a URL.</p>
                                 <p>Here are some example URLs:</p>
                                 <ul>
                 <li><code>build/classes</code></li>
                 <li><code>c:\program files\ant\bin</code></li>
                 <li><code>file://C:/program files/ant</code></li>
-                <li><code>zip://build/lib/ant.jar!/org/apache/tools</code></li>
+                <li><code>zip:build/lib/ant.jar!/org/apache/tools</code></li>
                 <li><code>ftp://adam@somehost/pub/downloads</code></li>
                 <li><code>smb://password:adam@somehost/home/adam</code></li>
             </ul>

proposal/myrmidon/src/xdocs/buildfile.xml

@@ -168,9 +168,9 @@ Implicit tasks can be used to initialise the project.  For example:</p>
 
 <subsection name="Targets">
 
-<p>Targets have the same format as in Ant 1.x, though some of the behaviour
-is different.  A <code>&lt;target&gt;</code> element takes the following
-attributes:</p>
+<p>Targets have a similar format to targets in Ant 1.x, though some of the
+behaviour is different.  A <code>&lt;target&gt;</code> element takes the
+following attributes:</p>
 
 <table>
     <tr><th>Attribute</th><th>Description</th><th>Default Value</th></tr>
@@ -185,18 +185,6 @@ attributes:</p>
         This list can contain targets from referenced projects.</td>
         <td>None</td>
     </tr>
-    <tr>
-        <td>if</td>
-        <td>Only execute this target if the specified property is set, and not
-        equal to <code>false</code>.</td>
-        <td>None</td>
-    </tr>
-    <tr>
-        <td>unless</td>
-        <td>Do not execute this target if the specified property is set, and not
-        equal to <code>false</code>.</td>
-        <td>None</td>
-    </tr>
 </table>
 
 </subsection>

proposal/myrmidon/src/xdocs/todo.xml

@@ -219,6 +219,10 @@
                     <li>Split up <code>&lt;is-set&gt;</code> condition into is-set and is-true conditions.</li>
                     <li>Allow the <code>&lt;if&gt;</code> task to take any condition implementation.</li>
                     <li>Add an else block to the <code>&lt;if&gt;</code> task.</li>
+                    <li>Split the <code>&lt;available&gt;</code> condition into separate conditions
+                    that test for the availability of a class, or a resource.</li>
+                    <li>Move <code>crimson.jar</code> to <code>bin/lib</code> in the distribution,
+                    and make to other jars via the extension mechanism.</li>
                     <li>Unit tests.</li>
                 </ul>
 

proposal/myrmidon/src/xdocs/vfs.xml

@@ -31,9 +31,8 @@
                 <tr>
                     <td>Zip Files</td>
                     <td>The contents of Zip files (and Jar, War, and Ear files).
-                    Currently, the VFS supports read-only access to Zip file contents,
-                    and only for local Zip files.</td>
-                    <td><code>zip://</code> <i>zip-file-path</i> [<code>!</code><i>absolute-path</i>]</td>
+                    Currently, the VFS supports read-only access to Zip file contents.</td>
+                    <td><code>zip:</code> <i>zip-file-uri</i> [<code>!</code><i>absolute-path</i>]</td>
                 </tr>
                 <tr>
                     <td>FTP</td>
@@ -47,13 +46,16 @@
                 </tr>
             </table>
 
+            <p>Both forward or backward slashes can be used to separate the elements of
+            a URL.</p>
+
             <p>Here are some example URLs:</p>
 
             <ul>
                 <li><code>build/classes</code></li>
                 <li><code>c:\program files\ant\bin</code></li>
                 <li><code>file://C:/program files/ant</code></li>
-                <li><code>zip://build/lib/ant.jar!/org/apache/tools</code></li>
+                <li><code>zip:build/lib/ant.jar!/org/apache/tools</code></li>
                 <li><code>ftp://adam@somehost/pub/downloads</code></li>
                 <li><code>smb://password:adam@somehost/home/adam</code></li>
             </ul>