bodewig 2004/04/20 05:52:21
Modified: docs/manual Tag: ANT_16_BRANCH dirtasks.html
docs/manual/CoreTasks Tag: ANT_16_BRANCH concat.html
java.html
docs/manual/CoreTypes Tag: ANT_16_BRANCH xmlcatalog.html
docs/manual/OptionalTasks Tag: ANT_16_BRANCH ccm.html
dotnet.html
src/etc Tag: ANT_16_BRANCH tagdiff.xsl
Log:
merge
Revision Changes Path
No revision
No revision
1.20.2.3 +1 -1 ant/docs/manual/dirtasks.html
Index: dirtasks.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/dirtasks.html,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -r1.20.2.2 -r1.20.2.3
--- dirtasks.html 9 Feb 2004 22:12:06 -0000 1.20.2.2
+++ dirtasks.html 20 Apr 2004 12:52:20 -0000 1.20.2.3
@@ -189,7 +189,7 @@
<li><a href="CoreTasks/tar.html"><tar></a></li>
<li><a href="CoreTasks/zip.html"><zip></a></li>
<li><a href="OptionalTasks/ejb.html#ddcreator"><ddcreator></a></li>
- <li><a href="OptionalTasks/ejb.html#ejbjar.html"><ejbjar></a></li>
+ <li><a href="OptionalTasks/ejb.html#ejbjar"><ejbjar></a></li>
<li><a href="OptionalTasks/ejb.html#ejbc"><ejbc></a></li>
<li><a href="OptionalTasks/cab.html"><cab></a></li>
<li><a href="OptionalTasks/icontract.html"><icontract></a></li>
No revision
No revision
1.9.2.3 +1 -1 ant/docs/manual/CoreTasks/concat.html
Index: concat.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/concat.html,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- concat.html 9 Feb 2004 22:12:07 -0000 1.9.2.2
+++ concat.html 20 Apr 2004 12:52:20 -0000 1.9.2.3
@@ -19,7 +19,7 @@
</p>
<p>
- <a href="../CoreTypes/path.html">Path</a>s and/or
+ <a href="../using.html#path">Path</a>s and/or
<a href="../CoreTypes/fileset.html">FileSet</a>s and/or <a
href="../CoreTypes/filelist.html">FileList</a>s are used to
select which files are to be concatenated. There is no
1.24.2.6 +5 -5 ant/docs/manual/CoreTasks/java.html
Index: java.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/java.html,v
retrieving revision 1.24.2.5
retrieving revision 1.24.2.6
diff -u -r1.24.2.5 -r1.24.2.6
--- java.html 9 Feb 2004 22:12:07 -0000 1.24.2.5
+++ java.html 20 Apr 2004 12:52:20 -0000 1.24.2.6
@@ -95,7 +95,7 @@
<tr>
<td valign="top">failonerror</td>
<td valign="top">Stop the buildprocess if the command exits with a
- returncode other than 0. Default is "false" (see <a
href="#failonerror">note)</a></td>
+ returncode other than 0. Default is "false" (see <a
href="#failonerror">note</a>)</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
@@ -227,10 +227,10 @@
<p>When the permission RuntimePermission exitVM has not been granted (or has
been revoked) the System.exit() call will be intercepted
and treated like indicated in <i>failonerror</i>.</p>
-<p><a name="failonerror"/>
-If you specify <code>failonerror="true"</code> and you do not
specify permissions,
-a set of default permissions will be added to your java invocation making
sure that
-a non zero return code will lead to a <code>BuildException</code>.
+<p><a name="failonerror">Note:</a>
+if you specify <code>failonerror="true"</code> and you do not
specify permissions,
+a set of default permissions will be added to your Java invocation to make
sure that
+a non-zero return code will lead to a <code>BuildException</code>.
</p>
<p>Settings will be ignored if fork is enabled.</p>
No revision
No revision
1.7.2.3 +1 -1 ant/docs/manual/CoreTypes/xmlcatalog.html
Index: xmlcatalog.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTypes/xmlcatalog.html,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- xmlcatalog.html 9 Feb 2004 22:12:10 -0000 1.7.2.2
+++ xmlcatalog.html 20 Apr 2004 12:52:20 -0000 1.7.2.3
@@ -212,7 +212,7 @@
<h4>catalogpath</h4>
<p>
The nested <code>catalogpath</code> element is a <a
-href="using.html#path">path</a>-like structure listing catalog files to
+href="../using.html#path">path</a>-like structure listing catalog files to
search. All files in this path are assumed to be OASIS catalog files, in
either
<a href="http://oasis-open.org/committees/entity/background/9401.html";>
No revision
No revision
1.9.2.3 +1 -1 ant/docs/manual/OptionalTasks/ccm.html
Index: ccm.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/ccm.html,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -u -r1.9.2.2 -r1.9.2.3
--- ccm.html 9 Feb 2004 22:12:11 -0000 1.9.2.2
+++ ccm.html 20 Apr 2004 12:52:20 -0000 1.9.2.3
@@ -62,7 +62,7 @@
Comment attribute <i>mycomment</i> is added as a task comment. The task
used is the one set as the default.</p>
<hr>
-<h2><a name="ccmheckout">CCMCheckout</a></h2>
+<h2><a name="ccmcheckout">CCMCheckout</a></h2>
<h3>Description</h3>
Task to perform a Checkout command to Continuus
<h3>Parameters</h3>
1.10.2.11 +1 -1 ant/docs/manual/OptionalTasks/dotnet.html
Index: dotnet.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/OptionalTasks/dotnet.html,v
retrieving revision 1.10.2.10
retrieving revision 1.10.2.11
diff -u -r1.10.2.10 -r1.10.2.11
--- dotnet.html 9 Feb 2004 22:12:11 -0000 1.10.2.10
+++ dotnet.html 20 Apr 2004 12:52:20 -0000 1.10.2.11
@@ -97,7 +97,7 @@
</tr>
<tr>
- <td><a href="ImportTypelib.html">ImportTypelib</a></td>
+ <td><a href="importtypelib.html">ImportTypelib</a></td>
<td>Imports a COM type library into .NET</td>
</tr>
No revision
No revision
1.2.2.4 +1 -1 ant/src/etc/tagdiff.xsl
Index: tagdiff.xsl
===================================================================
RCS file: /home/cvs/ant/src/etc/tagdiff.xsl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- tagdiff.xsl 3 Mar 2004 17:18:48 -0000 1.2.2.3
+++ tagdiff.xsl 20 Apr 2004 12:52:21 -0000 1.2.2.4
@@ -64,7 +64,7 @@
</h1>
Tagdiff between <xsl:value-of select="@startTag"/> <xsl:value-of
select="@startDate"/> and
<xsl:value-of select="@endTag"/> <xsl:value-of
select="@endDate"/>
- <p align="right">Designed for use with <a
href="http://jakarta.apache.org";>Ant</a>.</p>
+ <p align="right">Designed for use with <a
href="http://ant.apache.org/";>Ant</a>.</p>
<hr size="2"/>
<a name="TOP"/>
<table width="100%">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
