svn commit: r617540 - /ant/core/trunk/docs/manual/CoreTypes/resources.html

[mbenson]

Author: mbenson
Date: Fri Feb  1 08:13:52 2008
New Revision: 617540

URL: http://svn.apache.org/viewvc?rev=617540&view=rev
Log:
tweak

Modified:
    ant/core/trunk/docs/manual/CoreTypes/resources.html

Modified: ant/core/trunk/docs/manual/CoreTypes/resources.html
URL: 
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/CoreTypes/resources.html?rev=617540&r1=617539&r2=617540&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/CoreTypes/resources.html (original)
+++ ant/core/trunk/docs/manual/CoreTypes/resources.html Fri Feb  1 08:13:52 2008
@@ -675,7 +675,7 @@
   <p>Assuming the namespace settings
 <pre><code>  rsel="antlib:org.apache.tools.ant.types.resources.selectors"
   rcmp="antlib:org.apache.tools.ant.types.resources.comparators"
-</code></pre> The following selects files a, b, c, and d:</p>
+</code></pre></p>
   <pre>
 &lt;restrict&gt;
   &lt;fileset dir="src" includes="a,b,c,d,e,f,g" /&gt;
@@ -685,7 +685,39 @@
     &lt;/control&gt;
     &lt;rcmp:name /&gt;
   &lt;/rsel:compare&gt;
-&lt;/restrict&gt;</pre>
+&lt;/restrict&gt;
+  </pre>
+  <p>Selects files a, b, c, and d.</p>
+  <pre>
+    &lt;project 
rsel=&quot;antlib:org.apache.tools.ant.types.resources.selectors&quot;&gt;
+        &lt;macrodef name=&quot;copyFromPath&quot;&gt;
+            &lt;attribute name=&quot;todir&quot;/&gt;
+            &lt;attribute name=&quot;refid&quot;/&gt;
+            &lt;element name=&quot;nested-resource-selectors&quot; 
optional=&quot;yes&quot; implicit=&quot;true&quot;/&gt;
+            &lt;sequential&gt;
+                &lt;mkdir dir=&quot;@{todir}&quot; 
taskname=&quot;copyFromPath&quot;/&gt;
+                &lt;copy todir=&quot;@{todir}&quot; 
taskname=&quot;copyFromPath&quot;&gt;
+                    &lt;restrict&gt;
+                        &lt;path refid=&quot;@{refid}&quot;/&gt;
+                        &lt;rsel:or&gt;
+                            &lt;nested-resource-selectors/&gt;
+                        &lt;/rsel:or&gt;
+                    &lt;/restrict&gt;
+                    &lt;flattenmapper/&gt;
+                &lt;/copy&gt;
+            &lt;/sequential&gt;
+        &lt;/macrodef&gt;
+        &lt;copyFromPath refid=&quot;classpath&quot; 
todir=&quot;todir&quot;&gt;
+            &lt;rsel:name name=&quot;log4j.properties&quot;/&gt;
+            &lt;rsel:name name=&quot;default.properties&quot;/&gt;
+        &lt;/copyFromPath&gt;
+     &lt;/project&gt;
+  </pre>
+  <p>Creates the <tt>todir</tt> directory and copies (if present) the
+     files <tt>log4j.properties</tt> and <tt>default.properties</tt>
+     from the Classpath (already used while compiling).
+  </p>
+
 </blockquote>
 
 <h4><a name="sort">sort</a></h4>
@@ -794,37 +826,6 @@
      their namespace must be set explicitly.
   </p>
 
-  <pre>
-    &lt;project 
rsel=&quot;antlib:org.apache.tools.ant.types.resources.selectors&quot;&gt;
-        &lt;macrodef name=&quot;copyFromPath&quot;&gt;
-            &lt;attribute name=&quot;todir&quot;/&gt;
-            &lt;attribute name=&quot;refid&quot;/&gt;
-            &lt;element name=&quot;nested-resource-selectors&quot; 
optional=&quot;yes&quot; implicit=&quot;true&quot;/&gt;
-            &lt;sequential&gt;
-                &lt;mkdir dir=&quot;@{todir}&quot; 
taskname=&quot;copyFromPath&quot;/&gt;
-                &lt;copy todir=&quot;@{todir}&quot; 
taskname=&quot;copyFromPath&quot;&gt;
-                    &lt;restrict&gt;
-                        &lt;path refid=&quot;@{refid}&quot;/&gt;
-                        &lt;rsel:or&gt;
-                            &lt;nested-resource-selectors/&gt;
-                        &lt;/rsel:or&gt;
-                    &lt;/restrict&gt;
-                    &lt;flattenmapper/&gt;
-                &lt;/copy&gt;
-            &lt;/sequential&gt;
-        &lt;/macrodef&gt;
-        &lt;copyFromPath refid=&quot;classpath&quot; 
todir=&quot;todir&quot;&gt;
-            &lt;rsel:name name=&quot;log4j.properties&quot;/&gt;
-            &lt;rsel:name name=&quot;default.properties&quot;/&gt;
-        &lt;/copyFromPath&gt;
-     &lt;/project&gt;
-  </pre>
-  <p>Creates the <tt>todir</tt> directory and copies (if present) the
-     files <tt>log4j.properties</tt> and <tt>default.properties</tt>
-     from the Classpath (already used while compiling).
-  </p>
-
-
 </blockquote>
 
 <h4><a name="first">first</a></h4>
@@ -952,16 +953,16 @@
     </tr>
   </table>
   
-  <h4>Example</h4>
+  <h4>Examples</h4>
   <pre>
-    &lt;union id=&quot;A&quot;&gt;
+    &lt;resources id=&quot;A&quot;&gt;
         &lt;string value=&quot;a&quot;/&gt;
         &lt;string value=&quot;b&quot;/&gt;
-    &lt;/union&gt;
-    &lt;union id=&quot;B&quot;&gt;
+    &lt;/resources&gt;
+    &lt;resources id=&quot;B&quot;&gt;
         &lt;string value=&quot;b&quot;/&gt;
         &lt;string value=&quot;c&quot;/&gt;
-    &lt;/union&gt;
+    &lt;/resources&gt;
     &lt;union id=&quot;union&quot;&gt;&lt;resources 
refid=&quot;A&quot;/&gt;&lt;resources refid=&quot;B&quot;/&gt;&lt;/union&gt;
     &lt;intersect id=&quot;intersect&quot;&gt;&lt;resources 
refid=&quot;A&quot;/&gt;&lt;resources refid=&quot;B&quot;/&gt;&lt;/intersect&gt;
     &lt;difference id=&quot;difference&quot;&gt;&lt;resources 
refid=&quot;A&quot;/&gt;&lt;resources 
refid=&quot;B&quot;/&gt;&lt;/difference&gt;