Merge branch '1.9.x'

manual/Tasks/copy.html

@@ -28,7 +28,8 @@
 <h3>Description</h3>
 <p>Copies a file or resource collection to a new file or directory.  By default, files are only
 copied if the source file is newer than the destination file, or when the destination file does not
-exist.  However, you can explicitly overwrite files with the <var>overwrite</var> attribute.</p>
+exist - please see the <var>granularity</var> attribute for Ant's idea of <em>newer</em>.
+However, you can explicitly overwrite files with the <code>overwrite</code> attribute.</p>
 
 <p><a href="../Types/resources.html#collection">Resource collections</a> are used to select a group
 of files to copy.  To use a resource collection, the <var>todir</var> attribute must be

manual/Tasks/move.html

@@ -29,7 +29,8 @@
 <p>Moves a file to a new file or directory, or collections of files to a new directory.  By default,
 the destination file is overwritten if it already exists.  When <var>overwrite</var> is turned off,
 then files are only moved if the source file is newer than the destination file, or when the
-destination file does not exist.</p>
+destination file does not exist
+- please see the <var>granularity</var> attribute for Ant's idea of <em>newer</em>.</p>
 
 <p><a href="../Types/resources.html#collection">Resource collections</a> are used to select a group
 of files to move.  Only file system based resource collections are supported, this

src/main/org/apache/tools/ant/types/selectors/SelectorUtils.java

@@ -573,7 +573,7 @@ public final class SelectorUtils {
      *
      * @param src the original file
      * @param target the file being compared against
-     * @param granularity the amount in seconds of slack we will give in
+     * @param granularity the amount in milliseconds of slack we will give in
      *        determining out of dateness
      * @return whether the target is out of date
      */
@@ -592,7 +592,7 @@ public final class SelectorUtils {
      *
      * @param src the original resource
      * @param target the resource being compared against
-     * @param granularity the int amount in seconds of slack we will give in
+     * @param granularity the int amount in milliseconds of slack we will give in
      *        determining out of dateness
      * @return whether the target is out of date
      */
@@ -611,7 +611,7 @@ public final class SelectorUtils {
      *
      * @param src the original resource
      * @param target the resource being compared against
-     * @param granularity the long amount in seconds of slack we will give in
+     * @param granularity the long amount in milliseconds of slack we will give in
      *        determining out of dateness
      * @return whether the target is out of date
      */