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/05/15 07:52:41 UTC
[4/4] ant git commit: Bz 21192: description should precede code
examples
Bz 21192: description should precede code examples
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/332330b2
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/332330b2
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/332330b2
Branch: refs/heads/master
Commit: 332330b278a39db7bb77017035311d44349704ae
Parents: 3321c7b
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Tue May 15 09:51:58 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Tue May 15 09:51:58 2018 +0200
----------------------------------------------------------------------
manual/Tasks/ant.html | 9 +--
manual/Tasks/antcall.html | 5 +-
manual/Tasks/antlr.html | 4 +-
manual/Tasks/antstructure.html | 10 +--
manual/Tasks/antversion.html | 14 ++--
manual/Tasks/apply.html | 53 +++++++-------
manual/Tasks/attrib.html | 13 ++--
manual/Tasks/augment.html | 6 +-
manual/Tasks/available.html | 29 ++++----
manual/Tasks/basename.html | 14 ++--
manual/Tasks/buildnumber.html | 6 +-
manual/Tasks/cab.html | 22 +++---
manual/Tasks/ccm.html | 30 ++++----
manual/Tasks/changelog.html | 36 ++++------
manual/Tasks/checksum.html | 37 +++++-----
manual/Tasks/chgrp.html | 28 ++++----
manual/Tasks/chmod.html | 24 ++++---
manual/Tasks/chown.html | 19 ++---
manual/Tasks/clearcase.html | 83 +++++++++-------------
manual/Tasks/componentdef.html | 6 +-
manual/Tasks/concat.html | 22 +++---
manual/Tasks/condition.html | 13 ++--
manual/Tasks/copy.html | 29 ++++----
manual/Tasks/copydir.html | 16 +++--
manual/Tasks/cvs.html | 29 ++++----
manual/Tasks/cvspass.html | 2 +-
manual/Tasks/cvstagdiff.html | 46 ++++++------
manual/Tasks/cvsversion.html | 5 +-
manual/Tasks/delete.html | 25 +++----
manual/Tasks/deltree.html | 6 +-
manual/Tasks/depend.html | 18 +++--
manual/Tasks/dependset.html | 22 +++---
manual/Tasks/diagnostics.html | 2 +-
manual/Tasks/dirname.html | 5 +-
manual/Tasks/ear.html | 2 +-
manual/Tasks/echo.html | 20 +++---
manual/Tasks/echoproperties.html | 26 ++++---
manual/Tasks/echoxml.html | 3 +-
manual/Tasks/exec.html | 20 +++---
manual/Tasks/fail.html | 21 +++---
manual/Tasks/filter.html | 12 ++--
manual/Tasks/fixcrlf.html | 36 +++++-----
manual/Tasks/ftp.html | 118 +++++++++++++++++--------------
manual/Tasks/genkey.html | 3 +-
manual/Tasks/get.html | 21 +++---
manual/Tasks/hostinfo.html | 9 ++-
manual/Tasks/image.html | 13 ++--
manual/Tasks/input.html | 30 ++++----
manual/Tasks/jar.html | 42 +++++------
manual/Tasks/jarlib-available.html | 11 +--
manual/Tasks/jarlib-display.html | 4 +-
manual/Tasks/jarlib-manifest.html | 5 +-
manual/Tasks/jarlib-resolve.html | 21 +++---
manual/Tasks/java.html | 33 +++++----
manual/Tasks/javac.html | 91 ++++++++++--------------
manual/Tasks/javacc.html | 6 +-
manual/Tasks/javah.html | 23 +++---
manual/Tasks/jdepend.html | 17 ++---
manual/Tasks/jjdoc.html | 6 +-
manual/Tasks/jjtree.html | 17 +++--
manual/Tasks/jlink.html | 2 +-
manual/Tasks/jspc.html | 14 ++--
manual/Tasks/junit.html | 85 +++++++++++-----------
manual/Tasks/junitlauncher.html | 39 +++++-----
manual/Tasks/junitreport.html | 14 ++--
manual/Tasks/length.html | 12 ++--
manual/Tasks/loadfile.html | 18 ++---
manual/Tasks/loadproperties.html | 11 +--
manual/Tasks/loadresource.html | 5 +-
manual/Tasks/mail.html | 22 +++---
manual/Tasks/makeurl.html | 11 +--
manual/Tasks/manifest.html | 14 ++--
manual/Tasks/manifestclasspath.html | 10 +--
manual/Tasks/mimemail.html | 5 +-
manual/Tasks/mkdir.html | 7 +-
manual/Tasks/move.html | 18 +++--
manual/Tasks/native2ascii.html | 12 ++--
manual/Tasks/nice.html | 12 ++--
manual/Tasks/pack.html | 5 +-
manual/Tasks/parallel.html | 47 ++++++------
manual/Tasks/patch.html | 12 ++--
manual/Tasks/pathconvert.html | 14 ++--
manual/Tasks/property.html | 37 +++++-----
manual/Tasks/rename.html | 5 +-
manual/Tasks/replace.html | 8 +--
manual/Tasks/replaceregexp.html | 22 +++---
manual/Tasks/resourcecount.html | 9 +--
manual/Tasks/retry.html | 4 +-
manual/Tasks/rmic.html | 10 +--
manual/Tasks/schemavalidate.html | 18 ++---
manual/Tasks/scp.html | 21 +++---
manual/Tasks/script.html | 22 +++---
manual/Tasks/scriptdef.html | 4 +-
manual/Tasks/sequential.html | 5 +-
manual/Tasks/setpermissions.html | 9 ++-
manual/Tasks/setproxy.html | 29 +++++---
manual/Tasks/signjar.html | 27 ++++---
manual/Tasks/sleep.html | 11 +--
manual/Tasks/sos.html | 44 ++++++------
manual/Tasks/sound.html | 11 +--
manual/Tasks/splash.html | 14 ++--
manual/Tasks/sql.html | 25 +++----
manual/Tasks/sshexec.html | 16 +++--
manual/Tasks/sshsession.html | 16 +++--
manual/Tasks/subant.html | 34 +++++----
manual/Tasks/sync.html | 12 ++--
manual/Tasks/tar.html | 37 +++++-----
manual/Tasks/taskdef.html | 10 ++-
manual/Tasks/tempfile.html | 7 +-
manual/Tasks/touch.html | 26 +++----
manual/Tasks/translate.html | 4 +-
manual/Tasks/truncate.html | 8 +--
manual/Tasks/tstamp.html | 18 ++---
manual/Tasks/typedef.html | 9 +--
manual/Tasks/unpack.html | 17 ++---
manual/Tasks/unzip.html | 50 ++++++-------
manual/Tasks/uptodate.html | 6 +-
manual/Tasks/verifyjar.html | 7 +-
manual/Tasks/vss.html | 57 ++++++++-------
manual/Tasks/waitfor.html | 13 ++--
manual/Tasks/war.html | 2 +-
manual/Tasks/xmlvalidate.html | 28 ++++----
manual/Tasks/zip.html | 61 ++++++++--------
123 files changed, 1280 insertions(+), 1180 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/ant.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/ant.html b/manual/Tasks/ant.html
index f417efd..65b9d77 100644
--- a/manual/Tasks/ant.html
+++ b/manual/Tasks/ant.html
@@ -293,6 +293,7 @@ will be set to the specified value of the property element unless the correspond
the <var>dir</var> attribute explicitly.</p>
<h3>Examples</h3>
+<p>These are different ways of using the task:</p>
<pre>
<ant antfile="subproject/subbuild.xml" target="compile"/>
@@ -325,12 +326,12 @@ this:</p>
</path></pre>
<p>and the called build file (<samp>subbuild.xml</samp>) also defines a <code><path></code>
-with the <var>id</var> <samp>path1</samp>, but <samp>path2</samp> is not defined:</p>
+with the <var>id</var> <samp>path1</samp>, but <samp>path2</samp> is not defined; then</p>
<pre><ant antfile="subbuild.xml" inheritrefs="true"/></pre>
<p>will not override <samp>subbuild</samp>'s definition of <samp>path1</samp>, but make the parent's
-definition of <samp>path2</samp> available in the <samp>subbuild</samp>.</p>
+definition of <samp>path2</samp> available in the <samp>subbuild</samp>, whereas</p>
<pre><ant antfile="subbuild.xml"/></pre>
@@ -338,14 +339,14 @@ definition of <samp>path2</samp> available in the <samp>subbuild</samp>.</p>
<pre><ant antfile="subbuild.xml" inheritrefs="false"/></pre>
-<p>will neither override <samp>path1</samp> nor copy <samp>path2</samp>.</p>
+<p>will neither override <samp>path1</samp> nor copy <samp>path2</samp>, while</p>
<pre>
<ant antfile="subbuild.xml" inheritrefs="false">
<reference refid="path1"/>
</ant></pre>
-<p>will override <samp>subbuild</samp>'s definition of <samp>path1</samp>.</p>
+<p>will override <samp>subbuild</samp>'s definition of <samp>path1</samp>, and</p>
<pre>
<ant antfile="subbuild.xml" inheritrefs="false">
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/antcall.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/antcall.html b/manual/Tasks/antcall.html
index 201cbf3..1beed13 100644
--- a/manual/Tasks/antcall.html
+++ b/manual/Tasks/antcall.html
@@ -154,6 +154,7 @@ single target whose dependencies are the targets so specified, in the order spec
</table>
<h3>Examples</h3>
+<p>The following</p>
<pre>
<target name="default">
<antcall target="doSomethingElse">
@@ -164,13 +165,11 @@ single target whose dependencies are the targets so specified, in the order spec
<target name="doSomethingElse">
<echo message="param1=${param1}"/>
</target></pre>
-<p>Will run the target <var>doSomethingElse</var> and echo <code>param1=value</code>.</p>
-
+<p>will run the target <var>doSomethingElse</var> and echo <code>param1=value</code>, whereas</p>
<pre>
<antcall ... >
<reference refid="path1" torefid="path2"/>
</antcall></pre>
-
<p>will copy the parent's definition of <samp>path1</samp> into the new project using
the <var>id</var> <samp>path2</samp>.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/antlr.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/antlr.html b/manual/Tasks/antlr.html
index 996809b..741f9f7 100644
--- a/manual/Tasks/antlr.html
+++ b/manual/Tasks/antlr.html
@@ -137,12 +137,12 @@ nested <code><jvmarg></code> attributes, for example:</p>
in <a href="../using.html#arg">Command line arguments</a>.</p>
<h3>Example</h3>
+<p>Invoke ANTLR on grammar file <samp>etc/java.g</samp>, writing the generated files
+to <samp>build/src</samp>:</p>
<pre>
<antlr
target="etc/java.g"
outputdirectory="build/src"/></pre>
-<p>This invokes ANTLR on grammar file <samp>etc/java.g</samp>, writing the generated files
-to <samp>build/src</samp>.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/antstructure.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/antstructure.html b/manual/Tasks/antstructure.html
index 4b2988b..37ddfcd 100644
--- a/manual/Tasks/antstructure.html
+++ b/manual/Tasks/antstructure.html
@@ -64,11 +64,11 @@ task—see the example below.
</tr>
</table>
<h3>Examples</h3>
-<pre><antstructure output="project.dtd"/></pre>
+<p>Basic usage</p>
-<p><strong>Emitting your own structure instead of a DTD</strong></p>
+<pre><antstructure output="project.dtd"/></pre>
-<p>First you need to implement the interface</p>
+<p>Emit your own structure instead of a DTD: first you need to implement the interface</p>
<pre>
package org.example;
@@ -85,8 +85,8 @@ public class MyPrinter implements AntStructure.StructurePrinter {
<myprinter/>
</antstructure></pre>
-<p>Your own StructurePrinter can accept attributes and nested elements just like any other Ant type
-or task.</p>
+<p>Your own <code class="code">StructurePrinter</code> can accept attributes and nested elements
+just like any other Ant type or task.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/antversion.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/antversion.html b/manual/Tasks/antversion.html
index e1a0f00..6022d76 100644
--- a/manual/Tasks/antversion.html
+++ b/manual/Tasks/antversion.html
@@ -62,17 +62,19 @@ as condition).</p>
<h3>Examples</h3>
+<p>Store the current Ant version in the property <code>antversion</code>.</p>
<pre><antversion property="antversion"/></pre>
-<p>Stores the current Ant version in the property <code>antversion</code>.</p>
+<p>Store the Ant version in the property <code>antversion</code> if the current Ant version is 1.6.0
+or higher. Otherwise the property remains unset.</p>
<pre><antversion property="antversion" atleast="1.6"/></pre>
-<p>Stores the Ant version in the property <code>antversion</code> if the current Ant version is
-1.6.0 or higher. Otherwise the property remains unset.</p>
-<pre><antversion property="ant-is-exact-7" exactly="1.7.0"/></pre>
-<p>Sets the property <code>ant-is-exact-7</code> if Ant 1.7.0 is running. Neither 1.6.5 nor 1.7.1
+<p>Set the property <code>ant-is-exact-7</code> if Ant 1.7.0 is running. Neither 1.6.5 nor 1.7.1
would match.</p>
+<pre><antversion property="ant-is-exact-7" exactly="1.7.0"/></pre>
+<p>Set <code>Ant17isOnline</code> if Ant 1.7.0 is running and can get a non-error-response from the
+Ant homepage.</p>
<pre>
<condition property="Ant17isOnline">
<and>
@@ -80,8 +82,6 @@ would match.</p>
<http url="http://ant.apache.org"/>
</and>
</condition></pre>
-<p>Sets <code>Ant17isOnline</code> if Ant 1.7.0 is running and can get a non-error-response from the
-Ant homepage.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/apply.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/apply.html b/manual/Tasks/apply.html
index bb63d61..d85c0e2 100644
--- a/manual/Tasks/apply.html
+++ b/manual/Tasks/apply.html
@@ -350,6 +350,9 @@ files for each sourcefile.</p>
(with <var>maxparallel</var> > 0) and null will be used a source file just like it is in the case
of <code>exec</code>.</p>
<h3>Examples</h3>
+<p>Invoke <kbd>ls -l</kbd>, adding the absolute filenames of all files below <samp>/tmp</samp> not
+ending in <samp>.txt</samp> and all files of the FileSet with <var>id</var> <samp>other.files</samp>
+to the command line.</p>
<pre>
<apply executable="ls">
<arg value="-l"/>
@@ -360,9 +363,11 @@ of <code>exec</code>.</p>
</fileset>
<fileset refid="other.files"/>
</apply></pre>
-<p>invokes <kbd>ls -l</kbd>, adding the absolute filenames of all files below <samp>/tmp</samp> not
-ending in <samp>.txt</samp> and all files of the FileSet with <var>id</var> <samp>other.files</samp>
-to the command line.</p>
+
+<p>Invoke <kbd>somecommand arg1 SOURCEFILENAME arg2</kbd> for each file in <samp>/tmp</samp>
+replacing <code>SOURCEFILENAME</code> with the absolute filename of each file in
+turn. If <var>parallel</var> had been set to <q>true</q>, <code>SOURCEFILENAME</code> would be
+replaced with the absolute filenames of all files separated by spaces.</p>
<pre>
<apply executable="somecommand" parallel="false">
<arg value="arg1"/>
@@ -371,10 +376,11 @@ to the command line.</p>
<fileset dir="/tmp"/>
</apply>
</pre>
-<p>invokes <code>somecommand arg1 SOURCEFILENAME arg2</code> for each file in <samp>/tmp</samp>
-replacing <code>SOURCEFILENAME</code> with the absolute filename of each file in
-turn. If <var>parallel</var> had been set to true, <code>SOURCEFILENAME</code> would be replaced
-with the absolute filenames of all files separated by spaces.</p>
+
+<p>Invoke <kbd>cc -c -o TARGETFILE SOURCEFILE</kbd> for each <samp>.c</samp> file that is newer than
+the corresponding <samp>.o</samp>, replacing <code>TARGETFILE</code> with the absolute filename of
+the <samp>.o</samp> and <code>SOURCEFILE</code> with the absolute name of the <samp>.c</samp>
+file.</p>
<pre>
<apply executable="cc" dest="src/C" parallel="false">
<arg value="-c"/>
@@ -384,10 +390,15 @@ with the absolute filenames of all files separated by spaces.</p>
<fileset dir="src/C" includes="*.c"/>
<mapper type="glob" from="*.c" to="*.o"/>
</apply></pre>
-<p>invokes <kbd>cc -c -o TARGETFILE SOURCEFILE</kbd> for each <samp>.c</samp> file that is newer
-than the corresponding <samp>.o</samp>, replacing <code>TARGETFILE</code> with the absolute filename
-of the <samp>.o</samp> and <code>SOURCEFILE</code> with the absolute name of the <samp>.c</samp>
-file.</p>
+
+<p>Apply the fictitious <kbd>processfile</kbd> executable to all files matching <samp>*.file</samp>
+in the <samp>src</samp> directory. The <samp>out</samp> <code><mapper></code> has been set up
+to map <samp>*.file</samp> to <samp>*.out</samp>, then this <code><mapper></code> is used to
+specify <code>targetfile</code>s for this <code><apply></code> task. A reference
+to <samp>out</samp> is then used as an <code><outputmapper></code> nested in
+a <code><redirector></code>, which in turn is nested beneath this <code><apply></code>
+instance. This allows us to perform dependency checking against output files—the target files
+in this case.</p>
<pre>
<mapper id="out" type="glob"
from="src${file.separator}*.file"
@@ -400,15 +411,9 @@ file.</p>
<outputmapper refid="out"/>
</redirector>
</apply></pre>
-<p>Applies the fictitious <kbd>processfile</kbd> executable to all files
-matching <samp>*.file</samp> in the <samp>src</samp> directory.
-The <samp>out</samp> <code><mapper></code> has been set up to map <samp>*.file</samp>
-to <samp>*.out</samp>, then this <code><mapper></code> is used to
-specify <code>targetfile</code>s for this <code><apply></code> task. A reference
-to <samp>out</samp> is then used as an <code><outputmapper></code> nested in
-a <code><redirector></code>, which in turn is nested beneath this <code><apply></code>
-instance. This allows us to perform dependency checking against output files—the target files
-in this case.</p>
+
+<p>Apply the <kbd>ls</kbd> executable to all directories in the <code>PATH</code>, effectively
+listing all executables that are available on the <code>PATH</code>.</p>
<pre>
<apply executable="ls" parallel="true"
force="true" dest="${basedir}" append="true" type="both">
@@ -417,9 +422,10 @@ in this case.</p>
</path>
<identitymapper/>
</apply></pre>
-<p>Applies the <kbd>ls</kbd> executable to all directories in the <code>PATH</code>, effectively
-listing all executables that are available on the <code>PATH</code>.</p>
+<p>Convert all JavaScript files in the <samp>src</samp> directory using the command <kbd>jsmin <
+src/a.js > dest/a.js</kbd>. Because the filename itself should not be passed to
+the <code>jsmin</code> program, the <var>addsourcefile</var> is set to <q>false</q>.</p>
<pre>
<apply executable="jsmin" addsourcefile="false">
<!-- Collect the JS-files -->
@@ -432,9 +438,6 @@ listing all executables that are available on the <code>PATH</code>.</p>
<outputmapper id="out" type="glob" from="*.js" to="dest/*.js"/>
</redirector>
</apply></pre>
-<p>Conversion of the command <kbd>jsmin < src/a.js > dest/a.js</kbd> but for all files in
-the <samp>src</samp> directory. Because the filename itself should not be passed to
-the <code>jsmin</code> program, the <var>addsourcefile</var> is set to <q>false</q>.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/attrib.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/attrib.html b/manual/Tasks/attrib.html
index 07e5989..552f270 100644
--- a/manual/Tasks/attrib.html
+++ b/manual/Tasks/attrib.html
@@ -129,16 +129,17 @@ alternative.</p>
<h3>Examples</h3>
+<p>Make the <code>run.bat</code> file read-only and hidden.</p>
<pre><attrib file="${dist}/run.bat" readonly="true" hidden="true"/></pre>
-<p>makes the <code>run.bat</code> file read-only and hidden.</p>
-
+<p>Make all <samp>.xml</samp> files below <samp>${meta.inf}</samp> readable.</p>
<pre><attrib readonly="false">
<fileset dir="${meta.inf}" includes="**/*.xml"/>
</attrib></pre>
-<p>makes all <samp>.xml</samp> files below <samp>${meta.inf}</samp> readable.</p>
-
+<p>Make all files below <samp>shared/sources1</samp> (except those below any directory
+named <samp>trial</samp>) read-only and archived. In addition all files belonging to a FileSet
+with <var>id</var> <samp>other.shared.sources</samp> get the same attributes.</p>
<pre>
<attrib readonly="true" archive="true">
<fileset dir="shared/sources1">
@@ -147,9 +148,5 @@ alternative.</p>
<fileset refid="other.shared.sources"/>
</attrib></pre>
-<p>makes all files below <samp>shared/sources1</samp> (except those below any directory
-named <samp>trial</samp>) read-only and archived. In addition all files belonging to a FileSet
-with <var>id</var> <samp>other.shared.sources</samp> get the same attributes.</p>
-
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/augment.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/augment.html b/manual/Tasks/augment.html
index 3dc64f9..f39368b 100644
--- a/manual/Tasks/augment.html
+++ b/manual/Tasks/augment.html
@@ -58,16 +58,18 @@ declared <code>augment</code> element as though it were the original element.</p
<pre><fileset id="input-fs" dir="${basedir}"/></pre>
+<p>invocation</p>
+
<pre><augment id="input-fs" excludes="foo"/></pre>
-<p>modifies the <var>excludes</var> attribute of <samp>input-fs</samp>.</p>
+<p>modifies the <var>excludes</var> attribute of <samp>input-fs</samp>, whereas</p>
<pre>
<augment id="input-fs">
<filename name="bar"/>
</augment></pre>
-<p>Adds a <code>filename</code> selector to <samp>input-fs</samp>.</p>
+<p>adds a <code>filename</code> selector to <samp>input-fs</samp>.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/available.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/available.html b/manual/Tasks/available.html
index 9b80734..48ceda9 100644
--- a/manual/Tasks/available.html
+++ b/manual/Tasks/available.html
@@ -110,20 +110,27 @@ a <a href="../using.html#path">path-like structure</a> and can also be set via a
<p><code>Available</code>'s <var>filepath</var> attribute is
a <a href="../using.html#path">path-like structure</a> and can also be set via a
nested <code><filepath></code> element.</p>
+
<h3>Examples</h3>
-<pre><available classname="org.whatever.Myclass" property="Myclass.present"/></pre>
-<p>sets the <code>Myclass.present</code> property to the value <q>true</q> if the
+<p>Set the <code>Myclass.present</code> property to the value <q>true</q> if the
class <code>org.whatever.Myclass</code> is found in Ant's classpath.</p>
+<pre><available classname="org.whatever.Myclass" property="Myclass.present"/></pre>
+
+<p>Set the <code>jaxp.jar.present</code> property to the value <q>true</q> if the
+file <samp>./lib/jaxp11/jaxp.jar</samp> is found.</p>
<pre>
<property name="jaxp.jar" value="./lib/jaxp11/jaxp.jar"/>
<available file="${jaxp.jar}" property="jaxp.jar.present"/></pre>
-<p>sets the <code>jaxp.jar.present</code> property to the value <q>true</q> if the
-file <samp>./lib/jaxp11/jaxp.jar</samp> is found.</p>
+
+<p>Set the <code>local.lib.present</code> property to the value <q>true</q> if the
+directory <samp>/usr/local/lib</samp> is found.</p>
<pre>
<available file="/usr/local/lib" type="dir"
property="local.lib.present"/></pre>
-<p>sets the <code>local.lib.present</code> property to the value <q>true</q> if the
-directory <samp>/usr/local/lib</samp> is found.</p>
+
+<p>Set the <code>jaxp11.present</code> property to the value <q>true</q> if the
+class <code>javax.xml.transform.Transformer</code> is found in the classpath referenced
+by <samp>jaxp</samp> (in this case, <samp>./lib/jaxp11/jaxp.jar</samp>).</p>
<pre>
...in project ...
<property name="jaxp.jar" value="./lib/jaxp11/jaxp.jar"/>
@@ -131,19 +138,15 @@ directory <samp>/usr/local/lib</samp> is found.</p>
...in target ...
<available classname="javax.xml.transform.Transformer"
classpathref="jaxp" property="jaxp11.present"/></pre>
-<p>sets the <code>jaxp11.present</code> property to the value <q>true</q> if the
-class <code>javax.xml.transform.Transformer</code> is found in the classpath referenced
-by <samp>jaxp</samp> (in this case, <samp>./lib/jaxp11/jaxp.jar</samp>).
-</p>
+
+<p>Set the <code>have.extras</code> property to the value <q>true</q> if the resource
+file <samp>extratasks.properties</samp> is found.</p>
<pre>
<available property="have.extras" resource="extratasks.properties">
<classpath>
<pathelement location="/usr/local/ant/extra.jar"/>
</classpath>
</available></pre>
-<p>sets the <code>have.extras</code> property to the value <q>true</q> if the resource
-file <samp>extratasks.properties</samp> is found.
-</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/basename.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/basename.html b/manual/Tasks/basename.html
index c52e2bd..dcf622b 100644
--- a/manual/Tasks/basename.html
+++ b/manual/Tasks/basename.html
@@ -59,20 +59,22 @@ the simple file name, without any directory elements.</p>
</table>
<h3>Examples</h3>
-<pre><basename property="jar.filename" file="${lib.jarfile}"/></pre>
-<p>will set <code>jar.filename</code> to <samp>myjar.jar</samp>, if <code>lib.jarfile</code> is
-defined as either a full-path filename (eg., <samp>/usr/local/lib/myjar.jar</samp>), a relative-path
+<p>Set <code>jar.filename</code> to <samp>myjar.jar</samp>, if <code>lib.jarfile</code> is defined
+as either a full-path filename (eg., <samp>/usr/local/lib/myjar.jar</samp>), a relative-path
filename (eg., <samp>lib/myjar.jar</samp>), or a simple filename (eg., <samp>myjar.jar</samp>).</p>
+<pre><basename property="jar.filename" file="${lib.jarfile}"/></pre>
+
+<p>Set <code>cmdname</code> to <samp>foo</samp>.</p>
<pre>
<basename property="cmdname" file="D:/usr/local/foo.exe"
suffix=".exe"/></pre>
-<p>will set <code>cmdname</code> to <samp>foo</samp>.</p>
+
+<p>Set <code>temp.dirname</code> to the last directory element of the path defined for
+the <code>TEMP</code> environment variable.</p>
<pre>
<property environment="env"/>
<basename property="temp.dirname" file="${env.TEMP}"/>
</pre>
-<p>will set <code>temp.dirname</code> to the last directory element of the path defined for
-the <code>TEMP</code> environment variable.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/buildnumber.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/buildnumber.html b/manual/Tasks/buildnumber.html
index f2eab08..db8e69b 100644
--- a/manual/Tasks/buildnumber.html
+++ b/manual/Tasks/buildnumber.html
@@ -48,13 +48,11 @@ need finer control over things such as the property name or the number format.)<
</table>
<h3>Examples</h3>
-<pre><buildnumber/></pre>
-
<p>Read, increment, and write a build number to the default file, <samp>build.number</samp>.</p>
-
-<pre><buildnumber file="mybuild.number"/></pre>
+<pre><buildnumber/></pre>
<p>Read, increment, and write a build number to the file <samp>mybuild.number</samp>.</p>
+<pre><buildnumber file="mybuild.number"/></pre>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/cab.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/cab.html b/manual/Tasks/cab.html
index 84c3b20..9d33565 100644
--- a/manual/Tasks/cab.html
+++ b/manual/Tasks/cab.html
@@ -106,29 +106,32 @@ element to specify the files to be included in the archive. If this is specifie
the <var>basedir</var> attribute cannot be used.</p>
<h3>Examples</h3>
+<p>Cab all files in the <samp>htdocs/manual</samp> directory into a file
+called <samp>manual.cab</samp> in the <samp>${dist}</samp> directory.</p>
<pre>
<cab cabfile="${dist}/manual.cab"
basedir="htdocs/manual"/></pre>
-<p>cabs all files in the <samp>htdocs/manual</samp> directory into a file
-called <samp>manual.cab</samp> in the <samp>${dist}</samp> directory.</p>
+
+<p>Cab all files in the <samp>htdocs/manual</samp> directory into a file
+called <samp>manual.cab</samp> in the <samp>${dist}</samp> directory. Files in the
+directory <samp>mydocs</samp>, or files with the name <samp>todo.html</samp> are excluded.</p>
<pre>
<cab cabfile="${dist}/manual.cab"
basedir="htdocs/manual"
excludes="mydocs/**, **/todo.html"/></pre>
-<p>cabs all files in the <samp>htdocs/manual</samp> directory into a file
-called <samp>manual.cab</samp> in the <samp>${dist}</samp> directory. Files in the
-directory <samp>mydocs</samp>, or files with the name <samp>todo.html</samp> are excluded.</p>
+
+<p>Cab all files in the <samp>htdocs/manual</samp> directory into a file
+called <samp>manual.cab</samp> in the <samp>${dist}</samp> directory. Only <samp>.html</samp> files
+under the directory <samp>api</samp> are archived, and files with the name <samp>todo.html</samp>
+are excluded. Output from the <kbd>cabarc</kbd> tool is displayed in the build output.</p>
<pre>
<cab cabfile="${dist}/manual.cab"
basedir="htdocs/manual"
includes="api/**/*.html"
excludes="**/todo.html"
verbose="yes"/></pre>
-<p>Cab all files in the <samp>htdocs/manual</samp> directory into a file
-called <samp>manual.cab</samp> in the <samp>${dist}</samp> directory. Only <samp>.html</samp> files
-under the directory <samp>api</samp> are archived, and files with the name <samp>todo.html</samp>
-are excluded. Output from the <code>cabarc</code> tool is displayed in the build output.</p>
+<p>The following is equivalent to the example above.</p>
<pre>
<cab cabfile="${dist}/manual.cab"
verbose="yes">
@@ -137,7 +140,6 @@ are excluded. Output from the <code>cabarc</code> tool is displayed in the build
includes="api/**/*.html"
excludes="**/todo.html"/>
</cab></pre>
-<p>is equivalent to the example above.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/ccm.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/ccm.html b/manual/Tasks/ccm.html
index ed2ded8..20b5725 100644
--- a/manual/Tasks/ccm.html
+++ b/manual/Tasks/ccm.html
@@ -74,13 +74,12 @@ other platforms with <kbd>ccm</kbd> installed.</p>
</table>
<h3>Examples</h3>
+<p>Check in the file <samp>c:/wa/com/foo/MyFile.java</samp>. Text <samp>mycomment</samp> is added
+as a comment. The task used is the one set as the default.</p>
<pre>
<ccmcheckin file="c:/wa/com/foo/MyFile.java"
comment="mycomment"/></pre>
-<p>Checks in the file <samp>c:/wa/com/foo/MyFile.java</samp>. Text <samp>mycomment</samp> is added
-as a comment. The task used is the one set as the default.</p>
-
<hr/>
<h2 id="ccmcheckout">CCMCheckout</h2>
@@ -121,14 +120,16 @@ as a comment. The task used is the one set as the default.</p>
</table>
<h3>Examples</h3>
+<p>Check out the file <samp>c:/wa/com/foo/MyFile.java</samp>. Comment
+attribute <samp>mycomment</samp> is added as a task comment. The task used is the one set as the
+default.</p>
<pre>
<ccmcheckout file="c:/wa/com/foo/MyFile.java"
comment="mycomment"/></pre>
-<p>Check out the file <samp>c:/wa/com/foo/MyFile.java</samp>. Comment
-attribute <samp>mycomment</samp> is added as a task comment The used task is the one set as the
-default.</p>
-
+<p>Check out all the files in the <samp>lib</samp> directory having the <samp>.jar</samp>
+extension. Comment attribute <samp>mycomment</samp> is added as a task comment The used task is the
+one set as the default.</p>
<pre>
<ccmcheckout comment="mycomment">
<fileset dir="lib" >
@@ -136,10 +137,6 @@ default.</p>
</fileset>
</ccmcheckout ></pre>
-<p>Check out all the files in the <samp>lib</samp> directory having the <samp>.jar</samp> extension.
-Comment attribute <samp>mycomment</samp> is added as a task comment The used task is the one set as
-the default.</p>
-
<hr/>
<h2 id="ccmcheckintask">CCMCheckinTask</h2>
@@ -171,10 +168,9 @@ the default.</p>
</table>
<h3>Examples</h3>
+<p>Perform a Checkin default task on all the checked out files in the current task.</p>
<pre><ccmcheckintask comment="blahblah/></pre>
-<p>Does a Checkin default task on all the checked out files in the current task.</p>
-
<hr/>
<h2 id="ccmreconfigure">CCMReconfigure</h2>
@@ -211,12 +207,11 @@ the default.</p>
</table>
<h3>Examples</h3>
+<p>Perform a Continuus <code>reconfigure</code> on the project <samp>ANTCCM_TEST#BMO_1</samp>.</p>
<pre>
<ccmreconfigure ccmproject="ANTCCM_TEST#BMO_1"
verbose="true"/></pre>
-<p>Does a Continuus <code>reconfigure</code> on the project <samp>ANTCCM_TEST#BMO_1</samp>.</p>
-
<hr/>
<h2 id="ccmcreatetask">CCMCreateTask</h2>
@@ -268,12 +263,11 @@ the default.</p>
</table>
<h3>Examples</h3>
+<p>Create a task for the release <samp>ANTCCM_TEST</samp> with the current user as the resolver for
+this task.</p>
<pre>
<ccmcreatetask resolver="${user.name}"
release="ANTCCM_TEST" comment="blahblah"/></pre>
-<p>Creates a task for the release <samp>ANTCCM_TEST</samp> with the current user as the resolver for
-this task.</p>
-
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/changelog.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/changelog.html b/manual/Tasks/changelog.html
index 4b018ef..b030469 100644
--- a/manual/Tasks/changelog.html
+++ b/manual/Tasks/changelog.html
@@ -184,59 +184,53 @@ attribute can contain spaces in their name.</p>
</table>
<h3>Examples</h3>
+<p>Generate a change log report for all the changes that have been made under
+the <samp>dve/network</samp> directory. Write these changes into the
+file <samp>changelog.xml</samp>.</p>
<pre>
<cvschangelog dir="dve/network"
destfile="changelog.xml"/></pre>
-<p>Generates a change log report for all the changes that have been made under
-the <samp>dve/network</samp> directory. It writes these changes into the
-file <samp>changelog.xml</samp>.</p>
-
+<p>Generate a change log report for any changes that were made under the <samp>dve/network</samp>
+directory in the past 10 days. Write these changes into the file <samp>changelog.xml</samp>.</p>
<pre>
<cvschangelog dir="dve/network"
destfile="changelog.xml"
daysinpast="10"/></pre>
-<p>Generates a change log report for any changes that were made under the <samp>dve/network</samp>
-directory in the past 10 days. It writes these changes into the
+<p>Generate a change log report for any changes that were made between February 20, 2002 and March
+20, 2002 under the <samp>dve/network</samp> directory. Write these changes into the
file <samp>changelog.xml</samp>.</p>
-
<pre>
<cvschangelog dir="dve/network"
destfile="changelog.xml"
start="20 Feb 2002"
end="20 Mar 2002"/></pre>
-<p>Generates a change log report for any changes that were made between February 20, 2002 and March
-20, 2002 under the <samp>dve/network</samp> directory. It writes these changes into the
+<p>Generate a change log report for any changes that were made after February 20, 2002 under
+the <samp>dve/network</samp> directory. Write these changes into the
file <samp>changelog.xml</samp>.</p>
-
<pre>
<cvschangelog dir="dve/network"
destfile="changelog.xml"
start="20 Feb 2002"/></pre>
-<p>Generates a change log report for any changes that were made after February 20, 2002 under
-the <samp>dve/network</samp> directory. It writes these changes into the
-file <samp>changelog.xml</samp>.</p>
-
+<p>Generate a change log report for all the changes that were made under
+the <code>dve/network</code> directory, substituting the name <samp>Peter Donald</samp> in
+the <code><author></code> tags anytime a change made by the user ID <samp>donaldp</samp> is
+encountered. Write these changes into the file <samp>changelog.xml</samp>.</p>
<pre>
<cvschangelog dir="dve/network"
destfile="changelog.xml">
<user displayname="Peter Donald" userid="donaldp"/>
</cvschangelog></pre>
-<p>Generates a change log report for all the changes that were made under
-the <code>dve/network</code> directory, substituting the name <samp>Peter Donald</samp> in
-the <code><author></code> tags anytime it encounters a change made by the user
-ID <samp>donaldp</samp>. It writes these changes into the file <samp>changelog.xml</samp>.</p>
-
-<p>Generates a change log report on the <code>ANT_16_BRANCH</code>.</p>
+<p>Generate a change log report on the <code>ANT_16_BRANCH</code>.</p>
<pre>
<cvschangelog dir="c:/dev/asf/ant.head" passfile="c:/home/myself/.cvspass"
destfile="changelogant.xml" tag="ANT_16_BRANCH"/></pre>
<h4>Generate Report</h4>
-<p>Ant includes a basic XSLT stylesheet that you can use to generate a HTML report based on the xml
+<p>Ant includes a basic XSLT stylesheet that you can use to generate a HTML report based on the XML
output. The following example illustrates how to generate a HTML report from the XML report.</p>
<pre>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/checksum.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/checksum.html b/manual/Tasks/checksum.html
index dadeb39..c5f5bd1 100644
--- a/manual/Tasks/checksum.html
+++ b/manual/Tasks/checksum.html
@@ -173,50 +173,54 @@ target="_top">Cryptography Architecture Standard Algorithm Name Documentation</a
for which checksums should be generated.</p>
<h3>Examples</h3>
+
<p><strong>Example 1</strong></p>
-<pre><checksum file="foo.bar"/></pre>
-<p>Generates a MD5 checksum for <samp>foo.bar</samp> and stores the checksum in the destination
+<p>Generate a MD5 checksum for <samp>foo.bar</samp> and store the checksum in the destination
file <samp>foo.bar.MD5</samp>. <samp>foo.bar.MD5</samp> is overwritten only if <samp>foo.bar</samp>
is newer than itself.</p>
+<pre><checksum file="foo.bar"/></pre>
<p><strong>Example 2</strong></p>
-<pre><checksum file="foo.bar" forceOverwrite="yes"/></pre>
-<p>Generates a MD5 checksum for <samp>foo.bar</samp> and stores the checksum
+<p>Generate a MD5 checksum for <samp>foo.bar</samp> and store the checksum
in <samp>foo.bar.MD5</samp>. If <samp>foo.bar.MD5</samp> already exists, it is overwritten.</p>
+<pre><checksum file="foo.bar" forceOverwrite="yes"/></pre>
<p><strong>Example 3</strong></p>
-<pre><checksum file="foo.bar" property="foobarMD5"/></pre>
-<p>Generates a MD5 checksum for <samp>foo.bar</samp> and stores it in the project
+<p>Generate a MD5 checksum for <samp>foo.bar</samp> and store it in the project
property <code>foobarMD5</code>.</p>
+<pre><checksum file="foo.bar" property="foobarMD5"/></pre>
<p><strong>Example 4</strong></p>
+<p>Generate a MD5 checksum for <samp>foo.bar</samp>, compare it against <samp>foo.bar.MD5</samp> and
+set <code>isMD5ok</code> to either <q>true</q> or <q>false</q>, depending upon the result.</p>
<pre><checksum file="foo.bar" verifyProperty="isMD5ok"/></pre>
-<p>Generates a MD5 checksum for <samp>foo.bar</samp>, compares it against <samp>foo.bar.MD5</samp>
-and sets <code>isMD5ok</code> to either <q>true</q> or <q>false</q>, depending upon the result.</p>
<p><strong>Example 5</strong></p>
-<pre><checksum file="foo.bar" algorithm="SHA-512" fileext="asc"/></pre>
-<p>Generates a SHA-512 checksum for <samp>foo.bar</samp> and stores the checksum in the destination
+<p>Generate a SHA-512 checksum for <samp>foo.bar</samp> and store the checksum in the destination
file <samp>foo.bar.asc</samp>. <samp>foo.bar.asc</samp> is overwritten only if <samp>foo.bar</samp>
is newer than itself.</p>
+<pre><checksum file="foo.bar" algorithm="SHA-512" fileext="asc"/></pre>
<p><strong>Example 6</strong></p>
-<pre><checksum file="foo.bar" property="${md5}" verifyProperty="isEqual"/></pre>
-<p>Generates a MD5 checksum for <samp>foo.bar</samp>, compares it against the value of the
-property <code>md5</code>, and sets <code>isEqual</code> to either <q>true</q> or <q>false</q>,
+<p>Generate a MD5 checksum for <samp>foo.bar</samp>, compare it against the value of the
+property <code>md5</code>, and set <code>isEqual</code> to either <q>true</q> or <q>false</q>,
depending upon the result.</p>
+<pre><checksum file="foo.bar" property="${md5}" verifyProperty="isEqual"/></pre>
<p><strong>Example 7</strong></p>
+<p>Just like Example 1, but generates a <samp>.MD5</samp> file for every file that begins with the
+name <samp>foo</samp>.</p>
<pre>
<checksum>
<fileset dir=".">
<include name="foo*"/>
</fileset>
</checksum></pre>
-<p>Works just like Example 1, but generates a <samp>.MD5</samp> file for every file that begins with
-the name <samp>foo</samp>.</p>
<p><strong>Example 8</strong></p>
+<p>Just like Example 4, but only sets <code>isChecksumEqual</code> to <q>true</q>, if the checksum
+matches—it will never be set to <q>false</q>. This example demonstrates use with
+the <code>condition</code> task.</p>
<pre>
<condition property="isChecksumEqual">
<checksum>
@@ -225,9 +229,6 @@ the name <samp>foo</samp>.</p>
</fileset>
</checksum>
</condition></pre>
-<p>Works like Example 4, but only sets <code>isChecksumEqual</code> to <q>true</q>, if the checksum
-matches—it will never be set to <q>false</q>. This example demonstrates use with
-the <code>condition</code> task.</p>
<h3>Note</h3>
<p>When working with more than one file, if condition and/or <var>verifyproperty</var> is used, the
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/chgrp.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/chgrp.html b/manual/Tasks/chgrp.html
index 29e8bf4..88ec1c7 100644
--- a/manual/Tasks/chgrp.html
+++ b/manual/Tasks/chgrp.html
@@ -110,19 +110,21 @@ set its value to your current OS.</p>
</tr>
</table>
<h3>Examples</h3>
-<pre><chgrp file="${dist}/start.sh" group="coders"/></pre>
-<p>makes the <samp>start.sh</samp> file belong to the <samp>coders</samp> group on a UNIX
-system.</p>
+<p>Make the <samp>start.sh</samp> file belong to the <samp>coders</samp> group on a UNIX system.</p>
+<pre><chgrp file="${dist}/start.sh" group="coders"/></pre>
+<p>Make all <samp>.sh</samp> files below <samp>${dist}/bin</samp> belong to the <samp>coders</samp>
+group on a UNIX system.</p>
<pre>
<chgrp group="coders">
<fileset dir="${dist}/bin" includes="**/*.sh"/>
</chgrp></pre>
-<p>makes all <samp>.sh</samp> files below <samp>${dist}/bin</samp> belong to the <samp>coders</samp>
-group on a UNIX system.</p>
-
+<p>Make all files below <samp>shared/sources1</samp> (except those below any directory
+named <samp>trial</samp>) belong to the <samp>coders</samp> group on a UNIX system. In addition, all
+files belonging to a FileSet with <var>id</var>=<samp>other.shared.sources</samp> get the same
+group.</p>
<pre>
<chgrp group="coders">
<fileset dir="shared/sources1">
@@ -132,11 +134,10 @@ group on a UNIX system.</p>
</chgrp>
</pre>
-<p>makes all files below <samp>shared/sources1</samp> (except those below any directory
-named <samp>trial</samp>) belong to the <samp>coders</samp> group on a UNIX system. In addition all
-files belonging to a FileSet with <var>id</var> <samp>other.shared.sources</samp> get the same
-group.</p>
-
+<p>Make all <samp>.test.jsp</samp>, and <samp>.new</samp> files belong to
+group <samp>webdev</samp>. Directories with names beginning with <samp>test_</samp> also will belong
+to <samp>webdev</samp>, but if there is a directory name that ends in <samp>.new</samp> or a file
+name that begins with <samp>test_</samp> it will be unaffected.</p>
<pre>
<chgrp group="webdev" type="file">
<fileset dir="/web">
@@ -148,10 +149,5 @@ group.</p>
</dirset>
</chmod></pre>
-<p>makes all <samp>.test.jsp</samp>, and <samp>.new</samp> files belong to
-group <samp>webdev</samp>. Directories with names beginning with <samp>test_</samp> also will belong
-to <samp>webdev</samp>, but if there is a directory name that ends in <samp>.new</samp> or a file
-name that begins with <samp>test_</samp> it will be unaffected.</p>
-
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/chmod.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/chmod.html b/manual/Tasks/chmod.html
index 8f79379..b20f814 100644
--- a/manual/Tasks/chmod.html
+++ b/manual/Tasks/chmod.html
@@ -138,19 +138,24 @@ alternative.</p>
</tr>
</table>
<h3>Examples</h3>
+
+<p>Make the <samp>start.sh</samp> file readable and executable for anyone on a UNIX system.</p>
<pre><chmod file="${dist}/start.sh" perm="ugo+rx"/></pre>
-<p>makes the <samp>start.sh</samp> file readable and executable for anyone on a UNIX system.</p>
-<pre><chmod file="${dist}/start.sh" perm="700"/></pre>
-<p>makes the <samp>start.sh</samp> file readable, writable and executable only for the owner on a
+<p>Make the <samp>start.sh</samp> file readable, writable and executable only for the owner on a
UNIX system.</p>
+<pre><chmod file="${dist}/start.sh" perm="700"/></pre>
+<p>Make all <samp>.sh</samp> files below <samp>${dist}/bin</samp> readable and executable for anyone
+on a UNIX system.</p>
<pre>
<chmod dir="${dist}/bin" perm="ugo+rx"
includes="**/*.sh"/></pre>
-<p>makes all <samp>.sh</samp> files below <samp>${dist}/bin</samp> readable and executable for
-anyone on a UNIX system.</p>
+<p>Make all files below <samp>shared/sources1</samp> (except those below any directory
+named <samp>trial</samp>) writable for members of the same group on a UNIX system. In addition, all
+files belonging to a FileSet with <var>id</var> <samp>other.shared.sources</samp> get the same
+permissions.</p>
<pre>
<chmod perm="g+w">
<fileset dir="shared/sources1">
@@ -158,10 +163,10 @@ anyone on a UNIX system.</p>
</fileset>
<fileset refid="other.shared.sources"/>
</chmod></pre>
-<p>makes all files below <samp>shared/sources1</samp> (except those below any directory named trial)
-writable for members of the same group on a UNIX system. In addition all files belonging to a
-FileSet with <var>id</var> <samp>other.shared.sources</samp> get the same permissions.</p>
+<p>Keep non-owners from touching <code>cgi</code> scripts, files with a <samp>.old</samp> extension
+or directories beginning with <samp>private_</samp>. A directory ending in <samp>.old</samp> or a
+file beginning with <samp>private_</samp> would remain unaffected.</p>
<pre>
<chmod perm="go-rwx" type="file">
<fileset dir="/web">
@@ -172,9 +177,6 @@ FileSet with <var>id</var> <samp>other.shared.sources</samp> get the same permis
<include name="**/private_*"/>
</dirset>
</chmod></pre>
-<p>keeps non-owners from touching cgi scripts, files with a <samp>.old</samp> extension or
-directories beginning with <samp>private_</samp>. A directory ending in <samp>.old</samp> or a file
-beginning with <samp>private_</samp> would remain unaffected.</p>
<h3>Note on <var>maxparallel</var> attribute</h3>
<p>Some shells have a limit of the number of characters that a command line may contain. This
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/chown.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/chown.html b/manual/Tasks/chown.html
index 55a17ac..4a700c7 100644
--- a/manual/Tasks/chown.html
+++ b/manual/Tasks/chown.html
@@ -111,16 +111,20 @@ value to your current OS.</p>
</tr>
</table>
<h3>Examples</h3>
+
+<p>Make the <samp>start.sh</samp> file belong to <samp>coderjoe</samp> on a UNIX system.</p>
<pre><chown file="${dist}/start.sh" owner="coderjoe"/></pre>
-<p>makes the <samp>start.sh</samp> file belong to <samp>coderjoe</samp> on a UNIX system.</p>
+<p>Make all <samp>.sh</samp> files below <samp>${dist}/bin</samp> belong to <samp>coderjoe</samp> on
+a UNIX system.</p>
<pre>
<chown owner="coderjoe">
<fileset dir="${dist}/bin" includes="**/*.sh"/>
</chown></pre>
-<p>makes all <samp>.sh</samp> files below <samp>${dist}/bin</samp> belong to <samp>coderjoe</samp>
-on a UNIX system.</p>
+<p>Make all files below <samp>shared/sources1</samp> (except those below any directory
+named <samp>trial</samp>) belong to <samp>coderjoe</samp> on a UNIX system. In addition, all files
+belonging to a FileSet with <var>id</var>=<code>other.shared.sources</code> get the same owner.</p>
<pre>
<chown owner="coderjoe">
<fileset dir="shared/sources1">
@@ -128,10 +132,10 @@ on a UNIX system.</p>
</fileset>
<fileset refid="other.shared.sources"/>
</chown></pre>
-<p>makes all files below <samp>shared/sources1</samp> (except those below any directory
-named <samp>trial</samp>) belong to <samp>coderjoe</samp> on a UNIX system. In addition all files
-belonging to a FileSet with <var>id</var> <code>other.shared.sources</code> get the same owner.</p>
+<p>Make <samp>cgi</samp> scripts, files with a <samp>.old</samp> extension or directories beginning
+with <samp>private_</samp> belong to the user named <samp>webadmin</samp>. A directory ending
+in <samp>.old</samp> or a file beginning with <samp>private_</samp> would remain unaffected.</p>
<pre>
<chown owner="webadmin" type="file">
<fileset dir="/web">
@@ -142,9 +146,6 @@ belonging to a FileSet with <var>id</var> <code>other.shared.sources</code> get
<include name="**/private_*"/>
</dirset>
</chmod></pre>
-<p>makes <samp>cgi</samp> scripts, files with a <samp>.old</samp> extension or directories beginning
-with <samp>private_</samp> belong to the user named <samp>webadmin</samp>. A directory ending
-in <samp>.old</samp> or a file beginning with <samp>private_</samp> would remain unaffected.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/clearcase.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/clearcase.html b/manual/Tasks/clearcase.html
index 7b0e480..9327645 100644
--- a/manual/Tasks/clearcase.html
+++ b/manual/Tasks/clearcase.html
@@ -118,17 +118,16 @@ problem.</p>
</table>
<h3>Examples</h3>
+<p>Perform a ClearCase <code>checkin</code> on the file <samp>c:/views/viewdir/afile</samp>. Comment
+text from the file <samp>acomment.txt</samp> is added to ClearCase as a comment. All warning
+messages are suppressed. The file is checked in even if it is <em>identical</em> to the
+original.</p>
<pre>
<cccheckin viewpath="c:/views/viewdir/afile"
commentfile="acomment.txt"
nowarn="true"
identical="true"/></pre>
-<p>Does a ClearCase <code>checkin</code> on the file <samp>c:/views/viewdir/afile</samp>. Comment
-text from the file <samp>acomment.txt</samp> is added to ClearCase as a comment. All warning
-messages are suppressed. The file is checked in even if it is <em>identical</em> to the
-original.</p>
-
<hr/>
<h2 id="cccheckout">CCCheckout</h2>
@@ -200,6 +199,9 @@ original.</p>
</table>
<h3>Examples</h3>
+<p>Perform a ClearCase <code>checkout</code> on the file <samp>c:/views/viewdir/afile</samp>. It is
+checked out as <em>reserved</em> on branch called <samp>abranch</samp>. All warning messages are
+suppressed. A "<samp>Some comment text</samp>" is added to ClearCase as a comment.</p>
<pre>
<cccheckout viewpath="c:/views/viewdir/afile"
reserved="true"
@@ -207,10 +209,6 @@ original.</p>
nowarn="true"
comment="Some comment text"/></pre>
-<p>Does a ClearCase <code>checkout</code> on the file <samp>c:/views/viewdir/afile</samp>. It is
-checked out as <em>reserved</em> on branch called <samp>abranch</samp>. All warning messages are
-suppressed. A "<samp>Some comment text</samp>" is added to ClearCase as a comment.</p>
-
<hr/>
<h2 id="ccuncheckout">CCUnCheckout</h2>
@@ -241,11 +239,10 @@ suppressed. A "<samp>Some comment text</samp>" is added to ClearCase a
</table>
<h3>Examples</h3>
+<p>Perform a ClearCase <code>uncheckout</code> on the file <samp>c:/views/viewdir/afile</samp>. A
+copy of the file named <samp>c:/views/viewdir/afile.keep</samp> is kept.</p>
<pre><ccuncheckout viewpath="c:/views/viewdir/afile" keepcopy="true"/></pre>
-<p>Does a ClearCase <code>uncheckout</code> on the file <samp>c:/views/viewdir/afile</samp>. A copy
-of the file called <samp>c:/views/viewdir/afile.keep</samp> is kept.</p>
-
<hr/>
<h2 id="ccupdate">CCUpdate</h2>
@@ -303,6 +300,10 @@ of the file called <samp>c:/views/viewdir/afile.keep</samp> is kept.</p>
</table>
<h3>Examples</h3>
+<p>Perform a ClearCase <code>update</code> on the snapshot view
+directory <samp>c:/views/viewdir</samp>. A graphical dialog will be displayed. The output will be
+logged to <samp>log.log</samp> and it will overwrite any hijacked files. The modified time will be
+set to the current time.</p>
<pre>
<ccupdate viewpath="c:/views/viewdir"
graphical="false"
@@ -311,11 +312,6 @@ of the file called <samp>c:/views/viewdir/afile.keep</samp> is kept.</p>
currenttime="true"
rename="false"/></pre>
-<p>Does a ClearCase <code>update</code> on the snapshot view
-directory <samp>c:/views/viewdir</samp>. A graphical dialog will be displayed. The output will be
-logged to <samp>log.log</samp> and it will overwrite any hijacked files. The modified time will be
-set to the current time.</p>
-
<hr/>
<h2 id="ccmklbtype">CCMklbtype</h2>
@@ -382,15 +378,14 @@ set to the current time.</p>
<h3>Examples</h3>
+<p>Perform a ClearCase <code>mklbtype</code> to create a label type named <samp>VERSION_1</samp>. It
+is created as <em>ordinary</em> so it is available only to the current VOB. The text <q>Development
+version 1</q> is added as a comment.</p>
<pre>
<ccmklbtype typename="VERSION_1"
ordinary="true"
comment="Development version 1"/></pre>
-<p>Does a ClearCase <code>mklbtype</code> to create a label type named <samp>VERSION_1</samp>. It
-is created as <em>ordinary</em> so it is available only to the current VOB. The text <q>Development
-version 1</q> is added as a comment.</p>
-
<hr/>
<h2 id="ccmklabel">CCMklabel</h2>
@@ -451,6 +446,9 @@ version 1</q> is added as a comment.</p>
<h3>Examples</h3>
+<p>Perform a ClearCase <code>mklabel</code> on the file <samp>c:/views/viewdir/afile</samp> under
+the <samp>main</samp> branch for version 2 (<samp>\main\2</samp>). Text "<samp>Some comment
+text</samp>" is added as a comment. It will <em>recurse</em> all subdirectories.</p>
<pre>
<ccmklabel viewpath="c:/views/viewdir/afile"
comment="Some comment text"
@@ -459,10 +457,6 @@ version 1</q> is added as a comment.</p>
typename="VERSION_1"/>
</pre>
-<p>Does a ClearCase <code>mklabel</code> on the file <samp>c:/views/viewdir/afile</samp> under the
-main branch for version 2 (<samp>\main\2</samp>). Text "<samp>Some comment text</samp>" is
-added as a comment. It will <em>recurse</em> all subdirectories.</p>
-
<hr/>
<h2 id="ccrmtype">CCRmtype</h2>
@@ -544,16 +538,15 @@ added as a comment. It will <em>recurse</em> all subdirectories.</p>
<h3>Examples</h3>
+<p>Perform a ClearCase <code>rmtype</code> to remove a label type (<q>lbtype</q>)
+named <samp>VERSION_1</samp>. Comment text from the file <samp>acomment.txt</samp> is added as a
+comment. All instances of the type are removed, including the type object itself.</p>
<pre>
<ccrmtype typekind="lbtype"
typename="VERSION_1"
commentfile="acomment.txt"
rmall="true"/></pre>
-<p>Does a ClearCase <code>rmtype</code> to remove a label type (<q>lbtype</q>)
-named <samp>VERSION_1</samp>. Comment text from the file <samp>acomment.txt</samp> is added as a
-comment. All instances of the type are removed, including the type object itself.</p>
-
<hr/>
<h2 id="cclock">CCLock</h2>
@@ -609,10 +602,9 @@ comment. All instances of the type are removed, including the type object itself
</table>
<h3>Examples</h3>
-<pre><cclock objsel="stream:Application_Integration@\MyProject_PVOB"/></pre>
-
-<p>Does a ClearCase <code>lock</code> on the
+<p>Perform a ClearCase <code>lock</code> on the
object <samp>stream:Application_Integration@\MyProject_PVOB</samp>.</p>
+<pre><cclock objsel="stream:Application_Integration@\MyProject_PVOB"/></pre>
<hr/>
@@ -654,10 +646,9 @@ object <samp>stream:Application_Integration@\MyProject_PVOB</samp>.</p>
</table>
<h3>Examples</h3>
-<pre><ccunlock objsel="stream:Application_Integration@\MyProject_PVOB"/></pre>
-
-<p>Does a ClearCase <code>unlock</code> on the
+<p>Perform a ClearCase <code>unlock</code> on the
object <samp>stream:Application_Integration@\MyProject_PVOB</samp>.</p>
+<pre><ccunlock objsel="stream:Application_Integration@\MyProject_PVOB"/></pre>
<hr/>
@@ -713,16 +704,15 @@ object <samp>stream:Application_Integration@\MyProject_PVOB</samp>.</p>
</table>
<h3>Examples</h3>
+<p>Perform a ClearCase <code>mkbl</code> on the Integration view at <samp>v:\ApplicationCC</samp>
+even if it is <em>identical</em> to a previous baseline. The new baseline with be incremental and
+named <samp>Application_Baseline_AUTO</samp>.</p>
<pre>
<ccmkbl baselinerootname="Application_Baseline_AUTO"
identical="yes"
full="no"
viewpath="v:\ApplicationCC"/></pre>
-<p>Does a ClearCase <code>mkbl</code> on the Integration view at <samp>v:\ApplicationCC</samp> even
-if it is <em>identical</em> to a previous baseline. The new baseline with be incremental and
-named <samp>Application_Baseline_AUTO</samp>.</p>
-
<hr/>
<h2 id="ccmkattr">CCMkattr</h2>
@@ -783,15 +773,14 @@ named <samp>Application_Baseline_AUTO</samp>.</p>
</table>
<h3>Examples</h3>
+<p>Perform a ClearCase <code>mkattr</code> on the file <samp>c:/views/viewdir/afile</samp> and
+attach the attribute <samp>BugFix</samp> with a value of <samp>34445</samp> to it.</p>
<pre>
<ccmkattr viewpath="c:/views/viewdir/afile"
typename="BugFix"
typevalue="34445"/>
</pre>
-<p>Does a ClearCase <code>mkattr</code> on the file <samp>c:/views/viewdir/afile</samp> and attaches
-the attribute <samp>BugFix</samp> with a value of <samp>34445</samp> to it.</p>
-
<hr/>
<h2 id="ccmkdir">CCMkdir</h2>
@@ -832,14 +821,13 @@ the attribute <samp>BugFix</samp> with a value of <samp>34445</samp> to it.</p>
</table>
<h3>Examples</h3>
+<p>Perform a ClearCase <code>mkdir</code> on the dir <samp>c:/views/viewdir/adir</samp> and do not
+automatically check it out.</p>
<pre>
<ccmkdir viewpath="c:/views/viewdir/adir"
nocheckout="true"
comment="Some comment text"/></pre>
-<p>Does a ClearCase <code>mkdir</code> on the dir <samp>c:/views/viewdir/adir</samp> and does not
-automatically check it out.</p>
-
<hr/>
<h2 id="ccmkelem">CCMkelem</h2>
@@ -905,14 +893,13 @@ automatically check it out.</p>
</table>
<h3>Examples</h3>
+<p>Perform ClearCase <code>mkelem</code> on the file <samp>c:/views/viewdir/afile</samp> with
+element type <samp>text_file</samp>, check in the file after creation.</p>
<pre>
<ccmkelem viewpath="c:/views/viewdir/afile"
eltype="text_file"
checkin="true"
comment="Some comment text"/></pre>
-<p>Does a ClearCase <code>mkelem</code> on the file <samp>c:/views/viewdir/afile</samp> with element
-type <samp>text_file</samp>. It also checks in the file after creation.</p>
-
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/componentdef.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/componentdef.html b/manual/Tasks/componentdef.html
index 63d2493..557c1a5 100644
--- a/manual/Tasks/componentdef.html
+++ b/manual/Tasks/componentdef.html
@@ -38,13 +38,13 @@ like <samp>and</samp> or <samp>or</samp>.</p>
<h3>Examples</h3>
+<p>Define two components with the same name <samp>or</samp>; one is a
+condition (see <a href="conditions.html">conditions</a>) and one is a
+selector (see <a href="../Types/selectors.html">selectors</a>).</p>
<pre>
<componentdef name="or" onerror="ignore"
classname="com.apache.tools.ant.taskdefs.conditions.Or"/>
<componentdef name="or" onerror="ignore"
classname="com.apache.tools.ant.types.resources.selectors.Or"/></pre>
-<p>defines two components with the same name <samp>or</samp>; one is a condition
-(see <a href="conditions.html">conditions</a>) and one is a selector
-(see <a href="../Types/selectors.html">selectors</a>).</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/concat.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/concat.html b/manual/Tasks/concat.html
index cccacc6..b472342 100644
--- a/manual/Tasks/concat.html
+++ b/manual/Tasks/concat.html
@@ -185,27 +185,23 @@
<h3>Examples</h3>
- <p><strong>Concatenate a string to a file:</strong></p>
-
+ <p>Concatenate a string to a file:</p>
<pre><concat destfile="README">Hello, World!</concat></pre>
- <p><strong>Concatenate a series of files to the console:</strong></p>
-
+ <p>Concatenate a series of files to the console:</p>
<pre>
<concat>
<fileset dir="messages" includes="*important*"/>
</concat></pre>
- <p><strong>Concatenate a single file, appending if the destination file exists:</strong></p>
-
+ <p>Concatenate a single file, appending if the destination file exists:</p>
<pre>
<concat destfile="NOTES" append="true">
<filelist dir="notes" files="note.txt"/>
</concat></pre>
- <p><strong>Concatenate a series of files, update the destination file only if is older that all
- the source files:</strong></p>
-
+ <p>Concatenate a series of files, update the destination file only if is older that all the
+ source files:</p>
<pre>
<concat destfile="${docbook.dir}/all-sections.xml"
force="no">
@@ -216,7 +212,7 @@
excludes="introduction.xml,overview.xml"/>
</concat></pre>
- <p><strong>Concatenate a series of files, expanding Ant properties</strong></p>
+ <p>Concatenate a series of files, expanding Ant properties.</p>
<pre>
<concat destfile="${build.dir}/subs">
<path>
@@ -228,8 +224,8 @@
</filterchain>
</concat></pre>
- <p><strong>Filter the lines containing project from build.xml and output them to report.output,
- prepending with a header</strong></p>
+ <p>Filter the lines containing project from <samp>build.xml</samp> and output them
+ to <samp>report.output</samp>, prepending with a header.</p>
<pre>
<concat destfile="${build.dir}/report.output">
<header filtering="no" trimleading="yes">
@@ -244,7 +240,7 @@
</filterchain>
</concat></pre>
- <p><strong>Concatenate a number of binary files.</strong></p>
+ <p>Concatenate a number of binary files.</p>
<pre>
<concat destfile="${build.dir}/dist.bin" binary="yes">
<fileset file="${src.dir}/scripts/dist.sh"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/condition.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/condition.html b/manual/Tasks/condition.html
index 7c12da4..25e4386 100644
--- a/manual/Tasks/condition.html
+++ b/manual/Tasks/condition.html
@@ -63,6 +63,9 @@ condition.</p>
see <a href="conditions.html">here</a>.</p>
<h3>Examples</h3>
+
+<p>Set the property <code>javamail.complete</code> if both the JavaBeans Activation Framework and
+JavaMail are available in the classpath.</p>
<pre>
<condition property="javamail.complete">
<and>
@@ -70,9 +73,9 @@ see <a href="conditions.html">here</a>.</p>
<available classname="javax.mail.Transport"/>
</and>
</condition></pre>
-<p>sets the property <code>javamail.complete</code> if both the JavaBeans Activation Framework and
-JavaMail are available in the classpath.</p>
+<p>Set the property <code>isMacOsButNotMacOsX</code> if the current operating system is MacOS, but
+not MacOS X/macOS—which Ant considers to be in the Unix family as well.</p>
<pre>
<condition property="isMacOsButNotMacOsX">
<and>
@@ -82,15 +85,13 @@ JavaMail are available in the classpath.</p>
</not>
</and>
</condition></pre>
-<p>sets the property <code>isMacOsButNotMacOsX</code> if the current operating system is MacOS, but
-not MacOS X/macOS—which Ant considers to be in the Unix family as well.</p>
+<p>Set the property <code>isSunOSonSparc</code> if the current operating system is SunOS and if it
+is running on a SPARC architecture.</p>
<pre>
<condition property="isSunOSonSparc">
<os name="SunOS" arch="sparc"/>
</condition></pre>
-<p>sets the property <code>isSunOSonSparc</code> if the current operating system is SunOS and if it
-is running on a SPARC architecture.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/copy.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/copy.html b/manual/Tasks/copy.html
index 49b21b8..55160e1 100644
--- a/manual/Tasks/copy.html
+++ b/manual/Tasks/copy.html
@@ -183,17 +183,21 @@ the same <code><copy></code> task, all <code><filterchain></code> el
first followed by <code><filterset></code> elements.</p>
<h3>Examples</h3>
-<p><strong>Copy a single file</strong></p>
+
+<p>Copy a single file</p>
<pre><copy file="myfile.txt" tofile="mycopy.txt"/></pre>
-<p><strong>Copy a single file to a directory</strong></p>
+
+<p>Copy a single file to a directory</p>
<pre><copy file="myfile.txt" todir="../some/other/dir"/></pre>
-<p><strong>Copy a directory to another directory</strong></p>
+
+<p>Copy a directory to another directory</p>
<pre>
<copy todir="../new/dir">
<fileset dir="src_dir"/>
</copy>
</pre>
-<p><strong>Copy a set of files to a directory</strong></p>
+
+<p>Copy a set of files to a directory</p>
<pre>
<copy todir="../dest/dir">
<fileset dir="src_dir">
@@ -204,16 +208,17 @@ first followed by <code><filterset></code> elements.</p>
<copy todir="../dest/dir">
<fileset dir="src_dir" excludes="**/*.java"/>
</copy></pre>
-<p><strong>Copy a set of files to a directory, appending <samp>.bak</samp> to the file name on the
-fly</strong></p>
+
+<p>Copy a set of files to a directory, appending <samp>.bak</samp> to the file name on the
+fly</p>
<pre>
<copy todir="../backup/dir">
<fileset dir="src_dir"/>
<globmapper from="*" to="*.bak"/>
</copy></pre>
-<p><strong>Copy a set of files to a directory, replacing <code>@TITLE@</code> with <samp>Foo
-Bar</samp> in all files.</strong></p>
+<p>Copy a set of files to a directory, replacing <code>@TITLE@</code> with <samp>Foo
+Bar</samp> in all files.</p>
<pre>
<copy todir="../backup/dir">
<fileset dir="src_dir"/>
@@ -222,8 +227,8 @@ Bar</samp> in all files.</strong></p>
</filterset>
</copy></pre>
-<p><strong>Collect all items from the current <code>CLASSPATH</code> setting into a destination
-directory, flattening the directory structure.</strong></p>
+<p>Collect all items from the current <code>CLASSPATH</code> setting into a destination
+directory, flattening the directory structure.</p>
<pre>
<copy todir="dest" flatten="true">
<path>
@@ -231,7 +236,7 @@ directory, flattening the directory structure.</strong></p>
</path>
</copy></pre>
-<p><strong>Copies some resources to a given directory.</strong></p>
+<p>Copies some resources to a given directory.</p>
<pre>
<copy todir="dest" flatten="true">
<resources>
@@ -245,7 +250,7 @@ resource would have returned its full path as source and target name and would n
at all. In general it is a good practice to use an explicit mapper together with resources that use
an absolute path as their names.</p>
-<p><strong>Copies the two newest resources into a destination directory.</strong></p>
+<p>Copies the two newest resources into a destination directory.</p>
<pre>
<copy todir="dest" flatten="true">
<first count="2">
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/copydir.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/copydir.html b/manual/Tasks/copydir.html
index 6609a2e..84c73c7 100644
--- a/manual/Tasks/copydir.html
+++ b/manual/Tasks/copydir.html
@@ -102,26 +102,28 @@ and <code><patternset></code> elements.</p>
</tr>
</table>
<h3>Examples</h3>
+<p>Copy the directory <samp>${src}/resources</samp> to <samp>${dist}</samp>.</p>
<pre>
<copydir src="${src}/resources"
dest="${dist}"/></pre>
-<p>copies the directory <samp>${src}/resources</samp> to <samp>${dist}</samp>.</p>
+
+<p>Copy the directory <samp>${src}/resources</samp> to <samp>${dist}</samp>
+recursively. All <samp>.java</samp> files are copied, except for files with the
+name <samp>Test.java</samp>.</p>
<pre>
<copydir src="${src}/resources"
dest="${dist}"
includes="**/*.java"
excludes="**/Test.java"/></pre>
-<p>copies the directory <samp>${src}/resources</samp> to <samp>${dist}</samp>
-recursively. All <samp>.java</samp> files are copied, except for files with the
-name <samp>Test.java</samp>.</p>
+
+<p>Copy the directory <samp>${src}/resources</samp> to <samp>${dist}</samp>
+recursively. All <samp>.java</samp> files are copied, except for the files under
+the <samp>mypackage/test</samp> directory.</p>
<pre>
<copydir src="${src}/resources"
dest="${dist}"
includes="**/*.java"
excludes="mypackage/test/**"/></pre>
-<p>copies the directory <samp>${src}/resources</samp> to <samp>${dist}</samp>
-recursively. All <samp>.java</samp> files are copied, except for the files under
-the <samp>mypackage/test</samp> directory.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/cvs.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/cvs.html b/manual/Tasks/cvs.html
index c8e5333..95f8971 100644
--- a/manual/Tasks/cvs.html
+++ b/manual/Tasks/cvs.html
@@ -169,22 +169,23 @@ attribute can contain spaces in their name.</p>
</table>
<h3>Examples</h3>
+
+<p>Check out the package/module <samp>ant</samp> from the CVS repository pointed to by
+the <var>cvsRoot</var> attribute, and store the files in <samp>${ws.dir}</samp>.</p>
<pre>
<cvs cvsRoot=":pserver:anoncvs@cvs.apache.org:/home/cvspublic"
package="ant"
dest="${ws.dir}"/></pre>
-<p>checks out the package/module <samp>ant</samp> from the CVS repository pointed to by
-the <var>cvsRoot</var> attribute, and stores the files in <samp>${ws.dir}</samp>.</p>
+<p>Update the package/module that has previously been checked out into <samp>${ws.dir}</samp>.</p>
<pre><cvs dest="${ws.dir}" command="update"/></pre>
-<p>updates the package/module that has previously been checked out into <samp>${ws.dir}</samp>.</p>
+<p>Silently (<kbd>-q</kbd>) create a file called <samp>patch.txt</samp> containing a unified
+(<kbd>-u</kbd>) diff which includes new files added via <kbd>cvs add</kbd> (<kbd>-N</kbd>) and can
+be used as input to <kbd>patch</kbd>.</p>
<pre><cvs command="-q diff -u -N" output="patch.txt"/></pre>
-<p>silently (<kbd>-q</kbd>) creates a file called <samp>patch.txt</samp> which contains a unified
-(<kbd>-u</kbd>) diff which includes new files added via <kbd>cvs add</kbd> (<kbd>-N</kbd>) and
-can be used as input to <kbd>patch</kbd>. The equivalent, using <code><commandline></code>
-elements, is:</p>
+<p>The equivalent, using <code><commandline></code> elements, is:</p>
<pre>
<cvs output="patch">
<commandline>
@@ -205,15 +206,15 @@ elements, is:</p>
the <var>failonerror</var>, <var>compression</var>, and other "global" parameters from
the <code><cvs></code> element.</p>
-<pre> <cvs command="update -A -d"/></pre>
-<p>Updates from the head of repository ignoring sticky bits (<kbd>-A</kbd>) and creating any new
+<p>Update from the head of repository ignoring sticky bits (<kbd>-A</kbd>) and creating any new
directories as necessary (<kbd>-d</kbd>).</p>
-<p>Note: the text of the command is passed to <kbd>cvs</kbd> "as-is" so any cvs options
-should appear before the command, and any command options should appear after the command as in the
-diff example above. See <a href="http://cvsbook.red-bean.com/cvsbook.html" target="_top">the CVS
-book</a> for details, specifically
+<pre><cvs command="update -A -d"/></pre>
+<p>Note: the text of the command is passed to <kbd>cvs</kbd> "as-is" so any <kbd>cvs</kbd>
+options should appear before the command, and any command options should appear after the command as
+in the <code>diff</code> example above. See <a href="http://cvsbook.red-bean.com/cvsbook.html"
+target="_top">the CVS book</a> for details, specifically
the <a href="http://cvsbook.red-bean.com/cvsbook.html#Commands%20And%20Options" target="_top">Guide
-to CVS commands</a></p>
+to CVS commands</a>.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/cvspass.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/cvspass.html b/manual/Tasks/cvspass.html
index abcb7d2..bdd7446 100644
--- a/manual/Tasks/cvspass.html
+++ b/manual/Tasks/cvspass.html
@@ -59,10 +59,10 @@ target="_top">bugzilla report 21657</a> for recommended workarounds.</p>
</tr>
</table>
<h3>Examples</h3>
+<p>Add an entry into the <samp>~/.cvspass</samp> password file.</p>
<pre>
<cvspass cvsroot=":pserver:anoncvs@cvs.apache.org:/home/cvspublic"
password="anoncvs"/></pre>
-<p>Adds an entry into the <samp>~/.cvspass</samp> password file.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/cvstagdiff.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/cvstagdiff.html b/manual/Tasks/cvstagdiff.html
index dc9e66b..bc92d32 100644
--- a/manual/Tasks/cvstagdiff.html
+++ b/manual/Tasks/cvstagdiff.html
@@ -147,6 +147,9 @@ attribute can contain spaces in their name.</p>
</table>
<h3>Examples</h3>
+<p>Generate a <code>tagdiff</code> report for all the changes that have been made in
+ the <code>ant</code> module between the tags <samp>ANT_14</samp>
+ and <samp>ANT_141</samp>. Write these changes into the file <samp>tagdiff.xml</samp>.</p>
<pre>
<cvstagdiff cvsRoot=":pserver:anoncvs@cvs.apache.org:/home/cvspublic"
destfile="tagdiff.xml"
@@ -154,36 +157,31 @@ attribute can contain spaces in their name.</p>
startTag="ANT_14"
endTag="ANT_141"/></pre>
-<p>Generates a <code>tagdiff</code> report for all the changes that have been made in
-the <code>ant</code> module between the tags <samp>ANT_14</samp> and <samp>ANT_141</samp>. It
-writes these changes into the file <samp>tagdiff.xml</samp>.</p>
-
+<p>Generate a <code>tagdiff</code> report for all the changes that have been made in
+ the <samp>ant</samp> module in January 2002. Write the changes into the
+ file <samp>tagdiff.xml</samp>. In this example, <var>cvsRoot</var> has not been
+ set. The current <var>cvsRoot</var> will be used (assuming the build is started from a folder stored
+ in CVS.</p>
<pre>
<cvstagdiff destfile="tagdiff.xml"
package="ant"
startDate="2002-01-01"
endDate="2002-31-01"/></pre>
-<p>Generates a <code>tagdiff</code> report for all the changes that have been made in
-the <samp>ant</samp> module in January 2002. In this example <var>cvsRoot</var> has not been
-set. The current <var>cvsRoot</var> will be used (assuming the build is started from a folder stored
-in <samp>cvs</samp>. It writes these changes into the file <samp>tagdiff.xml</samp>.</p>
-
+<p>Generate a <code>tagdiff</code> report for all the changes that have been made in
+ the <samp>ant</samp> and <samp>jakarta-gump</samp> modules in January 2003. Write the changes into
+ the file <samp>tagdiff.xml</samp>. In this
+ example, <var>cvsRoot</var> has not been set. The current <var>cvsRoot</var> will be used (assuming
+ the build is started from a folder stored in CVS.</p>
<pre>
<cvstagdiff destfile="tagdiff.xml"
package="ant jakarta-gump"
startDate="2003-01-01"
endDate="2003-31-01"/></pre>
-<p>Generates a <code>tagdiff</code> report for all the changes that have been made in
-the <samp>ant</samp> and <samp>jakarta-gump</samp> modules in January 2003. In this
-example <var>cvsRoot</var> has not been set. The current <var>cvsRoot</var> will be used (assuming
-the build is started from a folder stored in <samp>cvs</samp>. It writes these changes into the
-file <samp>tagdiff.xml</samp>.</p>
-
<h4>Generate Report</h4>
-<p>Ant includes a basic XSLT stylesheet that you can use to generate a HTML report based on the xml
-output. The following example illustrates how to generate a HTML report from the XML report.</p>
+<p>Ant includes a basic XSLT stylesheet that you can use to generate a HTML report based on the XML
+output. The following example illustrates how to generate an HTML report from the XML report.</p>
<pre>
<style in="tagdiff.xml"
@@ -195,27 +193,31 @@ output. The following example illustrates how to generate a HTML report from the
</style></pre>
<h4>Output</h4>
-<p>The <var>cvsroot</var> and <var>package</var> attributes of the <code>tagdiff</code> element are
-new in Ant 1.6.<br/> Notes on <code>entry</code> attributes:</p>
+<p>The <var>cvsroot</var> and <var>package</var> attributes of the <code><tagdiff></code> element are
+ added <em>since Ant 1.6</em>.</p>
+
+<p>Description of <code><entry></code> attributes:</p>
<table>
<tr>
<th>Attribute</th>
<th>Comment</th>
</tr>
<tr>
- <td>name</td>
+ <td><var>name</var></td>
<td>when reporting on one package, the package name is removed from the output</td>
</tr>
<tr>
- <td>revision</td>
+ <td><var>revision</var></td>
<td>supplied for files which exist at the end of the reporting period</td>
</tr>
<tr>
- <td>prevrevision</td>
+ <td><var>prevrevision</var></td>
<td>supplied for files which exist at the beginning of the reporting period.<br/>Old CVS servers
do not supply it for deleted files. CVS 1.12.2 supplies it.</td>
</tr>
</table>
+
+<p>Example:</p>
<pre>
<?xml version="1.0" encoding="UTF-8"?>
<tagdiff startTag="ANT_14" endTag="ANT_141"
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/cvsversion.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/cvsversion.html b/manual/Tasks/cvsversion.html
index 8d56a34..510462f 100644
--- a/manual/Tasks/cvsversion.html
+++ b/manual/Tasks/cvsversion.html
@@ -89,13 +89,14 @@
</tr>
</table>
<h3>Examples</h3>
+
+<p>Find out the CVS client and server versions and store the versions in the properties
+called <code>apachecvsversion</code> and <code>localcvsversion</code></p>
<pre>
<cvsversion cvsRoot=":pserver:anoncvs@cvs.apache.org:/home/cvspublic"
passfile="/home/myself/.cvspass"
serverversionproperty="apachecvsversion"
clientversionproperty="localcvsversion"/></pre>
-<p>finds out the CVS client and server versions and stores the versions in the properties
-called <code>apachecvsversion</code> and <code>localcvsversion</code></p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/delete.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/delete.html b/manual/Tasks/delete.html
index 0ac5b77..ed4bb6e 100644
--- a/manual/Tasks/delete.html
+++ b/manual/Tasks/delete.html
@@ -153,45 +153,46 @@ nested <code><fileset></code>.</p>
</table>
<h3>Examples</h3>
+
+<p>Delete the file <samp>/lib/ant.jar</samp>.</p>
<pre><delete file="/lib/ant.jar"/></pre>
-<p>deletes the file <samp>/lib/ant.jar</samp>.</p>
-<pre><delete dir="lib"/></pre>
-<p>deletes the <samp>lib</samp> directory, including all files and subdirectories
+<p>Delete the <samp>lib</samp> directory, including all files and subdirectories
of <samp>lib</samp>.</p>
+<pre><delete dir="lib"/></pre>
+<p>Delete all files with the extension <samp>.bak</samp> from the current directory and any
+subdirectories.</p>
<pre>
<delete>
<fileset dir="." includes="**/*.bak"/>
</delete>
</pre>
-<p>deletes all files with the extension <samp>.bak</samp> from the current directory and any
-subdirectories.</p>
+<p>Delete all files and subdirectories of <samp>build</samp>, including <samp>build</samp>
+itself.</p>
<pre>
<delete includeEmptyDirs="true">
<fileset dir="build"/>
</delete>
</pre>
-<p>deletes all files and subdirectories of <samp>build</samp>, including <samp>build</samp>
-itself.</p>
+<p>Delete all files and subdirectories of <samp>build</samp>, without <samp>build</samp> itself.</p>
<pre>
<delete includeemptydirs="true">
<fileset dir="build" includes="**/*"/>
</delete>
</pre>
-<p>deletes all files and subdirectories of <samp>build</samp>, without <samp>build</samp>
-itself.</p>
+<p>Delete the Subversion metadata directories under <samp>src</samp>. Because <samp>.svn</samp> is
+on of the <a href="../dirtasks.html#defaultexcludes">default excludes</a> you have to use
+the <var>defaultexcludes</var> flag, otherwise Ant won't delete these directories and the files in
+it.</p>
<pre>
<delete includeemptydirs="true">
<fileset dir="src" includes="**/.svn/" defaultexcludes="false"/>
</delete>
</pre>
-<p>deletes the subversion metadata directories under <samp>src</samp>. Because <samp>.svn</samp> is
-on of the <a href="../dirtasks.html#defaultexcludes">default excludes</a> you have to use the
-<var>defaultexcludes</var> flag, otherwise Ant won't delete these directories and the files in it.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/332330b2/manual/Tasks/deltree.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/deltree.html b/manual/Tasks/deltree.html
index 8e3bff7..994499b 100644
--- a/manual/Tasks/deltree.html
+++ b/manual/Tasks/deltree.html
@@ -43,10 +43,12 @@
</tr>
</table>
<h3>Examples</h3>
+
+<p>Delete the directory <samp>dist</samp>, including its files and subdirectories.</p>
<pre><deltree dir="dist"/></pre>
-<p>deletes the directory <samp>dist</samp>, including its files and subdirectories.</p>
+
+<p>Delete the directory <samp>${dist}</samp>, including its files and subdirectories.</p>
<pre><deltree dir="${dist}"/></pre>
-<p>deletes the directory <samp>${dist}</samp>, including its files and subdirectories.</p>
</body>
</html>