Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 28257 invoked from network); 6 May 2004 16:18:17 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 6 May 2004 16:18:17 -0000 Received: (qmail 17904 invoked by uid 500); 6 May 2004 16:15:21 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 17859 invoked by uid 500); 6 May 2004 16:15:21 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 17833 invoked by uid 500); 6 May 2004 16:15:21 -0000 Received: (qmail 17804 invoked from network); 6 May 2004 16:15:20 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 6 May 2004 16:15:20 -0000 Received: (qmail 72114 invoked by uid 1694); 6 May 2004 09:08:43 -0000 Date: 6 May 2004 09:08:43 -0000 Message-ID: <20040506090843.72111.qmail@minotaur.apache.org> From: jhm@apache.org To: ant-cvs@apache.org Subject: cvs commit: ant/xdocs external.xml X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jhm 2004/05/06 02:08:43 Modified: docs/manual/CoreTasks concat.html docs/manual/CoreTypes regexp.html docs/manual/Integration VAJAntTool.html xdocs external.xml Log: Link Check Revision Changes Path 1.12 +61 -61 ant/docs/manual/CoreTasks/concat.html Index: concat.html =================================================================== RCS file: /home/cvs/ant/docs/manual/CoreTasks/concat.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- concat.html 20 Apr 2004 12:48:43 -0000 1.11 +++ concat.html 6 May 2004 09:08:42 -0000 1.12 @@ -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 @@

- + \ No newline at end of file 1.4 +2 -2 ant/docs/manual/CoreTypes/regexp.html Index: regexp.html =================================================================== RCS file: /home/cvs/ant/docs/manual/CoreTypes/regexp.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- regexp.html 9 Feb 2004 21:50:07 -0000 1.3 +++ regexp.html 6 May 2004 09:08:42 -0000 1.4 @@ -81,7 +81,7 @@

Usage

The following tasks and types use the Regexp type :

@@ -95,4 +95,4 @@

- + \ No newline at end of file 1.21 +4 -5 ant/docs/manual/Integration/VAJAntTool.html Index: VAJAntTool.html =================================================================== RCS file: /home/cvs/ant/docs/manual/Integration/VAJAntTool.html,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- VAJAntTool.html 21 May 2003 06:34:39 -0000 1.20 +++ VAJAntTool.html 6 May 2004 09:08:43 -0000 1.21 @@ -56,8 +56,8 @@ @@ -160,7 +160,7 @@

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 @@

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 @@
   Foundation. All rights Reserved.
   
   
  -
  
  
  
  1.124     +1 -1      ant/xdocs/external.xml
  
  Index: external.xml
  ===================================================================
  RCS file: /home/cvs/ant/xdocs/external.xml,v
  retrieving revision 1.123
  retrieving revision 1.124
  diff -u -r1.123 -r1.124
  --- external.xml	6 May 2004 06:03:45 -0000	1.123
  +++ external.xml	6 May 2004 09:08:43 -0000	1.124
  @@ -389,7 +389,7 @@

- + --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org

License:
Attribute	Description	Required
destfile	- The destination file for the concatenated stream. +
Attribute	Description	Required
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.net	masogato@users.sourceforge.net