conor 01/09/13 06:43:04
Modified: docs/manual/CoreTasks Tag: ANT_14_BRANCH apply.html
docs/manual/CoreTypes Tag: ANT_14_BRANCH filterset.html
src/main/org/apache/tools/ant/types Tag: ANT_14_BRANCH
FilterSet.java FilterSetCollection.java
Log:
Fix up filterset documentation
PR: 3439
Submitted by: [EMAIL PROTECTED] (Benjamin Reed)
Revision Changes Path
No revision
No revision
1.7.2.1 +1 -1 jakarta-ant/docs/manual/CoreTasks/apply.html
Index: apply.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/apply.html,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -w -u -r1.7 -r1.7.2.1
--- apply.html 2001/07/27 09:57:35 1.7
+++ apply.html 2001/09/13 13:43:04 1.7.2.1
@@ -166,7 +166,7 @@
<blockquote><pre>
<apply executable="somecommand" parallel="false" >
<arg value="arg1"/>
- <srfile/>
+ <srcfile/>
<arg value="arg2"/>
<fileset dir="/tmp"/>
</apply>
No revision
No revision
1.1.2.3 +2 -2 jakarta-ant/docs/manual/CoreTypes/filterset.html
Index: filterset.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTypes/filterset.html,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -w -u -r1.1.2.2 -r1.1.2.3
--- filterset.html 2001/08/28 21:50:53 1.1.2.2
+++ filterset.html 2001/09/13 13:43:04 1.1.2.3
@@ -28,7 +28,7 @@
<TD vAlign=top align="center"><B>Required</B></TD>
</TR>
<TR>
- <TD vAlign=top>starttoken</TD>
+ <TD vAlign=top>begintoken</TD>
<TD vAlign=top>The string marking the beginning of a token. eg
<STRONG>@</STRONG>Date@</TD>
<TD vAlign=top>@</TD>
@@ -82,7 +82,7 @@
<p>You are copying the version.txt file to the dist directory from the build
directory
but wish to replace the token @DATE@ with todays date.</p>
<BLOCKQUOTE><PRE>
-<copy file="${build.home}/version.txt"
toFile="${dist.home}/version.txt"<
+<copy file="${build.home}/version.txt"
toFile="${dist.home}/version.txt">
<filterset>
<filter token="DATE" value="${DATE}"/>
</filterset>
No revision
No revision
1.2.2.2 +2 -2
jakarta-ant/src/main/org/apache/tools/ant/types/FilterSet.java
Index: FilterSet.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/FilterSet.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -w -u -r1.2.2.1 -r1.2.2.2
--- FilterSet.java 2001/08/17 15:09:49 1.2.2.1
+++ FilterSet.java 2001/09/13 13:43:04 1.2.2.2
@@ -72,7 +72,7 @@
/**
* A set of filters to be applied to something.
*
- * A filter set may have starttoken and endtokens defined.
+ * A filter set may have begintoken and endtokens defined.
*
* @author <A href="mailto:[EMAIL PROTECTED]"> Michael McCallum </A>
* @created 14 March 2001
@@ -324,7 +324,7 @@
/**
* Does replacement on the given string with token matching.
- * This uses the defined starttoken and endtoken values which default to
@ for both.
+ * This uses the defined begintoken and endtoken values which default to
@ for both.
*
* @param line The line to process the tokens in.
* @return The string with the tokens replaced.
1.1.2.2 +1 -1
jakarta-ant/src/main/org/apache/tools/ant/types/FilterSetCollection.java
Index: FilterSetCollection.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/FilterSetCollection.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -w -u -r1.1.2.1 -r1.1.2.2
--- FilterSetCollection.java 2001/08/17 15:09:57 1.1.2.1
+++ FilterSetCollection.java 2001/09/13 13:43:04 1.1.2.2
@@ -93,7 +93,7 @@
/**
* Does replacement on the given string with token matching.
- * This uses the defined starttoken and endtoken values which default to
@ for both.
+ * This uses the defined begintoken and endtoken values which default to
@ for both.
*
* @param line The line to process the tokens in.
* @return The string with the tokens replaced.
