You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/03/04 09:36:57 UTC
ant git commit: Small edits in the manual
Repository: ant
Updated Branches:
refs/heads/master 63d1abc7c -> 34ef33900
Small edits in the manual
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/34ef3390
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/34ef3390
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/34ef3390
Branch: refs/heads/master
Commit: 34ef3390094ebee20d04217b1af993785061f732
Parents: 63d1abc
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sun Mar 4 10:36:45 2018 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sun Mar 4 10:36:45 2018 +0100
----------------------------------------------------------------------
manual/Integration/jext-plugin.html | 2 +-
manual/Tasks/filter.html | 8 ++++----
manual/Tasks/junitreport.html | 11 +++++++----
manual/Tasks/vss.html | 17 ++---------------
manual/develop.html | 8 ++++----
manual/install.html | 6 +++---
manual/proxy.html | 2 +-
7 files changed, 22 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/34ef3390/manual/Integration/jext-plugin.html
----------------------------------------------------------------------
diff --git a/manual/Integration/jext-plugin.html b/manual/Integration/jext-plugin.html
index 83628d5..cf0734f 100644
--- a/manual/Integration/jext-plugin.html
+++ b/manual/Integration/jext-plugin.html
@@ -27,7 +27,7 @@ by
<ul>
<li>Klaus Hartlage (<a href="mailto:KHartlage@t-online.de">KHartlage@t-online.de</a>)</li>
</ul>
-<hr>
+<hr/>
<p>You can download the plugin
at: <a href="http://sourceforge.net/projects/jext/files/OldFiles/antwork_plugin.zip/download">http://sourceforge.net/projects/jext/files/OldFiles/antwork_plugin.zip/download</a></p>
http://git-wip-us.apache.org/repos/asf/ant/blob/34ef3390/manual/Tasks/filter.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/filter.html b/manual/Tasks/filter.html
index 3525756..a6fe45e 100644
--- a/manual/Tasks/filter.html
+++ b/manual/Tasks/filter.html
@@ -26,10 +26,10 @@
<h2 id="filter">Filter</h2>
<h3>Description</h3>
-<p>Sets a token filter for this project or read multiple token filter from an input file and sets
-these as filters. Token filters are used by all tasks that perform file copying operations through
-the Project commodity methods. See the warning <a href="../using.html#filters"><em>here</em></a>
-before using.</p>
+<p>Sets a token filter for this project or reads a properties file as multiple token filter
+definitions and sets them. Token filters are used by all tasks that perform file copying operations
+through the Project commodity methods. See the
+warning <a href="../using.html#filters"><em>here</em></a> before using.</p>
<p>The task uses <q>@</q> as token separator. Token strings cannot contain separator characters;
incorrect tokens are ignored.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/34ef3390/manual/Tasks/junitreport.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/junitreport.html b/manual/Tasks/junitreport.html
index bc0afb9..ebf79bc 100644
--- a/manual/Tasks/junitreport.html
+++ b/manual/Tasks/junitreport.html
@@ -42,8 +42,9 @@ out of the box. The table below summarize the compatibility status.</p>
<tr><th>Xalan</th><th>Sun JDK Bundle</th><th>Status<th></tr>
<tr><td>2.4.1+</td><td>JDK 1.4.2-01+</td><td>OK</td></tr>
<tr><td>XSLTC</td><td>JDK 1.5.x</td><td>OK</td></tr>
-<tr><td>2.x</td><td>JDK 1.4.x</td><td><em><u>Deprecated</u>, use <samp>${ant.home}/etc/junit-frames-xalan1.xsl</samp>
-<br/>Upgrade Xalan using the JDK endorsement mechanism</em></td></tr>
+<tr><td>2.x</td><td>JDK 1.4.x</td><td><em><u>Deprecated</u>,
+use <samp>${ant.home}/etc/junit-frames-xalan1.xsl</samp><br/>Upgrade Xalan using the JDK endorsement
+mechanism</em></td></tr>
</table>
<p>In Ant 1.6.2, we had to decide between supporting Xalan 1/Xalan 2.4.1- and Xalan 2.4.1+/XSLTC,
@@ -94,8 +95,10 @@ using the nested <a href="../Types/fileset.html"><code><FileSet></code></a
<td>The directory where the stylesheets are defined. They must be conforming to the following
conventions:
<ul>
- <li><q>frames</q> format: the stylesheet must be named <samp>junit-frames.xsl</samp>, or <i>junit-frames-saxon.xsl if you are using Saxon 9+.</li>
- <li><q>noframes</q> format: the stylesheet must be named <samp>junit-noframes.xsl</samp>, or <i>junit-noframes-saxon.xsl if you are using Saxon 9+.</li>
+ <li><q>frames</q> format: the stylesheet must be named <samp>junit-frames.xsl</samp>,
+ or <samp>junit-frames-saxon.xsl</samp> if you are using Saxon 9+.</li>
+ <li><q>noframes</q> format: the stylesheet must be named <samp>junit-noframes.xsl</samp>,
+ or <samp>junit-noframes-saxon.xsl</samp> if you are using Saxon 9+.</li>
</ul>
</td>
<td>No; defaults to embedded stylesheets</td>
http://git-wip-us.apache.org/repos/asf/ant/blob/34ef3390/manual/Tasks/vss.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/vss.html b/manual/Tasks/vss.html
index 99d6c1d..8e6117c 100644
--- a/manual/Tasks/vss.html
+++ b/manual/Tasks/vss.html
@@ -34,7 +34,7 @@
<li>Gary S. Weaver</li>
<li>Jesse Stockall</li>
</ul>
-<hr>
+<hr/>
<h2>Contents</h2>
<ul>
<li><a href="#intro">Introduction</a></li>
@@ -207,9 +207,7 @@ and write them to the local directory <samp>C:\mysrc\myproject</samp>. The local
writable.</p>
<hr/>
-
<!-- VSSLABEL -->
-
<h2 id="vsslabel">VssLabel</h2>
<h3>Description</h3>
<p>Task to perform LABEL commands to Microsoft Visual SourceSafe.</p>
@@ -291,9 +289,7 @@ label <q>1.03.004</q>. If this version already has a label, the operation (and t
fail.</p>
<hr/>
-
<!-- VSSHISTORY -->
-
<h2 id="vsshistory">VssHistory</h2>
<h3>Description</h3>
Task to perform HISTORY commands to Microsoft Visual SourceSafe.
@@ -423,10 +419,9 @@ specified according to your locale).</p>
toDate="${to.tstamp}"/></pre>
<p>Shows all changes in the 14 days before today.</p>
-<hr/>
+<hr/>
<!-- VSSCHECKIN -->
-
<h2 id="vsscheckin">VssCheckin</h2>
<h3>Description</h3>
<p>Task to perform CHECKIN commands to Microsoft Visual SourceSafe.</p>
@@ -503,9 +498,7 @@ specified according to your locale).</p>
directory <samp>D:\build</samp>.</p>
<hr/>
-
<!-- VSSCHECKOUT -->
-
<h2 id="vsscheckout">VssCheckout</h2>
<h3>Description</h3>
<p>Task to perform CHECKOUT commands to Microsoft Visual SourceSafe.</p>
@@ -605,9 +598,7 @@ order <var>version</var>, <var>date</var>, <var>label</var>.</p>
directory <samp>D:\build</samp>.</p>
<hr/>
-
<!-- VSSADD -->
-
<h2 id="vssadd">VssAdd</h2>
<h3>Description</h3>
Task to perform ADD commands to Microsoft Visual SourceSafe.
@@ -677,9 +668,7 @@ Task to perform ADD commands to Microsoft Visual SourceSafe.
(see <code>vsscp</code>).</p>
<hr/>
-
<!-- VSSCP -->
-
<h2 id="vsscp">VssCp</h2>
<h3>Description</h3>
<p>Task to perform CP (Change Project) commands to Microsoft Visual SourceSafe.</p>
@@ -727,9 +716,7 @@ Task to perform ADD commands to Microsoft Visual SourceSafe.
<p>Sets the current VSS project to <samp>$/Projects/ant</samp>.</p>
<hr/>
-
<!-- VSSCREATE -->
-
<h2 id="vsscreate">VssCreate</h2>
<h3>Description</h3>
<p>Task to perform CREATE commands to Microsoft Visual Source Safe.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/34ef3390/manual/develop.html
----------------------------------------------------------------------
diff --git a/manual/develop.html b/manual/develop.html
index 424e54c..ab6552b 100644
--- a/manual/develop.html
+++ b/manual/develop.html
@@ -61,7 +61,7 @@
a <code>BuildException</code>. This method implements the task itself.</li>
</ol>
-<hr>
+<hr/>
<p id="footnote-1"><a href="#footnote-1-back">*</a> Actually the case of the letters after the first
one doesn't really matter to Ant, using all lower case is a good convention, though.</p>
@@ -108,7 +108,7 @@ one doesn't really matter to Ant, using all lower case is a good convention, tho
<li id="execute"><code>execute()</code> is called at runtime. If <q>target1</q>
and <q>target2</q> both depend on <q>target3</q>, then running <code>'ant target1
- target2'</code> will run all tasks in <q>target3</code> twice.</li>
+ target2'</code> will run all tasks in <q>target3</q> twice.</li>
</ol>
<h3 id="set-magic">Conversions Ant will perform for attributes</h3>
@@ -381,7 +381,7 @@ just been compiled.</p>
to the <samp>default.properties</samp> file in the <code>org.apache.tools.ant.taskdefs</code>
package. Then you can use it as if it were a built-in task.</p>
-<hr>
+<hr/>
<h2 id="buildevents">Build Events</h2>
<p>Ant is capable of generating build events as it performs the tasks necessary to build a project.
Listeners can be attached to Ant to receive these events. This capability could be used, for
@@ -466,7 +466,7 @@ public class MyLogAdapter implements BuildListener {
// implement all methods in that way
}</pre>
-<hr>
+<hr/>
<h2 id="integration">Source code integration</h2>
<p>The other way to extend Ant through Java is to make changes to existing tasks, which is
http://git-wip-us.apache.org/repos/asf/ant/blob/34ef3390/manual/install.html
----------------------------------------------------------------------
diff --git a/manual/install.html b/manual/install.html
index a061f3d..6fb04ae 100644
--- a/manual/install.html
+++ b/manual/install.html
@@ -31,11 +31,11 @@
To get up and running with the binary distribution of Ant quickly, follow these steps:
</p>
<ol>
-<li>Make sure you have a Java environment installed, See <a href="#sysrequirements">System Requirements</a> for
+<li>Make sure you have a Java environment installed. See <a href="#sysrequirements">System Requirements</a> for
details.</li>
<li>Download Ant. See <a href="#getBinary">Binary Distribution</a> for details.</li>
<li>Uncompress the downloaded file into a directory.</li>
-<li>Set environmental variables <code>JAVA_HOME</code> to your Java environment, <code>ANT_HOME</code> to the directory
+<li>Set environmental variables: <code>JAVA_HOME</code> to your Java environment, <code>ANT_HOME</code> to the directory
you uncompressed Ant to, and add <samp>${ANT_HOME}/bin</samp> (Unix) or <samp>%ANT_HOME%/bin</samp> (Windows) to
your <code>PATH</code>. See <a href="#setup">Setup</a> for details.</li>
<li>Optionally, from the <code>ANT_HOME</code> directory run <code>ant -f fetch.xml -Ddest=system</code> to get the
@@ -615,7 +615,7 @@ proprietary packages. For example, suppose you want to install support for NetRe
usually <samp>/usr/share/ant/lib</samp>. Another, less messy option is to create an <samp>.ant/lib</samp> subdirectory
of your home directory and place your non-JPackage Ant JARs there, thereby avoiding mixing JPackage libraries with
non-JPackage stuff in the same folder. More information on where Ant finds its libraries is
-available <a href="https://ant.apache.org/manual/running.html#libs">here</a></li>
+available <a href="running.html#libs">here</a></li>
<li>Download a non-JPackage binary distribution from the regular <a href="https://ant.apache.org/bindownload.cgi"
target="_top">Apache Ant site</a></li>
<li>Unzip or untar the distribution into a temporary directory</li>
http://git-wip-us.apache.org/repos/asf/ant/blob/34ef3390/manual/proxy.html
----------------------------------------------------------------------
diff --git a/manual/proxy.html b/manual/proxy.html
index b10d81f..5b0b61f 100644
--- a/manual/proxy.html
+++ b/manual/proxy.html
@@ -71,7 +71,7 @@
access, although in practise the results are inconsistent.
</p>
<p>
- It is has also been reported a breaking the IBM Java 5 JRE on AIX,
+ It is has also been reported a breaking the IBM Java 5 runtime on AIX,
and does not always work on Linux (presumably due to
missing <code>gconf</code> settings) Other odd things can go wrong,
like Oracle JDBC drivers or pure Java SVN clients.