diff --git a/docs/manual/CoreTasks/concat.html b/docs/manual/CoreTasks/concat.html index d51df0dd3..20a0fac1d 100644 --- a/docs/manual/CoreTasks/concat.html +++ b/docs/manual/CoreTasks/concat.html @@ -12,58 +12,58 @@

Description

- Concatenates a file, or a series of files, to a single file or - the console. The destination file will be created if it does - not exist. + Concatenates a file, or a series of files, to a single file or + the console. The destination file will be created if it does + not exist.

Paths and/or - FileSets and/or FileLists are used to - select which files are to be concatenated. There is no - singular 'file' attribute to specify a single file to cat. + FileSets and/or FileLists are used to + select which files are to be concatenated. There is no + singular 'file' attribute to specify a single file to cat.

Parameters

- - - - - + + + + + - - - + + - - - - - - - - - - + + + + + + + + + + + - - + + + @@ -89,7 +89,7 @@ @@ -131,7 +131,7 @@

since Ant 1.6.

- This is a Path. This is + This is a Path. This is used to select file files to be concatenated. Note that a file can only appear once in a path. If this is an issue consider using multiple paths. @@ -140,11 +140,11 @@

fileset

- FileSets are used to - select files to be concatenated. Note that the order in which - the files selected from a fileset are concatenated is - not guaranteed. If this is an issue, use multiple - filesets or consider using filelists. + FileSets are used to + select files to be concatenated. Note that the order in which + the files selected from a fileset are concatenated is + not guaranteed. If this is an issue, use multiple + filesets or consider using filelists.

filelist

@@ -156,7 +156,7 @@

filterchain

since Ant 1.6.

-

The concat task supports nested +

The concat task supports nested FilterChains.

header,footer

@@ -226,10 +226,10 @@ 
   <concat destfile="${docbook.dir}/all-sections.xml"
           force="no">
-    <filelist dir="${docbook.dir}/sections" 
+    <filelist dir="${docbook.dir}/sections"
          files="introduction.xml,overview.xml"/>
-    <fileset dir="${docbook.dir}" 
-         includes="sections/*.xml" 
+    <fileset dir="${docbook.dir}"
+         includes="sections/*.xml"
          excludes="introduction.xml,overview.xml"/>
   </concat>
@@ -267,10 +267,10 @@

- Copyright © 2002-2004 The Apache Software Foundation. All - Rights Reserved. + Copyright © 2002-2004 The Apache Software Foundation. All + Rights Reserved.

- + \ No newline at end of file diff --git a/docs/manual/CoreTypes/regexp.html b/docs/manual/CoreTypes/regexp.html index 5e2e3df00..129a6fc98 100644 --- a/docs/manual/CoreTypes/regexp.html +++ b/docs/manual/CoreTypes/regexp.html @@ -81,7 +81,7 @@ both Unix and Windows platforms before you rely on it.

Usage

The following tasks and types use the Regexp type :

@@ -95,4 +95,4 @@ These string filters also use the mechanism of regexp to choose a regular expres

Copyright © 2003-2004 The Apache Software Foundation. All rights Reserved.

- + \ No newline at end of file diff --git a/docs/manual/Integration/VAJAntTool.html b/docs/manual/Integration/VAJAntTool.html index 05e6f48ce..2c7e4e6d5 100644 --- a/docs/manual/Integration/VAJAntTool.html +++ b/docs/manual/Integration/VAJAntTool.html @@ -56,8 +56,8 @@ support VAJ has not (out of the box).

@@ -160,7 +160,7 @@ workspace.

Description:

Exports Java source files, class files and/or resources from the workspace to the file system. Exports can be specified by giving the VAJ project -name and package name(s). This works very similar to +name and package name(s). This works very similar to FileSets.

Parameters

@@ -322,7 +322,7 @@ from the file system into VAJ. These imports can be specified with a fileset.

Parameters specified as nested elements

fileset

-A FileSet specifies the files to import. +A FileSet specifies the files to import.

Example

<vajimport project="Test" importClasses="true">
@@ -566,4 +566,3 @@ JDK independent by now.
 Foundation. All rights Reserved.
 
 
-
diff --git a/xdocs/external.xml b/xdocs/external.xml
index 33ea9134b..6995d224d 100644
--- a/xdocs/external.xml
+++ b/xdocs/external.xml
@@ -389,7 +389,7 @@
- +
AttributeDescriptionRequired
AttributeDescriptionRequired
destfile - The destination file for the concatenated stream. +
destfile + The destination file for the concatenated stream. If not specified the console will be used instead. - - No -
append - Specifies whether or not the file specified by 'destfile' - should be appended. Defaults to "no". - No
force + No +
append + Specifies whether or not the file specified by 'destfile' + should be appended. Defaults to "no". + No
force - Specifies whether or not the file specified by 'destfile' - should be written to even if it is newer than all source files. + Specifies whether or not the file specified by 'destfile' + should be written to even if it is newer than all source files. since Ant 1.6. Defaults to "yes". - No
No
encoding
fixlastline - Specifies whether or not to check if + Specifies whether or not to check if each file concatenated is terminated by a new line. If this attribute is "yes" a new line will be appended to the stream if @@ -108,17 +108,17 @@ since Ant 1.6 Valid values for this property are:
    -
  • cr: a single CR
    • -
  • lf: a single LF
    • -
  • crlf: the pair CRLF
    • -
  • mac: a single CR
    • -
  • unix: a single LF
    • -
  • dos: the pair CRLF
    • -
+
  • cr: a single CR
    • +
  • lf: a single LF
    • +
  • crlf: the pair CRLF
    • +
  • mac: a single CR
    • +
  • unix: a single LF
    • +
  • dos: the pair CRLF
    • + The default is platform dependent. For Unix platforms, the default is "lf". - For DOS based systems (including Windows), - the default is "crlf". + For DOS based systems (including Windows), + the default is "crlf". For Mac OS, the default is "cr".     		No
    • Now works outside of VAJ. -
    • Added attribute haltonerror, "*" and "**" version qualifiers. -
    • Amended documentation (this file) accordingly. +
    • Added attribute haltonerror, "*" and "**" version qualifiers. +
    • Amended documentation (this file) accordingly.
    2001/06/14
    Contact:masogato@users.sourceforge.netmasogato@users.sourceforge.net
    License: