diff --git a/manual/Tasks/copy.html b/manual/Tasks/copy.html index 69219f3b0..9c2cc9018 100644 --- a/manual/Tasks/copy.html +++ b/manual/Tasks/copy.html @@ -72,7 +72,7 @@ note.

todir - The directory to copy to. + The directory to copy to. overwrite diff --git a/manual/Tasks/filter.html b/manual/Tasks/filter.html index 09c263b8e..3525756aa 100644 --- a/manual/Tasks/filter.html +++ b/manual/Tasks/filter.html @@ -30,9 +30,8 @@ these as filters. Token filters are used by all tasks that perform file copying operations through the Project commodity methods. See the warning here before using.

-

Note 1: the token string must not contain the separators chars (@).
Note 2: -Either token and value attributes must be provided, or only -the filtersfile attribute.

+

The task uses @ as token separator. Token strings cannot contain separator characters; +incorrect tokens are ignored.

Parameters

@@ -43,22 +42,20 @@ the filtersfile attribute.

- - + + - - + - - +
tokenthe token string without @Yes*the token string without the separator chars (@)Yes; either both token and value, or + only filtersfile
valuethe string that should be put to replace the token when the file is copiedYes*the string that should be put to replace the token when the file is copied
filtersfileThe file from which the filters must be read. This file must be a formatted as a property - file.Yes*The file from which the filters must be read. This file must be a formatted as + a property file.
-

* see Note 1 and 2 above parameters table.

Examples

 <filter token="year" value="2000"/>
diff --git a/manual/Tasks/java.html b/manual/Tasks/java.html
index 3883b6d16..01b3759e4 100644
--- a/manual/Tasks/java.html
+++ b/manual/Tasks/java.html
@@ -56,7 +56,7 @@ because it tries to read from the standard input.

jar the location of the jar file to execute (must have a Main-Class entry in the manifest). fork must be set to true if this option is selected. - See notes below for more details. + See notes below for more details. @@ -302,7 +302,7 @@ structure and can also be set via a nested modulepath element.<

The location of modules that replace upgradeable modules in the runtime image can be specified using this path-like structure.

-

JAR file execution

+

JAR file execution

The parameter of the jar attribute is of type File; that is, the parameter is resolved to an absolute file relative to the base directory of the diff --git a/manual/Tasks/jjtree.html b/manual/Tasks/jjtree.html index 0757856a1..0c6fc93f0 100644 --- a/manual/Tasks/jjtree.html +++ b/manual/Tasks/jjtree.html @@ -418,13 +418,13 @@ versions Not Supported Same - +

jjtree -OUTPUT_FILE:D:/tmp/subdir/output.jj grammar.jjt
     /tmp/subdir/output.jj
     /tmp/<generated>.java
Not Supported - Not Supported *) + Not Supported*
jjtree -OUTPUT_FILE:D:/tmp/subdir/output.jj relative/grammar.jjt
@@ -432,7 +432,7 @@ versions
     /tmp/<generated>.java
Not Supported - Not Supported *) + Not Supported*
jjtree -OUTPUT_FILE:D:/tmp/subdir/output.jj /tmp/absolute/grammar.jjt
@@ -440,7 +440,7 @@ versions
     /tmp/<generated>.java
Not Supported - Not Supported *) + Not Supported*
jjtree -OUTPUT_FILE:/tmp/subdir/output.jj -OUTPUT_DIRECTORY:relative grammar.jjt
@@ -493,11 +493,11 @@ versions
   
 
 
-

*) Footnote: When running JJTree with the Ant taskdef jjtree the -option -OUTPUT_DIRECTORY must always be set, because the project's basedir -and the Ant working directory might differ. So even if you don't specify -the outputdirectory for taskdef jjtree, JJTree will be called with -the -OUTPUT_DIRECTORY set to the project's basedir. But when +

Note: When running JJTree with +the Ant taskdef jjtree the option -OUTPUT_DIRECTORY must always be set, +because the project's basedir and the Ant working directory might differ. So even if you +don't specify the outputdirectory for taskdef jjtree, JJTree will be called +with the -OUTPUT_DIRECTORY set to the project's basedir. But when the -OUTPUT_DIRECTORY is set, the -OUTPUT_FILE setting is handled as if relative to this -OUTPUT_DIRECTORY. Thus when the -OUTPUT_FILE is absolute or contains a drive letter we have a problem. Therefore absolute outputfiles (when diff --git a/manual/Tasks/rmic.html b/manual/Tasks/rmic.html index 5af1a7ee3..86992f4ef 100644 --- a/manual/Tasks/rmic.html +++ b/manual/Tasks/rmic.html @@ -77,7 +77,7 @@ documentation to learn how to use it.

Description Required - + base the location to store the compiled files. Also serves as the parent directory for any non-Fileset includes, etc. (This functionality has remained unchanged.) @@ -214,7 +214,7 @@ documentation to learn how to use it.

-

Note:

+

Note: