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/10 19:17:53 UTC
[1/6] ant git commit: , highlighting of input,
output and inlined code
Repository: ant
Updated Branches:
refs/heads/master 5c9cb3d63 -> 14dfef587
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/tutorial-tasks-filesets-properties.html
----------------------------------------------------------------------
diff --git a/manual/tutorial-tasks-filesets-properties.html b/manual/tutorial-tasks-filesets-properties.html
index 8df706f..220ae8d 100644
--- a/manual/tutorial-tasks-filesets-properties.html
+++ b/manual/tutorial-tasks-filesets-properties.html
@@ -46,7 +46,7 @@ property.</p>
<h2 id="buildenvironment">Build environment</h2>
<p>We can use the buildfile from the other tutorial and modify it a little bit. That's the advantage of using
properties—we can reuse nearly the whole script. :-)</p>
-<pre class="code">
+<pre>
<?xml version="1.0" encoding="UTF-8"?>
<project name="<b>FindTask</b>" basedir="." default="test">
...
@@ -66,18 +66,18 @@ same for sources).</p>
<h2 id="propertyaccess">Property access</h2>
<p>Our first step is to set a property to a value and print the value of that property. So
our scenario would be</p>
-<pre class="code">
+<pre>
<find property="test" value="test-value"/>
<find print="test"/></pre>
<p>Ok, it can be rewritten with the core tasks</p>
-<pre class="code">
+<pre>
<property name="test" value="test-value"/>
<echo message="${test}"/></pre>
<p>but I have to start on known ground :-)</p>
<p>So what to do? Handling three attributes (<var>property</var>, <var>value</var>, <var>print</var>) and an execute
method. Because this is only an introduction example I don't do much checking:</p>
-<pre class="code">
+<pre>
import org.apache.tools.ant.BuildException;
public class Find extends Task {
@@ -104,15 +104,16 @@ public class Find extends Task {
}
}</pre>
-<p>As said in the other tutorial, the property access is done via Project instance. We get this instance via the
-public <code>getProject()</code> method which we inherit from <code>Task</code> (more precisely
-from <code>ProjectComponent</code>). Reading a property is done via <code>getProperty(<i>propertyname</i>)</code> (very
-simple, isn't it?). This property returns the value as <samp>String</samp> or <code>null</code> if not set.<br/>
-Setting a property is ... not really difficult, but there is more than one setter. You can use
-the <code>setProperty()</code> method which will do the job as expected. But there is a golden rule in
-Ant: <em>properties are immutable</em>. And this method sets the property to the specified value—whether it has a
-value before that or not. So we use another way. <code>setNewProperty()</code> sets the property only if there is no
-property with that name. Otherwise a message is logged.</p>
+<p>As said in the other tutorial, the property access is done via <code class="code">Project</code> instance. We get
+this instance via the public <code class="code">getProject()</code> method which we inherit
+from <code class="code">Task</code> (more precisely from <code class="code">ProjectComponent</code>). Reading a property
+is done via <code class="code">getProperty(<i>propertyname</i>)</code> (very simple, isn't it?). This property returns
+the value as <code>String</code> or <code>null</code> if not set.<br/> Setting a property is ... not really difficult,
+but there is more than one setter. You can use the <code class="code">setProperty()</code> method which will do the job
+as expected. But there is a golden rule in Ant: <em>properties are immutable</em>. And this method sets the property to
+the specified value—whether it has a value before that or not. So we use another
+way. <code class="code">setNewProperty()</code> sets the property only if there is no property with that name. Otherwise
+a message is logged.</p>
<p><em>(By the way, a short explanation of Ant's "namespaces"—not to be confused with XML namespaces:
an <code><antcall></code> creates a new space for property names. All properties from the caller are passed to the
@@ -123,7 +124,7 @@ callee, but the callee can set its own properties without notice by the caller.)
<p>After putting our two line example from above into a target names <code>use.simple</code> we can call that from our
test case:</p>
-<pre class="code">
+<pre>
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
@@ -154,7 +155,7 @@ public class FindTest {
and I don't have to spend more explanations about their usage in buildfiles. Our goal is to search for a file in
path. And in this step the path is simply a fileset (or more precise: a collection of filesets). So our usage would
be</p>
-<pre class="code">
+<pre>
<find file="ant.jar" location="location.ant-jar">
<fileset dir="${ant.home}" includes="**/*.jar"/>
</find></pre>
@@ -162,7 +163,7 @@ be</p>
<p>What do we need? A task with two attributes (<var>file</var>, <var>location</var>) and nested filesets. Because we
had attribute handling already explained in the example above and the handling of nested elements is described in the
other tutorial, the code should be very easy:</p>
-<pre class="code">
+<pre>
public class Find extends Task {
private String file;
@@ -196,10 +197,10 @@ tested?</p>
<li>don't find a present file</li>
<li>behaviour if file can't be found</li>
</ul>
-<p>Maybe you find some more test cases. But this is enough for now.<br/>
-For each of these points we create a <code>testXX</code> method.</p>
+<p>Maybe you find some more test cases. But this is enough for now.<br/> For each of these points we create
+a <code class="code">testXX</code> method.</p>
-<pre class="code">
+<pre>
public class FindTest {
@Rule
@@ -252,10 +253,10 @@ public class FindTest {
}
}</pre>
-<p>If we run this test class all test cases (except <var>testFileNotPresent</var>) fail. Now we can implement our task,
-so that these test cases will pass.</p>
+<p>If we run this test class all test cases (except <code class="code">testFileNotPresent</code>) fail. Now we can
+implement our task, so that these test cases will pass.</p>
-<pre class="code">
+<pre>
protected void validate() {
if (file == null) throw new BuildException("file not set");
if (location == null) throw new BuildException("location not set");
@@ -281,28 +282,29 @@ so that these test cases will pass.</p>
getProject().setNewProperty(location, foundLocation);
}</pre>
-<p>On <strong>//1</strong> we check the prerequisites for our task. Doing that in a <code>validate</code>-method is a
-common way, because we separate the prerequisites from the real work. On <strong>//2</strong> we iterate over all nested
-filesets. If we don't want to handle multiple filesets, the <code>addFileset()</code> method has to reject the further
-calls. We can get the result of a fileset via its DirectoryScanner like done in <strong>//3</strong>. After that we
-create a platform independent String representation of the file path (<strong>//4</strong>, can be done in other ways of
-course). We have to do the <code>replace()</code>, because we work with a simple string comparison. Ant itself is
-platform independent and can therefore run on filesystems with slash (<q>/</q>, e.g. Linux) or backslash (<q>\</q>,
-e.g. Windows) as path separator. Therefore we have to unify that. If we find our file, we create an absolute path
-representation on <strong>//5</strong>, so that we can use that information without knowing the <var>basedir</var>.
-(This is very important on use with multiple filesets, because they can have different <var>basedir</var>s and the
-return value of the directory scanner is relative to its <var>basedir</var>.) Finally we store the location of the file
-as property, if we had found one (<strong>//6</strong>).</p>
+<p>On <strong>//1</strong> we check the prerequisites for our task. Doing that in a <code class="code">validate()</code>
+method is a common way, because we separate the prerequisites from the real work. On <strong>//2</strong> we iterate
+over all nested filesets. If we don't want to handle multiple filesets, the <code class="code">addFileset()</code>
+method has to reject the further calls. We can get the result of a fileset via
+its <code class="code">DirectoryScanner</code> like done in <strong>//3</strong>. After that we create a platform
+independent String representation of the file path (<strong>//4</strong>, can be done in other ways of course). We have
+to do the <code class="code">replace()</code>, because we work with a simple string comparison. Ant itself is platform
+independent and can therefore run on filesystems with slash (<q>/</q>, e.g. Linux) or backslash (<q>\</q>, e.g. Windows)
+as path separator. Therefore we have to unify that. If we find our file, we create an absolute path representation
+on <strong>//5</strong>, so that we can use that information without knowing the <var>basedir</var>. (This is very
+important on use with multiple filesets, because they can have different <var>basedir</var>s and the return value of the
+directory scanner is relative to its <var>basedir</var>.) Finally we store the location of the file as property, if we
+had found one (<strong>//6</strong>).</p>
<p>Ok, much more easier in this simple case would be to add the <var>file</var> as additional <code>include</code>
element to all filesets. But I wanted to show how to handle complex situations without being complex :-)</p>
<p>The test case uses the Ant property <code>ant.home</code> as reference. This property is set by
-the <code>Launcher</code> class which starts ant. We can use that property in our buildfiles as
+the <code class="code">Launcher</code> class which starts ant. We can use that property in our buildfiles as
a <a href="properties.html#built-in-props">build-in property [3]</a>. But if we create a new Ant environment we have to
set that value for our own. And we use the <code><junit></code> task in <var>fork</var> mode. Therefore we have
do modify our buildfile:</p>
-<pre class="code">
+<pre>
<target name="junit" description="Runs the unit tests" depends="jar">
<delete dir="${junit.out.dir.xml}"/>
<mkdir dir="${junit.out.dir.xml}"/>
@@ -327,24 +329,24 @@ modified to support paths instead of filesets. So we want that, too.</p>
<p>Changing from fileset to path support is very easy:</p>
<em><strong>Change Java code from:</strong></em>
-<pre class="code">
+<pre>
private List<FileSet> filesets = new ArrayList<>();
public void addFileset(FileSet fileset) {
filesets.add(fileset);
}</pre>
<em><strong>to:</strong></em>
-<pre class="code">
+<pre>
private List<Path> paths = new ArrayList<>(); *1
public void add<b>Path</b>(<b>Path</b> path) { *2
paths.add(path);
}</pre>
<em><strong>and build file from:</strong></em>
-<pre class="code">
+<pre>
<find file="ant.jar" location="location.ant-jar">
<fileset dir="${ant.home}" includes="**/*.jar"/>
</find></pre>
<em><strong>to:</strong></em>
-<pre class="code">
+<pre>
<find file="ant.jar" location="location.ant-jar">
<b><path></b> *3
<fileset dir="${ant.home}" includes="**/*.jar"/>
@@ -355,19 +357,20 @@ have to provide the right method: an <code>add<i>Name</i>(<i>Type</i> t)</code>.
here. Finally we have to modify our buildfile on <strong>*3</strong> because our task doesn't support nested filesets
any longer. So we wrap the fileset inside a path.</p>
-<p>And now we modify the test case. Oh, not very much to do :-) Renaming the <code>testMissingFileset()</code> (not
-really a <em>must-be</em> but better it's named like the thing it does) and update the <var>expected</var>-String in
-that method (now a <samp>path not set</samp> message is expected). The more complex test cases base on the build
-script. So the targets <var>testFileNotPresent</var> and <var>testFilePresent</var> have to be modified in the manner
-described above.</p>
+<p>And now we modify the test case. Oh, not very much to do :-) Renaming
+the <code class="code">testMissingFileset()</code> (not really a <em>must-be</em> but better it's named like the thing
+it does) and update the <var>expected</var>-String in that method (now a <samp>path not set</samp> message is
+expected). The more complex test cases base on the build script. So the targets <var>testFileNotPresent</var>
+and <var>testFilePresent</var> have to be modified in the manner described above.</p>
<p>The test are finished. Now we have to adapt the task implementation. The easiest modification is in
-the <code>validate()</code> method where we change the last line to <code>if (paths.size()<1) throw new
-BuildException("path not set");</code>. In the <code>execute()</code> method we have a little more work. ... mmmh
-... in reality it's less work, because the Path class does the whole DirectoryScanner-handling and
-creating-absolute-paths stuff for us. So the execute method becomes just:</p>
+the <code class="code">validate()</code> method where we change the last line to <code class="code">if
+(paths.size()<1) throw new BuildException("path not set");</code>. In the <code class="code">execute()</code> method
+we have a little more work. ... mmmh ... in reality it's less work, because the <code class="code">Path</code> class
+does the whole <code class="code">DirectoryScanner</code>-handling and creating-absolute-paths stuff for us. So the
+execute method becomes just:</p>
-<pre class="code">
+<pre>
public void execute() {
validate();
String foundLocation = null;
@@ -395,12 +398,12 @@ And would it be good to get all of them?—It depends ...<p>
<p>In this section we will extend that task to support returning a list of all files. Lists as property values are not
supported by Ant natively. So we have to see how other tasks use lists. The most famous task using lists is
-Ant-Contribs <code><foreach></code>. All list elements are concatenated and separated with a customizable
+Ant-Contrib's <code><foreach></code>. All list elements are concatenated and separated with a customizable
separator (default <q>,</q>).</p>
<p>So we do the following:</p>
-<pre class="code"><find ... <b>delimiter=""</b>/> ... </find></pre>
+<pre><find ... <b>delimiter=""</b>/> ... </find></pre>
<p>if the delimiter is set, we will return all found files as list with that delimiter.</p>
@@ -415,7 +418,7 @@ separator (default <q>,</q>).</p>
<p>So we add as test case:</p>
<strong><em>in the buildfile:</em></strong>
-<pre class="code">
+<pre>
<target name="test.init">
<mkdir dir="test1/dir11/dir111"/> *1
<mkdir dir="test1/dir11/dir112"/>
@@ -446,7 +449,7 @@ separator (default <q>,</q>).</p>
</delete>
</target></pre>
<strong><em>in the test class:</em></strong>
-<pre class="code">
+<pre>
public void testMultipleFiles() {
executeTarget("testMultipleFiles");
String result = getProject().getProperty("location.test");
@@ -461,7 +464,7 @@ reuse later (<strong>*3</strong>).
<p>The task implementation is modified as followed:</p>
-<pre class="code">
+<pre>
private List<String> foundFiles = new ArrayList<>();
...
private String delimiter = null;
@@ -531,7 +534,7 @@ add a feature after an Ant release, provide a <em>since Ant xx</em> statement wh
</ul>
<p>As a template we have:</p>
-<pre class="code">
+<pre>
<html>
<head>
@@ -579,7 +582,7 @@ add a feature after an Ant release, provide a <em>since Ant xx</em> statement wh
</html></pre>
<p>Here is an example documentation page for our task:</p>
-<pre class="code">
+<pre>
<html>
<head>
@@ -683,17 +686,18 @@ behaviour <strong><em>hasn't</em></strong></li>
<h3>Package / Directories</h3>
<p>This task does not depend on any external library. Therefore we can use this as a core task. This task contains only
one class. So we can use the standard package for core
-tasks: <code>org.apache.tools.ant.taskdefs</code>. Implementations are in the directory <samp>src/main</samp>, tests
-in <samp>src/testcases</samp> and buildfiles for tests in <samp>src/etc/testcases</samp>.</p>
+tasks: <code class="code">org.apache.tools.ant.taskdefs</code>. Implementations are in the
+directory <samp>src/main</samp>, tests in <samp>src/testcases</samp> and buildfiles for tests
+in <samp>src/etc/testcases</samp>.</p>
<p>Now we integrate our work into Ant distribution. So first we do an update of our Git tree. If not done yet, you
should clone the Ant repository on GitHub[7], then create a local clone:</p>
-<pre class="output">git clone https://github.com/<em>your-sig</em>/ant.git</pre>
+<pre class="input">git clone https://github.com/<em>your-sig</em>/ant.git</pre>
<p>Now we will build our Ant distribution and do a test. So we can see if there are any tests failing on our
machine. (We can ignore these failing tests on later steps; Windows syntax used here—translate to UNIX if
needed):</p>
-<pre class="output">
+<pre class="input">
ANTREPO> build // 1
ANTREPO> set ANT_HOME=%CD%\dist // 2
ANTREPO> ant test -Dtest.haltonfailure=false // 3</pre>
@@ -723,7 +727,7 @@ the beginning. The advantage: this step isn't necessary and saves a lot of work
</ul>
<p>Now our modifications are done and we will retest it:</p>
-<pre class="output">
+<pre class="input">
ANTREPO> build
ANTREPO> ant run-single-test // 1
-Dtestcase=org.apache.tools.ant.taskdefs.FindTest // 2
@@ -734,12 +738,12 @@ not to halt on the first failure—we want to see all failures of our own te
<p>And ... oh, all tests fail: <em>Ant could not find the task or a class this task relies upon.</em></p>
<p>Ok: in the earlier steps we told Ant to use the Find class for the <code><find></code> task (remember
-the <code><taskdef></code> statement in the "use.init" target). But now we want to introduce that task as a core
-task. And nobody wants to taskdef the javac, echo, ... So what to do? The answer is
-the <samp>src/main/.../taskdefs/default.properties</samp>. Here is the mapping between taskname and implementing class
-done. So we add a <code>find=org.apache.tools.ant.taskdefs.Find</code> as the last core task (just before the <code>#
-optional tasks</code> line). Now a second try:</p>
-<pre class="output">
+the <code><taskdef></code> statement in the <q>use.init</q> target). But now we want to introduce that task as a
+core task. And nobody wants to <code>taskdef</code> the <code>javac</code>, <code>echo</code>, ... So what to do? The
+answer is the <samp>src/main/.../taskdefs/default.properties</samp>. Here is the mapping between taskname and
+implementing class done. So we add a <code>find=org.apache.tools.ant.taskdefs.Find</code> as the last core task (just
+before the <code># optional tasks</code> line). Now a second try:</p>
+<pre class="input">
ANTREPO> build // 1
ANTREPO> ant run-single-test
-Dtestcase=org.apache.tools.ant.taskdefs.FindTest
@@ -747,10 +751,10 @@ ANTREPO> ant run-single-test
<p>We have to rebuild (<strong>//1</strong>) Ant because the test look in the <samp>%ANT_HOME%\lib\ant.jar</samp> (more
precise: on the classpath) for the properties file. And we have only modified it in the source path. So we have to
rebuild that jar. But now all tests pass and we check whether our class breaks some other tests.</p>
-<pre class="output">ANTREPO> ant test -Dtest.haltonfailure=false</pre>
+<pre class="input">ANTREPO> ant test -Dtest.haltonfailure=false</pre>
<p>Because there are a lot of tests this step requires a little bit of time. So use the <q>run-single-test</q> during
development and do the <q>test</q> only at the end (maybe sometimes during development too). We use
-the <code>-Dtest.haltonfailure=false</code> here because there could be other tests fail and we have to look into
+the <kbd>-Dtest.haltonfailure=false</kbd> here because there could be other tests fail and we have to look into
them.</p>
<p>This test run should show us two things: our test will run and the number of failing tests is the same as directly
@@ -767,7 +771,7 @@ from <a href="https://www.oracle.com/technetwork/java/archive-139210.html" targe
<p>Clean the <code>ANT_HOME</code> variable, delete the <samp>build</samp>, <samp>bootstrap</samp> and <samp>dist</samp>
directories, and point <code>JAVA_HOME</code> to the JDK 5 home directory. Then create the patch with your commit,
checkout 1.9.x branch in Git, apply your patch and do the <code>build</code>, set <code>ANT_HOME</code> and
-run <code>ant test</code> (like above).</p>
+run <kbd>ant test</kbd> (like above).</p>
<p>Our test should pass.</p>
@@ -784,7 +788,7 @@ All jar's stored there are available to Ant so you haven't to add it to you <sam
feature is available <em>since Ant 1.6</em>).</p>
<p>So we will run the tests with</p>
-<pre class="output">ANTREPO> ant -f check.xml checkstyle htmlreport</pre>
+<pre class="input">ANTREPO> ant -f check.xml checkstyle htmlreport</pre>
<p>I prefer the HTML report because there are lots of messages and we can navigate faster. Open
the <samp>ANTREPO/build/reports/checkstyle/html/index.html</samp> and navigate to the <samp>Find.java</samp>. Now we see
that there are some errors: missing whitespaces, unused imports, missing javadocs. So we have to do that.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/tutorial-writing-tasks.html
----------------------------------------------------------------------
diff --git a/manual/tutorial-writing-tasks.html b/manual/tutorial-writing-tasks.html
index a1dee02..c292f70 100644
--- a/manual/tutorial-writing-tasks.html
+++ b/manual/tutorial-writing-tasks.html
@@ -17,7 +17,7 @@
<html>
<head>
<title>Tutorial: Writing Tasks</title>
- <link rel="stylesheet" type="text/css" href="stylesheets/style.css" />
+ <link rel="stylesheet" type="text/css" href="stylesheets/style.css"/>
</head>
<body>
<h1>Tutorial: Writing Tasks</h1>
@@ -53,7 +53,7 @@ names <samp>build.xml</samp>. What should Ant do for us?</p>
<li>clean up everything</li>
</ul>
So the buildfile contains three targets.
-<pre class="code">
+<pre>
<?xml version="1.0" encoding="UTF-8"?>
<project name="MyTask" basedir="." default="jar">
@@ -77,7 +77,7 @@ rewrite that using <code><property></code>s. On second there are some hand
requires that the destination directory exists; a call of <q>clean</q> with a non existing classes directory will
fail; <q>jar</q> requires the execution of some steps before. So the refactored code is:
-<pre class="code">
+<pre>
<?xml version="1.0" encoding="UTF-8"?>
<project name="MyTask" basedir="." default="jar">
@@ -106,20 +106,20 @@ properties [1]</a> of Ant.</p>
<p>Now we write the simplest Task—a HelloWorld Task (what else?). Create a text file <samp>HelloWorld.java</samp>
in the src-directory with:</p>
-<pre class="code">
+<pre>
public class HelloWorld {
public void execute() {
System.out.println("Hello World");
}
}</pre>
-<p>and we can compile and jar it with <code>ant</code> (default target is <q>jar</q> and via its <var>depends</var>
+<p>and we can compile and jar it with <kbd>ant</kbd> (default target is <q>jar</q> and via its <var>depends</var>
attribute the <q>compile</q> is executed before).</p>
<h2 id="use1">Use the Task</h2>
<p>But after creating the jar we want to use our new Task. Therefore we need a new target <q>use</q>. Before we can use
our new task we have to declare it with <a href="Tasks/taskdef.html" target="_top"><code><taskdef></code>
[2]</a>. And for easier process we change the <var>default</var> attribute:</p>
-<pre class="code">
+<pre>
<?xml version="1.0" encoding="UTF-8"?>
<project name="MyTask" basedir="." default="<b>use</b>">
@@ -135,7 +135,7 @@ our new task we have to declare it with <a href="Tasks/taskdef.html" target="_to
<p>Important is the <var>classpath</var> attribute. Ant searches in its <samp>/lib</samp> directory for tasks and our
task isn't there. So we have to provide the right location.</p>
-<p>Now we can type in <code>ant</code> and all should work ...</p>
+<p>Now we can type in <kbd>ant</kbd> and all should work ...</p>
<pre class="output">
Buildfile: build.xml
@@ -154,13 +154,14 @@ Total time: 3 seconds</pre>
<h2 id="TaskAdapter">Integration with TaskAdapter</h2>
<p>Our class has nothing to do with Ant. It extends no superclass and implements no interface. How does Ant know to
-integrate? Via name convention: our class provides a method with signature <code>public void execute()</code>. This
-class is wrapped by Ant's <code>org.apache.tools.ant.TaskAdapter</code> which is a task and uses reflection for setting
-a reference to the project and calling the <code>execute()</code> method.</p>
+integrate? Via name convention: our class provides a method with signature <code class="code">public void
+execute()</code>. This class is wrapped by Ant's <code class="code">org.apache.tools.ant.TaskAdapter</code> which is a
+task and uses reflection for setting a reference to the project and calling the <code class="code">execute()</code>
+method.</p>
<p><em>Setting a reference to the project</em>? Could be interesting. The Project class gives us some nice abilities:
access to Ant's logging facilities getting and setting properties and much more. So we try to use that class:</p>
-<pre class="code">
+<pre>
import org.apache.tools.ant.Project;
public class HelloWorld {
@@ -176,18 +177,18 @@ public class HelloWorld {
project.log("Here is project '" + message + "'.", Project.MSG_INFO);
}
}</pre>
-<p>and the execution with <code>ant</code> will show us the expected</p>
+<p>and the execution with <kbd>ant</kbd> will show us the expected</p>
<pre class="output">
use:
Here is project 'MyTask'.</pre>
<h2 id="derivingFromTask">Deriving from Ant's Task</h2>
-<p>Ok, that works ... But usually you will extend <code>org.apache.tools.ant.Task</code>. That class is integrated in
-Ant, gets the project reference, provides documentation fields, provides easier access to the logging facility and (very
-useful) gives you the exact location where <em>in the buildfile</em> this task instance is used.</p>
+<p>Ok, that works ... But usually you will extend <code class="code">org.apache.tools.ant.Task</code>. That class is
+integrated in Ant, gets the project reference, provides documentation fields, provides easier access to the logging
+facility and (very useful) gives you the exact location where <em>in the buildfile</em> this task instance is used.</p>
<p>Oki-doki—let's us use some of these:</p>
-<pre class="code">
+<pre>
import org.apache.tools.ant.Task;
public class HelloWorld extends Task {
@@ -209,23 +210,25 @@ use:
[helloworld] I am used in: C:\tmp\anttests\MyFirstTask\build.xml:23:</pre>
<h2 id="accessTaskProject">Accessing the Task's Project</h2>
-<p>The parent project of your custom task may be accessed through method <code>getProject()</code>. However, do not
-call this from the custom task constructor, as the return value will be null. Later, when node attributes or text are
-set, or method <code>execute()</code> is called, the Project object is available.</p>
+<p>The parent project of your custom task may be accessed through method <code class="code">getProject()</code>.
+However, do not call this from the custom task constructor, as the return value will be null. Later, when node
+attributes or text are set, or method <code class="code">execute()</code> is called, the Project object is
+available.</p>
<p>Here are two useful methods from class Project:</p>
<ul>
- <li><code>String getProperty(String propertyName)</code></li>
- <li><code>String replaceProperties(String value)</code></li>
+ <li><code class="code">String getProperty(String propertyName)</code></li>
+ <li><code class="code">String replaceProperties(String value)</code></li>
</ul>
-<p>The method <code>replaceProperties()</code> is discussed further in section <a href="#NestedText">Nested Text</a>.</p>
+<p>The method <code class="code">replaceProperties()</code> is discussed further in section <a href="#NestedText">Nested
+Text</a>.</p>
<h2 id="attributes">Attributes</h2>
<p>Now we want to specify the text of our message (it seems that we are rewriting the <code><echo/></code> task
-:-). First we well do that with an attribute. It is very easy—for each attribute provide a <code>public void
-set<code><attributename></code>(<code><type></code> newValue)</code> method and Ant will do the rest via
-reflection.</p>
-<pre class="code">
+:-). First we well do that with an attribute. It is very easy—for each attribute provide
+a <code class="code">public void set<i>Attributename</i>(<i>Type</i> newValue)</code> method and Ant will do the rest
+via reflection.</p>
+<pre>
import org.apache.tools.ant.Task;
import org.apache.tools.ant.BuildException;
@@ -244,14 +247,14 @@ public class HelloWorld extends Task {
}
}</pre>
-<p>Oh, what's that in <code>execute()</code>? Throw a <code>BuildException</code>? Yes, that's the usual way to show Ant
-that something important is missed and complete build should fail. The string provided there is written as
-build-fails-message. Here it's necessary because the <code>log()</code> method can't handle a <code>null</code> value as
-parameter and throws a NullPointerException. (Of course you can initialize the <var>message</var> with a default
-string.)</p>
+<p>Oh, what's that in <code class="code">execute()</code>? Throw a <code>BuildException</code>? Yes, that's the usual
+way to show Ant that something important is missed and complete build should fail. The string provided there is written
+as build-fails-message. Here it's necessary because the <code class="code">log()</code> method can't handle
+a <code>null</code> value as parameter and throws a <code>NullPointerException</code>. (Of course you can initialize
+the <var>message</var> with a default string.)</p>
<p>After that we have to modify our buildfile:</p>
-<pre class="code">
+<pre>
<target name="use" description="Use the Task" depends="jar">
<taskdef name="helloworld"
classname="HelloWorld"
@@ -262,11 +265,12 @@ string.)</p>
<p>Some background for working with attributes: Ant supports any of these datatypes as arguments of the set-method:</p>
<ul>
-<li>primitive data types like <code>int</code>, <code>long</code>, ...</li>
-<li>their wrapper classes like <code>java.lang.Integer</code>, <code>java.lang.Long</code>, ...</li>
-<li><code>java.lang.String</code></li>
-<li>some other classes (e.g. <code>java.io.File</code>; see <a href="develop.html#set-magic">Manual 'Writing Your Own
-Task' [3]</a>)</li>
+<li>primitive data types like <code class="code">int</code>, <code class="code">long</code>, ...</li>
+<li>their wrapper classes like <code class="code">java.lang.Integer</code>, <code class="code">java.lang.Long</code>,
+...</li>
+<li><code class="code">java.lang.String</code></li>
+<li>some other classes (e.g. <code class="code">java.io.File</code>; see <a href="develop.html#set-magic">Manual
+'Writing Your Own Task' [3]</a>)</li>
<li>Any Java Object parsed from Ant 1.8's <a href="Tasks/propertyhelper.html">Property
Helper</a></li>
</ul>
@@ -275,8 +279,9 @@ would not set the message string to <q>${msg}</q> if there is a property <code>m
<h2 id="NestedText">Nested Text</h2>
<p>Maybe you have used the <code><echo></code> task in a way like <code><echo>Hello
-World</echo></code>. For that you have to provide a <code>public void addText(String text)</code> method.</p>
-<pre class="code">
+World</echo></code>. For that you have to provide a <code class="code">public void addText(String text)</code>
+method.</p>
+<pre>
...
public class HelloWorld extends Task {
private String message;
@@ -287,10 +292,11 @@ public class HelloWorld extends Task {
...
}</pre>
<p>But here properties are <strong>not</strong> resolved! For resolving properties we have to use
-Project's <code>replaceProperties(String propname)</code> method which takes the property name as argument and returns
-its value (or <code>${propname}</code> if not set).</p>
-<p>Thus, to replace properties in the nested node text, our method <code>addText()</code> can be written as:</p>
-<pre class="code">
+Project's <code class="code">replaceProperties(String propname)</code> method which takes the property name as argument
+and returns its value (or <code>${propname}</code> if not set).</p>
+<p>Thus, to replace properties in the nested node text, our method <code class="code">addText()</code> can be written
+as:</p>
+<pre>
public void addText(String text) {
message = getProject().replaceProperties(text);
}</pre>
@@ -301,12 +307,13 @@ the <a href="develop.html#nested-elements">Manual [4]</a> for other. We use the
ways. There are several steps for that:</p>
<ol>
<li>We create a class for collecting all the info the nested element should contain. This class is created by the same
-rules for attributes and nested elements as for the task (<code>set<i>attributename</i>()</code> methods).</li>
+rules for attributes and nested elements as for the task (<code class="code">set<i>Attributename</i>()</code>
+methods).</li>
<li>The task holds multiple instances of this class in a list.</li>
<li>A factory method instantiates an object, saves the reference in the list and returns it to Ant Core.</li>
-<li>The <code>execute()</code> method iterates over the list and evaluates its values.</li>
+<li>The <code class="code">execute()</code> method iterates over the list and evaluates its values.</li>
</ol>
-<pre class="code">
+<pre>
import java.util.ArrayList;
import java.util.List;
...
@@ -335,9 +342,9 @@ import java.util.List;
}
...</pre>
<p>Then we can use the new nested element. But where is XML-name for that defined? The mapping XML-name →
-classname is defined in the factory method: <code>public <i>classname</i> create<i>XML-name</i>()</code>. Therefore we
-write in the buildfile</p>
-<pre class="code">
+classname is defined in the factory method: <code class="code">public <i>classname</i>
+create<i>XML-name</i>()</code>. Therefore we write in the buildfile</p>
+<pre>
<helloworld>
<message msg="Nested Element 1"/>
<message msg="Nested Element 2"/>
@@ -347,7 +354,7 @@ as <code>static</code></p>
<h2 id="complex">Our task in a little more complex version</h2>
<p>For recapitulation now a little refactored buildfile:</p>
-<pre class="code">
+<pre>
<?xml version="1.0" encoding="UTF-8"?>
<project name="MyTask" basedir="." default="use">
@@ -418,7 +425,7 @@ as <code>static</code></p>
</project></pre>
<p>And the code of the task:</p>
-<pre class="code">
+<pre>
import org.apache.tools.ant.Task;
import org.apache.tools.ant.BuildException;
import java.util.ArrayList;
@@ -438,7 +445,7 @@ public class HelloWorld extends Task {
message = msg;
}
- /** Should the build fail? Defaults to <em>false</em>. As attribute. */
+ /** Should the build fail? Defaults to <i>false</i>. As attribute. */
boolean fail = false;
public void setFail(boolean b) {
fail = b;
@@ -542,10 +549,10 @@ C:\tmp\anttests\MyFirstTask></pre>
<h2 id="TestingTasks">Test the Task</h2>
<p>We have written a test already: the <q>use.*</q> targets in the buildfile. But it's difficult to test that
automatically. Commonly (and in Ant) JUnit is used for that. For testing tasks Ant provides a JUnit
-Rule <code>org.apache.tools.ant.BuildFileRule</code>. This class provides some for testing tasks useful methods:
-initialize Ant, load a buildfile, execute targets, capture debug and run logs ...</p>
+Rule <code class="code">org.apache.tools.ant.BuildFileRule</code>. This class provides some for testing tasks useful
+methods: initialize Ant, load a buildfile, execute targets, capture debug and run logs ...</p>
-<p>In Ant it is usual that the testcase has the same name as the task with a prepending <code>Test</code>, therefore we
+<p>In Ant it is usual that the testcase has the same name as the task with a prepended <code>Test</code>, therefore we
will create a file <samp>HelloWorldTest.java</samp>. Because we have a very small project we can put this file
into <samp>src</samp> directory (Ant's own testclasses are in <samp>/src/testcases/...</samp>). Because we have already
written our tests for "hand-test" we can use that for automatic tests, too. All test supporting classes are a part of
@@ -554,7 +561,7 @@ jar file from source distro with target "test-jar".
<p>For executing the test and creating a report we need the optional tasks <code><junit></code>
and <code><junitreport></code>. So we add to the buildfile:</p>
-<pre class="code">
+<pre>
<span style="color:gray"><project name="MyTask" basedir="." </span>default="test"<span style="color:gray">></span>
...
<property name="ant.test.lib" value="ant-testutil.jar"/>
@@ -613,11 +620,12 @@ and <code><junitreport></code>. So we add to the buildfile:</p>
...
<span style="color:gray"></project></span></pre>
-<p>Back to the <samp>src/HelloWorldTest.java</samp>. We create a class with a public <code>BuildFileRule</code> field
-annotated with JUnit's <code>@Rule</code> annotation. As per conventional JUnit4 tests, this class should have no
-constructors, or a default no-args constructor, setup methods should be annotated with <code>@Before</code>, tear down
-methods annotated with <code>@After</code> and any test method annotated with <code>@Test</code>.
-<pre class="code">
+<p>Back to the <samp>src/HelloWorldTest.java</samp>. We create a class with a
+public <code class="code">BuildFileRule</code> field annotated with JUnit's <code class="code">@Rule</code>
+annotation. As per conventional JUnit4 tests, this class should have no constructors, nor a default no-args constructor,
+setup methods should be annotated with <code class="code">@Before</code>, tear down methods annotated
+with <code class="code">@After</code> and any test method annotated with <code class="code">@Test</code>.
+<pre>
import org.apache.tools.ant.BuildFileRule;
import org.junit.Assert;
import org.junit.Test;
@@ -677,7 +685,7 @@ public class HelloWorldTest {
}
}</pre>
-<p>When starting <code>ant</code> we'll get a short message to STDOUT and a nice HTML report.</p>
+<p>When starting <kbd>ant</kbd> we'll get a short message to STDOUT and a nice HTML report.</p>
<pre class="output">
C:\tmp\anttests\MyFirstTask>ant
Buildfile: build.xml
@@ -709,19 +717,20 @@ C:\tmp\anttests\MyFirstTask></pre>
<h2 id="Debugging">Debugging</h2>
-<p>Try running Ant with the flag <code>-verbose</code>. For more information, try flag <code>-debug</code>.</p>
+<p>Try running Ant with the flag <kbd>-verbose</kbd>. For more information, try flag <kbd>-debug</kbd>.</p>
<p>For deeper issues, you may need to run the custom task code in a Java debugger. First, get the source for Ant and
build it with debugging information.</p>
<p>Since Ant is a large project, it can be a little tricky to set the right breakpoints. Here are two important
breakpoints for version 1.8:</p>
<ul>
- <li>Initial <code>main()</code> function: <code>com.apache.tools.ant.launch.Launcher.main()</code></li>
- <li>Task entry point: <code>com.apache.tools.ant.UnknownElement.execute()</code></li>
+ <li>Initial <code class="code">main()</code>
+ function: <code class="code">com.apache.tools.ant.launch.Launcher.main()</code></li>
+ <li>Task entry point: <code class="code">com.apache.tools.ant.UnknownElement.execute()</code></li>
</ul>
-<p>If you need to debug when a task attribute or the text is set, begin by debugging into method <code>execute()</code>
-of your custom task. Then set breakpoints in other methods. This will ensure the class byte-code has been loaded by
-JVM.</p>
+<p>If you need to debug when a task attribute or the text is set, begin by debugging into
+method <code class="code">execute()</code> of your custom task. Then set breakpoints in other methods. This will
+ensure the class bytecode has been loaded by JVM.</p>
<h2 id="resources">Resources</h2>
<p>This tutorial and its resources are available via <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=22570"
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/using.html
----------------------------------------------------------------------
diff --git a/manual/using.html b/manual/using.html
index e66ea2b..0f357fa 100644
--- a/manual/using.html
+++ b/manual/using.html
@@ -48,7 +48,7 @@ the <a href="#tasks">Tasks</a> section below.)</p>
<td>the default target to use when no target is supplied.</td>
<td>No; however, <em>since Ant 1.6.0</em>, every project includes an implicit target that contains any and all
top-level tasks and/or types. This target will always be executed as part of the project's initialization, even
- when Ant is run with the <a href="running.html#options"><code>-projecthelp</code></a> option.
+ when Ant is run with the <a href="running.html#options"><kbd>-projecthelp</kbd></a> option.
</td>
</tr>
<tr>
@@ -180,7 +180,7 @@ and <code><taskdef></code>). When you do this they are evaluated before a
will generate build failures if they are used outside of targets as they may cause infinite loops otherwise
(<code><antcall></code> for example).</p>
-<p>We have given some targets descriptions; this causes the <code>-projecthelp</code> invocation option to list them as
+<p>We have given some targets descriptions; this causes the <kbd>-projecthelp</kbd> invocation option to list them as
public targets with the descriptions; the other target is internal and not listed.</p>
<p>Finally, for this target to work the source in the <samp>src</samp> subdirectory should be stored in a directory tree
which matches the package names. Check the <code><javac></code> task for details.</p>
@@ -424,7 +424,7 @@ deliberately assign a different meaning to <var>refid</var>.</p>
<p>Don't add anything to the <code>CLASSPATH</code> environment variable—this is often the reason for very obscure
errors. Use Ant's own <a href="install.html#optionalTasks">mechanisms</a> for adding libraries:</p>
<ul>
- <li>via command line argument <code>-lib</code></li>
+ <li>via command line argument <kbd>-lib</kbd></li>
<li>adding to <code>${user.home}/.ant/lib</code></li>
<li>adding to <code>${ant.home}/lib</code></li>
</ul>
[4/6] ant git commit: , highlighting of input,
output and inlined code
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/rmic.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/rmic.html b/manual/Tasks/rmic.html
index 8e82cc3..0cb43b6 100644
--- a/manual/Tasks/rmic.html
+++ b/manual/Tasks/rmic.html
@@ -26,7 +26,7 @@
<h2 id="rmic">Rmic</h2>
<h3>Description</h3>
-<p>Runs the <code>rmic</code> compiler for a certain class.</p>
+<p>Runs the <kbd>rmic</kbd> compiler for a certain class.</p>
<p><code>Rmic</code> can be run on a single class (as specified with the classname attribute) or a
number of classes at once (all classes below base that are neither <code>_Stub</code>
nor <code>_Skel</code> classes). If you want to <code>rmic</code> a single class and this class is
@@ -58,9 +58,9 @@ are the choices:</p>
<li><q>forking</q>—(<em>since Apache Ant 1.7</em>) the <q>sun</q> compiler forked into a
separate process. <em>Since Ant 1.9.8</em>, this is the default when running on JDK 9+.</li>
<li><q>xnew</q>—(<em>since Ant 1.7</em>) the <q>sun</q> compiler forked into a separate
- process, with the <code>-Xnew</code> option. This is the most reliable way to
- use <code>-Xnew</code>.<br/>JDK 9 has removed support for <code>-Xnew</code> and <em>since Ant
- 1.9.8</em> this option will be rejected when running on JDK 9.</li>
+ process, with the <kbd>-Xnew</kbd> option. This is the most reliable way to
+ use <kbd>-Xnew</kbd>.<br/>JDK 9 has removed support for <kbd>-Xnew</kbd> and <em>since Ant
+ 1.9.8</em> this option will be rejected when running on JDK 9+.</li>
<li><q></q> (empty string). This has the same behaviour as not setting the compiler attribute.
First the value of <code>build.rmic</code> is used if defined, and if not, the default for the
platform is chosen. If <code>build.rmic</code> is set to this, you get the default.</li>
@@ -73,8 +73,8 @@ consult miniRMI's documentation to learn how to use it.</p>
<h4>CORBA support</h4>
<p>Java 11 <a href="http://openjdk.java.net/jeps/320" target="_top">removes</a> the Java EE and
-CORBA packages and <code>rmic</code> no longer supports either <code>iiop</code>
-or <code>idl</code>. Starting with Ant 1.10.3, the <code>rmic</code> task will fail when using
+CORBA packages and <kbd>rmic</kbd> no longer supports either <kbd>-iiop</kbd>
+or <kbd>-idl</kbd> options. Starting with Ant 1.10.3, the <kbd>rmic</kbd> task will fail when using
either while running Java 11+ unless you fork the task and explicitly specify an executable.</p>
<h3>Parameters</h3>
@@ -96,7 +96,7 @@ either while running Java 11+ unless you fork the task and explicitly specify an
</tr>
<tr>
<td>classname</td>
- <td>the class for which to run <code>rmic</code>.</td>
+ <td>the class for which to run <kbd>rmic</kbd>.</td>
<td>No</td>
</tr>
<tr>
@@ -106,15 +106,15 @@ either while running Java 11+ unless you fork the task and explicitly specify an
</tr>
<tr>
<td>sourcebase</td>
- <td>Pass the <code>-keepgenerated</code> flag to <code>rmic</code> and move the generated source
+ <td>Pass the <kbd>-keepgenerated</kbd> flag to <kbd>rmic</kbd> and move the generated source
file to the given <var>sourcebase</var> directory.</td>
<td>No</td>
</tr>
<tr>
<td>stubversion</td>
<td>Specify the JDK version for the generated stub code. Specify <q>1.1</q> to pass
- the <code>-v1.1</code> option to <code>rmic</code>, <q>1.2</q>
- for <code>-v12</code>, <q>compat</q> for <code>-vcompat</code>.<br/><em>Since Ant 1.7</em>, if
+ the <kbd>-v1.1</kbd> option to <kbd>rmic</kbd>, <q>1.2</q>
+ for <kbd>-v1.2</kbd>, <q>compat</q> for <kbd>-vcompat</kbd>.<br/><em>Since Ant 1.7</em>, if
you do not specify a version, and do not ask for <samp>.iiop</samp> or <samp>.idl</samp>
files, <q>compat</q> is selected.</td>
<td>No; default is <q>compat</q></td>
@@ -157,7 +157,7 @@ either while running Java 11+ unless you fork the task and explicitly specify an
</tr>
<tr>
<td>verify</td>
- <td>check that classes implement <code>Remote</code> before handing them to <code>rmic</code></td>
+ <td>check that classes implement <code>Remote</code> before handing them to <kbd>rmic</kbd></td>
<td>No; default is <q>false</q></td>
</tr>
<tr>
@@ -184,7 +184,7 @@ either while running Java 11+ unless you fork the task and explicitly specify an
</tr>
<tr>
<td>debug</td>
- <td>generate debug info (passes <code>-g</code> to <code>rmic</code>)</td>
+ <td>generate debug info (passes <kbd>-g</kbd> to <kbd>rmic</kbd>)</td>
<td>No; defaults to <q>false</q></td>
</tr>
<tr>
@@ -211,9 +211,9 @@ either while running Java 11+ unless you fork the task and explicitly specify an
</tr>
<tr>
<td>executable</td>
- <td>Complete path to the <code>rmic</code> executable to use in case of the <q>forking</q>
+ <td>Complete path to the <kbd>rmic</kbd> executable to use in case of the <q>forking</q>
or <q>xnew</q> compiler. <em>Since Ant 1.8.0</em>.</td>
- <td>No; defaults to the <code>rmic</code> compiler of JDK that is currently running Ant</td>
+ <td>No; defaults to the <kbd>rmic</kbd> compiler of JDK that is currently running Ant</td>
</tr>
<tr>
<td>listfiles</td>
@@ -298,10 +298,10 @@ can be used as an alternative to the <var>compiler</var> attribute.</p>
<h3>Examples</h3>
<pre><rmic classname="com.xyz.FooBar" base="${build}/classes"/></pre>
-<p>runs the <code>rmic</code> compiler for the class <code>com.xyz.FooBar</code>. The compiled files
+<p>runs the <kbd>rmic</kbd> compiler for the class <code>com.xyz.FooBar</code>. The compiled files
will be stored in the directory <samp>${build}/classes</samp>.</p>
<pre><rmic base="${build}/classes" includes="**/Remote*.class"/></pre>
-<p>runs the <code>rmic</code> compiler for all classes with <samp>.class</samp> files
+<p>runs the <kbd>rmic</kbd> compiler for all classes with <samp>.class</samp> files
below <samp>${build}/classes</samp> whose classname starts with <code>Remote</code>. The compiled
files will be stored in the directory <samp>${build}/classes</samp>.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/rpm.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/rpm.html b/manual/Tasks/rpm.html
index f6e35e8..5b80fdb 100644
--- a/manual/Tasks/rpm.html
+++ b/manual/Tasks/rpm.html
@@ -56,31 +56,31 @@ with <code>rpm</code> support.</p>
<tr>
<td>cleanBuildDir</td>
<td>This will remove the generated files in the <samp>BUILD</samp> directory. See the
- the <code>--clean</code> option of rpmbuild.</td>
+ the <kbd>--clean</kbd> option of <kbd>rpmbuild</kbd>.</td>
<td>No</td>
</tr>
<tr>
<td>removeSpec</td>
- <td>This will remove the spec file from <samp>SPECS</samp>. See the the <code>--rmspec</code>
- option of <code>rpmbuild</code>.</td>
+ <td>This will remove the spec file from <samp>SPECS</samp>. See the the <kbd>--rmspec</kbd>
+ option of <kbd>rpmbuild</kbd>.</td>
<td>No</td>
</tr>
<tr>
<td>removeSource</td>
- <td>Flag to remove the sources after the build. See the <code>--rmsource</code> option
- of <code>rpmbuild</code>.</td>
+ <td>Flag to remove the sources after the build. See the <kbd>--rmsource</kbd> option
+ of <kbd>rpmbuild</kbd>.</td>
<td>No; default is <q>false</q></td>
</tr>
<tr>
<td>rpmBuildCommand</td>
<td>The executable to use for building the RPM. Set this if default executables are not on
<code>PATH</code> or a different executable is needed. <em>Since Apache Ant 1.6</em>.</td>
- <td>No; defaults to <code>rpmbuild</code> if it can be found or <code>rpm</code> otherwise</td>
+ <td>No; defaults to <kbd>rpmbuild</kbd> if it can be found or <kbd>rpm</kbd> otherwise</td>
</tr>
<tr>
<td>command</td>
<td>The command to pass to the <code>rpmbuild</code> program.</td>
- <td>No; default is <code>-bb</code></td>
+ <td>No; default is <kbd>-bb</kbd></td>
</tr>
<tr>
<td>quiet</td>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/schemavalidate.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/schemavalidate.html b/manual/Tasks/schemavalidate.html
index 8b1964d..abc3c61 100644
--- a/manual/Tasks/schemavalidate.html
+++ b/manual/Tasks/schemavalidate.html
@@ -169,7 +169,7 @@ their URL equivalents.</p>
perform entity resolution.</p>
<h4>attribute</h4>
<p>The <code><attribute></code> element is used to set parser features.<br/>Features usable
-with the xerces parser are defined here: <a href="https://xml.apache.org/xerces-j/features.html"
+with the Xerces parser are defined here: <a href="https://xml.apache.org/xerces-j/features.html"
target="_top">Setting features</a><br/>SAX features are defined
here: <a href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description"
target="_top"><code>http://xml.org/sax/features/</code></a></p>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/scp.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/scp.html b/manual/Tasks/scp.html
index 14781fa..98db95a 100644
--- a/manual/Tasks/scp.html
+++ b/manual/Tasks/scp.html
@@ -260,9 +260,9 @@ can be a serious security hole. Consider using variable substitution and includ
the command line. For example:</p>
<pre><scp todir="${username}:${password}@host:/dir" ...></pre>
<p>Invoking Ant with the following command line:</p>
-<pre>ant -Dusername=me -Dpassword=mypassword target1 target2</pre>
-<p>Is slightly better, but the username/password is exposed to all users on an Unix system (via
-the <code>ps</code> command). The best approach is to use the <code><input></code> task and/or
+<pre class="input">ant -Dusername=me -Dpassword=mypassword target1 target2</pre>
+<p>is slightly better, but the username/password is exposed to all users on an Unix system (via
+the <kbd>ps</kbd> command). The best approach is to use the <code><input></code> task and/or
retrieve the password from a (secured) <samp>.properties</samp> file.</p>
<p><strong>Unix Note</strong>: File permissions are not retained when files are downloaded; they end
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/script.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/script.html b/manual/Tasks/script.html
index a53870f..cd33533 100644
--- a/manual/Tasks/script.html
+++ b/manual/Tasks/script.html
@@ -39,10 +39,10 @@ indicated by <q>javax</q>.</p>
<p>All items (tasks, targets, etc) of the running project are accessible from the script, using
either their <var>name</var> or <var>id</var> attributes (as long as their names are considered
valid Java identifiers, that is). This is controlled by the <var>setbeans</var> attribute of the
-task. The name <code>project</code> is a pre-defined reference to the Project, which can be used
-instead of the project name. The name <code>self</code> is a pre-defined reference to the
-actual <code><script></code>-Task instance.<br/>From these objects you have access to the Ant
-Java API, see the <a href="../api/index.html">JavaDoc</a> (especially
+task. The name <code class="code">project</code> is a pre-defined reference to the Project, which
+can be used instead of the project name. The name <code class="code">self</code> is a pre-defined
+reference to the actual <code><script></code>-Task instance.<br/>From these objects you have
+access to the Ant Java API, see the <a href="../api/index.html">JavaDoc</a> (especially
for <a href="../api/org/apache/tools/ant/Project.html">Project</a>
and <a href="../api/org/apache/tools/ant/taskdefs/optional/Script.html">Script</a>) for more
information.</p>
@@ -124,7 +124,7 @@ In particular all targets should have different location values.</p>
<h4>classpath</h4>
<p><em>Since Ant 1.7</em></p>
<p><code>Script</code>'s <var>classpath</var> attribute is a <a href="../using.html#path">path-like
-structure</a> and can also be set via a nestedq <code><classpath></code> element.
+structure</a> and can also be set via a nested <code><classpath></code> element.
</p>
<p>If a classpath is set, it will be used as the current thread context classloader, and as the
classloader given to the BSF manager. This means that it can be used to specify the classpath
@@ -266,21 +266,22 @@ of all files a <code><fileset/></code> caught.</p>
<p>We want to use the Java API. Because we don't want always typing the package signature we do an
import. Rhino knows two different methods for import statements: one for packages and one for a
single class. By default only the <code>java</code> packages are available,
-so <code>java.lang.System</code> can be directly imported
+so <code class="code">java.lang.System</code> can be directly imported
with <code>importClass/importPackage</code>. For other packages you have to prefix the full
classified name with <strong>Packages</strong>. For example Ant's <code>FileUtils</code> class can
be imported
-with <code>importClass(<strong>Packages</strong>.org.apache.tools.ant.util.FileUtils)</code><br/>
+with <code class="code">importClass(<strong>Packages</strong>.org.apache.tools.ant.util.FileUtils)</code><br/>
The <code><script></code> task populates the Project instance under the
name <code>project</code>, so we can use that reference. Another way is to use its given name or
getting its reference from the task itself.<br/> The Project provides methods for accessing and
setting properties, creating DataTypes and Tasks and much more.<br/> After creating a FileSet
object we initialize that by calling its set-methods. Then we can use that object like a normal Ant
task (<code><copy></code> for example).<br/> For getting the size of a file we instantiate
-a <code>java.io.File</code>. So we are using normal Java API here.<br/> Finally we use
+a <code class="code">java.io.File</code>. So we are using normal Java API here.<br/> Finally we use
the <code><echo></code> task for producing the output. The task is not executed by
-its <code>execute()</code> method, because the <code>perform()</code> method (implemented in Task
-itself) does the appropriate logging before and after invoking <code>execute()</code>.</p>
+its <code class="code">execute()</code> method, because the <code class="code">perform()</code>
+method (implemented in Task itself) does the appropriate logging before and after
+invoking <code class="code">execute()</code>.</p>
<p>Here is an example of using beanshell to create an Ant task. This task will add filesets and
paths to a referenced path. If the path does not exist, it will be created.</p>
<pre>
@@ -313,7 +314,7 @@ paths to a referenced path. If the path does not exist, it will be created.</p>
project.addTaskDefinition("addtopath", AddToPath.class);
</script></pre>
<p>An example of using this task to create a path from a list of directories (using
-ant-contrib's <a href="http://ant-contrib.sourceforge.net/tasks/tasks/for.html"
+Ant-Contrib's <a href="http://ant-contrib.sourceforge.net/tasks/tasks/for.html"
target="_top"><for></a> task) follows:</p>
<pre>
<path id="main.path">
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/scriptdef.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/scriptdef.html b/manual/Tasks/scriptdef.html
index 8b497ff..942a07f 100644
--- a/manual/Tasks/scriptdef.html
+++ b/manual/Tasks/scriptdef.html
@@ -43,28 +43,29 @@ information.</p>
<p>The attributes and nested elements supported by the task may be defined
using <code><attribute></code> and <code><element></code> nested elements. These are
available to the script that implements the task as two collection style script
-variables <code>attributes</code> and <code>elements</code>. The elements in
-the <code>attributes</code> collection may be accessed by the attribute
-name. The <code>elements</code> collection is accessed by the nested element name. This will return
-a list of all instances of the nested element. The instances in this list may be accessed by an
-integer index.</p>
+variables <code class="code">attributes</code> and <code class="code">elements</code>. The elements
+in the <code class="code">attributes</code> collection may be accessed by the attribute
+name. The <code class="code">elements</code> collection is accessed by the nested element name. This
+will return a list of all instances of the nested element. The instances in this list may be
+accessed by an integer index.</p>
<p><strong>Note</strong>: Ant will turn all attribute and element names into all lowercase names, so
even if you use <var>name</var>=<q>SomeAttribute</q>, you'll have to use <q>someattribute</q> to
-retrieve the attribute's value from the <code>attributes</code> collection.</p>
+retrieve the attribute's value from the <code class="code">attributes</code> collection.</p>
-<p>The name <code>self</code> (<em>since Ant 1.6.3</em>) is a pre-defined reference to
+<p>The name <code class="code">self</code> (<em>since Ant 1.6.3</em>) is a pre-defined reference to
the <code>scriptdef</code> task instance. It can be used for logging, or for integration with the
-rest of Ant. the <code>self.text attribute</code> contains any nested text passed to the script</p>
+rest of Ant. The <code class="code">self.text</code> attribute contains any nested text passed to
+the script</p>
-<p>If an attribute or element is not passed in, then <code>attributes.get()</code>
-or <code>elements.get()</code> will return null. It is up to the script to perform any checks and
-validation. <code>self.fail(String message)</code>can be used to raise
+<p>If an attribute or element is not passed in, then <code class="code">attributes.get()</code>
+or <code class="code">elements.get()</code> will return null. It is up to the script to perform any
+checks and validation. <code class="code">self.fail(String message)</code>can be used to raise
a <code>BuildException</code>.</p>
-<p>The name <code>project</code> is a pre-defined reference to the Ant Project. For more information
-on writing scripts, please refer to the <a href="script.html"><code><script></code></a>
-task.</p>
+<p>The name <code class="code">project</code> is a pre-defined reference to the Ant Project. For
+more information on writing scripts, please refer to
+the <a href="script.html"><code><script></code></a> task.</p>
<h3>Parameters</h3>
<table class="attr">
@@ -236,8 +237,8 @@ through them</p>
error. For example in the above script, removing the closing curly bracket would result in this
error</p>
-<pre>build.xml:15: SyntaxError: missing } in compound
-statement (scriptdef <code><scripttest2></code>; line 10)</pre>
+<pre class="output">build.xml:15: SyntaxError: missing } in compound
+statement (scriptdef <scripttest2>; line 10)</pre>
<p>Script errors are only detected when a <code>script</code> task is actually executed.</p>
<p>The next example does uses nested text in Jython. It also declares the script in a new xml
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/signjar.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/signjar.html b/manual/Tasks/signjar.html
index 2dde124..53269f3 100644
--- a/manual/Tasks/signjar.html
+++ b/manual/Tasks/signjar.html
@@ -29,7 +29,7 @@
<p>Signing a jar allows users to authenticate the publisher.</p>
<p>Signs JAR files with
the <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/jarsigner.html"
-target="_top"><code>jarsigner</code> command line tool</a>. It will take a named file in
+target="_top"><kbd>jarsigner</kbd></a> command line tool. It will take a named file in
the <var>jar</var> attribute, and an optional <var>destDir</var> or <var>signedJar</var>
attribute. Nested paths are also supported; here only an (optional) <var>destDir</var> is
allowed. If a destination directory or explicit JAR file name is not provided, JARs are signed in
@@ -119,7 +119,7 @@ place.</p>
</tr>
<tr>
<td>maxmemory</td>
- <td>Specifies the maximum memory the <code>jarsigner</code> JVM will use. Specified in the style
+ <td>Specifies the maximum memory the <kbd>jarsigner</kbd> JVM will use. Specified in the style
of standard Java memory specs (e.g. <q>128m</q> = 128 MBytes)</td>
<td>No</td>
</tr>
@@ -150,9 +150,9 @@ place.</p>
</tr>
<tr>
<td>executable</td>
- <td>Specify a particular <code>jarsigner</code> executable to use in place of the default binary
+ <td>Specify a particular <kbd>jarsigner</kbd> executable to use in place of the default binary
(found in the same JDK as Apache Ant is running in).<br/>Must support the same command line
- options as the Sun JDK <code>jarsigner</code> command. <em>since Ant 1.8.0</em>.</td>
+ options as the Sun JDK <kbd>jarsigner</kbd> command. <em>since Ant 1.8.0</em>.</td>
<td>No</td>
</tr>
<tr>
@@ -250,7 +250,7 @@ the files will only be signed if they are not already signed.</p>
</signjar></pre>
<p>Sign all the JAR files in <samp>dist/**/*.jar</samp> using the digest algorithm SHA1 and the
signature algorithm MD5withRSA. This is especially useful when you want to use the JDK
-7 <code>jarsigner</code> (which uses SHA256 and SHA256withRSA as default) to create signed jars that
+7 <kbd>jarsigner</kbd> (which uses SHA256 and SHA256withRSA as default) to create signed jars that
will be deployed on platforms not supporting SHA256 and SHA256withRSA.</p>
<h3>About timestamp signing</h3>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/sos.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sos.html b/manual/Tasks/sos.html
index 4d242a3..1180e97 100644
--- a/manual/Tasks/sos.html
+++ b/manual/Tasks/sos.html
@@ -45,10 +45,10 @@ target="_top">SourceGear's</a> <a href="https://sourcegear.com/sos/" target="_to
product. SourceOffSite is an add-on to Microsoft's VSS, that allows remote development teams and
tele-commuters that need fast and secure read/write access to a centralized SourceSafe database via
any TCP/IP connection. SOS provides Linux, Solaris & Windows
-clients. The <code>org.apache.tools.ant.taskdefs.optional.sos</code> package consists of a simple
-framework to support SOS functionality as well as some Apache Ant tasks encapsulating frequently
-used SOS commands. Although it is possible to use these commands on the desktop, they were
-primarily intended to be used by automated build systems. These tasks have been tested with
+clients. The <code class="code">org.apache.tools.ant.taskdefs.optional.sos</code> package consists
+of a simple framework to support SOS functionality as well as some Apache Ant tasks encapsulating
+frequently used SOS commands. Although it is possible to use these commands on the desktop, they
+were primarily intended to be used by automated build systems. These tasks have been tested with
SourceOffSite version 3.5.1 connecting to VisualSourceSafe 6.0. The tasks have been tested with
Linux, Solaris & Windows 2000.</p>
@@ -95,7 +95,7 @@ Linux, Solaris & Windows 2000.</p>
<tbody>
<tr>
<td>soscmd</td>
- <td>Directory which contains <code>soscmd(.exe)</code></td>
+ <td>Directory which contains <kbd>soscmd(.exe)</kbd></td>
<td>No; by default, the executable must be in the path</td>
</tr>
<tr>
@@ -207,7 +207,7 @@ working directory.</p>
<tbody>
<tr>
<td>soscmd</td>
- <td>Directory which contains <code>soscmd(.exe)</code></td>
+ <td>Directory which contains <kbd>soscmd(.exe)</kbd></td>
<td>No; by default, the executable must be in the path</td>
</tr>
<tr>
@@ -283,7 +283,7 @@ the <samp>$/SourceRoot/project1</samp> project with <q>test label</q>.</p>
<tbody>
<tr>
<td>soscmd</td>
- <td>Directory which contains <code>soscmd(.exe)</code></td>
+ <td>Directory which contains <kbd>soscmd(.exe)</kbd></td>
<td>No; by default, the executable must be in the path</td>
</tr>
<tr>
@@ -391,7 +391,7 @@ be displayed on screen.</p>
<tbody>
<tr>
<td>soscmd</td>
- <td>Directory which contains <code>soscmd(.exe)</code></td>
+ <td>Directory which contains <kbd>soscmd(.exe)</kbd></td>
<td>No; by default, the executable must be in the path</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/sound.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sound.html b/manual/Tasks/sound.html
index 9a441a2..d46ffd0 100644
--- a/manual/Tasks/sound.html
+++ b/manual/Tasks/sound.html
@@ -36,7 +36,7 @@ specify.</p>
finishes. Therefore you have to place this task as top level or inside a target which is always
executed.</p>
<p>Unless you are running on Java 1.3 or later, you need the Java Media Framework on the classpath
-(<code>javax.sound</code>).</p>
+(<code class="code">javax.sound</code>).</p>
<h3>Parameters specified as nested elements</h3>
<h4>success</h4>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/sql.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sql.html b/manual/Tasks/sql.html
index 764eaea..4923b47 100644
--- a/manual/Tasks/sql.html
+++ b/manual/Tasks/sql.html
@@ -45,7 +45,7 @@ and transaction and fail task.</p>
proxy settings to route their JDBC operations to the database. <em>Since Apache Ant 1.7</em>, Ant
running on Java 5 or later defaults to <a href="../proxy.html">using the proxy settings of the
operating system</a>. Accordingly, the OS proxy settings need to be valid, or Ant's proxy support
-disabled with <code>-noproxy</code> option.</p>
+disabled with <kbd>-noproxy</kbd> option.</p>
<h3>Parameters</h3>
<table class="attr">
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/sshexec.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sshexec.html b/manual/Tasks/sshexec.html
index fb0cdc2..2b291a0 100644
--- a/manual/Tasks/sshexec.html
+++ b/manual/Tasks/sshexec.html
@@ -173,7 +173,7 @@ JSCh earlier than 0.1.28.</p>
<tr>
<td>verbose</td>
<td>Determines whether <code>sshexec</code> outputs verbosely to the user.<br/> Similar output
- is generated as the <code>ssh</code> commandline tool with the <code>-v</code>
+ is generated as the <kbd>ssh</kbd> command line tool with the <kbd>-v</kbd>
option. <em>since Ant 1.8.0</em></td>
<td>No; defaults to <q>false</q></td>
</tr>
@@ -196,7 +196,7 @@ JSCh earlier than 0.1.28.</p>
</tr>
<tr>
<td>usepty</td>
- <td>Whether to allocate a pseudo-tty (like <code>ssh -t</code>). <em>since Ant 1.8.3</em></td>
+ <td>Whether to allocate a pseudo-tty (like <kbd>ssh -t</kbd>). <em>since Ant 1.8.3</em></td>
<td>No; defaults to <q>false</q></td>
</tr>
<tr>
@@ -261,9 +261,9 @@ command line. For example:</p>
password="${password}"
command="touch somefile"/></pre>
<p>Invoking Ant with the following command line:</p>
-<pre>ant -Dusername=me -Dpassword=mypassword target1 target2</pre>
+<pre class="input">ant -Dusername=me -Dpassword=mypassword target1 target2</pre>
<p>is slightly better, but the username/password is exposed to all users on an Unix system (via
-the <code>ps</code> command). The best approach is to use the <code><input></code> task and/or
+the <kbd>ps</kbd> command). The best approach is to use the <code><input></code> task and/or
retrieve the password from a (secured) <samp>.properties</samp> file.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/sshsession.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sshsession.html b/manual/Tasks/sshsession.html
index ec60bbf..d94f80f 100644
--- a/manual/Tasks/sshsession.html
+++ b/manual/Tasks/sshsession.html
@@ -242,9 +242,9 @@ and include the password on the command line. For example:</p>
</sshsession></pre>
<p>Invoking Ant with the following command line:</p>
-<pre>ant -Dusername=me -Dpassword=mypassword target1 target2</pre>
+<pre class="input">ant -Dusername=me -Dpassword=mypassword target1 target2</pre>
<p>is slightly better, but the username/password is exposed to all users on an Unix system (via
-the <code>ps</code> command). The best approach is to use the <code><input></code> task and/or
+the <kbd>ps</kbd> command). The best approach is to use the <code><input></code> task and/or
retrieve the password from a (secured) <samp>.properties</samp> file.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/style.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/style.html b/manual/Tasks/style.html
index f8de21a..c792122 100644
--- a/manual/Tasks/style.html
+++ b/manual/Tasks/style.html
@@ -45,7 +45,7 @@ whether you want to use default exclusions or not. See the section
on <a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on how the
inclusion/exclusion of files works, and how to write patterns.</p>
<p>This task forms an implicit <a href="../Types/fileset.html">FileSet</a> and supports all
-attributes of <code><fileset></code> (<code>dir</code> becomes <code>basedir</code>) as well
+attributes of <code><fileset></code> (<var>dir</var> becomes <var>basedir</var>) as well
as the nested <code><include></code>, <code><exclude></code>
and <code><patternset></code> elements.</p>
@@ -55,7 +55,7 @@ stylesheets to all files contain in them as well. Since the default <var>includ
is <code>**</code> this means it will apply the stylesheet to all files. If you specify
an <var>excludes</var> pattern, it may still work on the files matched by those patterns because the
parent directory has been matched. If this behavior is not what you want, set
-the <var>scanincludedirectories</var> attribute to false.</p>
+the <var>scanincludedirectories</var> attribute to <q>false</q>.</p>
<p><em>Since Ant 1.7</em>, this task supports
nested <a href="../Types/resources.html#collection">resource collections</a> in addition to (or
@@ -405,7 +405,7 @@ documentation of your processor. For example, in Xalan 2.x:</p>
<tr>
<td>classloaderforpath</td>
<td class="left">Value of the attribute is a classloader that uses the classpath specified by a
- path that is the project reference with the given id. <em>since Ant 1.9.8</em></td>
+ path that is the project reference with the given <var>id</var>. <em>since Ant 1.9.8</em></td>
</tr>
</table>
</blockquote>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/subant.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/subant.html b/manual/Tasks/subant.html
index 22783f2..2f15d2a 100644
--- a/manual/Tasks/subant.html
+++ b/manual/Tasks/subant.html
@@ -168,7 +168,7 @@ whose dependencies are the targets so specified, in the order specified.</p>
</subant>
</target>
</project></pre>
-<p>this snippet build file will run <code>ant</code> in each subdirectory of the project directory,
+<p>this snippet build file will run <kbd>ant</kbd> in each subdirectory of the project directory,
where a file called <samp>build.xml</samp> can be found. The property <code>build.dir</code> will
have the value <q>subant1.build</q> in the Ant projects called by <code>subant</code>.</p>
<pre>
@@ -179,7 +179,7 @@ have the value <q>subant1.build</q> in the Ant projects called by <code>subant</
</propertyset>
<fileset dir="." includes="*/build.xml"/>
</subant></pre>
-<p>this snippet build file will run <code>ant</code> in each subdirectory of the project directory,
+<p>this snippet build file will run <kbd>ant</kbd> in each subdirectory of the project directory,
where a file called <samp>build.xml</samp> can be found. All properties whose name starts
with <q>foo</q> are passed, their names are changed to start with <q>bar</q> instead</p>
<pre>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/symlink.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/symlink.html b/manual/Tasks/symlink.html
index ad1714f..67e97dd 100644
--- a/manual/Tasks/symlink.html
+++ b/manual/Tasks/symlink.html
@@ -111,14 +111,14 @@ named <samp>dir.links</samp></p>
<p><strong>Java 1.2 and earlier</strong>: Due to limitations on executing system level commands in
Java versions earlier than 1.3 this task may have difficulty operating with a relative path
-in <code>ANT_HOME</code>. The typical symptom is an IOException where Apache Ant can't
+in <code>ANT_HOME</code>. The typical symptom is an <code>IOException</code> where Apache Ant can't
find <samp>/some/working/directory${ANT_HOME}/bin/antRun</samp> or something similar. The workaround
is to change your <code>ANT_HOME</code> environment variable to an absolute path, which will remove
the <samp>/some/working/directory</samp> portion of the above path and allow Ant to find the correct
command line execution script.</p>
<p><strong>Note</strong>: <em>Since Ant 1.10.2</em>, this task relies on the symbolic link support
-introduced in Java 7 through the <code>java.nio.file.Files</code> APIs</p>
+introduced in Java 7 through the <code class="code">java.nio.file.Files</code> APIs</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/tar.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/tar.html b/manual/Tasks/tar.html
index 98518ce..927b96b 100644
--- a/manual/Tasks/tar.html
+++ b/manual/Tasks/tar.html
@@ -40,27 +40,28 @@ access mode, username and groupname to be applied to the tar entries. This is us
when preparing archives for Unix systems where some files need to have execute permission. By
default this task will use Unix permissions of 644 for files and 755 for directories.</p>
-<p>Early versions of <code>tar</code> utility did not support paths longer than 100 characters. Over
+<p>Early versions of <kbd>tar</kbd> utility did not support paths longer than 100 characters. Over
time several incompatible extensions have been developed until a new POSIX standard was created that
-added so called PAX extension headers (as the <code>pax</code> utility first introduced them) that
-among another things addressed file names longer than 100 characters. All modern implementations of
-tar support PAX extension headers.</p>
-
-<p>Ant's tar support predates the standard with PAX extension headers, it supports different
-dialects that can be enabled using the <var>longfile</var> attribute. If the <var>longfile</var>
-attribute is set to <q>fail</q>, any long paths will cause the tar task to fail. If
-the <var>longfile</var> attribute is set to <q>truncate</q>, any long paths will be truncated to the
-100 character maximum length prior to adding to the archive. If the value of the <var>longfile</var>
-attribute is set to <q>omit</q> then files containing long paths will be omitted from the archive.
-Either option ensures that the archive can be untarred by any compliant version of tar.</p>
+added so called PAX extension headers (as the <kbd>pax</kbd> utility first introduced them) that
+among another things addressed file names longer than 100 characters. All modern implementations
+of <kbd>tar</kbd> support PAX extension headers.</p>
+
+<p>Ant's <kbd>tar</kbd> support predates the standard with PAX extension headers, it supports
+different dialects that can be enabled using the <var>longfile</var> attribute. If
+the <var>longfile</var> attribute is set to <q>fail</q>, any long paths will cause
+the <code>tar</code> task to fail. If the <var>longfile</var> attribute is set to <q>truncate</q>,
+any long paths will be truncated to the 100 character maximum length prior to adding to the
+archive. If the value of the <var>longfile</var> attribute is set to <q>omit</q> then files
+containing long paths will be omitted from the archive. Either option ensures that the archive can
+be untarred by any compliant version of <kbd>tar</kbd>.</p>
<p>If the loss of path or file information is not acceptable, and it rarely is, <var>longfile</var>
may be set to the value <q>gnu</q> or <q>posix</q>. With <q>posix</q> Ant will add PAX extension
-headers, with <q>gnu</q> it adds GNU tar specific extensions that newer versions of GNU tar
-call <q>oldgnu</q>. GNU tar still creates these extensions by default but supports PAX extension
-headers as well. Either choice will produce a tar file which can have arbitrary length paths. Note
-however, that the resulting archive will only be able to be untarred with tar tools that support the
-chosen format.</p>
+headers, with <q>gnu</q> it adds GNU <kbd>tar</kbd> specific extensions that newer versions of
+GNU <kbd>tar</kbd> call <q>oldgnu</q>. GNU <kbd>tar</kbd> still creates these extensions by default
+but supports PAX extension headers as well. Either choice will produce a tar file which can have
+arbitrary length paths. Note however, that the resulting archive will only be able to be untarred
+with <kbd>tar</kbd> tools that support the chosen format.</p>
<p>The default for the <var>longfile</var> attribute is <q>warn</q> which behaves just like
the <q>gnu</q> option except that it produces a warning for each filepath encountered that does not
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/telnet.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/telnet.html b/manual/Tasks/telnet.html
index 3f81e46..78a7c97 100644
--- a/manual/Tasks/telnet.html
+++ b/manual/Tasks/telnet.html
@@ -26,8 +26,8 @@
<h2 id="telnet">Telnet</h2>
<h3>Description</h3>
-<q>Task to automate a remote telnet session. The task uses nested <code><read></code> to
-indicate strings to wait for, and <code><write></code> tags to specify text to send.</q>
+<p>Task to automate a remote telnet session. The task uses nested <code><read></code> to
+indicate strings to wait for, and <code><write></code> tags to specify text to send.</p>
<p>If you do specify a userid and password, the system will assume a common Unix prompt to wait
on. This behavior can be easily overridden.</p>
@@ -115,7 +115,7 @@ of <q>ogin:</q> for the userid, and a prompt of <q>assword:</q> for the password
</telnet></pre>
<p>A timeout can be specified at the <code><telnet></code> level or at
-the <code><read></code> level. This will connect, issue a <code>sleep</code> command that is
+the <code><read></code> level. This will connect, issue a <kbd>sleep</kbd> command that is
suppressed from displaying and wait 10 seconds before quitting.</p>
<pre>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/tempfile.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/tempfile.html b/manual/Tasks/tempfile.html
index d2f0c5b..9a3da65 100644
--- a/manual/Tasks/tempfile.html
+++ b/manual/Tasks/tempfile.html
@@ -26,8 +26,8 @@
<h2>Tempfile Task</h2>
<h3 id="description">Description</h3>
<p>This task sets a property to the name of a temporary file.
-Unlike <code>java.io.File.createTempFile</code>, this task does not actually create the temporary
-file, but it does guarantee that the file did not exist when the task was executed.</p>
+Unlike <code class="code">java.io.File.createTempFile</code>, this task does not actually create the
+temporary file, but it does guarantee that the file did not exist when the task was executed.</p>
<h3 id="attributes">Parameters</h3>
<table class="attr">
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/touch.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/touch.html b/manual/Tasks/touch.html
index d4ed96b..2ce9e42 100644
--- a/manual/Tasks/touch.html
+++ b/manual/Tasks/touch.html
@@ -33,10 +33,10 @@ on <a href="../Types/resources.html">resources</a> and resource collections (whi
directories). Prior to Apache Ant 1.7 only FileSet or <a href="../Types/filelist.html">Filelist</a>
(<em>since Ant 1.6</em>) were supported.</p>
-<p>Ant uses the API of <code>java.io.File</code> to set the last modification time which has some
-limitations. For example, the timestamp granularity depends on the operating system and sometimes
-the operating system may allow a granularity smaller than milliseconds. If you need more control
-you have to fall back to the <code><exec></code> task and native commands.</p>
+<p>Ant uses the API of <code class="code">java.io.File</code> to set the last modification time
+which has some limitations. For example, the timestamp granularity depends on the operating system
+and sometimes the operating system may allow a granularity smaller than milliseconds. If you need
+more control you have to fall back to the <code><exec></code> task and native commands.</p>
<p><em>Since Ant 1.8.2</em>, a warning message is logged upon failure to change the file
modification time. This will happen if you try to change the modification time of a file you do not
@@ -90,8 +90,9 @@ own on many Unix systems, for example.</p>
<p>You can use any number of nested resource collection elements to define the resources for this
task and refer to resources defined elsewhere. <strong>Note</strong>: resources passed to this task
-must implement the <code>org.apache.tools.ant.types.resources.Touchable</code> interface, this is
-true for all filesystem-based resources like those returned by path, fileset ot filelist.</p>
+must implement the <code class="code">org.apache.tools.ant.types.resources.Touchable</code>
+interface, this is true for all filesystem-based resources like those returned by path, fileset ot
+filelist.</p>
<p>For backwards compatibility directories matched by nested filesets will be "touched" as well, use
a <var>type</var> selector to suppress this. This only applies to filesets nested into the task
@@ -103,7 +104,7 @@ Files specified via nested <code>fileset</code>s, <code>filelist</code>s, or the
attribute are mapped using the specified mapper. For each file mapped, the resulting files are
touched. If no time has been specified and the original file exists its timestamp will be used. If
no time has been specified and the original file does not exist the current time is used. <em>Since
-Ant 1.8</em>, the task settings (<var>millis</var>, and <var>datetime</var>) have priority over the
+Ant 1.8</em>, the task settings (<var>millis</var> and <var>datetime</var>) have priority over the
timestamp of the original file.</p>
<h3>Examples</h3>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/translate.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/translate.html b/manual/Tasks/translate.html
index ea1f5a5..5f16457 100644
--- a/manual/Tasks/translate.html
+++ b/manual/Tasks/translate.html
@@ -54,7 +54,7 @@ bundle files can be specified.</p>
If <var>forceoverwrite</var> is <q>false</q>, the destination file is overwritten only if either the
source file or any of the files that make up the bundle have been modified after the destination
file was last modified.</p>
-<p><em>Since Apache Ant 1.6</em>:<br/>Line endings of source files are preserved in the translated
+<p><em>Since Apache Ant 1.6</em> line endings of source files are preserved in the translated
files.</p>
<p><a href="../Types/fileset.html">FileSet</a>s are used to select files to translate.</p>
<h3>Parameters</h3>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/truncate.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/truncate.html b/manual/Tasks/truncate.html
index 54a8610..3bd9c26 100644
--- a/manual/Tasks/truncate.html
+++ b/manual/Tasks/truncate.html
@@ -28,8 +28,8 @@
<p><em>Since Apache Ant 1.7.1</em></p>
<h3>Description</h3>
-<p>Set the length of one or more files, as the intermittently available <code>truncate</code> Unix
-utility/function. In addition to working with a single file, this Task can also work
+<p>Set the length of one or more files, as the <code>truncate</code> Unix function or GNU
+utility. In addition to working with a single file, this Task can also work
on <a href="../Types/resources.html">resources</a> and resource collections.</p>
<h3>Parameters</h3>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/typedef.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/typedef.html b/manual/Tasks/typedef.html
index 3908447..77ef03d 100644
--- a/manual/Tasks/typedef.html
+++ b/manual/Tasks/typedef.html
@@ -28,8 +28,8 @@
<h3>Description</h3>
<p>Adds a task or a data type definition to the current project such that this new type or task can
be used in the current project.</p>
-<p>A Task is any class that extends <code>org.apache.tools.ant.Task</code> or can be adapted as a
-Task using an adapter class.</p>
+<p>A Task is any class that extends <code class="code">org.apache.tools.ant.Task</code> or can be adapted
+as a Task using an adapter class.</p>
<p>Data types are things like <a href="../using.html#path">paths</a>
or <a href="../Types/fileset.html">filesets</a> that can be defined at the project level and
referenced via their <var>id</var> attribute. Custom data types usually need custom tasks to put
@@ -159,9 +159,10 @@ structure</a> and can also be set via a nested <code>classpath</code> element.</
type.</p>
<p>Assuming a class <code>org.acme.ant.RunnableAdapter</code> that extends Task and
-implements <code>org.apache.tools.ant.TypeAdapter</code>, and in the execute method
-invokes <code>run()</code> on the proxied object, one may use a Runnable class as an Ant task. The
-following fragment defines a task called <code>runclock</code>.</p>
+implements <code class="code">org.apache.tools.ant.TypeAdapter</code>, and in
+the <code class="code">execute()</code> method invokes <code class="code">run()</code> on the
+proxied object, one may use a <code>Runnable</code> class as an Ant task. The following fragment
+defines a task called <code>runclock</code>.</p>
<pre>
<typedef name="runclock"
classname="com.acme.ant.RunClock"
@@ -191,7 +192,7 @@ important:</p>
classpath="path/to/ant-contrib.jar"/></pre>
<p>Here the namespace declaration <code>xmlns:antcontrib="antlib:net.sf.antcontrib"</code> allows
-tasks and types of the AntContrib Antlib to be used with the <samp>antcontrib</samp> prefix
+tasks and types of the Ant-Contrib Antlib to be used with the <samp>antcontrib</samp> prefix
like <code><antcontrib:if></code>. The normal rules of XML namespaces apply and you can
declare the prefix at any element to make it usable for the element it is declared on as well as all
its child elements.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/verifyjar.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/verifyjar.html b/manual/Tasks/verifyjar.html
index 3fe02ce..e20c401 100644
--- a/manual/Tasks/verifyjar.html
+++ b/manual/Tasks/verifyjar.html
@@ -26,8 +26,10 @@
<h2 id="verifyjar">VerifyJar</h2>
<h3>Description</h3>
-<p>Verifies JAR files with the <code>jarsigner</code> command line tool. It will take a named file
-in the <var>jar</var> attribute. Nested paths are also supported.</p>
+<p>Verifies JAR files with
+the <a href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/jarsigner.html"
+target="_top"><kbd>jarsigner</kbd></a> command line tool. It will take a named file in
+the <var>jar</var> attribute. Nested paths are also supported.</p>
<h3>Parameters</h3>
<table class="attr">
@@ -83,15 +85,15 @@ in the <var>jar</var> attribute. Nested paths are also supported.</p>
</tr>
<tr>
<td>maxmemory</td>
- <td>Specifies the maximum memory the <code>jarsigner</code> JVM will use. Specified in the style
+ <td>Specifies the maximum memory the <kbd>jarsigner</kbd> JVM will use. Specified in the style
of standard Java memory specs (e.g. <q>128m</q> = 128 MBytes)</td>
<td>No</td>
</tr>
<tr>
<td>executable</td>
- <td>Specify a particular <code>jarsigner</code> executable to use in place of the default binary
+ <td>Specify a particular <kbd>jarsigner</kbd> executable to use in place of the default binary
(found in the same JDK as Apache Ant is running in).<br/> Must support the same command line
- options as the Sun JDK <code>jarsigner</code> command. <em>since Ant 1.8.0</em>.</td>
+ options as the Sun JDK <kbd>jarsigner</kbd> command. <em>since Ant 1.8.0</em>.</td>
<td>No</td>
</tr>
</table>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/vss.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/vss.html b/manual/Tasks/vss.html
index 8e6117c..e7ece0b 100644
--- a/manual/Tasks/vss.html
+++ b/manual/Tasks/vss.html
@@ -46,13 +46,13 @@
<p>These tasks provide an interface to
the <a href="https://msdn.microsoft.com/en-us/library/3h0544kx(v=vs.80).aspx"
target="_top">Microsoft Visual SourceSafe</a> SCM.
-The <code>org.apache.tools.ant.taskdefs.optional.vss</code> package consists of a simple framework
-to support VSS functionality as well as some Apache Ant tasks encapsulating frequently used VSS
-commands. Although it is possible to use these commands on the desktop, they were primarily
-intended to be used by automated build systems.</p>
-<p>If you get a <code>CreateProcess error=2</code> when running these, it means
-that <code>ss.exe</code> was not found. Check to see if you can run it from the command
-line—you may need to alter your path, or set the <var>ssdir</var> property.</p>
+The <code class="code">org.apache.tools.ant.taskdefs.optional.vss</code> package consists of a
+simple framework to support VSS functionality as well as some Apache Ant tasks encapsulating
+frequently used VSS commands. Although it is possible to use these commands on the desktop, they
+were primarily intended to be used by automated build systems.</p>
+<p>If you get a <code class="output">CreateProcess error=2</code> when running these, it means
+that <kbd>ss.exe</kbd> was not found. Check to see if you can run it from the command line—you
+may need to alter your path, or set the <var>ssdir</var> property.</p>
<h2 id="tasks">The Tasks</h2>
<table>
@@ -127,7 +127,7 @@ order version, date, label.</p>
</tr>
<tr>
<td>ssdir</td>
- <td>directory where <code>ss.exe</code> resides.</td>
+ <td>directory where <kbd>ss.exe</kbd> resides.</td>
<td>No; by default expected to be in <code>PATH</code></td>
</tr>
<tr>
@@ -168,7 +168,7 @@ order version, date, label.</p>
</tr>
<tr>
<td>autoresponse</td>
- <td>What to respond with (sets the <code>-I</code> option). By default, <code>-I-</code> is
+ <td>What to respond with (sets the <kbd>-I</kbd> option). By default, <kbd>-I-</kbd> is
used; values of <q>Y</q> or <q>N</q> will be appended to this.</td>
<td>No</td>
</tr>
@@ -180,7 +180,7 @@ order version, date, label.</p>
</tr>
<tr>
<td>failonerror</td>
- <td>Stop the build process if <code>ss.exe</code> exits with a return code <q>100</q></td>
+ <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code <q>100</q></td>
<td>No; defaults to <q>true</q></td>
</tr>
<tr>
@@ -233,7 +233,7 @@ writable.</p>
</tr>
<tr>
<td>ssdir</td>
- <td>directory where <code>ss.exe</code> resides.</td>
+ <td>directory where <kbd>ss.exe</kbd> resides.</td>
<td>No; by default expected to be in <code>PATH</code></td>
</tr>
<tr>
@@ -259,13 +259,13 @@ writable.</p>
</tr>
<tr>
<td>autoresponse</td>
- <td>What to respond with (sets the <code>-I</code> option). By default, <code>-I-</code> is
+ <td>What to respond with (sets the <kbd>-I</kbd> option). By default, <kbd>-I-</kbd> is
used; values of <q>Y</q> or <q>N</q> will be appended to this.</td>
<td>No</td>
</tr>
<tr>
<td>failonerror</td>
- <td>Stop the build process if <code>ss.exe</code> exits with a return code <q>100</q>.</td>
+ <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code <q>100</q>.</td>
<td>No; defaults to <q>true</q></td>
</tr>
</table>
@@ -314,7 +314,7 @@ Task to perform HISTORY commands to Microsoft Visual SourceSafe.
</tr>
<tr>
<td>ssdir</td>
- <td>directory where <code>ss.exe</code> resides.</td>
+ <td>directory where <kbd>ss.exe</kbd> resides.</td>
<td>No; by default expected to be in <code>PATH</code></td>
</tr>
<tr>
@@ -376,7 +376,7 @@ Task to perform HISTORY commands to Microsoft Visual SourceSafe.
</tr>
<tr>
<td>failonerror</td>
- <td>Stop the build process if <code>ss.exe</code> exits with a return code <q>100</q></td>
+ <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code <q>100</q></td>
<td>No; defaults to <q>true</q></td>
</tr>
</table>
@@ -451,7 +451,7 @@ specified according to your locale).</p>
</tr>
<tr>
<td>ssdir</td>
- <td>directory where <code>ss.exe</code> resides.</td>
+ <td>directory where <kbd>ss.exe</kbd> resides.</td>
<td>No; by default expected to be in <code>PATH</code></td>
</tr>
<tr>
@@ -481,7 +481,7 @@ specified according to your locale).</p>
</tr>
<tr>
<td>failonerror</td>
- <td>Stop the build process if <code>ss.exe</code> exits with a return code <q>100</q>.</td>
+ <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code <q>100</q>.</td>
<td>No; defaults to <q>true</q></td>
</tr>
</table>
@@ -531,7 +531,7 @@ order <var>version</var>, <var>date</var>, <var>label</var>.</p>
</tr>
<tr>
<td>ssdir</td>
- <td>directory where <code>ss.exe</code> resides.</td>
+ <td>directory where <kbd>ss.exe</kbd> resides.</td>
<td>No; by default expected to be in <code>PATH</code></td>
</tr>
<tr>
@@ -570,7 +570,7 @@ order <var>version</var>, <var>date</var>, <var>label</var>.</p>
</tr>
<tr>
<td>failonerror</td>
- <td>Stop the build process if <code>ss.exe</code> exits with a return code <q>100</q>.</td>
+ <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code <q>100</q>.</td>
<td>No; defaults to <q>true</q></td>
</tr>
<tr>
@@ -623,7 +623,7 @@ Task to perform ADD commands to Microsoft Visual SourceSafe.
</tr>
<tr>
<td>ssdir</td>
- <td>directory where <code>ss.exe</code> resides.</td>
+ <td>directory where <kbd>ss.exe</kbd> resides.</td>
<td>No; by default expected to be in <code>PATH</code></td>
</tr>
<tr>
@@ -653,7 +653,7 @@ Task to perform ADD commands to Microsoft Visual SourceSafe.
</tr>
<tr>
<td>failonerror</td>
- <td>Stop the build process if <code>ss.exe</code> exits with a return code <q>100</q>.</td>
+ <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code <q>100</q>.</td>
<td>No; defaults to <q>true</q></td>
</tr>
</table>
@@ -694,7 +694,7 @@ Task to perform ADD commands to Microsoft Visual SourceSafe.
</tr>
<tr>
<td>ssdir</td>
- <td>directory where <code>ss.exe</code> resides.</td>
+ <td>directory where <kbd>ss.exe</kbd> resides.</td>
<td>No; by default expected to be in <code>PATH</code></td>
</tr>
<tr>
@@ -704,7 +704,7 @@ Task to perform ADD commands to Microsoft Visual SourceSafe.
</tr>
<tr>
<td>failonerror</td>
- <td>Stop the build process if <code>ss.exe</code> exits with a return code <q>100</q>.</td>
+ <td>Stop the build process if <kbd>ss.exe</kbd> exits with a return code <q>100</q>.</td>
<td>No; defaults to <q>true</q></td>
</tr>
</table>
@@ -740,7 +740,7 @@ Task to perform ADD commands to Microsoft Visual SourceSafe.
</tr>
<tr>
<td>ssdir</td>
- <td>directory where <code>ss.exe</code> resides.</td>
+ <td>directory where <kbd>ss.exe</kbd> resides.</td>
<td>No; by default expected to be in <code>PATH</code></td>
</tr>
<tr>
@@ -755,7 +755,7 @@ Task to perform ADD commands to Microsoft Visual SourceSafe.
</tr>
<tr>
<td>autoresponse</td>
- <td>What to respond with (sets the <code>-I</code> option). By default, <code>-I-</code> is
+ <td>What to respond with (sets the <kbd>-I</kbd> option). By default, <kbd>-I-</kbd> is
used; values of <q>Y</q> or <q>N</q> will be appended to this.</td>
<td>No</td>
</tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/xmlvalidate.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/xmlvalidate.html b/manual/Tasks/xmlvalidate.html
index 9a74c59..f1256bd 100644
--- a/manual/Tasks/xmlvalidate.html
+++ b/manual/Tasks/xmlvalidate.html
@@ -118,10 +118,10 @@ perform entity resolution.</p>
<h4>attribute</h4>
<p>The <code><attribute></code> element is used to set parser features.</p>
<p>Features usable with the Xerces parser are defined
-here: <a href="https://xml.apache.org/xerces-j/features.html" target="_top">Setting features</a></p>
+here: <a href="https://xml.apache.org/xerces-j/features.html" target="_top">Setting Features</a></p>
<p>SAX features are defined
here: <a href="http://www.saxproject.org/apidoc/org/xml/sax/package-summary.html#package_description"
-target="_top"><code>http://xml.org/sax/features/</code></a></p>
+target="_top">SAX2 Standard Feature Flags</a></p>
<table class="attr">
<tr>
<th>Attribute</th>
@@ -212,7 +212,7 @@ task is better for validating W3C XML Schemas, as it extends this task with the
automatically enabled, and makes it easy to add a list of schema files/URLs to act as sources.</p>
<pre>
-<!-- Converts path to URL format -->
+<!-- Convert path to URL format -->
<pathconvert dirsep="/" property="xsd.file">
<path>
<pathelement location="xml/doc.xsd"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/zip.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/zip.html b/manual/Tasks/zip.html
index 28fc209..c83a28c 100644
--- a/manual/Tasks/zip.html
+++ b/manual/Tasks/zip.html
@@ -82,8 +82,8 @@ see <a href="#encoding">below</a></p>
(see description of the <var>filemode</var> and <var>dirmode</var> attributes
for <a href="../Types/zipfileset.html"><zipfileset></a>). Unfortunately there is no portable
way to store these permissions. Ant uses the algorithm used by <a href="http://www.info-zip.org"
-target="_top">Info-Zip's</a> implementation of the <code>zip</code> and <code>unzip</code>
-commands—these are the default versions of <code>zip</code> and <code>unzip</code> for many
+target="_top">Info-Zip's</a> implementation of the <kbd>zip</kbd> and <kbd>unzip</kbd>
+commands—these are the default versions of <kbd>zip</kbd> and <kbd>unzip</kbd> for many
Unix(-like) systems.</p>
<p><strong>Please note that the zip format allows multiple files of the same fully-qualified name to
@@ -264,8 +264,8 @@ extract an Ant generated ZIP archive.</p>
sufficient for many international character sets.</p>
<p>Over time different archivers have chosen different ways to work around the
-limitation—the <code>java.util.zip</code> packages simply uses UTF-8 as its encoding for
-example.</p>
+limitation—the <code class="code">java.util.zip</code> packages simply uses UTF-8 as its
+encoding for example.</p>
<p>Ant has been offering the <q>encoding</q> attribute of the <code>zip</code>
and <code>unzip</code> task as a way to explicitly specify the encoding to use (or expect) <em>since
@@ -307,13 +307,13 @@ ZIP archives. Below are some test results which may be superseded with later ve
tool.</p>
<ul>
- <li>The <code>java.util.zip</code> package used by the <code>jar</code> executable or to read jars
- from your <code>CLASSPATH</code> reads and writes UTF-8 names, it doesn't set or recognize any
- flags or unicode extra fields.</li>
- <li>Since Java 7, <code>java.util.zip</code> writes UTF-8 by default and uses the language
- encoding flag. It is possible to specify a different encoding when reading/writing ZIPs via new
- constructors. The package now recognizes the language encoding flag when reading and ignores
- the Unicode extra fields.</li>
+ <li>The <code class="code">java.util.zip</code> package used by the <kbd>jar</kbd> executable or
+ to read jars from your <code>CLASSPATH</code> reads and writes UTF-8 names, it doesn't set or
+ recognize any flags or unicode extra fields.</li>
+ <li>Since Java 7, <code class="code">java.util.zip</code> writes UTF-8 by default and uses the
+ language encoding flag. It is possible to specify a different encoding when reading/writing
+ ZIPs via new constructors. The package now recognizes the language encoding flag when reading
+ and ignores the Unicode extra fields.</li>
<li>7Zip writes CodePage 437 by default but uses UTF-8 and the language encoding flag when writing
entries that cannot be encoded as CodePage 437 (similar to the <code>zip</code> task
with <var>fallbacktoUTF8</var> set to <q>true</q>). It recognizes the language encoding flag
@@ -332,16 +332,16 @@ tool.</p>
<p>So, what to do?</p>
-<p>If you are creating jars, then <code>java.util.zip</code> is your main consumer. We recommend
-you set the encoding to UTF-8 and keep the language encoding flag enabled. The flag won't help or
-hurt <code>java.util.zip</code> prior to Java 7 but archivers that support it will show the correct
-file names.</p>
+<p>If you are creating jars, then <code class="code">java.util.zip</code> is your main consumer. We
+recommend you set the encoding to UTF-8 and keep the language encoding flag enabled. The flag won't
+help or hurt <code class="code">java.util.zip</code> prior to Java 7 but archivers that support it
+will show the correct file names.</p>
<p>For maximum interoparability it is probably best to set the encoding to UTF-8, enable the
language encoding flag and create Unicode extra fields when writing ZIPs. Such archives should be
-extracted correctly by <code>java.util.zip</code>, 7Zip, WinZIP, PKWARE tools and most likely
-InfoZIP tools. They will be unusable with Windows' "compressed folders" feature and bigger than
-archives without the Unicode extra fields, though.</p>
+extracted correctly by <code class="code">java.util.zip</code>, 7Zip, WinZIP, PKWARE tools and most
+likely InfoZIP tools. They will be unusable with Windows' "compressed folders" feature and bigger
+than archives without the Unicode extra fields, though.</p>
<p>If Windows' "compressed folders" is your primary consumer, then your best option is to explicitly
set the encoding to the target platform. You may want to enable creation of Unicode extra fields so
@@ -376,9 +376,9 @@ the <code>zip</code> family of tasks. It supports three values:
limits of traditional zip files but don't want to waste too much space (the Zip64 extensions take up
extra space). Unfortunately some ZIP implementations don't understand Zip64 extra fields or fail to
parse archives with extra fields in local file headers that are not present in the central
-directory, one such implementation is the <code>java.util.zip</code> package of Java 5, that's why
-the <code>jar</code> tasks default to <q>never</q>. Archives created with <q>as-needed</q> can be
-read without problems with Java 6 and later.</p>
+directory, one such implementation is the <code class="code">java.util.zip</code> package of Java 5,
+that's why the <code>jar</code> tasks default to <q>never</q>. Archives created
+with <q>as-needed</q> can be read without problems with Java 6 and later.</p>
<h3>Parameters specified as nested elements</h3>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/antlib.html
----------------------------------------------------------------------
diff --git a/manual/Types/antlib.html b/manual/Types/antlib.html
index bafc2f9..515e39f 100644
--- a/manual/Types/antlib.html
+++ b/manual/Types/antlib.html
@@ -27,10 +27,10 @@
<h3>Description</h3>
<p>
- An antlib file is an xml file with a root element of <code>antlib</code>. Antlib's
- elements are Apache Ant definition
- tasks—like <a href="../Tasks/taskdef.html">Taskdef</a> or any Ant task that
- extends <code>org.apache.tools.ant.taskdefs.AntlibDefinition</code>.
+ An antlib file is an xml file with a root element of <code>antlib</code>. Antlib's elements
+ are Apache Ant definition tasks—like <a href="../Tasks/taskdef.html">Taskdef</a> or any
+ Ant task that
+ extends <code class="code">org.apache.tools.ant.taskdefs.AntlibDefinition</code>.
</p>
<p>
The current set of declarations bundled with Ant that do this are:
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/classfileset.html
----------------------------------------------------------------------
diff --git a/manual/Types/classfileset.html b/manual/Types/classfileset.html
index f394b2d..eaf4a16 100644
--- a/manual/Types/classfileset.html
+++ b/manual/Types/classfileset.html
@@ -77,11 +77,11 @@ may be used
<h4>RootFileSet</h4>
<p>
-A root fileset is used to add a set of root classes from a fileset. In this case the entries in
-the fileset are expected to be Java class files. The name of the Java class is determined by the
+A root fileset is used to add a set of root classes from a fileset. In this case the entries in the
+fileset are expected to be Java class files. The name of the Java class is determined by the
relative location of the classfile in the fileset. So, the
file <code>org/apache/tools/ant/Project.class</code> corresponds to the Java
-class <code>org.apache.tools.ant.Project</code>.</p>
+class <code class="code">org.apache.tools.ant.Project</code>.</p>
<h4>Examples</h4>
<pre>
@@ -90,8 +90,8 @@ class <code>org.apache.tools.ant.Project</code>.</p>
</classfileset></pre>
<p>
This example creates a fileset containing all the class files upon which
-the <code>org.apache.tools.ant.Project</code> class depends. This fileset could then be used to
-create a jar.
+the <code class="code">org.apache.tools.ant.Project</code> class depends. This fileset could then be
+used to create a jar.
</p>
<pre>
@@ -104,8 +104,9 @@ create a jar.
<rootfileset dir="${classes.dir}" includes="org/apache/tools/ant/Project*.class"/>
</classfileset></pre>
<p>
-This example constructs the classfileset using all the class with names starting with Project in
-the <samp>org.apache.tools.ant</samp> package.
+This example constructs the classfileset using all the class with names starting
+with <code class="code">Project</code> in the <code class="code">org.apache.tools.ant</code>
+package.
</p>
</body>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/custom-programming.html
----------------------------------------------------------------------
diff --git a/manual/Types/custom-programming.html b/manual/Types/custom-programming.html
index ba743c1..1d233fe 100644
--- a/manual/Types/custom-programming.html
+++ b/manual/Types/custom-programming.html
@@ -24,18 +24,16 @@
<h2>Custom Components</h2>
<h3>Overview</h3>
<p>
- Custom components are conditions, selectors, filters and other objects
- that are defined outside Apache Ant core.
+ Custom components are conditions, selectors, filters and other objects that are defined
+ outside Apache Ant core.
</p>
<p>
- In Ant 1.6 custom conditions, selectors and filters has been
- overhauled.
+ In Ant 1.6 custom conditions, selectors and filters has been overhauled.
</p>
<p>
- It is now possible to define custom conditions, selectors and filters
- that behave like Ant Core components. This is achieved by allowing
- datatypes defined in build scripts to be used as custom components if
- the class of the datatype is compatible, or has been adapted by an
+ It is now possible to define custom conditions, selectors and filters that behave like Ant
+ Core components. This is achieved by allowing datatypes defined in build scripts to be used
+ as custom components if the class of the datatype is compatible, or has been adapted by an
adapter class.
</p>
<p>
@@ -43,15 +41,13 @@
</p>
<h3>Definition and Use</h3>
<p>
- A custom component is a normal Java class that implements a particular
- interface or extends a particular class, or has been adapted to the
- interface or class.
+ A custom component is a normal Java class that implements a particular interface or extends a
+ particular class, or has been adapted to the interface or class.
</p>
<p>
- It is exactly like writing
- a <a href="../develop.html#writingowntask">custom task</a>. One
- defines attributes and nested elements by writing <em>setter</em>
- methods and <em>add</em> methods.
+ It is exactly like writing a <a href="../develop.html#writingowntask">custom task</a>. One
+ defines attributes and nested elements by writing <em>setter</em> methods and <em>add</em>
+ methods.
</p>
<p>
After the class has been written, it is added to the ant system by
@@ -60,9 +56,9 @@
<h3 id="customconditions">Custom Conditions</h3>
<p>
Custom conditions are datatypes that
- implement <code>org.apache.tools.ant.taskdefs.condition.Condition</code>.
- For example a custom condition that returns true if a string is all
- upper case could be written as:
+ implement <code class="code">org.apache.tools.ant.taskdefs.condition.Condition</code>. For
+ example a custom condition that returns true if a string is all upper case could be written
+ as:
</p>
<pre>
package com.mydomain;
@@ -104,13 +100,12 @@ public class AllUpperCaseCondition implements Condition {
<h3 id="customselectors">Custom Selectors</h3>
<p>
Custom selectors are datatypes that
- implement <code>org.apache.tools.ant.types.selectors.FileSelector</code>.
+ implement <code class="code">org.apache.tools.ant.types.selectors.FileSelector</code>.
</p>
<p>
- There is only one method required, <code>public boolean
- isSelected(File basedir, String filename, File file)</code>. It
- returns true or false depending on whether the given file should be
- selected or not.
+ There is only one method required, <code class="code">public boolean isSelected(File basedir,
+ String filename, File file)</code>. It returns true or false depending on whether the given
+ file should be selected or not.
</p>
<p>
An example of a custom selection that selects filenames ending
@@ -134,8 +129,7 @@ public class JavaSelector implements FileSelector {
classname="com.mydomain.JavaSelector"
classpath="${mydomain.classes}"/></pre>
<p>
- This selector can now be used wherever a Core Ant selector is used,
- for example:
+ This selector can now be used wherever a Core Ant selector is used, for example:
</p>
<pre>
<copy todir="to">
@@ -144,34 +138,30 @@ public class JavaSelector implements FileSelector {
</fileset>
</copy></pre>
<p>
- One may
- use <code>org.apache.tools.ant.types.selectors.BaseSelector</code>, a
- convenience class that provides reasonable default behaviour. It has
- some predefined behaviours you can take advantage of. Any time you
- encounter a problem when setting attributes or adding tags, you can
- call <code>setError(String errmsg)</code> and the class will know that
- there is a problem. Then, at the top of your <code>isSelected()</code>
- method call <code>validate()</code> and a BuildException will be
- thrown with the contents of your error
- message. The <code>validate()</code> method also gives you a last
- chance to check your settings for consistency because it
- calls <code>verifySettings()</code>. Override this method and
- call <code>setError()</code> within it if you detect any problems in
- how your selector is set up.
+ One may use <code class="code">org.apache.tools.ant.types.selectors.BaseSelector</code>, a
+ convenience class that provides reasonable default behaviour. It has some predefined
+ behaviours you can take advantage of. Any time you encounter a problem when setting attributes
+ or adding tags, you can call <code class="code">setError(String errmsg)</code> and the class
+ will know that there is a problem. Then, at the top of
+ your <code class="code">isSelected()</code> method call <code class="code">validate()</code>
+ and a <code>BuildException</code> will be thrown with the contents of your error
+ message. The <code class="code">validate()</code> method also gives you a last chance to check
+ your settings for consistency because it
+ calls <code class="code">verifySettings()</code>. Override this method and
+ call <code class="code">setError()</code> within it if you detect any problems in how your
+ selector is set up.
</p>
<p>
To write custom selector containers one should
- extend <code>org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.
- Implement the <code>public boolean isSelected(File baseDir, String
- filename, File file)</code> method to do the right thing. Chances are
- you'll want to iterate over the selectors under you, so
- use <code>selectorElements()</code> to get an iterator that will do
- that.
+ extend <code class="code">org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.
+ Implement the <code class="code">public boolean isSelected(File baseDir, String filename, File
+ file)</code> method to do the right thing. Chances are you'll want to iterate over the
+ selectors under you, so use <code class="code">selectorElements()</code> to get an iterator
+ that will do that.
</p>
<p>
- For example to create a selector container that will select files if a
- certain number of contained selectors select, one could write a
- selector as follows:
+ For example to create a selector container that will select files if a certain number of
+ contained selectors select, one could write a selector as follows:
</p>
<pre>
public class MatchNumberSelectors extends BaseSelectorContainer {
@@ -214,28 +204,24 @@ public class MatchNumberSelectors extends BaseSelectorContainer {
<em>The custom selector</em>
</p>
<p>
- The custom selector was the pre Ant 1.6 way of defining custom
- selectors. This method is still supported for backward compatibility.
+ The custom selector was the pre Ant 1.6 way of defining custom selectors. This method is
+ still supported for backward compatibility.
</p>
<p>
- You can write your own selectors and use them within the selector
- containers by specifying them within the <code><custom></code>
- tag.
+ You can write your own selectors and use them within the selector containers by specifying
+ them within the <code><custom></code> tag.
</p>
<p>
To create a new Custom Selector, you have to create a class that
- implements <code>org.apache.tools.ant.types.selectors.ExtendFileSelector</code>.
+ implements <code class="code">org.apache.tools.ant.types.selectors.ExtendFileSelector</code>.
The easiest way to do that is through the convenience base
- class <code>org.apache.tools.ant.types.selectors.BaseExtendSelector</code>,
- which provides all of the methods for
- supporting <code><param></code> tags. First, override
- the <code>isSelected()</code> method, and optionally
- the <code>verifySettings()</code> method. If your custom selector
- requires parameters to be set, you can also override
- the <code>setParameters()</code> method and interpret the parameters
- that are passed in any way you like. Several of the core selectors
- demonstrate how to do that because they can also be used as custom
- selectors.
+ class <code class="code">org.apache.tools.ant.types.selectors.BaseExtendSelector</code>, which
+ provides all of the methods for supporting <code><param></code> tags. First, override
+ the <code class="code">isSelected()</code> method, and optionally
+ the <code class="code">verifySettings()</code> method. If your custom selector requires
+ parameters to be set, you can also override the <code class="code">setParameters()</code>
+ method and interpret the parameters that are passed in any way you like. Several of the core
+ selectors demonstrate how to do that because they can also be used as custom selectors.
</p>
<p>
Once that is written, you include it in your build file by using
@@ -252,7 +238,7 @@ public class MatchNumberSelectors extends BaseSelectorContainer {
<td>classname</td>
<td>
The name of your class that
- implements <code>org.apache.tools.ant.types.selectors.FileSelector</code>.
+ implements <code class="code">org.apache.tools.ant.types.selectors.FileSelector</code>.
</td>
<td>Yes</td>
</tr>
@@ -277,8 +263,7 @@ public class MatchNumberSelectors extends BaseSelectorContainer {
</table>
<p>
- Here is how you use <code><custom></code> to use your class as a
- selector:
+ Here is how you use <code><custom></code> to use your class as a selector:
</p>
<pre>
<fileset dir="${mydir}" includes="**/*">
@@ -290,20 +275,20 @@ public class MatchNumberSelectors extends BaseSelectorContainer {
<ul>
<li><a href="selectors.html#containsselect">Contains Selector</a> with
- classname <code>org.apache.tools.ant.types.selectors.ContainsSelector</code></li>
+ classname <code class="code">org.apache.tools.ant.types.selectors.ContainsSelector</code></li>
<li><a href="selectors.html#dateselect">Date Selector</a> with
- classname <code>org.apache.tools.ant.types.selectors.DateSelector</code></li>
+ classname <code class="code">org.apache.tools.ant.types.selectors.DateSelector</code></li>
<li><a href="selectors.html#depthselect">Depth Selector</a> with
- classname <code>org.apache.tools.ant.types.selectors.DepthSelector</code></li>
+ classname <code class="code">org.apache.tools.ant.types.selectors.DepthSelector</code></li>
<li><a href="selectors.html#filenameselect">Filename Selector</a> with
- classname <code>org.apache.tools.ant.types.selectors.FilenameSelector</code></li>
+ classname <code class="code">org.apache.tools.ant.types.selectors.FilenameSelector</code></li>
<li><a href="selectors.html#sizeselect">Size Selector</a> with
- classname <code>org.apache.tools.ant.types.selectors.SizeSelector</code></li>
+ classname <code class="code">org.apache.tools.ant.types.selectors.SizeSelector</code></li>
</ul>
<p>
- Here is the example from the Depth Selector section rewritten to use
- the selector through <code><custom></code>.
+ Here is the example from the Depth Selector section rewritten to use the selector
+ through <code><custom></code>.
</p>
<pre>
<fileset dir="${doc.path}" includes="**/*">
@@ -316,16 +301,14 @@ public class MatchNumberSelectors extends BaseSelectorContainer {
<h3 id="filterreaders">Custom Filter Readers</h3>
<p>
Custom filter readers selectors are datatypes that
- implement <code>org.apache.tools.ant.types.filters.ChainableReader</code>.
+ implement <code class="code">org.apache.tools.ant.types.filters.ChainableReader</code>.
</p>
<p>
- There is only one method required. <code>Reader chain(Reader
- reader)</code>. This returns a reader that filters input from the
- specified reader.
+ There is only one method required, <code class="code">Reader chain(Reader reader)</code>.
+ This returns a reader that filters input from the specified reader.
</p>
<p>
- For example a filterreader that removes every second character could
- be:
+ For example a filterreader that removes every second character could be:
</p>
<pre>
public class RemoveOddCharacters implements ChainableReader {
@@ -349,8 +332,8 @@ public class RemoveOddCharacters implements ChainableReader {
}</pre>
<p>
For line oriented filters it may be easier to
- extend <code>ChainableFilterReader</code> an inner class
- of <code>org.apache.tools.ant.filters.TokenFilter</code>.
+ extend <code class="code">ChainableFilterReader</code> an inner class
+ of <code class="code">org.apache.tools.ant.filters.TokenFilter</code>.
</p>
<p>
For example a filter that appends the line number could be
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/description.html
----------------------------------------------------------------------
diff --git a/manual/Types/description.html b/manual/Types/description.html
index f5cf02c..448aa63 100644
--- a/manual/Types/description.html
+++ b/manual/Types/description.html
@@ -27,7 +27,7 @@
<h2 id="description">Description</h2>
<h3>Description</h3>
<p>Allows for a description of the project to be specified that will be
-included in the output of the <code>ant -projecthelp</code> command.</p>
+included in the output of the <kbd>ant -projecthelp</kbd> command.</p>
<h3>Parameters</h3>
<p>(none)</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/fileset.html
----------------------------------------------------------------------
diff --git a/manual/Types/fileset.html b/manual/Types/fileset.html
index ea05ec5..1bc674e 100644
--- a/manual/Types/fileset.html
+++ b/manual/Types/fileset.html
@@ -28,7 +28,7 @@
<p>A FileSet is a group of files. These files can be found in a directory tree starting in a
base directory and are matched by patterns taken from a number
of <a href="patternset.html">PatternSets</a> and <a href="selectors.html">Selectors</a>.</p>
-<p>PatternSets can be specified as nested q<code><patternset></code> elements. In
+<p>PatternSets can be specified as nested <code><patternset></code> elements. In
addition, FileSet holds an implicit PatternSet and supports the
nested <code><include></code>, <code><includesfile></code>, <code><exclude></code>
and <code><excludesfile></code> elements of PatternSet directly, as well as PatternSet's
[2/6] ant git commit: , highlighting of input,
output and inlined code
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/install.html
----------------------------------------------------------------------
diff --git a/manual/install.html b/manual/install.html
index f6699ce..abff025 100644
--- a/manual/install.html
+++ b/manual/install.html
@@ -38,10 +38,10 @@ details.</li>
<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
+<li>Optionally, from the <code>ANT_HOME</code> directory run <kbd>ant -f fetch.xml -Ddest=system</kbd> to get the
library dependencies of most of the Ant tasks that require them. If you don't do this, many of the dependent Ant tasks
will not be available. See <a href="#optionalTasks">Optional Tasks</a> for details and other options for
-the <code>-Ddest</code> parameter.</li>
+the <kbd>-Ddest</kbd> parameter.</li>
<li>Optionally, add any desired Antlibs. See <a href="https://ant.apache.org/antlibs/proper.html" target="_top">Ant
Libraries</a> for a list.</li>
</ol>
@@ -325,7 +325,7 @@ security restrictions on the classes which may be loaded by an extension.
<h3 id="checkInstallation">Check Installation</h3>
<p>
-You can check the basic installation with opening a new shell and typing <code>ant</code>. You should get a message like
+You can check the basic installation with opening a new shell and typing <kbd>ant</kbd>. You should get a message like
this
</p>
<pre>
@@ -333,8 +333,8 @@ Buildfile: build.xml does not exist!
Build failed
</pre>
<p>
-So Ant works. This message is there because you need to write a buildfile for your project. With a <code>ant
--version</code> you should get an output like
+So Ant works. This message is there because you need to write a buildfile for your project. With a <kbd>ant
+-version</kbd> you should get an output like
</p>
<pre>
Apache Ant(TM) version 1.9.2 compiled on July 8 2013
@@ -351,7 +351,7 @@ If this does not work, ensure your environment variables are set right. E.g., on
<code>ANT_HOME</code> is used by the launcher script for finding the libraries. <code>JAVA_HOME</code> is used by the
launcher for finding the JDK/JRE to use. (JDK is recommended as some tasks require the Java tools.) If not set, the
launcher tries to find one via the <code>%PATH%</code> environment variable. <code>PATH</code> is set for user
-convenience. With that set you can just start <code>ant</code> instead of always
+convenience. With that set you can just start <kbd>ant</kbd> instead of always
typing <samp>the/complete/path/to/your/ant/installation/bin/ant</samp>.
</p>
@@ -381,7 +381,7 @@ Ant. All JAR files added to this directory are available to command-line Ant.
<li>
<p>
-On the command line with a <code>-lib</code> parameter. This lets you add new JAR files on a case-by-case basis.
+On the command line with a <kbd>-lib</kbd> parameter. This lets you add new JAR files on a case-by-case basis.
</p>
</li>
@@ -417,7 +417,7 @@ the optional Ant tasks need.
To do so, change to the <code>ANT_HOME</code> directory and execute the command:
</p>
-<pre>ant -f fetch.xml -Ddest=<em>[option]</em></pre>
+<pre class="input">ant -f fetch.xml -Ddest=<em>[option]</em></pre>
<p>
where option is one of the following, as described above:
@@ -471,14 +471,14 @@ space in a directory. This will break Ant, and it is not needed.</li>
Ant's ability to quote the string. Again, this is not needed for the correct operation of the <code>CLASSPATH</code>
environment variable, even if a DOS directory is to be added to the path.</li>
-<li>You can stop Ant using the <code>CLASSPATH</code> environment variable by setting the <code>-noclasspath</code>
+<li>You can stop Ant using the <code>CLASSPATH</code> environment variable by setting the <kbd>-noclasspath</kbd>
option on the command line. This is an easy way to test for classpath-related problems.</li>
</ol>
<p>
The usual symptom of <code>CLASSPATH</code> problems is that Ant will not run with some error about not being able to
find <code>org.apache.tools.ant.launch.Launcher</code>, or, if you have got the quotes/backslashes wrong, some very
-weird Java startup error. To see if this is the case, run <code>ant -noclasspath</code> or unset
+weird Java startup error. To see if this is the case, run <kbd>ant -noclasspath</kbd> or unset
the <code>CLASSPATH</code> environment variable.
</p>
@@ -510,7 +510,7 @@ this.
<li><strong>With Java 5 or above</strong><br/>
<p>
When you run Ant on Java 5 or above, you could try to use the automatic proxy setup mechanism
-with <code>-autoproxy</code>.
+with <kbd>-autoproxy</kbd>.
</p>
</li>
@@ -525,15 +525,15 @@ laptop, you have to change these settings as you roam. To set <code>ANT_OPTS</co
<p>
For csh/tcsh:
</p>
-<pre>setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"</pre>
+<pre class="input">setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"</pre>
<p>
For bash:
</p>
-<pre>export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"</pre>
+<pre class="input">export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"</pre>
<p>
For Windows, set the environment variable in the appropriate dialog box and open a new console or, by hand
</p>
-<pre>set ANT_OPTS = -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080</pre>
+<pre class="input">set ANT_OPTS = -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080</pre>
</blockquote>
</li>
@@ -554,7 +554,7 @@ do not work, because those are <em>Ant properties</em> being set, not JVM option
up the command line:
</p>
-<pre>ant -Dhttp.proxyHost=proxy -Dhttp.proxyPort=81</pre>
+<pre class="input">ant -Dhttp.proxyHost=proxy -Dhttp.proxyPort=81</pre>
<p>
All it does is set up two Ant properties.
@@ -569,19 +569,19 @@ have to spend much time configuring the JVM properties until they are happy.
<h3 id="windows">Windows and OS/2</h3>
<p>Assume Ant is installed in <samp>c:\ant\</samp>. The following sets up the
environment:</p>
-<pre>set ANT_HOME=c:\ant
+<pre class="input">set ANT_HOME=c:\ant
set JAVA_HOME=c:\jdk1.7.0_51
set PATH=%PATH%;%ANT_HOME%\bin</pre>
<h3 id="bash">Linux/Unix (bash)</h3>
<p>Assume Ant is installed in <samp>/usr/local/ant</samp>. The following sets up
the environment:</p>
-<pre>export ANT_HOME=/usr/local/ant
+<pre class="input">export ANT_HOME=/usr/local/ant
export JAVA_HOME=/usr/local/jdk1.7.0_51
export PATH=${PATH}:${ANT_HOME}/bin</pre>
<h3 id="tcshcsh">Linux/Unix (csh)</h3>
-<pre>setenv ANT_HOME /usr/local/ant
+<pre class="input">setenv ANT_HOME /usr/local/ant
setenv JAVA_HOME /usr/local/jdk/jdk1.7.0_51
set path=( $path $ANT_HOME/bin )</pre>
@@ -592,7 +592,7 @@ Having a symbolic link set up to point to the JVM/JDK version makes updates more
<p>
The <a href="http://www.jpackage.org" target="_top">JPackage project</a> distributes an RPM version of Ant. With this
version, it is not necessary to set <code>JAVA_HOME</code> or <code>ANT_HOME</code> environment variables and the RPM
-installer will correctly place the Ant executable on your path.
+installer will correctly place the <kbd>ant</kbd> executable on your path.
</p>
<p>
<strong>Note</strong>: <em>Since Ant 1.7.0</em>, if the <code>ANT_HOME</code> environment variable is set, the JPackage
@@ -626,7 +626,7 @@ above.</li>
Finally, if for some reason you are running on a system with both the JPackage and Apache versions of Ant available, if
you should want to run the Apache version (which will have to be specified with an absolute file name, not found on the
-path), you should use Ant's <code>--noconfig</code> command-line switch to avoid JPackage's classpath mechanism.
+path), you should use Ant's <kbd>--noconfig</kbd> command-line switch to avoid JPackage's classpath mechanism.
<h3 id="advanced">Advanced</h3>
@@ -665,8 +665,8 @@ installed. See <a href="#installing">Installing Ant</a> for examples on how to d
</p>
<p>
-<strong>Note</strong>: The bootstrap process of Ant requires a greedy compiler like OpenJDK or Oracle's javac. It does
-not work with gcj or kjc.
+<strong>Note</strong>: The bootstrap process of Ant requires a greedy compiler like OpenJDK or
+Oracle's <kbd>javac</kbd>. It does not work with <kbd>gcj</kbd> or <kbd>kjc</kbd>.
</p>
<p>
@@ -693,8 +693,8 @@ from <a href="https://junit.org/" target="_top">JUnit.org</a>) if you are using
Your are now ready to build Ant:
</p>
<blockquote>
- <p><code>build -Ddist.dir=<<i>directory-to-contain-Ant-distribution</i>> dist</code> (<em>Windows</em>)</p>
- <p><code>sh build.sh -Ddist.dir=<<i>directory-to-contain-Ant-distribution</i>> dist</code> (<em>Unix</em>)</p>
+ <p><kbd>build -Ddist.dir=<<i>directory-to-contain-Ant-distribution</i>> dist</kbd> (<em>Windows</em>)</p>
+ <p><kbd>sh build.sh -Ddist.dir=<<i>directory-to-contain-Ant-distribution</i>> dist</kbd> (<em>Unix</em>)</p>
</blockquote>
<p>
@@ -719,21 +719,21 @@ directory.</li>
<p>
On most occasions you will not need to explicitly bootstrap Ant since the build scripts do that for you. However, if the
build file you are using makes use of features not yet compiled into the bootstrapped Ant, you will need to manually
-bootstrap. Run <code>bootstrap.bat</code> (Windows) or <code>bootstrap.sh</code> (UNIX) to build a new bootstrap version
+bootstrap. Run <kbd>bootstrap.bat</kbd> (Windows) or <kbd>bootstrap.sh</kbd> (UNIX) to build a new bootstrap version
of Ant.
</p>
If you wish to install the build into the current <code>ANT_HOME</code>
directory, you can use:
<blockquote>
- <p><code>build install</code> (<em>Windows</em>)</p>
- <p><code>sh build.sh install</code> (<em>Unix</em>)</p>
+ <p><kbd>build install</kbd> (<em>Windows</em>)</p>
+ <p><kbd>sh build.sh install</kbd> (<em>Unix</em>)</p>
</blockquote>
You can avoid the lengthy Javadoc step, if desired, with:
<blockquote>
- <p><code>build install-lite</code> (<em>Windows</em>)</p>
- <p><code>sh build.sh install-lite</code> (<em>Unix</em>)</p>
+ <p><kbd>build install-lite</kbd> (<em>Windows</em>)</p>
+ <p><kbd>sh build.sh install-lite</kbd> (<em>Unix</em>)</p>
</blockquote>
This will only install the <samp>bin</samp> and <samp>lib</samp> directories.
@@ -749,7 +749,7 @@ different user than the one who installed Ant initially). In this case you can s
property <code>chmod.fail</code> to false when starting the build like in
</p>
-<pre>sh build.sh install -Dchmod.fail=false</pre>
+<pre class="input">sh build.sh install -Dchmod.fail=false</pre>
<p>
and any error to change permission will not result in a build failure.
@@ -936,7 +936,7 @@ these tasks available. Please refer to the <a href="#optionalTasks">Installing A
<h3 id="diagnostics">Diagnostics</h3>
<p>
-Ant has a built in diagnostics feature. If you run <code>ant -diagnostics</code>, Ant will look at its internal state
+Ant has a built in diagnostics feature. If you run <kbd>ant -diagnostics</kbd>, Ant will look at its internal state
and print it out. This code will check and print the following things.
</p>
@@ -965,7 +965,7 @@ get confused.</li>
</ul>
<p>
-Running <code>ant -diagnostics</code> is a good way to check that Ant is installed. It is also a first step towards
+Running <kbd>ant -diagnostics</kbd> is a good way to check that Ant is installed. It is also a first step towards
self-diagnosis of any problem. Any configuration problem reported to the user mailing list will probably result ins
someone asking you to run the command and show the results, so save time by using it yourself.
</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/javacprops.html
----------------------------------------------------------------------
diff --git a/manual/javacprops.html b/manual/javacprops.html
index 5593f22..dc3e22b 100644
--- a/manual/javacprops.html
+++ b/manual/javacprops.html
@@ -26,7 +26,7 @@
<p>The <var>source</var> and <var>target</var> attributes
of <code><javac></code> don't have any default values for
-historical reasons. Since the underlying <code>javac</code>
+historical reasons. Since the underlying <kbd>javac</kbd>
compiler defaults depends on the JDK you use, you may encounter
build files that don't explicitly set those attributes and that will
no longer compile using a newer JDK. If you cannot change the build
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/listeners.html
----------------------------------------------------------------------
diff --git a/manual/listeners.html b/manual/listeners.html
index 7677b81..346e205 100644
--- a/manual/listeners.html
+++ b/manual/listeners.html
@@ -45,7 +45,7 @@ loggers.</p>
</ul>
<p>These are used internally for various recording and housekeeping operations, however new
-listeners may registered on the command line through the <code>-listener</code> argument.</p>
+listeners may registered on the command line through the <kbd>-listener</kbd> argument.</p>
<h3 id="Loggers">Loggers</h3>
@@ -53,8 +53,8 @@ listeners may registered on the command line through the <code>-listener</code>
<ul>
<li>Receives a handle to the standard output and error print streams and therefore can log
- information to the console or the <code>-logfile</code> specified file.</li>
- <li>Logging level (<code>-quiet</code>, <code>-verbose</code>, <code>-debug</code>) aware</li>
+ information to the console or the <kbd>-logfile</kbd> specified file.</li>
+ <li>Logging level (<kbd>-quiet</kbd>, <kbd>-verbose</kbd>, <kbd>-debug</kbd>) aware</li>
<li>Emacs-mode aware</li>
</ul>
@@ -68,7 +68,7 @@ listeners may registered on the command line through the <code>-listener</code>
</tr>
<tr>
<td><code><a href="#DefaultLogger">org.apache.tools.ant.DefaultLogger</a></code></td>
- <td>The logger used implicitly unless overridden with the <code>-logger</code> command-line
+ <td>The logger used implicitly unless overridden with the <kbd>-logger</kbd> command-line
switch.</td>
<td>BuildLogger</td>
</tr>
@@ -127,12 +127,12 @@ listeners may registered on the command line through the <code>-listener</code>
<h3 id="DefaultLogger">DefaultLogger</h3>
<p>Simply run Ant normally, or:</p>
-<pre>ant -logger org.apache.tools.ant.DefaultLogger</pre>
+<pre class="input">ant -logger org.apache.tools.ant.DefaultLogger</pre>
<h3 id="NoBannerLogger">NoBannerLogger</h3>
<p>Removes output of empty target output.</p>
-<pre>ant -logger org.apache.tools.ant.NoBannerLogger</pre>
+<pre class="input">ant -logger org.apache.tools.ant.NoBannerLogger</pre>
<h3 id="MailLogger">MailLogger</h3>
<p>The MailLogger captures all output logged through DefaultLogger (standard Ant output) and will
@@ -266,7 +266,7 @@ failure messages individually.</p>
</tr>
</table>
-<pre>ant -logger org.apache.tools.ant.listener.MailLogger</pre>
+<pre class="input">ant -logger org.apache.tools.ant.listener.MailLogger</pre>
<h3 id="AnsiColorLogger">AnsiColorLogger</h3>
@@ -275,13 +275,13 @@ code escape sequences to it. It is just an extension of <a href="#DefaultLogger
and hence provides all features that DefaultLogger does.</p>
<p>AnsiColorLogger differentiates the output by assigning different colors depending upon the type
of the message.</p>
-<p>If used with the <code>-logfile</code> option, the output file will contain all the necessary
+<p>If used with the <kbd>-logfile</kbd> option, the output file will contain all the necessary
escape codes to display the text in colorized mode when displayed in the console using applications
like <code>cat</code>, <code>more</code>, etc.</p>
-<p>This is designed to work on terminals that support ANSI color codes. It works on XTerm, ETerm, Win9x Console (with
-ANSI.SYS loaded.), etc.</p>
+<p>This is designed to work on terminals that support ANSI color codes. It works on XTerm, ETerm,
+Win9x Console (with <code>ANSI.SYS</code> loaded.), etc.</p>
<p><strong>Note</strong>: It doesn't work on WinNT and successors, even when
-a <code>COMMAND.COM</code> console loaded with ANSI.SYS is used.</p>
+a <code>COMMAND.COM</code> console loaded with <code>ANSI.SYS<</code> is used.</p>
<p>If the user wishes to override the default colors with custom ones, a file containing zero or
more of the custom color key-value pairs must be created. The recognized keys and their default
values are shown below:</p>
@@ -294,11 +294,11 @@ AnsiColorLogger.DEBUG_COLOR=2;34</pre>
<p>Each key takes as value a color combination defined as <q>Attribute;Foreground;Background</q>.
In the above example, background value has not been used.</p>
<p>This file must be specified as the value of a system variable
-named <code>ant.logger.defaults</code> and passed as an argument using the <code>-D</code> option to
-the <code>java</code> command that invokes the Ant application. An easy way to achieve this is to
-add <code>-Dant.logger.defaults=</code><samp>/path/to/your/file</samp> to the <code>ANT_OPTS</code>
-environment variable. Ant's launching script recognizes this flag and will pass it to
-the <code>java</code> command appropriately.</p>
+named <code>ant.logger.defaults</code> and passed as an argument using the <kbd>-D</kbd> option to
+the <kbd>java</kbd> command that invokes the Ant application. An easy way to achieve this is to
+add <kbd>-Dant.logger.defaults=</kbd><samp class="input">/path/to/your/file</samp> to
+the <code>ANT_OPTS</code> environment variable. Ant's launching script recognizes this flag and will
+pass it to the <kbd>java</kbd> command appropriately.</p>
<p>Format:</p>
<pre>
AnsiColorLogger.*=Attribute;Foreground;Background
@@ -332,7 +332,7 @@ Background is one of the following:
46 → Cyan
47 → White</pre>
-<pre>ant -logger org.apache.tools.ant.listener.AnsiColorLogger</pre>
+<pre class="input">ant -logger org.apache.tools.ant.listener.AnsiColorLogger</pre>
<h3 id="Log4jListener">Log4jListener</h3>
<p><em><u>Deprecated</u></em>: Apache Log4j (1) is not developed any more. Last release is 1.2.17
@@ -340,8 +340,8 @@ from 26 May 2012 and contains vulnerability issues.</p>
<p>Passes build events to Log4j, using the full classname's of the generator of each build event as
the category:</p>
<ul>
- <li>build started / build finished—<code>org.apache.tools.ant.Project</code></li>
- <li>target started / target finished—<code>org.apache.tools.ant.Target</code></li>
+ <li>build started / build finished—<code class="code">org.apache.tools.ant.Project</code></li>
+ <li>target started / target finished—<code class="code">org.apache.tools.ant.Target</code></li>
<li>task started / task finished—the fully qualified classname of the task</li>
<li>message logged—the classname of one of the above, so if a task logs a message, its
classname is the category used, and so on.</li>
@@ -350,13 +350,13 @@ the category:</p>
on whether the build failed during that stage. Message events are logged according to their Ant
logging level, mapping directly to a corresponding Log4j level.</p>
-<pre>ant -listener org.apache.tools.ant.listener.Log4jListener</pre>
+<pre class="input">ant -listener org.apache.tools.ant.listener.Log4jListener</pre>
<p>To use Log4j you will need the Log4j JAR file and a <samp>log4j.properties</samp> configuration
file. Both should be placed somewhere in your Ant classpath. If the <samp>log4j.properties</samp>
-is in your project root folder you can add this with <code>-lib</code> option:</p>
+is in your project root folder you can add this with <kbd>-lib</kbd> option:</p>
-<pre>ant -listener org.apache.tools.ant.listener.Log4jListener -lib .</pre>
+<pre class="input">ant -listener org.apache.tools.ant.listener.Log4jListener -lib .</pre>
<p>If, for example, you wanted to capture the same information output to the console by the
DefaultLogger and send it to a file named <samp>build.log</samp>, you could use the following
@@ -387,7 +387,7 @@ want to use the Log4j 2.x runtime. For using the bridge with Ant you have to ad
<li><samp>log4j-core-${log4j.version}.jar</samp></li>
<li><samp>log4j2.xml</samp></li>
</ul>
-<p>to your classpath, e.g. via the <code>-lib</code> option. (For using the bridge, Ant
+<p>to your classpath, e.g. via the <kbd>-lib</kbd> option. (For using the bridge, Ant
1.9.10/1.10.2 or higher is required.) Translating the 1.x properties file into the 2.x XML syntax
would result in</p>
<pre>
@@ -414,7 +414,7 @@ would result in</p>
<h3 id="XmlLogger">XmlLogger</h3>
<p>Writes all build information out to an XML file named <samp>log.xml</samp>, or the value of
the <code>XmlLogger.file</code> property if present, when used as a listener. When used as a logger,
-it writes all output to either the console or to the value of <code>-logfile</code>. Whether used as
+it writes all output to either the console or to the value of <kbd>-logfile</kbd>. Whether used as
a listener or logger, the output is not generated until the build is complete, as it buffers the
information in order to provide timing information for task, targets, and the project.</p>
<p>By default the XML file creates a reference to an XSLT file <samp>log.xsl</samp> in the current
@@ -423,16 +423,16 @@ property <code>ant.XmlLogger.stylesheet.uri</code> to provide a URI to a style s
relative or absolute file path, or an HTTP URL. If you set the property to the empty
string, <q></q>, no XSLT transform is declared at all.</p>
-<pre>ant -listener org.apache.tools.ant.XmlLogger
+<pre class="input">ant -listener org.apache.tools.ant.XmlLogger
ant -logger org.apache.tools.ant.XmlLogger -verbose -logfile build_log.xml</pre>
<h3 id="TimestampedLogger">TimestampedLogger</h3>
<p>Acts like the default logger, except that the final success/failure message also includes the
time that the build completed. For example:</p>
-<pre>BUILD SUCCESSFUL - at 16/08/05 16:24</pre>
+<pre class="output">BUILD SUCCESSFUL - at 16/08/05 16:24</pre>
<p>To use this listener, use the command:</p>
-<pre>ant -logger org.apache.tools.ant.listener.TimestampedLogger</pre>
+<pre class="input">ant -logger org.apache.tools.ant.listener.TimestampedLogger</pre>
<h3 id="BigProjectLogger">BigProjectLogger</h3>
<p>This logger is designed to make examining the logs of a big build easier, especially those run
@@ -447,7 +447,7 @@ under continuous integration tools. It</p>
<p>This is useful when using <code><subant></code> to build a large project from many smaller
projects—the output shows which particular project is building. Here is an example in which
"clean" is being called on all a number of child projects, only some of which perform work:</p>
-<pre>
+<pre class="output">
======================================================================
Entering project "xunit"
In /home/ant/components/xunit
@@ -474,13 +474,13 @@ Exiting project "junit"
testing many child components, the messages are reduced to becoming clear delimiters of where
different projects are in charge—or, more importantly, which project is failing.</p>
<p>To use this listener, use the command:</p>
-<pre>ant -logger org.apache.tools.ant.listener.BigProjectLogger</pre>
+<pre class="input">ant -logger org.apache.tools.ant.listener.BigProjectLogger</pre>
<h3 id="SimpleBigProjectLogger">SimpleBigProjectLogger</h3>
<p><em>Since Ant 1.8.1</em></p>
<p>Like <code>BigProjectLogger</code>, project-qualified target names are printed, useful for big
builds with subprojects. Otherwise it is as quiet as <code>NoBannerLogger</code>:</p>
-<pre>
+<pre class="output">
Buildfile: /sources/myapp/build.xml
myapp-lib.compile:
@@ -500,7 +500,7 @@ Building jar: /sources/myapp/build/myapp.jar
BUILD SUCCESSFUL
Total time: 1 second</pre>
<p>To use this listener, use the command:</p>
-<pre>ant -logger org.apache.tools.ant.listener.SimpleBigProjectLogger</pre>
+<pre class="input">ant -logger org.apache.tools.ant.listener.SimpleBigProjectLogger</pre>
<h3 id="ProfileLogger">ProfileLogger</h3>
<!-- This is the 'since' as described in the Loggers JavaDoc -->
@@ -522,9 +522,9 @@ Having that buildfile
<echo>another-echo-task</echo>
</target>
</project></pre>
-<p>and executing with <code>ant -logger org.apache.tools.ant.listener.ProfileLogger
-anotherTarget</code> gives that output (with other timestamps and duration of course ;-):</p>
-<pre>
+<p>and executing with <kbd>ant -logger org.apache.tools.ant.listener.ProfileLogger
+anotherTarget</kbd> gives that output (with other timestamps and duration of course ;-):</p>
+<pre class="output">
Buildfile: ...\build.xml
Target aTarget: started Thu Jan 22 09:01:00 CET 2009
@@ -562,23 +562,23 @@ Total time: 2 seconds</pre>
<ul>
<li>
A listener or logger should not write to standard output or error in
- the <code>messageLogged()</code> method; Ant captures these internally and it will trigger an
- infinite loop.
+ the <code class="code">messageLogged()</code> method; Ant captures these internally and it will
+ trigger an infinite loop.
</li>
<li>
Logging is synchronous; all listeners and loggers are called one after the other, with the build
blocking until the output is processed. Slow logging means a slow build.
</li>
- <li>When a build is started, and <code>BuildListener.buildStarted(BuildEvent event)</code> is
- called, the project is not fully functional. The build has started, yes, and
- the <code>event.getProject()</code> method call returns the Project instance, but that project
- is initialized with JVM and Ant properties, nor has it parsed the build file yet. You cannot
- call <code>Project.getProperty()</code> for property lookup, or
- <code>Project.getName()</code> to get the project name (it will return null).
+ <li>When a build is started, and <code class="code">BuildListener.buildStarted(BuildEvent
+ event)</code> is called, the project is not fully functional. The build has started, yes, and
+ the <code class="code">event.getProject()</code> method call returns the Project instance, but
+ that project is initialized with JVM and Ant properties, nor has it parsed the build file
+ yet. You cannot call <code class="code">Project.getProperty()</code> for property lookup, or
+ <code class="code">Project.getName()</code> to get the project name (it will return null).
</li>
<li>
- Classes that implement <code>org.apache.tools.ant.SubBuildListener</code> receive notifications
- when child projects start and stop.
+ Classes that implement <code class="code">org.apache.tools.ant.SubBuildListener</code> receive
+ notifications when child projects start and stop.
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/platform.html
----------------------------------------------------------------------
diff --git a/manual/platform.html b/manual/platform.html
index f1ee98f..c9a89b0 100644
--- a/manual/platform.html
+++ b/manual/platform.html
@@ -46,7 +46,7 @@ or <code><apply></code> the real tar program.</li>
to build up a list of files. Unexpected things can happen.</li>
<li>Linux on IA-64: apparently you need a larger heap than the default one (64M) to compile big
projects. If you get out of heap errors, either increase the heap or use a
-forking <code>javac</code>. Better yet, use jikes for extra compilation speed.</li>
+forking <code>javac</code>. Better yet, use <code>jikes</code> for extra compilation speed.</li>
</ul>
<h2>Microsoft Windows</h2>
@@ -87,7 +87,7 @@ Ant is trying to run, it is not on the path.
<p>
There are reports of problems with Windows Vista security bringing up dialog boxes asking if the
user wants to run an untrusted executable during an Ant run, such as when the <signjar> task
-runs the <code>jarsigner.exe</code> program. This is beyond Ant's control, and stems from the OS
+runs the <kbd>jarsigner.exe</kbd> program. This is beyond Ant's control, and stems from the OS
trying to provide some illusion of security by being reluctant to run unsigned native executables.
The latest Java versions appear to resolve this problem by having signed binaries.
</p>
@@ -102,7 +102,7 @@ and JRE tools under Windows or cygwin. Relative path names such as <samp>src/org
are supported, but Java tools do not understand <samp>/cygdrive/c</samp> to mean <samp>c:\</samp>.
</p>
<p>
-The utility <code>cygpath</code> (used industrially in the <code>ant</code> script to support
+The utility <kbd>cygpath</kbd> (used industrially in the <kbd>ant</kbd> script to support
cygwin) can convert cygwin path names to Windows. You can use the <code><exec></code> task in
Ant to convert cygwin paths to Windows path, for instance like that:
</p>
@@ -139,7 +139,7 @@ or <samp>dist\bin</samp>).
<li><code>CLASSPATH</code>—put <samp>ant.jar</samp> and any other needed jars on the system
classpath.</li>
<li><code>ANT_OPTS</code>—On NetWare, <code>ANT_OPTS</code> needs to include a parameter of
- the form, <code>-envCWD=<i>ANT_HOME</i></code>, with <code><i>ANT_HOME</i></code> being the
+ the form, <kbd>-envCWD=<i>ANT_HOME</i></kbd>, with <kbd><i>ANT_HOME</i></kbd> being the
fully expanded location of Ant, <strong>not</strong> an environment variable. This is due to
the fact that the NetWare System Console has no notion of a current working directory.</li>
</ul>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/projecthelper.html
----------------------------------------------------------------------
diff --git a/manual/projecthelper.html b/manual/projecthelper.html
index 4c2523e..057f07c 100644
--- a/manual/projecthelper.html
+++ b/manual/projecthelper.html
@@ -28,122 +28,114 @@
<h2 id="definition">What is a ProjectHelper?</h2>
<p>
-The <code>ProjectHelper</code> in Apache Ant is responsible for parsing the build file
-and creating Java instances representing the build workflow. It also signals which
-kind of file it can parse, and which file name it expects as default input file.
+The <code class="code">ProjectHelper</code> in Apache Ant is responsible for parsing the build file
+and creating Java instances representing the build workflow. It also signals which kind of file it
+can parse, and which file name it expects as default input file.
</p>
<p>
-Ant's default <code>ProjectHelper</code>
-(<code>org.apache.tools.ant.helper.ProjectHelper2</code>) parses the
-usual <code>build.xml</code> files. And if no build file is specified on the command
-line, it will expect to find a file named <code>build.xml</code>.
+Ant's default <code class="code">ProjectHelper</code>
+(<code class="code">org.apache.tools.ant.helper.ProjectHelper2</code>) parses the
+usual <code>build.xml</code> files. And if no build file is specified on the command line, it will
+expect to find a file named <code>build.xml</code>.
</p>
<p>
-The immediate benefit of a such abstraction it that it is possible to make Ant
-understand other kind of descriptive languages than XML. Some experiments have been
-done around a pure Java frontend, and a Groovy one too (ask the dev mailing list for
-further info about these).
+The immediate benefit of a such abstraction it that it is possible to make Ant understand other kind
+of descriptive languages than XML. Some experiments have been done around a pure Java frontend, and
+a Groovy one too (ask the dev mailing list for further info about these).
</p>
<p>
-<em>Since Ant 1.8.2</em>, the <a href="Tasks/import.html">import</a> task will also
-try to use the proper helper to parse the imported file. So it is possible to write
-different build files in different languages and have them import each other.
+<em>Since Ant 1.8.2</em>, the <a href="Tasks/import.html">import</a> task will also try to use the
+proper helper to parse the imported file. So it is possible to write different build files in
+different languages and have them import each other.
</p>
<h2 id="repository">How is Ant is selecting the proper ProjectHelper</h2>
<p>
-Ant knows about several implementations of <code>ProjectHelper</code> and has to
-decide which to use for each build file.
+Ant knows about several implementations of <code class="code">ProjectHelper</code> and has to decide
+which to use for each build file.
</p>
<p>
-At startup Ant lists the all implementations found and keeps them in the same order
-they've been found in an internal 'repository':
+At startup Ant lists the all implementations found and keeps them in the same order they've been
+found in an internal 'repository':
</p>
<ul>
- <li>the first to be searched for is the one declared by the system property
- <code>org.apache.tools.ant.ProjectHelper</code> (see
- <a href="running.html#sysprops">Java System Properties</a>);</li>
- <li>then it searches with its class loader for a <code>ProjectHelper</code>
- service declarations in the <samp>META-INF</samp>: it searches in the classpath for a
- file <samp>META-INF/services/org.apache.tools.ant.ProjectHelper</samp>.
- This file will just contain the fully qualified name of the
- implementation of <code>ProjectHelper</code> to instantiate;</li>
- <li>it will also search with the system class loader for
- <code>ProjectHelper</code> service declarations in the <samp>META-INF</samp>;</li>
- <li>last but not least it will add its default <code>ProjectHelper</code>
- that can parse classical <samp>build.xml</samp> files.</li>
+ <li>the first to be searched for is the one declared by the system
+ property <code class="code">org.apache.tools.ant.ProjectHelper</code>
+ (see <a href="running.html#sysprops">Java System Properties</a>);</li>
+ <li>then it searches with its class loader for a <code>ProjectHelper</code> service declarations
+ in the <samp>META-INF</samp>: it searches in the classpath for a
+ file <samp>META-INF/services/org.apache.tools.ant.ProjectHelper</samp>. This file will just
+ contain the fully qualified name of the implementation
+ of <code class="code">ProjectHelper</code> to instantiate;</li>
+ <li>it will also search with the system class loader for <code class="code">ProjectHelper</code>
+ service declarations in the <samp>META-INF</samp>;</li>
+ <li>last but not least it will add its default <code class="code">ProjectHelper</code> that can
+ parse classical <samp>build.xml</samp> files.</li>
</ul>
<p>
-In case of an error while trying to instantiate a <code>ProjectHelper</code>, Ant will
+In case of an error while trying to instantiate a <code class="code">ProjectHelper</code>, Ant will
log an error but won't stop. If you want further debugging info about
-the <code>ProjectHelper</code> internal 'repository', use the <strong>system</strong>
-property <code>ant.project-helper-repo.debug</code> and set it to <code>true</code>;
-the full stack trace will then also be printed.
+the <code class="code">ProjectHelper</code> internal 'repository', use the <strong>system</strong>
+property <code>ant.project-helper-repo.debug</code> and set it to <q>true</q>; the full stack trace
+will then also be printed.
</p>
<p>
-When Ant is expected to parse a file, it will ask the <code>ProjectHelper</code>
-repository to find an implementation that will be able to parse the input
-file. Actually it will just iterate over the ordered list and the first implementation
-that returns <code>true</code> to <code>supportsBuildFile(File buildFile)</code> will
-be selected.
+When Ant is expected to parse a file, it will ask the <code class="code">ProjectHelper</code>
+repository to find an implementation that will be able to parse the input file. Actually it will
+just iterate over the ordered list and the first implementation that returns <q>true</q>
+to <code class="code">supportsBuildFile(File buildFile)</code> will be selected.
</p>
<p>
-When Ant is started and no input file has been specified, it will search for a default
-input file. It will iterate over list of <code>ProjectHelper</code>s and will select
-the first one that expects a default file that actually exist.
+When Ant is started and no input file has been specified, it will search for a default input
+file. It will iterate over list of <code class="code">ProjectHelper</code>s and will select the
+first one that expects a default file that actually exist.
</p>
<h2 id="writing">Writing your own ProjectHelper</h2>
<p>
-The class <code>org.apache.tools.ant.ProjectHelper</code> is the API expected to be
-implemented. So write your own <code>ProjectHelper</code> by extending that abstract
-class. You are then expected to implement at least the function <code>parse(Project
-project, Object source)</code>. Note also that your implementation will be
-instantiated by Ant, and it is expecting a default constructor with no arguments.
+The class <code class="code">org.apache.tools.ant.ProjectHelper</code> is the API expected to be
+implemented. So write your own <code class="code">ProjectHelper</code> by extending that abstract
+class. You are then expected to implement at least the function <code class="code">parse(Project
+project, Object source)</code>. Note also that your implementation will be instantiated by Ant, and
+it is expecting a default constructor with no arguments.
</p>
<p>
-There are some functions that will help you define what your helper is capable of and
-what is is expecting:
+There are some functions that will help you define what your helper is capable of and what is is
+expecting:
</p>
<ul>
- <li><code>getDefaultBuildFile()</code>: defines which file name is expected if
- none provided</li>
- <li><code>supportsBuildFile(File buildFile)</code>: defines if your parser
- can parse the input file</li>
- <li><code>canParseAntlibDescriptor(URL url)</code>: whether your
- implementation is capable of parsing a given Antlib
- descriptor. The base class returns <code>false</code></li>
- <li><code>parseAntlibDescriptor(Project containingProject, URL
- source)</code>: invoked to actually parse the Antlib
- descriptor if your implementation returned <code>true</code>
- for the previous method.</li>
+ <li><code class="code">getDefaultBuildFile()</code>: defines which file name is expected if none
+ provided</li>
+ <li><code class="code">supportsBuildFile(File buildFile)</code>: defines if your parser can parse
+ the input file</li>
+ <li><code class="code">canParseAntlibDescriptor(URL url)</code>: whether your implementation is
+ capable of parsing a given Antlib descriptor. The base class returns <q>false</q></li>
+ <li><code class="code">parseAntlibDescriptor(Project containingProject, URL source)</code>:
+ invoked to actually parse the Antlib descriptor if your implementation returned <q>true</q> for
+ the previous method.</li>
</ul>
<p>
-Now that you have your implementation ready, you have to declare it to Ant. Three
-solutions here:
+Now that you have your implementation ready, you have to declare it to Ant. Three solutions here:
</p>
<ul>
- <li>use the system property <code>org.apache.tools.ant.ProjectHelper</code>
- (see also the <a href="running.html#sysprops">Java System Properties</a>);</li>
+ <li>use the system property <code class="code">org.apache.tools.ant.ProjectHelper</code> (see also
+ the <a href="running.html#sysprops">Java System Properties</a>);</li>
<li>use the service file in <samp>META-INF</samp>: in the jar you will build with your
- implementation, add a file
- <samp>META-INF/services/org.apache.tools.ant.ProjectHelper</samp>.
- And then in this file just put the fully qualified name of your
- implementation</li>
- <li>use the <a href="Tasks/projecthelper.html">projecthelper</a> task (<em>since
- Ant 1.8.2</em>) which will install dynamically a helper in the internal helper
- 'repository'. Then your helper can be used on the next call to the
- <a href="Tasks/import.html">import</a> task.</li>
+ implementation, add a file <samp>META-INF/services/org.apache.tools.ant.ProjectHelper</samp>.
+ And then in this file just put the fully qualified name of your implementation</li>
+ <li>use the <a href="Tasks/projecthelper.html">projecthelper</a> task (<em>since Ant 1.8.2</em>)
+ which will install dynamically a helper in the internal helper 'repository'. Then your helper
+ can be used on the next call to the <a href="Tasks/import.html">import</a> task.</li>
</ul>
</body>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/properties.html
----------------------------------------------------------------------
diff --git a/manual/properties.html b/manual/properties.html
index 224d9a3..8dc459e 100644
--- a/manual/properties.html
+++ b/manual/properties.html
@@ -106,16 +106,18 @@
<h1 id="propertyHelper">PropertyHelpers</h1>
<p>Ant's property handling is accomplished by an instance
- of <code>org.apache.tools.ant.PropertyHelper</code> associated with the current Project. You
- can learn more about this class by examining Ant's Java API. In Ant 1.8 the PropertyHelper class
- was much reworked and now itself employs a number of helper classes (actually instances of
- the <code>org.apache.tools.ant.PropertyHelper$Delegate</code> marker interface) to take care of
- discrete tasks such as property setting, retrieval, parsing, etc. This makes Ant's property
- handling highly extensible; also of interest is the
+ of <code class="code">org.apache.tools.ant.PropertyHelper</code> associated with the current
+ Project. You can learn more about this class by examining Ant's Java API. In Ant 1.8 the
+ <code class="code">PropertyHelper</code> class was much reworked and now itself employs a number
+ of helper classes (actually instances of
+ the <code class="code">org.apache.tools.ant.PropertyHelper$Delegate</code> marker interface) to
+ take care of discrete tasks such as property setting, retrieval, parsing, etc. This makes Ant's
+ property handling highly extensible; also of interest is the
new <a href="Tasks/propertyhelper.html">propertyhelper</a> task used to manipulate the
PropertyHelper and its delegates from the context of the Ant buildfile.</p>
- <p>There are three sub-interfaces of <code>Delegate</code> that may be useful to implement.</p>
+ <p>There are three sub-interfaces of <code class="code">Delegate</code> that may be useful to
+ implement.</p>
<ul>
<li><code>org.apache.tools.ant.property.PropertyExpander</code> is responsible for finding the
@@ -126,36 +128,36 @@
syntax—or allow nested property expansions since the default implementation doesn't
balance braces
(see <a href="https://git-wip-us.apache.org/repos/asf?p=ant-antlibs-props.git;a=blob;f=src/main/org/apache/ant/props/NestedPropertyExpander.java;hb=HEAD"
- target="_top"><code>NestedPropertyExpander</code> in the <samp>props</samp> Antlib</a> for
+ target="_top"><code class="code">NestedPropertyExpander</code> in the <samp>props</samp> Antlib</a> for
an example).</p>
</li>
- <li><code>org.apache.tools.ant.PropertyHelper$PropertyEvaluator</code> is used to
+ <li><code class="code">org.apache.tools.ant.PropertyHelper$PropertyEvaluator</code> is used to
expand <samp>${some-string}</samp> into an <code>Object</code>.
<p>This is the interface you'd implement if you want to provide your own storage independent
of Ant's project instance—the interface represents the reading end. An example for
- this would be <code>org.apache.tools.ant.property.LocalProperties</code> which implements
- storage for <a href="Tasks/local.html">local properties</a>.</p>
+ this would be <code class="code">org.apache.tools.ant.property.LocalProperties</code> which
+ implements storage for <a href="Tasks/local.html">local properties</a>.</p>
<p>Another reason to implement this interface is if you wanted to provide your own "property
protocol" like expanding <code>toString:foo</code> by looking up the project
- reference <samp>foo</samp> and invoking <code>toString()</code> on it (which is already
- implemented in Ant, see below).</p>
+ reference <samp>foo</samp> and invoking <code class="code">toString()</code> on it (which is
+ already implemented in Ant, see below).</p>
</li>
- <li><code>org.apache.tools.ant.PropertyHelper$PropertySetter</code> is responsible for setting
- properties.
+ <li><code class="code">org.apache.tools.ant.PropertyHelper$PropertySetter</code> is responsible
+ for setting properties.
<p>This is the interface you'd implement if you want to provide your own storage independent
of Ant's project instance—the interface represents the reading end. An example for
- this would be <code>org.apache.tools.ant.property.LocalProperties</code> which implements
- storage for <a href="Tasks/local.html">local properties</a>.</p>
+ this would be <code class="code">org.apache.tools.ant.property.LocalProperties</code> which
+ implements storage for <a href="Tasks/local.html">local properties</a>.</p>
</li>
</ul>
- <p>The default <code>PropertyExpander</code> looks similar to:</p>
+ <p>The default <code class="code">PropertyExpander</code> looks similar to:</p>
<pre>
public class DefaultExpander implements PropertyExpander {
@@ -176,8 +178,9 @@ public class DefaultExpander implements PropertyExpander {
}</pre>
<p>The logic that replaces <samp>${toString:<i>some-id</i>}</samp> with the stringified
- representation of the object with <var>id</var> <samp>some-id</samp> inside the current build is
- contained in a PropertyEvaluator similar to the following code:</p>
+ representation of the object with <var>id</var> <samp><i>some-id</i></samp> inside the current
+ build is contained in a <code class="code">PropertyEvaluator</code> similar to the following
+ code:</p>
<pre>
public class ToStringEvaluator implements PropertyHelper.PropertyEvaluator {
@@ -234,10 +237,10 @@ public class ToStringEvaluator implements PropertyHelper.PropertyEvaluator {
<p>This means you can't use easily expand properties whose names are given by properties, but
there are <a href="https://ant.apache.org/faq.html#propertyvalue-as-name-for-property"
- target="_top">some workarounds</a> for older versions of Ant. With Ant 1.8.0 and
- the <a href="https://ant.apache.org/antlib/props/" target="_top">the props Antlib</a> you can
- configure Ant to use the <code>NestedPropertyExpander</code> defined there if you need such a
- feature.</p>
+ target="_top">some workarounds</a> for older versions of Ant. <em>Since Ant 1.8.0</em> using
+ the <a href="https://ant.apache.org/antlibs/props/" target="_top">props Antlib</a> you can
+ configure Ant to use the <code class="code">NestedPropertyExpander</code> defined there if you
+ need such a feature.</p>
<h2>Expanding a "Property Name"</h2>
@@ -253,9 +256,9 @@ public class ToStringEvaluator implements PropertyHelper.PropertyEvaluator {
<p>Any Ant type which has been declared with a reference can also its string value extracted by
using the <samp>${toString:}</samp> operation, with the name of the reference listed after
- the <code>toString:</code> text. The <code>toString()</code> method of the Java class instance
- that is referenced is invoked—all built in types strive to produce useful and relevant
- output in such an instance.</p>
+ the <code>toString:</code> text. The <code class="code">toString()</code> method of the Java
+ class instance that is referenced is invoked—all built in types strive to produce useful
+ and relevant output in such an instance.</p>
<p>For example, here is how to get a listing of the files in a fileset,<p>
@@ -272,12 +275,13 @@ public class ToStringEvaluator implements PropertyHelper.PropertyEvaluator {
the <samp>${ant.refid:}</samp> operation, with the name of the reference listed after
the <code>ant.refid:</code> text. The difference between this operation
and <a href="#toString"><samp>${toString:}</samp></a> is that <samp>${ant.refid:}</samp> will
- expand to the referenced object itself. In most circumstances the <code>toString</code> method
- will be invoked anyway, for example if the <samp>${ant.refid:}</samp> is surrounded by other
- text.</p>
+ expand to the referenced object itself. In most circumstances
+ the <code class="code">toString()</code> method will be invoked anyway, for example if
+ the <samp>${ant.refid:}</samp> is surrounded by other text.</p>
<p>This syntax is most useful when using a task with attribute setters that accept objects other
- than String. For example, if the setter accepts a Resource object as in</p>
+ than <code class="code">String</code>. For example, if the setter accepts
+ a <code class="code">Resource</code> object as in</p>
<pre>public void setAttr(Resource r) { ... }</pre>
@@ -327,7 +331,7 @@ public class ToStringEvaluator implements PropertyHelper.PropertyEvaluator {
</target>
<target name="lots-of-stuff" depends="use-file,other-unconditional-stuff"/></pre>
<p>
- Now <code>ant -Dfile.exists=false lots-of-stuff</code> will run <q>other-unconditional-stuff</q>
+ Now <kbd>ant -Dfile.exists=false lots-of-stuff</kbd> will run <q>other-unconditional-stuff</q>
but not <q>use-file</q>, as you might expect, and you can disable the condition from another
script too:
</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/proxy.html
----------------------------------------------------------------------
diff --git a/manual/proxy.html b/manual/proxy.html
index 4071503..72ed136 100644
--- a/manual/proxy.html
+++ b/manual/proxy.html
@@ -60,7 +60,7 @@
<h3>Java 5+ proxy support</h3>
<p><em>Since Ant 1.7</em></p>
<p>
- When Ant starts up, if the <code>-autoproxy</code> command is
+ When Ant starts up, if the <kbd>-autoproxy</kbd> command is
supplied, Ant sets the <code>java.net.useSystemProxies</code> system
property. This tells a Java 5+ runtime to use the current set of
property settings of the host environment. Other JVMs, such as
@@ -78,7 +78,7 @@
like Oracle JDBC drivers or pure Java SVN clients.
</p>
<p>
- To make the <code>-autoproxy</code> option the default, add it to
+ To make the <kbd>-autoproxy</kbd> option the default, add it to
the environment variable <code>ANT_ARGS</code>, which contains a
list of arguments to pass to Ant on every command line run.
</p>
@@ -130,7 +130,7 @@
<h3>Manual JVM options</h3>
<p>
Any JVM can have its proxy options explicitly configured by passing
- the appropriate <code>-D</code> system property options to the
+ the appropriate <kbd>-D</kbd> system property options to the
runtime. Ant can be configured through all its shell scripts via
the <code>ANT_OPTS</code> environment variable, which is a list of
options to supply to Ant's JVM:
@@ -260,7 +260,7 @@ For csh/tcsh:
There are four ways to set up proxies in Ant.
</p>
<ol>
- <li>With Ant 1.7 and Java 5+ using the <code>-autoproxy</code> parameter.</li>
+ <li>With Ant 1.7 and Java 5+ using the <kbd>-autoproxy</kbd> parameter.</li>
<li>Via JVM system properties—set these in the <code>ANT_ARGS</code> environment variable.</li>
<li>Via the <code><setproxy></code> task.</li>
<li>Custom ProxySelector implementations</li>
@@ -275,7 +275,7 @@ For csh/tcsh:
for Java code to adapt to them. However, given the fact that it
currently does break some builds, it will be some time before Ant
enables the automatic proxy feature by default. Until then, you have
- to enable the <code>-autoproxy</code> option or use one of the
+ to enable the <kbd>-autoproxy</kbd> option or use one of the
alternate mechanisms to configure the JVM.
</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/running.html
----------------------------------------------------------------------
diff --git a/manual/running.html b/manual/running.html
index e9d0ef2..84daea7 100644
--- a/manual/running.html
+++ b/manual/running.html
@@ -29,32 +29,32 @@
<p>If you've installed Apache Ant as described in
the <a href="install.html">Installing Ant</a> section, running Ant
-from the command-line is simple: just type <code>ant</code>.</p>
+from the command-line is simple: just type <kbd>ant</kbd>.</p>
<p>When no arguments are specified, Ant looks for
a <samp>build.xml</samp> file in the current directory and, if found,
uses that file as the build file and runs the target specified in
the <var>default</var> attribute of the <code><project></code>
tag. To make Ant use a build file other than <samp>build.xml</samp>,
-use the command-line option <code>-buildfile <em>file</em></code>,
-where <em>file</em> is the name of the build file you want to use (or
+use the command-line option <kbd>-buildfile <i>file</i></kbd>,
+where <code><i>file</i></code> is the name of the build file you want to use (or
a directory containing a <samp>build.xml</samp> file).</p>
-<p>If you use the <code>-find [<em>file</em>]</code> option, Ant will
+<p>If you use the <kbd>-find [<i>file</i>]</kbd> option, Ant will
search for a build file first in the current directory, then in the
parent directory, and so on, until either a build file is found or the
root of the filesystem has been reached. By default, it will look for
a build file called <samp>build.xml</samp>. To have it search for a
build file other than <samp>build.xml</samp>, specify a file
argument. <strong>Note</strong>: If you include any other flags or
-arguments on the command line after the <code>-find</code> flag, you
-must include the file argument for the <code>-find</code> flag, even
+arguments on the command line after the <kbd>-find</kbd> flag, you
+must include the file argument for the <kbd>-find</kbd> flag, even
if the name of the build file you want to find
is <samp>build.xml</samp>.</p>
<p>You can also set <a href="using.html#properties">properties</a> on
the command line. This can be done with
-the <code>-D<i>property</i>=<i>value</i></code> option,
+the <kbd>-D<i>property</i>=<i>value</i></kbd> option,
where <em>property</em> is the name of the property,
and <em>value</em> is the value for that property. If you specify a
property that is also set in the build file (see
@@ -62,19 +62,19 @@ the <a href="Tasks/property.html">property</a> task), the value
specified on the command line will override the value specified in the
build file. Defining properties on the command line can also be used
to pass in the value of environment variables; just
-pass <code>-DMYVAR=%MYVAR%</code> (Windows)
-or <code>-DMYVAR=$MYVAR</code> (Unix) to Ant. You can then access
+pass <kbd>-DMYVAR=%MYVAR%</kbd> (Windows)
+or <kbd>-DMYVAR=$MYVAR</kbd> (Unix) to Ant. You can then access
these variables inside your build file as <code>${MYVAR}</code>. You
can also access environment variables using
the <a href="Tasks/property.html">property</a>
task's <var>environment</var> attribute.</p>
<p>Options that affect the amount of logging output by Ant
-are: <code>-quiet</code>, which instructs Ant to print less
-information to the console; <code>-verbose</code>, which causes Ant to
-print additional information to the console; <code>-debug</code>,
+are: <kbd>-quiet</kbd>, which instructs Ant to print less
+information to the console; <kbd>-verbose</kbd>, which causes Ant to
+print additional information to the console; <kbd>-debug</kbd>,
which causes Ant to print considerably more additional information;
-and <code>-silent</code> which makes Ant print nothing but task output
+and <kbd>-silent</kbd> which makes Ant print nothing but task output
and build failures (useful to capture Ant output by scripts).</p>
<p>It is also possible to specify one or more targets that should be
@@ -83,16 +83,16 @@ the <var>default</var> attribute of
the <a href="using.html#projects"><code>project</code></a> tag is
used.</p>
-<p>The <code>-projecthelp</code> option prints out a list of the build
+<p>The <kbd>-projecthelp</kbd> option prints out a list of the build
file's targets. Targets that include a <var>description</var>
attribute are listed as "Main targets", those without
a <var>description</var> are listed as "Other targets", then
the "Default" target is listed ("Other targets" are only
displayed if there are no main targets, or if Ant is invoked
-in <code>-verbose</code> or <code>-debug</code> mode).</p>
+in <kbd>-verbose</kbd> or <kbd>-debug</kbd> mode).</p>
<h3 id="options">Command-line Options Summary</h3>
-<pre>ant [options] [target [target2 [target3] ...]]
+<pre class="output">ant [options] [target [target2 [target3] ...]]
Options:
-help, -h print this message and exit
-projecthelp, -p print project help information and exit
@@ -128,10 +128,10 @@ Options:
-autoproxy Java 5+ : use the OS proxies
-main <class> override Ant's normal entry point
</pre>
-<p>For more information about <code>-logger</code> and
-<code>-listener</code> see
+<p>For more information about <kbd>-logger</kbd> and
+<kbd>-listener</kbd> see
<a href="listeners.html">Loggers & Listeners</a>.
-<p>For more information about <code>-inputhandler</code> see
+<p>For more information about <kbd>-inputhandler</kbd> see
<a href="inputhandler.html">InputHandler</a>.
<p>Easiest way of changing the exit-behaviour is subclassing the original main class:</p>
<pre>
@@ -141,7 +141,7 @@ public class CustomExitCode extends org.apache.tools.ant.Main {
}
}
</pre>
-<p>and starting Ant with access (<code>-lib <i>path-to-class</i></code>) to this class.</p>
+<p>and starting Ant with access (<kbd>-lib <i>path-to-class</i></kbd>) to this class.</p>
<h3 id="libs">Library Directories</h3>
@@ -160,22 +160,22 @@ installation to be locked down which will please system
administrators.</p>
<p>Additional directories to be searched may be added by using
-the <code>-lib</code> option. The <code>-lib</code> option specifies
+the <kbd>-lib</kbd> option. The <kbd>-lib</kbd> option specifies
a search path. Any jars or classes in the directories of the path will
be added to Ant's classloader. The order in which jars are added to
the classpath is as follows:</p>
<ul>
- <li><code>-lib</code> jars in the order specified by the <code>-lib</code> options on the command line</li>
- <li>jars from <samp>${user.home}/.ant/lib</samp> (unless <code>-nouserlib</code> is set)</li>
+ <li>jars in the order specified by the <kbd>-lib</kbd> options on the command line</li>
+ <li>jars from <samp>${user.home}/.ant/lib</samp> (unless <kbd>-nouserlib</kbd> is set)</li>
<li>jars from <samp>ANT_HOME/lib</samp></li>
</ul>
<p>Note that the <code>CLASSPATH</code> environment variable is passed
-to Ant using a <code>-lib</code> option. Ant itself is started with a
+to Ant using a <kbd>-lib</kbd> option. Ant itself is started with a
very minimalistic classpath. Ant should work perfectly well with an
empty <code>CLASSPATH</code> environment variable, something the
-the <code>-noclasspath</code> option actually enforces. We get many
+the <kbd>-noclasspath</kbd> option actually enforces. We get many
more support calls related to classpath problems (especially quoting
problems) than we like.</p>
@@ -188,30 +188,30 @@ your JVM documentation for more details.</p>
<h3>Examples</h3>
-<pre>ant</pre>
+<pre class="input">ant</pre>
<p>runs Ant using the <samp>build.xml</samp> file in the current
directory, on the default target.</p>
-<pre>ant -buildfile test.xml</pre>
+<pre class="input">ant -buildfile test.xml</pre>
<p>runs Ant using the <samp>test.xml</samp> file in the current
directory, on the default target.</p>
-<pre>ant -buildfile test.xml dist</pre>
+<pre class="input">ant -buildfile test.xml dist</pre>
<p>runs Ant using the <samp>test.xml</samp> file in the current
directory, on the target called <samp>dist</samp>.</p>
-<pre>ant -buildfile test.xml -Dbuild=build/classes dist</pre>
+<pre class="input">ant -buildfile test.xml -Dbuild=build/classes dist</pre>
<p>runs Ant using the <samp>test.xml</samp> file in the current
directory, on the target called <samp>dist</samp>, setting
the <code>build</code> property to the
-value <samp>build/classes</samp>.</p>
+value <q>build/classes</q>.</p>
-<pre>ant -lib /home/ant/extras</pre>
+<pre class="input">ant -lib /home/ant/extras</pre>
<p>runs Ant picking up additional task and support jars from
the <samp>/home/ant/extras</samp> location</p>
-<pre>ant -lib one.jar;another.jar</pre>
-<pre>ant -lib one.jar -lib another.jar</pre>
+<pre class="input">ant -lib one.jar;another.jar</pre>
+<pre class="input">ant -lib one.jar -lib another.jar</pre>
<p>adds two jars to Ants classpath.</p>
<h3 id="files">Files</h3>
@@ -238,8 +238,8 @@ section for examples.</p>
<li><code>ANT_ARGS</code>—Ant command-line arguments. For example,
set <code>ANT_ARGS</code> to point to a different logger, include a
- listener, and to include the <code>-find</code> flag.<br/>
- <strong>Note</strong>: If you include <code>-find</code>
+ listener, and to include the <kbd>-find</kbd> flag.<br/>
+ <strong>Note</strong>: If you include <kbd>-find</kbd>
in <code>ANT_ARGS</code>, you should include the name of the build file
to find, even if the file is called <samp>build.xml</samp>.</li>
</ul>
@@ -248,7 +248,7 @@ section for examples.</p>
<p>Some of Ant's core classes can be configured via system properties.</p>
<p>Here is the result of a search through the codebase. Because system
properties are available via Project instance, I searched for them with a</p>
-<pre>grep -r -n "getPropert" * > ..\grep.txt</pre>
+<pre class="input">grep -r -n "getPropert" * > ..\grep.txt</pre>
<p>command. After that I filtered out the often-used but
not-so-important values (most of them read-only
values): <code>path.separator</code>, <code>ant.home</code>, <code>basedir</code>, <code>user.dir</code>, <code>os.name</code>, <code>line.separator</code>, <code>java.home</code>, <code>java.version</code>, <code>java.version</code>, <code>user.home</code>, <code>java.class.path</code><br/>
@@ -358,34 +358,34 @@ properties are available via Project instance, I searched for them with a</p>
<td><code>build.compiler.emacs</code></td>
<td>boolean (default <q>false</q>)</td>
<td>Enable emacs-compatible error messages;
- see <a href="Tasks/javac.html">javac</a> "Jikes Notes".
+ see <a href="Tasks/javac.html#jikes">javac</a> "Jikes Notes".
</td>
</tr>
<tr>
<td><code>build.compiler.fulldepend</code></td>
<td>boolean (default false)</td>
<td>Enable full dependency checking;
- see <a href="Tasks/javac.html">javac</a> "Jikes Notes".
+ see <a href="Tasks/javac.html#jikes">javac</a> "Jikes Notes".
</td>
</tr>
<tr>
<td><code>build.compiler.jvc.extensions</code></td>
<td><em><u>Deprecated</u></em></td>
<td>Enable Microsoft extensions of their Java compiler;
- see <a href="Tasks/javac.html">javac</a> "Jvc Notes".
+ see <a href="Tasks/javac.html#jvc">javac</a> "Jvc Notes".
</td>
</tr>
<tr>
<td><code>build.compiler.pedantic</code></td>
<td>boolean (default <q>false</q>)</td>
<td>Enable pedantic warnings;
- see <a href="Tasks/javac.html">javac</a> "Jikes Notes".
+ see <a href="Tasks/javac.html#jikes">javac</a> "Jikes Notes".
</td>
</tr>
<tr>
<td><code>build.compiler.warnings</code></td>
<td><em><u>Deprecated</u></em></td>
- <td>See <a href="Tasks/javac.html">javac</a> "Jikes Notes"</td>
+ <td>See <a href="Tasks/javac.html#jikes">javac</a> "Jikes Notes"</td>
</tr>
<tr>
<td><code>build.rmic</code></td>
@@ -508,15 +508,15 @@ that command being available in the Windows path.
<h2 id="os2">OS/2 Users</h2>
<p>
The OS/2 launch script was developed to perform complex tasks. It has
-two parts: <code>ant.cmd</code> which calls Ant
-and <code>antenv.cmd</code> which sets the environment for Ant. Most
-often you will just call <code>ant.cmd</code> using the same command
+two parts: <kbd>ant.cmd</kbd> which calls Ant
+and <kbd>antenv.cmd</kbd> which sets the environment for Ant. Most
+often you will just call <kbd>ant.cmd</kbd> using the same command
line options as described above. The behaviour can be modified by a
number of ways explained below.
</p>
<p>
-Script <code>ant.cmd</code> first verifies whether the Ant environment
+Script <kbd>ant.cmd</kbd> first verifies whether the Ant environment
is set correctly. The requirements are:
</p>
<ol>
@@ -527,36 +527,36 @@ is set correctly. The requirements are:
</ol>
<p>
-If any of these conditions is violated, script <code>antenv.cmd</code>
+If any of these conditions is violated, script <kbd>antenv.cmd</kbd>
is called. This script first invokes configuration scripts if there
-exist: the system-wide configuration <code>antconf.cmd</code> from
+exist: the system-wide configuration <kbd>antconf.cmd</kbd> from
the <samp>%ETC%</samp> directory and then the user
-configuration <code>antrc.cmd</code> from the <samp>%HOME%</samp>
+configuration <kbd>antrc.cmd</kbd> from the <samp>%HOME%</samp>
directory. At this moment both <code>JAVA_HOME</code>
and <code>ANT_HOME</code> must be defined
-because <code>antenv.cmd</code> now adds <samp>classes.zip</samp>
+because <kbd>antenv.cmd</kbd> now adds <samp>classes.zip</samp>
or <samp>tools.jar</samp> (depending on version of JVM) and everything
from <samp>%ANT_HOME%\lib</samp> except <samp>ant-*.jar</samp>
-to <code>CLASSPATH</code>. Finally <code>ant.cmd</code> calls
-per-directory configuration <code>antrc.cmd</code>. All settings made
-by <code>ant.cmd</code> are local and are undone when the script
-ends. The settings made by <code>antenv.cmd</code> are persistent
+to <code>CLASSPATH</code>. Finally <kbd>ant.cmd</kbd> calls
+per-directory configuration <kbd>antrc.cmd</kbd>. All settings made
+by <kbd>ant.cmd</kbd> are local and are undone when the script
+ends. The settings made by <kbd>antenv.cmd</kbd> are persistent
during the lifetime of the shell (of course unless called
-automatically from <code>ant.cmd</code>). It is thus possible to
-call <code>antenv.cmd</code> manually and modify some settings before
-calling <code>ant.cmd</code>.
+automatically from <kbd>ant.cmd</kbd>). It is thus possible to
+call <kbd>antenv.cmd</kbd> manually and modify some settings before
+calling <kbd>ant.cmd</kbd>.
</p>
<p>
-Scripts <code>envset.cmd</code> and <code>runrc.cmd</code> perform
+Scripts <kbd>envset.cmd</kbd> and <kbd>runrc.cmd</kbd> perform
auxiliary tasks. All scripts have some documentation inside.
</p>
<h2 id="background">Running Ant as a background process on Unix(-like) systems</h2>
<p>
-If you start Ant as a background process (like in <code>ant
-&</code>) and the build process creates another process, Ant will
+If you start Ant as a background process (like in <kbd>ant
+&</kbd>) and the build process creates another process, Ant will
immediately try to read from standard input, which in turn will most
likely suspend the process. In order to avoid this, you must redirect
Ant's standard input or explicitly provide input to each spawned
@@ -576,13 +576,13 @@ If you have installed Ant in the do-it-yourself way, Ant can be
started from one of two entry points:
</p>
-<pre>java -Dant.home=c:\ant org.apache.tools.ant.Main [options] [target]</pre>
-<pre>java -Dant.home=c:\ant org.apache.tools.ant.launch.Launcher [options] [target]</pre>
+<pre class="input">java -Dant.home=c:\ant org.apache.tools.ant.Main [options] [target]</pre>
+<pre class="input">java -Dant.home=c:\ant org.apache.tools.ant.launch.Launcher [options] [target]</pre>
<p>
The first method runs Ant's traditional entry point. The second method
uses the Ant Launcher introduced in Ant 1.6. The former method does
-not support the <code>-lib</code> option and all required classes are
+not support the <kbd>-lib</kbd> option and all required classes are
loaded from the <code>CLASSPATH</code>. You must ensure that all
required jars are available. At a minimum the <code>CLASSPATH</code>
should include:
@@ -596,7 +596,7 @@ should include:
<p>
The latter method supports
-the <code>-lib</code>, <code>-nouserlib</code>, <code>-noclasspath</code>
+the <kbd>-lib</kbd>, <kbd>-nouserlib</kbd>, <kbd>-noclasspath</kbd>
options and will load jars from the
specified <code>ANT_HOME</code>. You should start the latter with the
most minimal classpath possible, generally just
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/stylesheets/style.css
----------------------------------------------------------------------
diff --git a/manual/stylesheets/style.css b/manual/stylesheets/style.css
index 37ad35e..9b35645 100644
--- a/manual/stylesheets/style.css
+++ b/manual/stylesheets/style.css
@@ -80,7 +80,7 @@ q.no-break {
hyphens: none;
}
-code, samp {
+code, samp, kbd {
white-space: nowrap;
hyphens: none;
font-size: 1.125rem;
@@ -114,10 +114,29 @@ pre var, code var {
background: #efefef;
}
+/* highlight console input */
+.input, kbd {
+ color: white;
+ background: darkseagreen;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
/* highlight console output */
.output {
color: white;
background: #837A67;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+/* a workaround for invisible
+ (white on white) overflows */
+pre.input:hover, pre.output:hover {
+ margin-right: 0;
+ margin-left: 0;
+ overflow: scroll;
+ text-overflow: initial;
}
td {
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/targets.html
----------------------------------------------------------------------
diff --git a/manual/targets.html b/manual/targets.html
index ba239ff..a3f2471 100644
--- a/manual/targets.html
+++ b/manual/targets.html
@@ -121,9 +121,9 @@
<p>The optional <var>description</var> attribute can be used to
provide a one-line description of this target, which is printed by
- the <code>-projecthelp</code> command-line option. Targets without
+ the <kbd>-projecthelp</kbd> command-line option. Targets without
such a description are deemed internal and will not be listed,
- unless either the <code>-verbose</code> or <code>-debug</code>
+ unless either the <kbd>-verbose</kbd> or <kbd>-debug</kbd>
option is used.</p>
<p>It is a good practice to place
@@ -241,7 +241,7 @@
<p>Unlike targets they don't contain any tasks, their main purpose
is to collect targets that contribute to the desired state in
- their depends list.</p>
+ their <var>depends</var> list.</p>
<p>Targets can add themselves to an
extension-point's <var>depends</var> list via
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/tasksoverview.html
----------------------------------------------------------------------
diff --git a/manual/tasksoverview.html b/manual/tasksoverview.html
index 8eb702e..7e69b51 100644
--- a/manual/tasksoverview.html
+++ b/manual/tasksoverview.html
@@ -107,14 +107,14 @@ documentation.</p>
<tr>
<td><a href="Tasks/rpm.html">Rpm</a></td>
- <td><p>Invokes the <code>rpm</code> executable to build a Linux
+ <td><p>Invokes the <kbd>rpm</kbd> executable to build a Linux
installation file. This task currently only works on Linux or
other Unix platforms with RPM support.</p></td>
</tr>
<tr>
<td><a href="Tasks/signjar.html">SignJar</a></td>
- <td><p>Signs a jar or zip file with the <code>javasign</code>
+ <td><p>Signs a jar or zip file with the <kbd>javasign</kbd>
command-line tool.</p></td>
</tr>
@@ -227,7 +227,7 @@ documentation.</p>
<tr>
<td><a href="Tasks/rmic.html">Rmic</a></td>
- <td><p>Runs the <code>rmic</code> compiler on the specified file(s).</p></td>
+ <td><p>Runs the <kbd>rmic</kbd> compiler on the specified file(s).</p></td>
</tr>
<tr>
@@ -270,7 +270,7 @@ documentation.</p>
<tr>
<td><a href="Tasks/javadoc.html">Javadoc</a></td>
- <td><p>Generates code documentation using the <code>javadoc</code>
+ <td><p>Generates code documentation using the <kbd>javadoc</kbd>
tool. <em>The <code>Javadoc2</code> task is <u>deprecated</u>; use
the <code>Javadoc</code> task instead.</em></p></td>
</tr>
@@ -417,7 +417,7 @@ documentation.</p>
<td><p>Changes the permissions of a file or all files inside the
specified directories. Currently, it has effect only under Unix.
The permissions are also UNIX style, like the arguments for the
- <code>chmod</code> command.</p></td>
+ <kbd>chmod</kbd> command.</p></td>
</tr>
<tr>
@@ -662,8 +662,9 @@ documentation.</p>
<tr>
<td><a href="Tasks/fail.html">Fail</a></td>
- <td><p>Exits the current build by throwing a BuildException,
- optionally printing additional information.</p></td>
+ <td><p>Exits the current build by throwing
+ a <code>BuildException</code>, optionally printing additional
+ information.</p></td>
</tr>
<tr>
@@ -1018,9 +1019,9 @@ documentation.</p>
<tr>
<td><a href="Tasks/cvspass.html">CVSPass</a></td>
- <td><p>Adds entries to a .cvspass file. Adding entries to this
- file has the same affect as a <code>cvs login</code>
- command.</p></td>
+ <td><p>Adds entries to a <samp>.cvspass</samp> file. Adding
+ entries to this file has the same affect as a <kbd>cvs
+ login</kbd> command.</p></td>
</tr>
<tr>
@@ -1033,26 +1034,26 @@ documentation.</p>
<tr>
<td><a href="Tasks/clearcase.html">ClearCase</a></td>
- <td><p>Tasks to perform the ClearCase cleartool <em>checkin</em>,
- <em>checkout</em>, <em>uncheckout</em>, <em>update</em>,
- <em>lock</em>, <em>unlock</em>, <em>mklbtype</em>, <em>rmtype</em>,
- <em>mklabel</em>, <em>mkattr</em>, <em>mkdir</em>, <em>mkelem</em>,
- and <em>mkbl</em> commands.</p></td>
+ <td><p>Tasks to perform the ClearCase <kbd>cleartool checkin</kbd>,
+ <kbd>checkout</kbd>, <kbd>uncheckout</kbd>, <kbd>update</kbd>,
+ <kbd>lock</kbd>, <kbd>unlock</kbd>, <kbd>mklbtype</kbd>, <kbd>rmtype</kbd>,
+ <kbd>mklabel</kbd>, <kbd>mkattr</kbd>, <kbd>mkdir</kbd>, <kbd>mkelem</kbd>,
+ and <kbd>mkbl</kbd> commands.</p></td>
</tr>
<tr>
<td><a href="Tasks/ccm.html">Continuus/Synergy</a></td>
- <td><p>Tasks to perform the Continuus <em>ccmcheckin</em>,
- <em>ccmcheckout</em>, <em>ccmcheckintask</em>, <em>ccmreconfigure</em>,
- and <em>ccmcreateTask</em> commands.</p></td>
+ <td><p>Tasks to perform the Continuus <kbd>ccm checkin</kbd>,
+ <kbd>checkout</kbd>, <kbd>reconfigure</kbd>, <em>ccmcheckintask</em>,
+ and <em>ccmcreatetask</em> commands.</p></td>
</tr>
<tr>
<td><a href="Tasks/vss.html">Microsoft Visual SourceSafe</a></td>
- <td><p>Tasks to perform the Visual SourceSafe <em>vssget</em>,
- <em>vsslabel</em>, <em>vsshistory</em>, <em>vsscheckin</em>,
- <em>vsscheckout</em>, <em>vssadd</em>, <em>vsscp</em>,
- and <em>vsscreate</em> commands.</p></td>
+ <td><p>Tasks to perform the Visual SourceSafe <kbd>ss get</kbd>,
+ <kbd>label</kbd>, <kbd>history</kbd>, <kbd>checkin</kbd>,
+ <kbd>checkout</kbd>, <kbd>add</kbd>, <kbd>cp</kbd>,
+ and <kbd>create</kbd> commands.</p></td>
</tr>
<tr>
@@ -1063,8 +1064,8 @@ documentation.</p>
<tr>
<td><a href="Tasks/sos.html">SourceOffSite</a></td>
- <td><p>Tasks to perform the SourceOffSite <em>sosget</em>, <em>soslabel</em>,
- <em>soscheckin</em>, and <em>soscheckout</em> commands.</p></td>
+ <td><p>Tasks to perform the SourceOffSite <kbd>sos get</kbd>, <kbd>label</kbd>,
+ <kbd>checkin</kbd>, and <kbd>checkout</kbd> commands.</p></td>
</tr>
</table>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/tutorial-HelloWorldWithAnt.html
----------------------------------------------------------------------
diff --git a/manual/tutorial-HelloWorldWithAnt.html b/manual/tutorial-HelloWorldWithAnt.html
index 784b142..41d6404 100644
--- a/manual/tutorial-HelloWorldWithAnt.html
+++ b/manual/tutorial-HelloWorldWithAnt.html
@@ -43,12 +43,12 @@ individual steps: <samp>classes</samp> for our compiled files and <samp>jar</sam
<p>We have to create only the <samp>src</samp> directory. (Because I am working on Windows, here is the Windows
syntax—translate to your shell):</p>
-<pre class="code">md src</pre>
+<pre class="input">md src</pre>
<p>The following simple Java class just prints a fixed message out to STDOUT, so just write this code
into <samp>src\oata\HelloWorld.java</samp>.</p>
-<pre class="code">
+<pre>
package oata;
public class HelloWorld {
@@ -58,7 +58,7 @@ public class HelloWorld {
}</pre>
<p>Now just try to compile and run that:</p>
-<pre class="code">
+<pre class="input">
md build\classes
javac -sourcepath src -d build\classes src\oata\HelloWorld.java
java -cp build\classes oata.HelloWorld</pre>
@@ -67,14 +67,14 @@ which will result in
<p>Creating a jar-file is not very difficult. But creating a <em>startable</em> jar-file needs more steps: create a
manifest-file containing the start class, creating the target directory and archiving the files.</p>
-<pre class="code">
+<pre class="input">
echo Main-Class: oata.HelloWorld>myManifest
md build\jar
jar cfm build\jar\HelloWorld.jar myManifest -C build\classes .
java -jar build\jar\HelloWorld.jar</pre>
-<p><strong>Note</strong>: Do not have blanks around the >-sign in the <code>echo
-Main-Class</code> instruction because it would falsify it!</p>
+<p><strong>Note</strong>: Do not have blanks around the >-sign in the <kbd>echo Main-Class</kbd> instruction because
+it would falsify it!</p>
<h2 id="four-steps">Four steps to a running application</h2>
<p>After finishing the java-only step we have to think about our build process. We <em>have</em> to compile our code,
@@ -85,7 +85,7 @@ startable jar file would be nice ... And it's a good practise to have a <q>clean
generated stuff. Many failures could be solved just by a "clean build".</p>
<p>By default Ant uses <samp>build.xml</samp> as the name for a buildfile, so our <samp>.\build.xml</samp> would be:</p>
-<pre class="code">
+<pre>
<project>
<target name="clean">
@@ -113,12 +113,12 @@ generated stuff. Many failures could be solved just by a "clean build".</p>
</project></pre>
<p>Now you can compile, package and run the application via</p>
-<pre class="code">
+<pre class="input">
ant compile
ant jar
ant run</pre>
<p>Or shorter with</p>
-<pre class="code">ant compile jar run</pre>
+<pre class="input">ant compile jar run</pre>
<p>While having a look at the buildfile, we will see some similar steps between Ant and the Java-only commands:</p>
<table>
@@ -127,7 +127,7 @@ ant run</pre>
<th>Ant</th>
</tr>
<tr>
- <td><pre class="code">
+ <td><pre class="input">
md build\classes
javac
-sourcepath src
@@ -144,7 +144,7 @@ jar cfm
java -jar build\jar\HelloWorld.jar</pre></td>
- <td><pre class="code">
+ <td><pre>
<mkdir dir="build/classes"/>
<javac
srcdir="src"
@@ -171,7 +171,7 @@ steps.</p>
<p>The first and second point would be addressed with <em>properties</em>, the third with a special property—an
attribute of the <code><project></code> tag and the fourth problem can be solved using dependencies.</p>
-<pre class="code">
+<pre>
<project name="HelloWorld" basedir="." default="main">
<property name="src.dir" value="src"/>
@@ -212,7 +212,7 @@ attribute of the <code><project></code> tag and the fourth problem can be
</project></pre>
-<p>Now it's easier, just do a <code>ant</code> and you will get</p>
+<p>Now it's easier, just do a <kbd>ant</kbd> and you will get</p>
<pre class="output">
Buildfile: build.xml
@@ -252,7 +252,7 @@ this library could be accessed during compilation and run.</p>
the <a href="https://logging.apache.org/log4j/1.2/manual.html" target="_top">Short Manual [2]</a>. First we have to
modify the java source to use the logging framework:</p>
-<pre class="code">
+<pre>
package oata;
<b>import org.apache.log4j.Logger;</b>
@@ -269,13 +269,13 @@ public class HelloWorld {
<p>Most of the modifications are "framework overhead" which has to be done once. The blue line is our "old System-out"
statement.</p>
-<p>Don't try to run <code>ant</code>—you will only get lot of compiler errors. Log4J is not on the classpath so we
+<p>Don't try to run <kbd>ant</kbd>—you will only get lot of compiler errors. Log4J is not on the classpath so we
have to do a little work here. But do not change the <code>CLASSPATH</code> environment variable! This is only for this
project and maybe you would break other environments (this is one of the most famous mistakes when working with Ant). We
introduce Log4J (or to be more precise: all libraries (jar-files) which are somewhere under <samp>.\lib</samp>) into our
buildfile:</p>
-<pre class="code">
+<pre>
<project name="HelloWorld" basedir="." default="main">
...
<b><property name="lib.dir" value="lib"/></b>
@@ -304,9 +304,9 @@ buildfile:</p>
</project></pre>
-<p>In this example we start our application not via its Main-Class manifest-attribute, because we could not provide a
-jarname <em>and</em> a classpath. So add our class in the red line to the already defined path and start as
-usual. Running <code>ant</code> would give (after the usual compile stuff):</p>
+<p>In this example we start our application not via its <code>Main-Class</code> manifest-attribute, because we could not
+provide a jarname <em>and</em> a classpath. So add our class in the red line to the already defined path and start as
+usual. Running <kbd>ant</kbd> would give (after the usual compile stuff):</p>
<pre class="output">[java] 0 [main] INFO oata.HelloWorld - Hello World</pre>
@@ -324,14 +324,14 @@ usual. Running <code>ant</code> would give (after the usual compile stuff):</p>
<h2 id="config-files">Configuration files</h2>
<p>Why we have used Log4J? "It's highly configurable"? No—all is hardcoded! But that is not the fault of
-Log4J—it's ours. We had coded <code>BasicConfigurator.configure();</code> which implies a simple, but hardcoded
-configuration. More comfortable would be using a property file. In the Java source file, delete
-the <code>BasicConfiguration</code> line from the <code>main()</code> method (and the
-related <code>import</code>-statement). Log4J will search then for a configuration as described in it's manual. Then
+Log4J—it's ours. We had coded <code class="code">BasicConfigurator.configure();</code> which implies a simple, but
+hardcoded configuration. More comfortable would be using a property file. In the Java source file, delete
+the <code class="code">BasicConfiguration</code> line from the <code class="code">main()</code> method (and the
+related <code>import</code> statement). Log4J will search then for a configuration as described in it's manual. Then
create a new file <samp>src/log4j.properties</samp>. That's the default name for Log4J's configuration and using that
name would make life easier—not only the framework knows what is inside, you too!</p>
-<pre class="code">
+<pre>
log4j.rootLogger=DEBUG, <b>stdout</b>
log4j.appender.<b>stdout</b>=org.apache.log4j.ConsoleAppender
@@ -341,11 +341,11 @@ log4j.appender.<b>stdout</b>.layout.ConversionPattern=<span style="color:blue"><
</pre>
<p>This configuration creates an output channel (<q>Appender</q>) to console named as <code>stdout</code> which prints
-the message (<q>%m</q>) followed by a line feed (<q>%n</q>)—same as the earlier <code>System.out.println()</code>
-:-) Oooh kay—but we haven't finished yet. We should deliver the configuration file, too. So we change the
-buildfile:</p>
+the message (<q>%m</q>) followed by a line feed (<q>%n</q>)—same as the
+earlier <code class="code">System.out.println()</code> :-) Oooh kay—but we haven't finished yet. We should deliver
+the configuration file, too. So we change the buildfile:</p>
-<pre class="code">
+<pre>
...
<target name="compile">
<mkdir dir="${classes.dir}"/>
@@ -363,7 +363,7 @@ start the application from that directory and these files will included into the
<p>In this step we will introduce the usage of the JUnit [3] test framework in combination with Ant. Because Ant has a
built-in JUnit 4.12 you could start directly using it. Write a test class in <samp>src\HelloWorldTest.java</samp>:</p>
-<pre class="code">
+<pre>
import org.junit.Test;
public class HelloWorldTest {
@@ -383,7 +383,7 @@ public class HelloWorldTest {
information see the JUnit documentation [3] and the manual of <a href="Tasks/junit.html">junit</a> task. Now we add a
junit instruction to our buildfile:</p>
-<pre class="code">
+<pre>
...
<path <b>id="application"</b> location="${jar.dir}/${ant.project.name}.jar"/>
@@ -418,7 +418,7 @@ How much tests failed? Some errors? <var>printsummary</var> lets us know. The c
To run tests the <code>batchtest</code> here is used, so you could easily add more test classes in the future just by
naming them <code>*Test.java</code>. This is a common naming scheme.</p>
-<p>After a <code>ant junit</code> you'll get:</p>
+<p>After a <kbd>ant junit</kbd> you'll get:</p>
<pre class="output">
...
@@ -433,7 +433,7 @@ BUILD SUCCESSFUL
<p>We can also produce a report. Something that you (and other) could read after closing the shell .... There are two
steps: 1. let <code><junit></code> log the information and 2. convert these to something readable (browsable).<p>
-<pre class="code">
+<pre>
...
<b><property name="report.dir" value="${build.dir}/junitreport"/></b>
...
[3/6] ant git commit: , highlighting of input,
output and inlined code
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/filterchain.html
----------------------------------------------------------------------
diff --git a/manual/Types/filterchain.html b/manual/Types/filterchain.html
index cf5b090..f5266e5 100644
--- a/manual/Types/filterchain.html
+++ b/manual/Types/filterchain.html
@@ -27,7 +27,7 @@
that contained the string <q>blee</q> from the first 10 lines of a text file <samp>foo</samp>
(<em>you wouldn't want to filter a binary file</em>) to a file <samp>bar</samp>, you would do
something like:</p>
-<pre>cat foo|head -n10|grep blee > bar</pre>
+<pre class="input">cat foo|head -n10|grep blee > bar</pre>
<p>Apache Ant was not flexible enough. There was no way for the <code><copy></code> task to
do something similar. If you wanted the <code><copy></code> task to get the first 10 lines,
you would have had to create special attributes:</p>
@@ -42,8 +42,8 @@ and plug them in.</p>
<p>The solution was to refactor data transformation oriented tasks to support FilterChains. A
FilterChain is a group of ordered FilterReaders. Users can define their own FilterReaders by just
-extending the <code>java.io.FilterReader</code> class. Such custom FilterReaders can be easily
-plugged in as nested elements of <code><filterchain></code> by
+extending the <code class="code">java.io.FilterReader</code> class. Such custom FilterReaders can
+be easily plugged in as nested elements of <code><filterchain></code> by
using <code><filterreader></code> elements.</p>
<p>Example:</p>
<pre>
@@ -119,8 +119,9 @@ elements are defined in the build file using this. Please note that built in fi
also be defined using this syntax.</p>
<p>A FilterReader element must be supplied with a class name as an attribute value. The class
-resolved by this name must extend <code>java.io.FilterReader</code>. If the custom filter reader
-needs to be parameterized, it must implement <code>org.apache.tools.type.Parameterizable</code>.</p>
+resolved by this name must extend <code class="code">java.io.FilterReader</code>. If the custom
+filter reader needs to be parameterized, it must
+implement <code class="code">org.apache.tools.type.Parameterizable</code>.</p>
<table class="attr">
<tr>
@@ -206,8 +207,8 @@ is substituted with the property's actual value.</p>
<h4>Example</h4>
-<p>This results in the property <code>modifiedmessage</code> holding the value "All these
-moments will be lost in time, like teardrops in the rain"</p>
+<p>This results in the property <code>modifiedmessage</code> holding the value <q>All these moments
+will be lost in time, like teardrops in the rain</q></p>
<pre>
<echo message="All these moments will be lost in time, like teardrops in the ${weather}"
file="loadfile1.tmp"/>
@@ -955,8 +956,8 @@ extracted)</p>
<p><em>Since Ant 1.8.0</em></p>
<p>The sort filter reads all lines and sorts them. The sort order can be reversed and it is
-possible to specify a custom implementation of the <code>java.util.Comparator</code> interface
-to get even more control.</p>
+possible to specify a custom implementation of the <code class="code">java.util.Comparator</code>
+interface to get even more control.</p>
<table class="attr">
<tr>
@@ -972,8 +973,8 @@ to get even more control.</p>
</tr>
<tr>
<td>comparator</td>
- <td>Class name of a class that implements <code>java.util.Comparator</code> for Strings.
- This class will be used to determine the sort order of lines.</td>
+ <td>Class name of a class that implements <code class="code">java.util.Comparator</code> for
+ Strings. This class will be used to determine the sort order of lines.</td>
<td>No</td>
</tr>
</table>
@@ -1023,12 +1024,12 @@ them into <samp>build</samp> location.
<p>
Sort all files <samp>*.txt</samp> from <samp>src</samp> location using as sorting
-criterium <code>EvenFirstCmp</code> class, that sorts the file lines putting even lines first
-then odd lines for example. The modified files are copied into <samp>build</samp>
-location. The <code>EvenFirstCmp</code>, has to an instanciable class
-via <code>Class.newInstance()</code>, therefore in case of inner class has to
-be <em>static</em>. It also has to implement <code>java.util.Comparator</code> interface, for
-example:
+criterium <code class="code">EvenFirstCmp</code> class, that sorts the file lines putting even lines
+first then odd lines for example. The modified files are copied into <samp>build</samp>
+location. The <code class="code">EvenFirstCmp</code> has to an instanciable class
+via <code class="code">Class.newInstance()</code>, therefore in case of inner class has to
+be <em>static</em>. It also has to implement <code class="code">java.util.Comparator</code>
+interface, for example:
</p>
<pre>
@@ -1166,9 +1167,9 @@ this on very large input.</p>
</tokenfilter></pre>
<h4 id="stringtokenizer">StringTokenizer</h4>
-<p>This tokenizer is based on <code>java.util.StringTokenizer</code>. It splits up the input
-into strings separated by white space, or by a specified list of delimiting characters. If the
-stream starts with delimiter characters, the first token will be the empty string (unless
+<p>This tokenizer is based on <code class="code">java.util.StringTokenizer</code>. It splits up the
+input into strings separated by white space, or by a specified list of delimiting characters. If
+the stream starts with delimiter characters, the first token will be the empty string (unless
the <var>delimsaretokens</var> attribute is used).</p>
<table class="attr">
@@ -1430,8 +1431,7 @@ the <a href="../Tasks/native2ascii.html">native2ascii</a> task.</p>
</tr>
<tr>
<td>reverse</td>
- <td>Reverse the sense of the conversion,
- i.e. convert from ASCII to native.</td>
+ <td>Reverse the sense of the conversion, i.e. convert from ASCII to native.</td>
<td>No</td>
</tr>
</table>
@@ -1456,9 +1456,10 @@ See the <a href="../Tasks/script.html">Script</a> task for an explanation of scr
dependencies.
</p>
<p>
-The script is provided with an object <samp>self</samp> that has <code>getToken()</code>
-and <code>setToken(String)</code> methods. The <code>getToken()</code> method returns the current
-token. The <code>setToken(String)</code> method replaces the current token.
+The script is provided with an object <samp class="code">self</samp> that
+has <code class="code">getToken()</code> and <code class="code">setToken(String)</code> methods.
+The <code class="code">getToken()</code> method returns the current
+token. The <code class="code">setToken(String)</code> method replaces the current token.
</p>
<p>
This filter may be used directly within a <code>filterchain</code>.
@@ -1538,8 +1539,8 @@ the <a href="../Tasks/script.html">script</a> task on how to use this element.
<h4 id="custom">Custom tokenizers and string filters</h4>
<p>Custom string filters and tokenizers may be plugged in by extending the
-interfaces <code>org.apache.tools.ant.filters.TokenFilter.Filter</code>
-and <code>org.apache.tools.ant.util.Tokenizer</code> respectly.</p>
+interfaces <code class="code">org.apache.tools.ant.filters.TokenFilter.Filter</code>
+and <code class="code">org.apache.tools.ant.util.Tokenizer</code> respectly.</p>
<p>They are defined in the build file using <code><typedef/></code>. For example, a string
filter that capitalizes words may be declared as:</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/mapper.html
----------------------------------------------------------------------
diff --git a/manual/Types/mapper.html b/manual/Types/mapper.html
index a4e014b..bf8a10a 100644
--- a/manual/Types/mapper.html
+++ b/manual/Types/mapper.html
@@ -32,9 +32,10 @@ may want to specify the target files, either to help Apache Ant or to get an ext
functionality.</p>
<p>While source files are usually specified as <a href="fileset.html">fileset</a>s, you don't
specify target files directly—instead, you tell Ant how to find the target file(s) for one
-source file. An instance of <code>org.apache.tools.ant.util.FileNameMapper</code> is responsible for
-this. It constructs target file names based on rules that can be parameterized with <var>from</var>
-and <var>to</var> attributes—the exact meaning of which is implementation-dependent.</p>
+source file. An instance of <code class="code">org.apache.tools.ant.util.FileNameMapper</code> is
+responsible for this. It constructs target file names based on rules that can be parameterized
+with <var>from</var> and <var>to</var> attributes—the exact meaning of which is
+implementation-dependent.</p>
<p>These instances are defined in <code><mapper></code> elements with the following
attributes:</p>
<table class="attr">
@@ -88,16 +89,16 @@ is, a <a href="../using.html#path">path</a>-like structure.</p>
<p><em>Since Ant 1.7.0</em>, nested File Mappers can be supplied via
either <code><mapper></code> elements
or <a href="../Tasks/typedef.html"><code><typedef></code></a>'d implementations
-of <code>org.apache.tools.ant.util.FileNameMapper</code>. If nested File Mappers are specified by
-either means, the mapper will be implicitly configured as a <a href="#composite-mapper">composite
-mapper</a>.</p>
+of <code class="code">org.apache.tools.ant.util.FileNameMapper</code>. If nested File Mappers are
+specified by either means, the mapper will be implicitly configured as
+a <a href="#composite-mapper">composite mapper</a>.</p>
<h3>The built-in mapper types</h3>
<p>All built-in mappers are case-sensitive.</p>
<p><em>Since Ant 1.7.0</em>, each of the built-in mapper implementation types is directly accessible
using a specific tagname. This makes it possible for filename mappers to support attributes in
-addition to the generally available <var>to</var> and <var>from</var>.<br/> The <code><mapper
-type|classname="..."></code> usage form remains valid for reasons of backward
-compatibility.</p>
+addition to the generally available <var>to</var> and <var>from</var>.<br/>
+The <code><mapper <var>type</var>|<var>classname</var>="..."></code> usage form
+remains valid for reasons of backward compatibility.</p>
<!-- -->
<!-- Identity Mapper -->
@@ -330,10 +331,10 @@ case).</p>
<p>Note that you need to escape a dollar-sign (<q>$</q>) with another dollar-sign in Ant.</p>
<p>The regexp mapper needs a supporting library and an implementation
-of <code>org.apache.tools.ant.util.regexp.RegexpMatcher</code> that hides the specifics of the
-library. <em>Since Ant 1.8.0</em>, Java 1.4 or later is required, so the implementation based on
-the <code>java.util.regex</code> package is always be available. You can still use the now retired
-Jakarta ORO or Jakarta Regex instead if your provide the corresponding jar in
+of <code class="code">org.apache.tools.ant.util.regexp.RegexpMatcher</code> that hides the specifics
+of the library. <em>Since Ant 1.8.0</em>, Java 1.4 or later is required, so the implementation based
+on the <code class="code">java.util.regex</code> package is always be available. You can still use
+the now retired Jakarta ORO or Jakarta Regex instead if your provide the corresponding jar in
your <code>CLASSPATH</code>.</p>
<p>For information about using <a href="https://savannah.gnu.org/projects/gnu-regexp/"
@@ -344,17 +345,17 @@ target="_top">your mileage may vary</a> with different regexp engines.</p>
<p>If you want to use one of the <a href="../install.html#librarydependencies">regular expression
libraries</a> other than <code>java.util.regex</code> you need to also use the
-corresponding <code>ant-[apache-oro, apache-regexp].jar</code> from the Ant release you are using.
+corresponding <samp>ant-[apache-oro, apache-regexp].jar</samp> from the Ant release you are using.
Make sure that both will be loaded from the same classpath, that is either put them into
your <code>CLASSPATH</code>, <samp>ANT_HOME/lib</samp> directory or a
nested <code><classpath></code> element of the mapper—you cannot
-have <code>ant-[apache-oro, apache-regexp].jar</code> in <samp>ANT_HOME/lib</samp> and the library
+have <samp>ant-[apache-oro, apache-regexp].jar</samp> in <samp>ANT_HOME/lib</samp> and the library
in a nested <code><classpath></code>.</p>
<p>Ant will choose the regular expression library based on the following algorithm:</p>
<ul>
<li>If the system property <code>ant.regexp.matcherimpl</code> has been set, it is taken as the name
-of the class implementing <code>org.apache.tools.ant.util.regexp.RegexpMatcher</code> that should be
-used.</li>
+of the class implementing <code class="code">org.apache.tools.ant.util.regexp.RegexpMatcher</code>
+that should be used.</li>
<li>If it has not been set, uses the JDK 1.4 classes.</li>
</ul>
@@ -590,7 +591,7 @@ mappers; prior to Ant 1.8.0 the order has been undefined.</p>
<td><code>foo.bar.A</code></td>
</tr>
</table>
-<p>The composite mapper has no corresponding <code><mapper <var>type</var>></code>
+<p>The composite mapper has no corresponding <code><mapper></code> <var>type</var>
attribute.</p>
<!-- -->
@@ -633,7 +634,7 @@ operation. The <var>to</var> and <var>from</var> attributes are ignored.</p>
<td><code>new/path/B.java2</code></td>
</tr>
</table>
-<p>The chained mapper has no corresponding <code><mapper <var>type</var>></code>
+<p>The chained mapper has no corresponding <code><mapper></code> <var>type</var>
attribute.</p>
<!-- -->
@@ -678,9 +679,7 @@ file name.</p>
</tr>
</table>
- <p>The filtermapper has no corresponding
- <code><mapper <var>type</var>></code> attribute.
- </p>
+<p>The filtermapper has no corresponding <code><mapper></code> <var>type</var> attribute.</p>
<!-- -->
<!-- Script Mapper -->
@@ -742,8 +741,7 @@ dependencies.</p>
</tr>
</table>
<p>This filename mapper can take a nested <classpath> element. See
-the <a href="../Tasks/script.html">script</a> task on how to use this element.
-</p>
+the <a href="../Tasks/script.html">script</a> task on how to use this element.</p>
<h5>Example</h5>
<pre>
@@ -793,7 +791,7 @@ every source file, with the list of mapped names reset after every invocation.</
</tr>
</table>
-<p>The scriptmapper has no corresponding <code><mapper <var>type</var>></code> attribute.</p>
+<p>The scriptmapper has no corresponding <code><mapper></code> <var>type</var> attribute.</p>
<h4 id="firstmatch-mapper">firstmatchmapper</h4>
<p><em>Since Ant 1.8.0</em></p>
@@ -822,7 +820,7 @@ collects the results of all matching children.</p>
</tr>
</table>
-<p>The firstmatchmapper has no corresponding <code><mapper <var>type</var>></code>
+<p>The firstmatchmapper has no corresponding <code><mapper></code> <var>type</var>
attribute.</p>
<h4 id="cutdirs-mapper">cutdirsmapper</h4>
@@ -843,7 +841,7 @@ attribute.</p>
</tr>
</table>
-<p>The cutdirsmapper has no corresponding <code><mapper <var>type</var>></code> attribute.</p>
+<p>The cutdirsmapper has no corresponding <code><mapper></code> <var>type</var> attribute.</p>
<table class="attr">
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/namespace.html
----------------------------------------------------------------------
diff --git a/manual/Types/namespace.html b/manual/Types/namespace.html
index d6711be..a9ece1c 100644
--- a/manual/Types/namespace.html
+++ b/manual/Types/namespace.html
@@ -184,17 +184,17 @@
<h3>Mixing Elements from Different Namespaces</h3>
<p>
- Now comes the difficult part: elements from different namespaces can be woven together
- under certain circumstances. This has a lot to do with the Ant
- 1.6 <a href="../develop.html#nestedtype">add type introspection rules</a>: Ant types and
- tasks are now free to accept arbitrary named types as nested elements, as long as the
- concrete type implements the interface expected by the task/type. The most obvious example
- for this is the <code><condition></code> task, which supports various nested
- conditions, all of which extend the interface <code>Condition</code>. To integrate a
- custom condition in Ant, you can now simply <code><typedef></code> the condition,
- and then use it anywhere nested conditions are allowed (assuming the containing element
- has a generic <code>add(Condition)</code> or <code>addConfigured(Condition)</code>
- method):
+ Now comes the difficult part: elements from different namespaces can be woven together under
+ certain circumstances. This has a lot to do with the Ant
+ 1.6 <a href="../develop.html#nestedtype">add type introspection rules</a>: Ant types and tasks
+ are now free to accept arbitrary named types as nested elements, as long as the concrete type
+ implements the interface expected by the task/type. The most obvious example for this is
+ the <code><condition></code> task, which supports various nested conditions, all of
+ which extend the interface <code class="code">Condition</code>. To integrate a custom
+ condition in Ant, you can now simply <code><typedef></code> the condition, and then use
+ it anywhere nested conditions are allowed (assuming the containing element has a
+ generic <code class="code">add(Condition)</code>
+ or <code class="code">addConfigured(Condition)</code> method):
</p>
<pre>
<typedef resource="org/example/conditions.properties" uri="<a href="http://example.org/conditions">http://example.org/conditions</a>"/>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/permissions.html
----------------------------------------------------------------------
diff --git a/manual/Types/permissions.html b/manual/Types/permissions.html
index 1032d37..4986f3f 100644
--- a/manual/Types/permissions.html
+++ b/manual/Types/permissions.html
@@ -134,9 +134,9 @@ are revoked. If the <var>actions</var> are left empty all actions match, and ar
<grant class="java.util.PropertyPermission" name="user.home" action="read,write"/>
</permissions>
</pre>
-<p>Grants the base set of permissions with the addition of a <code>SocketPermission</code> to
-connect to <samp>foo.bar.com</samp> and the permission to read and write
-the <code>user.home</code> system property.</p>
+<p>Grants the base set of permissions with the addition of
+a <code class="code">SocketPermission</code> to connect to <samp>foo.bar.com</samp> and the
+permission to read and write the <code>user.home</code> system property.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/regexp.html
----------------------------------------------------------------------
diff --git a/manual/Types/regexp.html b/manual/Types/regexp.html
index 48d3870..88bd69b 100644
--- a/manual/Types/regexp.html
+++ b/manual/Types/regexp.html
@@ -57,12 +57,12 @@ dependencies</a> concerning the supporting libraries.</p>
<p>The property <code>ant.regexp.regexpimpl</code> governs which regular expression implementation
will be chosen. Possible values for this property are:</p>
<ul>
-<li><code>org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp</code></li>
-<li><code>org.apache.tools.ant.util.regexp.JakartaOroRegexp</code></li>
-<li><code>org.apache.tools.ant.util.regexp.JakartaRegexpRegexp</code></li>
+<li><code class="code">org.apache.tools.ant.util.regexp.Jdk14RegexpRegexp</code></li>
+<li><code class="code">org.apache.tools.ant.util.regexp.JakartaOroRegexp</code></li>
+<li><code class="code">org.apache.tools.ant.util.regexp.JakartaRegexpRegexp</code></li>
</ul>
<p>It can also be another implementation of the
-interface <code>org.apache.tools.ant.util.regexp.Regexp</code>.
+interface <code class="code">org.apache.tools.ant.util.regexp.Regexp</code>.
If <code>ant.regexp.regexpimpl</code> is not defined, Ant uses Jdk14Regexp as this is always
available.</p>
<p>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/resources.html
----------------------------------------------------------------------
diff --git a/manual/Types/resources.html b/manual/Types/resources.html
index 62277cc..f78d6ce 100644
--- a/manual/Types/resources.html
+++ b/manual/Types/resources.html
@@ -1015,11 +1015,11 @@ collection.</p>
<p>A single resource collection is required.</p>
<h4 id="tokens">tokens</h4>
-<p>Includes the <a href="#string">string</a> tokens gathered from a nested resource
-collection. Uses the same tokenizers supported by
+<p>Includes the <a href="#string">string</a> tokens gathered from a nested resource collection. Uses
+the same tokenizers supported by
the <a href="filterchain.html#tokenfilter">TokenFilter</a>. Imaginative use of this resource
-collection can implement equivalents for such Unix functions as <code>sort</code>, <code>grep
--c</code>, <code>wc</code> and <code>wc -l</code>.</p>
+collection can implement equivalents for such Unix functions as <kbd>sort</kbd>, <kbd>grep
+-c</kbd>, <kbd>wc</kbd> and <kbd>wc -l</kbd>.</p>
<table class="attr">
<tr>
<th>Attribute</th>
@@ -1056,7 +1056,7 @@ collection can implement equivalents for such Unix functions as <code>sort</code
</sort>
</union>
</concat></pre>
-<p>Implements Unix <code>sort -u</code> against resource collection <q>input</q>.</p>
+<p>Implements Unix <kbd>sort -u</kbd> against resource collection <q>input</q>.</p>
<h4 id="setlogic">Set operations</h4>
<p>The following resource collections implement set operations:</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/selectors-program.html
----------------------------------------------------------------------
diff --git a/manual/Types/selectors-program.html b/manual/Types/selectors-program.html
index 6f415ed..55c3c9a 100644
--- a/manual/Types/selectors-program.html
+++ b/manual/Types/selectors-program.html
@@ -45,15 +45,15 @@
example.</p>
<p>To create a new Custom Selector, you have to create a class that
- implements <code>org.apache.tools.ant.types.selectors.ExtendFileSelector</code>. The
- easiest way to do that is through the convenience base
- class <code>org.apache.tools.ant.types.selectors.BaseExtendSelector</code>, which
- provides all of the methods for supporting <code><param></code> tags. First,
- override the <code>isSelected()</code> method, and optionally
- the <code>verifySettings()</code> method. If your custom selector requires parameters to
- be set, you can also override the <code>setParameters()</code> method and interpret the
- parameters that are passed in any way you like. Several of the core selectors
- demonstrate how to do that because they can also be used as custom selectors.</p>
+ implements <code class="code">org.apache.tools.ant.types.selectors.ExtendFileSelector</code>.
+ The easiest way to do that is through the convenience base
+ class <code class="code">org.apache.tools.ant.types.selectors.BaseExtendSelector</code>,
+ which provides all of the methods for supporting <code><param></code> tags. First,
+ override the <code class="code">isSelected()</code> method, and optionally
+ the <code class="code">verifySettings()</code> method. If your custom selector requires
+ parameters to be set, you can also override the <code class="code">setParameters()</code>
+ method and interpret the parameters that are passed in any way you like. Several of the core
+ selectors demonstrate how to do that because they can also be used as custom selectors.</p>
<li>Core Selectors
@@ -62,37 +62,40 @@
<ul>
<li><p>First, create a class that
- implements <code>org.apache.tools.ant.types.selectors.FileSelector</code>. You can
- either choose to implement all methods yourself from scratch, or you can
- extend <code>org.apache.tools.ant.types.selectors.BaseSelector</code> instead, a
- convenience class that provides reasonable default behaviour for many methods.</p>
-
- <p>There is only one method required. <code>public boolean isSelected(File basedir,
- String filename, File file)</code> is the real purpose of the whole exercise. It
- returns <q>true</q> or <q>false</q> depending on whether the given file should be
- selected from the list or not.</p>
-
- <p>If you are using <code>org.apache.tools.ant.types.selectors.BaseSelector</code>
- there are also some predefined behaviours you can take advantage of. Any time you
- encounter a problem when setting attributes or adding tags, you can
- call <code>setError(String errmsg)</code> and the class will know that there is a
- problem. Then, at the top of your <code>isSelected()</code> method
- call <code>validate()</code> and a BuildException will be thrown with the contents
- of your error message. The <code>validate()</code> method also gives you a last
- chance to check your settings for consistency because it
- calls <code>verifySettings()</code>. Override this method and
- call <code>setError()</code> within it if you detect any problems in how your
- selector is set up.</p>
-
- <p>You may also want to override <code>toString()</code>.</p></li>
-
- <li>Put an <code>add</code> method for your selector
- in <code>org.apache.tools.ant.types.selectors.SelectorContainer</code>. This is an
- interface, so you will also have to add an implementation for the method in the
- classes which implement it,
- namely <code>org.apache.tools.ant.types.AbstractFileSet</code>, <code>org.apache.tools.ant.taskdefs.MatchingTask</code>
- and <code>org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>. Once
- it is in there, it will be available everywhere that core selectors are
+ implements <code class="code">org.apache.tools.ant.types.selectors.FileSelector</code>.
+ You can either choose to implement all methods yourself from scratch, or you can
+ extend <code class="code">org.apache.tools.ant.types.selectors.BaseSelector</code>
+ instead, a convenience class that provides reasonable default behaviour for many
+ methods.</p>
+
+ <p>There is only one method required. <code class="code">public boolean isSelected(File
+ basedir, String filename, File file)</code> is the real purpose of the whole
+ exercise. It returns <q>true</q> or <q>false</q> depending on whether the given file
+ should be selected from the list or not.</p>
+
+ <p>If you are
+ using <code class="code">org.apache.tools.ant.types.selectors.BaseSelector</code> there
+ are also some predefined behaviours you can take advantage of. Any time you encounter a
+ problem when setting attributes or adding tags, you can
+ call <code class="code">setError(String errmsg)</code> and the class will know that
+ there is a problem. Then, at the top of your <code class="code">isSelected()</code>
+ method call <code class="code">validate()</code> and a <code>BuildException</code> will
+ be thrown with the contents of your error
+ message. The <code class="code">validate()</code> method also gives you a last chance to
+ check your settings for consistency because it
+ calls <code class="code">verifySettings()</code>. Override this method and
+ call <code class="code">setError()</code> within it if you detect any problems in how
+ your selector is set up.</p>
+
+ <p>You may also want to override <code class="code">toString()</code>.</p></li>
+
+ <li>Put an <code class="code">add()</code> method for your selector
+ in <code class="code">org.apache.tools.ant.types.selectors.SelectorContainer</code>.
+ This is an interface, so you will also have to add an implementation for the method in
+ the classes which implement it,
+ namely <code class="code">org.apache.tools.ant.types.AbstractFileSet</code>, <code class="code">org.apache.tools.ant.taskdefs.MatchingTask</code>
+ and <code class="code">org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.
+ Once it is in there, it will be available everywhere that core selectors are
appropriate.</li>
</ul>
@@ -100,18 +103,18 @@
<p>Got an idea for a new Selector Container? Creating a new one is no problem:</p>
<ul>
<li>Create a new class that
- implements <code>org.apache.tools.ant.types.selectors.SelectorContainer</code>.
+ implements <code class="code">org.apache.tools.ant.types.selectors.SelectorContainer</code>.
This will ensure that your new Container can access any new selectors that come
along. Again, there is a convenience class available for you
- called <code>org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.</li>
- <li>Implement the <code>public boolean isSelected(String filename, File file)</code>
- method to do the right thing. Chances are you'll want to iterate over the selectors
- under you, so use <code>selectorElements()</code> to get an iterator that will do
- that.</li>
- <li>Again, put an <code>add</code> method for your container
- in <code>org.apache.tools.ant.types.selectors.SelectorContainer</code> and its
- implementations <code>org.apache.tools.ant.types.AbstractFileSet</code>
- and <code>org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.</li>
+ called <code class="code">org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.</li>
+ <li>Implement the <code class="code">public boolean isSelected(String filename, File
+ file)</code> method to do the right thing. Chances are you'll want to iterate over the
+ selectors under you, so use <code class="code">selectorElements()</code> to get an
+ iterator that will do that.</li>
+ <li>Again, put an <code class="code">add()</code> method for your container
+ in <code class="code">org.apache.tools.ant.types.selectors.SelectorContainer</code> and
+ its implementations <code class="code">org.apache.tools.ant.types.AbstractFileSet</code>
+ and <code class="code">org.apache.tools.ant.types.selectors.BaseSelectorContainer</code>.</li>
</ul>
</ol>
@@ -119,16 +122,16 @@
<p>For a robust component (and selectors are (Project)Components) tests are necessary. For
testing Tasks we use JUnit Tests and Rules—more
- specific <code>org.apache.tools.ant.BuildFileRule extends
- org.junit.rules.ExternalResource</code>. Some of its features like configure the (test)
- project by reading its buildfile and execute targets we need for selector tests
- also. Therefore we use that BuildFileRule. But testing selectors requires some more work:
- having a set of files, instantiate and configure the selector, check the selection work and
- more. Because we usually extend <code>BaseExtendSelector</code> its features have to be
- tested also (e.g. <code>setError()</code>).</p>
+ specific <code class="code">org.apache.tools.ant.BuildFileRule extends
+ org.junit.rules.ExternalResource</code>. Some of its features like configure the (test) project
+ by reading its buildfile and execute targets we need for selector tests also. Therefore we use
+ that BuildFileRule. But testing selectors requires some more work: having a set of files,
+ instantiate and configure the selector, check the selection work and more. Because we usually
+ extend <code class="code">BaseExtendSelector</code> its features have to be tested also
+ (e.g. <code class="code">setError()</code>).</p>
<p>That's why we have a test rule for doing our selector
- tests: <code>org.apache.tools.ant.types.selectors.BaseSelectorRule</code>.</p>
+ tests: <code class="code">org.apache.tools.ant.types.selectors.BaseSelectorRule</code>.</p>
<p>This class extends ExternalResource and therefore can included in the set of Ant's unit
tests. It holds an instance of preconfigured BuildFileRule. Configuration is done by parsing
@@ -180,32 +183,32 @@ public class MySelectorTest {
[junit] at junit.framework.Assert.assertEquals(Assert.java:81)
[junit] at org.apache.tools.ant.types.selectors.BaseSelectorTest.performTest(BaseSelectorTest.java:194)</pre>
- <p>Described above the test class should provide a <code>getInstance()</code> method. But
- that isn't used here. The used <code>getSelector()</code> method is implemented in the base
- class and gives an instance of an Ant Project to the selector. This is usually done inside
- normal build file runs, but not inside this special environment, so this method gives the
- selector the ability to use its own Project object (<code>getProject()</code>), for example
- for logging.</p>
+ <p>Described above the test class should provide a <code class="code">getInstance()</code>
+ method. But that isn't used here. The used <code class="code">getSelector()</code> method is
+ implemented in the base class and gives an instance of an Ant Project to the selector. This is
+ usually done inside normal build file runs, but not inside this special environment, so this
+ method gives the selector the ability to use its own Project object
+ (<code class="code">getProject()</code>), for example for logging.</p>
<h3>Logging</h3>
- <p>During development and maybe later you sometimes need the output of information.
- Therefore Logging is needed. Because the selector extends BaseExtendSelector or directly
- BaseSelector it is an Ant <code>DataType</code> and therefore
- a <code>ProjectComponent</code>.<br/> That means that you have access to the project object
- and its logging capability. <code>ProjectComponent</code> itself
- provides <code>log()</code> methods which will do the access to the project
+ <p>During development and maybe later you sometimes need the output of information. Therefore
+ Logging is needed. Because the selector extends BaseExtendSelector or directly BaseSelector it
+ is an Ant <code class="code">DataType</code> and therefore
+ a <code class="code">ProjectComponent</code>.<br/> That means that you have access to the
+ project object and its logging capability. <code class="code">ProjectComponent</code> itself
+ provides <code class="code">log()</code> methods which will do the access to the project
instance. Logging is therefore done simply with:</p>
<pre>log("message");</pre>
<p>or</p>
<pre>log("message", loglevel);</pre>
<p>where the <code>loglevel</code> is one of the values</p>
<ul>
- <li><code>org.apache.tools.ant.Project.MSG_ERR</code></li>
- <li><code>org.apache.tools.ant.Project.MSG_WARN</code></li>
- <li><code>org.apache.tools.ant.Project.MSG_INFO</code> (default)</li>
- <li><code>org.apache.tools.ant.Project.MSG_VERBOSE</code></li>
- <li><code>org.apache.tools.ant.Project.MSG_DEBUG</code></li>
+ <li><code class="code">org.apache.tools.ant.Project.MSG_ERR</code></li>
+ <li><code class="code">org.apache.tools.ant.Project.MSG_WARN</code></li>
+ <li><code class="code">org.apache.tools.ant.Project.MSG_INFO</code> (default)</li>
+ <li><code class="code">org.apache.tools.ant.Project.MSG_VERBOSE</code></li>
+ <li><code class="code">org.apache.tools.ant.Project.MSG_DEBUG</code></li>
</ul>
</body>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/selectors.html
----------------------------------------------------------------------
diff --git a/manual/Types/selectors.html b/manual/Types/selectors.html
index 2c59d59..f8a2631 100644
--- a/manual/Types/selectors.html
+++ b/manual/Types/selectors.html
@@ -34,10 +34,10 @@
any target by using the <code><selector></code> tag and then using it as a reference.</p>
<p>Different selectors have different attributes. Some selectors can contain other selectors,
- and these are called <a href="#selectcontainers"><code>Selector Containers</code></a>. There is
- also a category of selectors that allow user-defined extensions,
- called <a href="#customselect"><code>Custom Selectors</code></a>. The ones built in to Apache
- Ant are called <a href="#coreselect"><code>Core Selectors</code></a>.</p>
+ and these are called <a href="#selectcontainers"><q>Selector Containers</q></a>. There is also
+ a category of selectors that allow user-defined extensions,
+ called <a href="#customselect"><q>Custom Selectors</q></a>. The ones built in to Apache Ant are
+ called <a href="#coreselect"><q>Core Selectors</q></a>.</p>
<h3 id="coreselect">Core Selectors</h3>
@@ -877,36 +877,36 @@
<h4 id="readable">Readable Selector</h4>
<p>The <code><readable></code> selector selects only files that are readable. Ant only
- invokes <code>java.io.File#canRead</code> so if a file is unreadable but JVM cannot detect this
- state, this selector will still select the file.</p>
+ invokes <code class="code">java.io.File#canRead</code> so if a file is unreadable but JVM cannot
+ detect this state, this selector will still select the file.</p>
<h4 id="writable">Writable Selector</h4>
<p>The <code><writable></code> selector selects only files that are writable. Ant only
- invokes <code>java.io.File#canWrite</code> so if a file is nonwritable but JVM cannot detect
- this state, this selector will still select the file.</p>
+ invokes <code class="code">java.io.File#canWrite</code> so if a file is nonwritable but JVM
+ cannot detect this state, this selector will still select the file.</p>
<h4 id="executable">Executable Selector</h4>
<p>The <code><executable></code> selector selects only files that are executable. Ant
- only invokes <code>java.nio.file.Files#isExecutable</code> so if a file is not executable but
- JVM cannot detect this state, this selector will still select the file.</p>
+ only invokes <code class="code">java.nio.file.Files#isExecutable</code> so if a file is not
+ executable but JVM cannot detect this state, this selector will still select the file.</p>
<p><em>Since Ant 1.10.0</em></p>
<h4 id="symlink">Symlink Selector</h4>
<p>The <code><symlink></code> selector selects only files that are symbolic links. Ant
- only invokes <code>java.nio.file.Files#isSymbolicLink</code> so if a file is a symbolic link but
- JVM cannot detect this state, this selector will not select the file.</p>
+ only invokes <code class="code">java.nio.file.Files#isSymbolicLink</code> so if a file is a
+ symbolic link but JVM cannot detect this state, this selector will not select the file.</p>
<p><em>Since Ant 1.10.0</em></p>
<h4 id="ownedBy">OwnedBy Selector</h4>
<p>The <code><ownedBy></code> selector selects only files that are owned by the given
- user. Ant only invokes <code>java.nio.file.Files#getOwner</code> so if a file system doesn't
- support the operation this selector will not select the file.</p>
+ user. Ant only invokes <code class="code">java.nio.file.Files#getOwner</code> so if a file
+ system doesn't support the operation this selector will not select the file.</p>
<p><em>Since Ant 1.10.0</em></p>
@@ -1312,9 +1312,9 @@
<p>First, you have to write your selector class in Java. The only requirement it must meet in
order to be a selector is that it implements
- the <code>org.apache.tools.ant.types.selectors.FileSelector</code> interface, which contains a
- single method. See <a href="selectors-program.html">Programming Selectors in Ant</a> for more
- information.</p>
+ the <code class="code">org.apache.tools.ant.types.selectors.FileSelector</code> interface, which
+ contains a single method. See <a href="selectors-program.html">Programming Selectors in Ant</a>
+ for more information.</p>
<p>Once that is written, you include it in your build file by using
the <code><custom></code> tag.</p>
@@ -1328,7 +1328,7 @@
<tr>
<td>classname</td>
<td>The name of your class that
- implements <code>org.apache.tools.ant.types.selectors.FileSelector</code>.
+ implements <code class="code">org.apache.tools.ant.types.selectors.FileSelector</code>.
</td>
<td>Yes</td>
</tr>
@@ -1362,15 +1362,15 @@
<ul>
<li><a href="#containsselect">Contains Selector</a> with
- classname <code>org.apache.tools.ant.types.selectors.ContainsSelector</code>
+ classname <code class="code">org.apache.tools.ant.types.selectors.ContainsSelector</code>
<li><a href="#dateselect">Date Selector</a> with
- classname <code>org.apache.tools.ant.types.selectors.DateSelector</code>
+ classname <code class="code">org.apache.tools.ant.types.selectors.DateSelector</code>
<li><a href="#depthselect">Depth Selector</a> with
- classname <code>org.apache.tools.ant.types.selectors.DepthSelector</code>
+ classname <code class="code">org.apache.tools.ant.types.selectors.DepthSelector</code>
<li><a href="#filenameselect">Filename Selector</a> with
- classname <code>org.apache.tools.ant.types.selectors.FilenameSelector</code>
+ classname <code class="code">org.apache.tools.ant.types.selectors.FilenameSelector</code>
<li><a href="#sizeselect">Size Selector</a> with
- classname <code>org.apache.tools.ant.types.selectors.SizeSelector</code>
+ classname <code class="code">org.apache.tools.ant.types.selectors.SizeSelector</code>
</ul>
<p>Here is the example from the Depth Selector section rewritten to use the selector
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Types/xmlcatalog.html
----------------------------------------------------------------------
diff --git a/manual/Types/xmlcatalog.html b/manual/Types/xmlcatalog.html
index 371ec07..edc27fa 100644
--- a/manual/Types/xmlcatalog.html
+++ b/manual/Types/xmlcatalog.html
@@ -38,8 +38,9 @@ Dependencies</a> for more information.</p>
<p>This data type provides a catalog of resource locations based on
the <a href="https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html"
target="_top">OASIS XML Catalog standard</a>. The catalog entries are used both for Entity
-resolution and URI resolution, in accordance with the <code>org.xml.sax.EntityResolver</code>
-and <code>javax.xml.transform.URIResolver</code> interfaces as defined in
+resolution and URI resolution, in accordance with
+the <code class="code">org.xml.sax.EntityResolver</code>
+and <code class="code">javax.xml.transform.URIResolver</code> interfaces as defined in
the <a href="https://download.oracle.com/otn-pub/jcp/jaxp-1_6-mrel3-spec/JAXP1_6-FinalSpec.pdf"
target="_top">Java API for XML Processing (JAXP) Specification</a>.</p>
<p>For example, in a <code>web.xml</code> file, the DTD is referenced as:</p>
@@ -193,21 +194,18 @@ warning will be logged.</p>
<p>Set up an XMLCatalog with a single DTD referenced locally in a user's home directory:</p>
<pre>
<xmlcatalog>
- <dtd
- publicId="-//OASIS//DTD DocBook XML V4.1.2//EN"
- location="/home/dion/downloads/docbook/docbookx.dtd"/>
+ <dtd publicId="-//OASIS//DTD DocBook XML V4.1.2//EN"
+ location="/home/dion/downloads/docbook/docbookx.dtd"/>
</xmlcatalog></pre>
<p>Set up an XMLCatalog with a multiple DTDs to be found either in the filesystem (relative to
the Ant project <var>basedir</var>) or in the classpath:
</p>
<pre>
<xmlcatalog id="commonDTDs">
- <dtd
- publicId="-//OASIS//DTD DocBook XML V4.1.2//EN"
- location="docbook/docbookx.dtd"/>
- <dtd
- publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
- location="web-app_2_2.dtd"/>
+ <dtd publicId="-//OASIS//DTD DocBook XML V4.1.2//EN"
+ location="docbook/docbookx.dtd"/>
+ <dtd publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
+ location="web-app_2_2.dtd"/>
</xmlcatalog></pre>
<p>Set up an XMLCatalog with a combination of DTDs and entities as well as a nested XMLCatalog
@@ -215,21 +213,17 @@ and external catalog files in both formats:</p>
<pre>
<xmlcatalog id="allcatalogs">
- <dtd
- publicId="-//ArielPartners//DTD XML Article V1.0//EN"
- location="com/arielpartners/knowledgebase/dtd/article.dtd"/>
- <entity
- publicId="LargeLogo"
- location="com/arielpartners/images/ariel-logo-large.gif"/>
+ <dtd publicId="-//ArielPartners//DTD XML Article V1.0//EN"
+ location="com/arielpartners/knowledgebase/dtd/article.dtd"/>
+ <entity publicId="LargeLogo"
+ location="com/arielpartners/images/ariel-logo-large.gif"/>
<xmlcatalog refid="commonDTDs"/>
<catalogpath>
<pathelement location="/etc/sgml/catalog"/>
- <fileset
- dir="/anetwork/drive"
- includes="**/catalog"/>
- <fileset
- dir="/my/catalogs"
- includes="**/catalog.xml"/>
+ <fileset dir="/anetwork/drive"
+ includes="**/catalog"/>
+ <fileset dir="/my/catalogs"
+ includes="**/catalog.xml"/>
</catalogpath>
</xmlcatalog>
</xmlcatalog></pre>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/argumentprocessor.html
----------------------------------------------------------------------
diff --git a/manual/argumentprocessor.html b/manual/argumentprocessor.html
index 848ffe8..0d8c2c2 100644
--- a/manual/argumentprocessor.html
+++ b/manual/argumentprocessor.html
@@ -28,48 +28,42 @@
<h2 id="definition">What is an ArgumentProcessor?</h2>
<p>
-An <code>ArgumentProcessor</code> is a parser of command line argument which is
-then call before and after the build file is being parsed. Third party
-libraries may then be able to have custom argument line argument which modify
-Ant behaviour.
+An <code class="code">ArgumentProcessor</code> is a parser of command line argument which is then
+call before and after the build file is being parsed. Third party libraries may then be able to have
+custom argument line argument which modify Ant behaviour.
</p>
<p>
-An <code>ArgumentProcessor</code> is called each time Ant parse an unknown
-argument, an <code>ArgumentProcessor</code> doesn't take precedence over Ant to
-parse already supported options. It is then recommended to third
-party <code>ArgumentProcessor</code> implementation to chose specific 'enough'
-argument name, avoiding for instance one letter arguments.
+An <code class="code">ArgumentProcessor</code> is called each time Ant parse an unknown argument,
+an <code class="code">ArgumentProcessor</code> doesn't take precedence over Ant to parse already
+supported options. It is then recommended to third party <code class="code">ArgumentProcessor</code>
+implementation to chose specific 'enough' argument name, avoiding for instance one letter arguments.
</p>
<p>
-It is also called at the different phases so different behaviour can be
-implemented. It is called just after every arguments are parsed, just
-before the project is being configured (the build file being parsed),
-and just after. Some of the methods to be implemented return a boolean:
-if <q>true</q> is returned, Ant will terminate immediately, without
-error.
+It is also called at the different phases so different behaviour can be implemented. It is called
+just after every arguments are parsed, just before the project is being configured (the build file
+being parsed), and just after. Some of the methods to be implemented return a boolean:
+if <q>true</q> is returned, Ant will terminate immediately, without error.
</p>
<p>
-Being called during all these phases, an <code>ArgumentProcessor</code>
-can just print some specific system properties and quit
-(like <code>-diagnose</code>), or print some specific properties of a
-project after being parsed and quit (like <code>-projectHelp</code>),
-or just set some custom properties on the project and let it run.
+Being called during all these phases, an <code class="code">ArgumentProcessor</code> can just print
+some specific system properties and quit (like <kbd>-diagnose</kbd>), or print some specific
+properties of a project after being parsed and quit (like <kbd>-projectHelp</kbd>), or just set some
+custom properties on the project and let it run.
</p>
<h2 id="repository">How to register it's own ArgumentProcessor</h2>
-<p>First, the <code>ArgumentProcessor</code> must be an implementation of
-<code>org.apache.tools.ant.ArgumentProcessor</code>.
+<p>First, the <code class="code">ArgumentProcessor</code> must be an implementation
+of <code class="code">org.apache.tools.ant.ArgumentProcessor</code>.
</p>
<p>Then to declare it: create a
-file <samp>META-INF/services/org.apache.tools.ant.ArgumentProcessor</samp>
-which contains only one line the fully qualified name of the class of the
-implementation. This file together with the implementation class need then to
-be found in Ant's classpath.
+file <samp>META-INF/services/org.apache.tools.ant.ArgumentProcessor</samp> which contains only one
+line the fully qualified name of the class of the implementation. This file together with the
+implementation class need then to be found in Ant's classpath.
</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/cover.html
----------------------------------------------------------------------
diff --git a/manual/cover.html b/manual/cover.html
index 8ba4d6f..bbadd5b 100644
--- a/manual/cover.html
+++ b/manual/cover.html
@@ -26,7 +26,7 @@
<h1 class="center"><img src="images/ant_logo_large.gif" width="190" height="120"></h1>
<h1 class="center">Apache Ant™ 1.10.3 Manual</h1>
<p>This is the manual for version 1.10.3 of <a href="https://ant.apache.org/" target="_top">Apache Ant</a>. If your
- version of Ant (as verified with <code>ant -version</code>) is older or newer than this version then this is not the
+ version of Ant (as verified with <kbd>ant -version</kbd>) is older or newer than this version then this is not the
correct manual set. Please use the documentation appropriate to your current version. Also, if you are using a
version older than the most recent release, we recommend an upgrade to fix bugs as well as provide new
functionality.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/develop.html
----------------------------------------------------------------------
diff --git a/manual/develop.html b/manual/develop.html
index 254e1f8..6806ced 100644
--- a/manual/develop.html
+++ b/manual/develop.html
@@ -28,25 +28,25 @@
<h2 id="writingowntask">Writing Your Own Task</h2>
<p>It is very easy to write your own task:</p>
<ol>
- <li>Create a Java class that extends <code>org.apache.tools.ant.Task</code>
+ <li>Create a Java class that extends <code class="code">org.apache.tools.ant.Task</code>
or <a href="base_task_classes.html">another class</a> that was designed to be extended.</li>
<li id="footnote-1-back">For each attribute, write a <em>setter</em> method. The setter method
must be a <code>public void</code> method that takes a single argument. The name of the method
must begin with <code>set</code>, followed by the attribute name, with the first character of
- the name in uppercase, and the rest in lowercase<a href="#footnote-1"><sup>*</sup></a>. That
- is, to support an attribute named <code>file</code> you create a method <code>setFile</code>.
- Depending on the type of the argument, Ant will perform some conversions for you,
- see <a href="#set-magic">below</a>.</li>
+ the name in uppercase, and the rest in lowercase<a href="#footnote-1">*</a>. That
+ is, to support an attribute named <code>file</code> you create a
+ method <code class="code">setFile</code>. Depending on the type of the argument, Ant will
+ perform some conversions for you, see <a href="#set-magic">below</a>.</li>
<li>If your task shall contain other tasks as nested elements
(like <a href="Tasks/parallel.html"><code>parallel</code></a>), your class must implement the
- interface <code>org.apache.tools.ant.TaskContainer</code>. If you do so, your task can not
- support any other nested elements. See <a href="#taskcontainer">below</a>.</li>
+ interface <code class="code">org.apache.tools.ant.TaskContainer</code>. If you do so, your task
+ can not support any other nested elements. See <a href="#taskcontainer">below</a>.</li>
<li>If the task should support character data (text nested between the start and end tags), write
- a <code>public void addText(String)</code> method. Note that Ant does <strong>not</strong>
- expand properties on the text it passes to the task.</li>
+ a <code class="code">public void addText(String)</code> method. Note that Ant
+ does <strong>not</strong> expand properties on the text it passes to the task.</li>
<li>For each nested element, write a <em>create</em>, <em>add</em> or <em>addConfigured</em>
method. A create method must be a <code>public</code> method that takes no arguments and returns
@@ -57,7 +57,7 @@
(<code>addConfigured</code>), followed by the element name. For a more complete discussion
see <a href="#nested-elements">below</a>.</li>
- <li>Write a <code>public void execute</code> method, with no arguments, that throws
+ <li>Write a <code class="code">public void execute()</code> method, with no arguments, that throws
a <code>BuildException</code>. This method implements the task itself.</li>
</ol>
@@ -68,13 +68,14 @@ one doesn't really matter to Ant, using all lower case is a good convention, tho
<h3>The Life-cycle of a Task</h3>
<ol>
<li>The xml element that contains the tag corresponding to the task gets converted to
- an <code>UnknownElement</code> at parse time. This <code>UnknownElement</code> gets placed in a
- list within a target object, or recursively within another <code>UnknownElement</code>.
+ an <code class="code">UnknownElement</code> at parse time.
+ This <code class="code">UnknownElement</code> gets placed in a list within a target object, or
+ recursively within another <code class="code">UnknownElement</code>.
</li>
- <li>When the target is executed, each <code>UnknownElement</code> is invoked using
- an <code>perform()</code> method. This instantiates the task. This means that tasks only gets
- instantiated at run time.
+ <li>When the target is executed, each <code class="code">UnknownElement</code> is invoked using
+ an <code class="code">perform()</code> method. This instantiates the task. This means that tasks
+ only gets instantiated at run time.
</li>
<li>The task gets references to its project and location inside the buildfile via its
@@ -86,29 +87,29 @@ one doesn't really matter to Ant, using all lower case is a good convention, tho
<li>The task gets a reference to the target it belongs to via its inherited <code>target</code>
variable.</li>
- <li><code>init()</code> is called at run time.</li>
+ <li><code class="code">init()</code> is called at run time.</li>
<li>All child elements of the XML element corresponding to this task are created via this
- task's <code>createXXX()</code> methods or instantiated and added to this task via
- its <code>addXXX()</code> methods, at run time. Child elements corresponding
- to <code>addConfiguredXXX()</code> are created at this point but the
- actual <code>addConfigured</code> method is not called.</li>
+ task's <code class="code">createXXX()</code> methods or instantiated and added to this task via
+ its <code class="code">addXXX()</code> methods, at run time. Child elements corresponding
+ to <code class="code">addConfiguredXXX()</code> are created at this point but the
+ actual <em>addConfigured</em> method is not called.</li>
- <li>All attributes of this task get set via their corresponding <code>setXXX</code> methods, at
- runtime.</li>
+ <li>All attributes of this task get set via their corresponding <code class="code">setXXX()</code>
+ methods, at runtime.</li>
<li>The content character data sections inside the XML element corresponding to this task is added
- to the task via its <code>addText</code> method, at runtime.</li>
+ to the task via its <code class="code">addText()</code> method, at runtime.</li>
- <li>All attributes of all child elements get set via their corresponding <code>setXXX</code>
- methods, at runtime.</li>
+ <li>All attributes of all child elements get set via their
+ corresponding <code class="code">setXXX()</code> methods, at runtime.</li>
<li>If child elements of the XML element corresponding to this task have been created
- for <code>addConfiguredXXX()</code> methods, those methods get invoked now.</li>
+ for <code class="code">addConfiguredXXX()</code> methods, those methods get invoked now.</li>
- <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</q> twice.</li>
+ <li id="execute"><code class="code">execute()</code> is called at runtime. If <q>target1</q>
+ and <q>target2</q> both depend on <q>target3</q>, then running <kbd>ant target1 target2</kbd>
+ will run all tasks in <q>target3</q> twice.</li>
</ol>
<h3 id="set-magic">Conversions Ant will perform for attributes</h3>
@@ -120,93 +121,98 @@ string containing a single property reference. These will be assigned directly v
matching type. Since it requires some beyond-the-basics intervention to enable this behavior, it may
be a good idea to flag attributes intended to permit this usage paradigm.</p>
-<p>The most common way to write an attribute setter is to use a <code>java.lang.String</code>
-argument. In this case Ant will pass the literal value (after property expansion) to your task.
-But there is more! If the argument of you setter method is</p>
+<p>The most common way to write an attribute setter is to use
+a <code class="code">java.lang.String</code> argument. In this case Ant will pass the literal value
+(after property expansion) to your task. But there is more! If the argument of you setter method
+is</p>
<ul>
- <li><code>boolean</code>, your method will be passed the value <code>true</code> if the value
- specified in the build file is one of <code>true</code>, <code>yes</code>, or <code>on</code>
- and <code>false</code> otherwise.</li>
+ <li><code>boolean</code>, your method will be passed the value <q>true</q> if the value specified
+ in the build file is one of <q>true</q>, <q>yes</q>, or <q>on</q> and <q>false</q>
+ otherwise.</li>
- <li><code>char</code> or <code>java.lang.Character</code>, your method will be passed the first
- character of the value specified in the build file.</li>
+ <li><code>char</code> or <code class="code">java.lang.Character</code>, your method will be passed
+ the first character of the value specified in the build file.</li>
- <li>any other primitive type (<code>int</code>, <code>short</code> and so on), Ant will convert
- the value of the attribute into this type, thus making sure that you'll never receive input that
- is not a number for that attribute.</li>
+ <li>any other primitive type (<code class="code">int</code>, <code class="code">short</code> and
+ so on), Ant will convert the value of the attribute into this type, thus making sure that you'll
+ never receive input that is not a number for that attribute.</li>
- <li><code>java.io.File</code>, Ant will first determine whether the value given in the build file
- represents an absolute path name. If not, Ant will interpret the value as a path name relative
- to the project's basedir.</li>
+ <li><code class="code">java.io.File</code>, Ant will first determine whether the value given in
+ the build file represents an absolute path name. If not, Ant will interpret the value as a path
+ name relative to the project's <var>basedir</var>.</li>
- <li><code>org.apache.tools.ant.types.Resource</code>, Ant will resolve the string as
- a <code>java.io.File</code> as above, then pass in as
- a <code>org.apache.tools.ant.types.resources.FileResource</code>. <em>Since Ant 1.8</em></li>
+ <li><code class="code">org.apache.tools.ant.types.Resource</code>, Ant will resolve the string as
+ a <code class="code">java.io.File</code> as above, then pass in as
+ a <code class="code">org.apache.tools.ant.types.resources.FileResource</code>. <em>Since Ant
+ 1.8</em></li>
- <li><code>org.apache.tools.ant.types.Path</code>, Ant will tokenize the value specified in the
- build file, accepting <q>:</q> and <q>;</q> as path separators. Relative path names will be
- interpreted as relative to the project's <var>basedir</var>.</li>
+ <li><code class="code">org.apache.tools.ant.types.Path</code>, Ant will tokenize the value
+ specified in the build file, accepting <q>:</q> and <q>;</q> as path separators. Relative path
+ names will be interpreted as relative to the project's <var>basedir</var>.</li>
- <li><code>java.lang.Class</code>, Ant will interpret the value given in the build file as a Java
- class name and load the named class from the system class loader.</li>
+ <li><code class="code">java.lang.Class</code>, Ant will interpret the value given in the build
+ file as a Java class name and load the named class from the system class loader.</li>
- <li>any other type that has a constructor with a single <code>String</code> argument, Ant will use
- this constructor to create a new instance from the value given in the build file.</li>
+ <li>any other type that has a constructor with a single <code class="code">String</code> argument,
+ Ant will use this constructor to create a new instance from the value given in the build
+ file.</li>
- <li>A subclass of <code>org.apache.tools.ant.types.EnumeratedAttribute</code>, Ant will invoke
- this classes <code>setValue</code> method. Use this if your task should support enumerated
- attributes (attributes with values that must be part of a predefined set of values).
- See <code>org/apache/tools/ant/taskdefs/FixCRLF.java</code> and the
- inner <code>AddAsisRemove</code> class used in <code>setCr</code> for an example.</li>
+ <li>A subclass of <code class="code">org.apache.tools.ant.types.EnumeratedAttribute</code>, Ant
+ will invoke this class's <code class="code">setValue</code> method. Use this if your task
+ should support enumerated attributes (attributes with values that must be part of a predefined
+ set of values). See <code>org/apache/tools/ant/taskdefs/FixCRLF.java</code> and the
+ inner <code class="code">AddAsisRemove</code> class used in <code class="code">setCr</code> for
+ an example.</li>
<li>A (Java 5) enumeration, Ant will call the setter with the enum constant matching the value
- given in the build file. This is easier than using <code>EnumeratedAttribute</code> and can
- result in cleaner code, but of course your task will not run on JDK 1.4 or earlier. Note that
- any override of <code>toString()</code> in the enumeration is ignored; the build file must use
- the declared name (see <code>Enum.getName()</code>). You may wish to use lowercase enum constant
- names, in contrast to usual Java style, to look better in build files. <em>Since Ant
- 1.7.0</em></li>
+ given in the build file. This is easier than using <code class="code">EnumeratedAttribute</code>
+ and can result in cleaner code, but of course your task will not run on JDK 1.4 or earlier. Note
+ that any override of <code class="code">toString()</code> in the enumeration is ignored; the
+ build file must use the declared name (see <code>Enum.getName()</code>). You may wish to use
+ lowercase enum constant names, in contrast to usual Java style, to look better in build
+ files. <em>Since Ant 1.7.0</em></li>
</ul>
<p>What happens if more than one setter method is present for a given attribute? A method taking
-a <code>String</code> argument will always lose against the more specific methods. If there are
-still more setters Ant could chose from, only one of them will be called, but we don't know which,
-this depends on the implementation of your Java virtual machine.</p>
+a <code class="code">String</code> argument will always lose against the more specific methods. If
+there are still more setters Ant could chose from, only one of them will be called, but we don't
+know which, this depends on the implementation of your Java virtual machine.</p>
<h3 id="nested-elements">Supporting nested elements</h3>
<p>Let's assume your task shall support nested elements with the name <code>inner</code>. First of
all, you need a class that represents this nested element. Often you simply want to use one of
-Ant's classes like <code>org.apache.tools.ant.types.FileSet</code> to support
+Ant's classes like <code class="code">org.apache.tools.ant.types.FileSet</code> to support
nested <code>fileset</code> elements.</p>
<p>Attributes of the nested elements or nested child elements of them will be handled using the same
-mechanism used for tasks (i.e. setter methods for attributes, addText for nested text and
-create/add/addConfigured methods for child elements).</p>
+mechanism used for tasks (i.e. <em>setter</em> methods for
+attributes, <code class="code">addText()</code> for nested text
+and <em>create</em>/<em>add</em>/<em>addConfigured</em> methods for child elements).</p>
-<p>Now you have a class <code>NestedElement</code> that is supposed to be used for your
+<p>Now you have a class <code class="code">NestedElement</code> that is supposed to be used for your
nested <code><inner></code> elements, you have three options:</p>
<ol>
- <li><code>public NestedElement createInner()</code></li>
- <li><code>public void addInner(NestedElement anInner)</code></li>
- <li><code>public void addConfiguredInner(NestedElement anInner)</code></li>
+ <li><code class="code">public NestedElement createInner()</code></li>
+ <li><code class="code">public void addInner(NestedElement anInner)</code></li>
+ <li><code class="code">public void addConfiguredInner(NestedElement anInner)</code></li>
</ol>
<p>What is the difference?</p>
-<p>Option 1 makes the task create the instance of <code>NestedElement</code>, there are no
-restrictions on the type. For the options 2 and 3, Ant has to create an instance
-of <code>NestedInner</code> before it can pass it to the task, this means, <code>NestedInner</code>
-must have a <code>public</code> no-arg constructor or a <code>public</code> one-arg constructor
-taking a <code>Project</code> class as a parameter. This is the only difference between options 1
-and 2.</p>
+<p>Option 1 makes the task create the instance of <code class="code">NestedElement</code>, there are
+no restrictions on the type. For the options 2 and 3, Ant has to create an instance
+of <code class="code">NestedInner</code> before it can pass it to the task, this
+means, <code class="code">NestedInner</code> must have a <code>public</code> no-arg constructor or
+a <code>public</code> one-arg constructor taking a <code class="code">Project</code> class as a
+parameter. This is the only difference between options 1 and 2.</p>
<p>The difference between 2 and 3 is what Ant has done to the object before it passes it to the
-method. <code>addInner</code> will receive an object directly after the constructor has been
-called, while <code>addConfiguredInner</code> gets the object <em>after</em> the attributes and
-nested children for this new object have been handled.</p>
+method. <code class="code">addInner()</code> will receive an object directly after the constructor
+has been called, while <code class="code">addConfiguredInner()</code> gets the object <em>after</em>
+the attributes and nested children for this new object have been handled.</p>
<p>What happens if you use more than one of the options? Only one of the methods will be called,
but we don't know which, this depends on the implementation of your JVM.</p>
@@ -215,12 +221,13 @@ but we don't know which, this depends on the implementation of your JVM.</p>
<p>If your task needs to nest an arbitrary type that has been defined
using <code><typedef></code> you have two options.</p>
<ol>
- <li><code>public void add(Type type)</code></li>
- <li><code>public void addConfigured(Type type)</code></li>
+ <li><code class="code">public void add(Type type)</code></li>
+ <li><code class="code">public void addConfigured(Type type)</code></li>
</ol>
<p>The difference between 1 and 2 is the same as between 2 and 3 in the previous section.</p>
<p>For example suppose one wanted to handle objects object of
-type <code>org.apache.tools.ant.taskdefs.condition.Condition</code>, one may have a class:</p>
+type <code class="code">org.apache.tools.ant.taskdefs.condition.Condition</code>, one may have a
+class:</p>
<pre>
public class MyTask extends Task {
private List conditions = new ArrayList();
@@ -270,8 +277,8 @@ public class Sample {
}
}</pre>
<p>This class defines a number of static classes that
-implement/extend <code>Path</code>, <code>MyFileSelector</code> and <code>MyInterface</code>. These
-may be defined and used as follows:</p>
+implement/extend <code class="code">Path</code>, <code class="code">MyFileSelector</code>
+and <code class="code">MyInterface</code>. These may be defined and used as follows:</p>
<pre>
<typedef name="myfileselector" classname="Sample$MyFileSelector"
classpath="classes" loaderref="classes"/>
@@ -292,17 +299,19 @@ may be defined and used as follows:</p>
<h3 id="taskcontainer">TaskContainer</h3>
-<p>The <code>TaskContainer</code> consists of a single method, <code>addTask</code> that basically
-is the same as an <a href="#nested-elements">add method</a> for nested elements. The task instances
-will be configured (their attributes and nested elements have been handled) when your
-task's <code>execute</code> method gets invoked, but not before that.</p>
+<p>The <code class="code">TaskContainer</code> consists of a single
+method, <code class="code">addTask</code> that basically is the same as
+an <a href="#nested-elements">add method</a> for nested elements. The task instances will be
+configured (their attributes and nested elements have been handled) when your
+task's <code class="code">execute</code> method gets invoked, but not before that.</p>
-<p>When we <a href="#execute">said</a> <code>execute</code> would be called, we lied ;-). In fact,
-Ant will call the <code>perform</code> method in <code>org.apache.tools.ant.Task</code>, which in
-turn calls <code>execute</code>. This method makes sure that <a href="#buildevents">Build
+<p>When we <a href="#execute">said</a> <code class="code">execute</code> would be called, we lied
+;-). In fact, Ant will call the <code class="code">perform</code> method
+in <code class="code">org.apache.tools.ant.Task</code>, which in turn
+calls <code class="code">execute</code>. This method makes sure that <a href="#buildevents">Build
Events</a> will be triggered. If you execute the task instances nested into your task, you should
-also invoke <code>perform</code> on these instances instead of
-<code>execute</code>.</p>
+also invoke <code class="code">perform</code> on these instances instead
+of <code class="code">execute</code>.</p>
<h3>Example</h3>
<p>Let's write our own task, which prints a message on the <code>System.out</code> stream. The task
@@ -378,17 +387,19 @@ just been compiled.</p>
</project></pre>
<p>Another way to add a task (more permanently) is to add the task name and implementing class name
-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>
+to the <samp>default.properties</samp> file in
+the <code class="code">org.apache.tools.ant.taskdefs</code> package. Then you can use it as if it
+were a built-in task.</p>
<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
example, to connect Ant to a GUI or to integrate Ant with an IDE.</p>
-<p>To use build events you need to create an ant <code>Project</code> object. You can then call
-the <code>addBuildListener</code> method to add your listener to the project. Your listener must
-implement the <code>org.apache.tools.antBuildListener</code> interface. The listener will receive
+<p>To use build events you need to create an ant <code class="code">Project</code> object. You can
+then call the <code class="code">addBuildListener</code> method to add your listener to the
+project. Your listener must implement
+the <code class="code">org.apache.tools.antBuildListener</code> interface. The listener will receive
BuildEvents for the following events</p>
<ul>
<li>Build started</li>
@@ -405,40 +416,43 @@ via <a href="Tasks/ant.html"><code><ant></code></a>
or <a href="Tasks/subant.html"><code><subant></code></a> or
uses <a href="Tasks/antcall.html"><code><antcall></code></a>, you are creating a new Ant
"project" that will send target and task level events of its own but never sends build
-started/finished events. <em>Since Ant 1.6.2</em>, BuildListener interface has an extension named
-SubBuildListener that will receive two new events for</p>
+started/finished events. <em>Since Ant 1.6.2</em>, <code class="code">BuildListener</code> interface
+has an extension named <code class="code">SubBuildListener</code> that will receive two new events
+for</p>
<ul>
<li>SubBuild started</li>
<li>SubBuild finished</li>
</ul>
<p>If you are interested in those events, all you need to do is to implement the new interface
-instead of BuildListener (and register the listener, of course).</p>
+instead of <code class="code">BuildListener</code> (and register the listener, of course).</p>
-<p>If you wish to attach a listener from the command line you may use the <code>-listener</code>
+<p>If you wish to attach a listener from the command line you may use the <kbd>-listener</kbd>
option. For example:</p>
-<pre>ant -listener org.apache.tools.ant.XmlLogger</pre>
+<pre class="input">ant -listener org.apache.tools.ant.XmlLogger</pre>
<p>will run Ant with a listener that generates an XML representation of the build progress. This
listener is included with Ant, as is the default listener, which generates the logging to standard
output.</p>
-<p><strong>Note</strong>: A listener must not access <code>System.out</code>
-and <code>System.err</code> directly since output on these streams is redirected by Ant's core to
-the build event system. Accessing these streams can cause an infinite loop in Ant. Depending on the
-version of Ant, this will either cause the build to terminate or the JVM to run out of Stack
-space. A logger, also, may not access <code>System.out</code> and <code>System.err</code>
-directly. It must use the streams with which it has been configured.</p>
+<p><strong>Note</strong>: A listener must not access <code class="code">System.out</code>
+and <code class="code">System.err</code> directly since output on these streams is redirected by
+Ant's core to the build event system. Accessing these streams can cause an infinite loop in
+Ant. Depending on the version of Ant, this will either cause the build to terminate or the JVM to
+run out of Stack space. A logger, also, may not access <code class="code">System.out</code>
+and <code class="code">System.err</code> directly. It must use the streams with which it has been
+configured.</p>
-<p><strong>Note</strong>: All methods of a BuildListener except for the "Build Started" and "Build
-Finished" events may occur on several threads simultaneously—for example while Ant is
-executing a <code><parallel></code> task.</p>
+<p><strong>Note</strong>: All methods of a <code class="code">BuildListener</code> except for the
+"Build Started" and "Build Finished" events may occur on several threads simultaneously—for
+example while Ant is executing a <code><parallel></code> task.</p>
<h3>Example</h3>
-<p>Writing an adapter to your favourite log library is very easy. Just implement the BuildListener
-interface, instantiate your logger and delegate the message to that instance.</p>
+<p>Writing an adapter to your favourite log library is very easy. Just implement
+the <code class="code">BuildListener</code> interface, instantiate your logger and delegate the
+message to that instance.</p>
<p>When starting your build provide your adapter class and the log library to the build classpath
-and activate your logger via <code>-listener</code> option as described above.</p>
+and activate your logger via <kbd>-listener</kbd> option as described above.</p>
<pre>
public class MyLogAdapter implements BuildListener {
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/feedback.html
----------------------------------------------------------------------
diff --git a/manual/feedback.html b/manual/feedback.html
index 2ac985e..2c958a2 100644
--- a/manual/feedback.html
+++ b/manual/feedback.html
@@ -25,7 +25,7 @@
<body>
<h1 id="feedback">Feedback and Troubleshooting</h1>
-<p>If things do not work, especially simple things like <code>ant -version</code>, then something is
+<p>If things do not work, especially simple things like <kbd>ant -version</kbd>, then something is
wrong with your configuration. Before filing bug reports and emailing all the Apache Ant mailing
lists</p>
<ol>
@@ -42,7 +42,7 @@
being picked up by accident.</li>
<li>If a task failing to run is from <samp>optional.jar</samp> in <samp>ANT_HOME/lib</samp>? Are
there any libraries which it depends on missing?</li>
- <li>If a task doesn't do what you expect, run <code>ant -verbose</code> or <code>ant -debug</code>
+ <li>If a task doesn't do what you expect, run <kbd>ant -verbose</kbd> or <kbd>ant -debug</kbd>
to see what is happening</li>
</ol>
<p>If you can't fix your problem, start with the <a href="https://ant.apache.org/mail.html"
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/inputhandler.html
----------------------------------------------------------------------
diff --git a/manual/inputhandler.html b/manual/inputhandler.html
index 6b366e0..1c48d5d 100644
--- a/manual/inputhandler.html
+++ b/manual/inputhandler.html
@@ -26,89 +26,77 @@
<h2>Overview</h2>
-<p>When a task wants to prompt a user for input, it doesn't simply
-read the input from the console as this would make it impossible to
-embed Apache Ant in an IDE. Instead it asks an implementation of the
-<code>org.apache.tools.ant.input.InputHandler</code> interface to
-prompt the user and hand the user input back to the task.</p>
-
-<p>To do this, the task creates an <code>InputRequest</code> object
-and passes it to the <code>InputHandler</code>. Such an
-<code>InputRequest</code> may know whether a given user input is valid
-and the <code>InputHandler</code> is supposed to reject all invalid
-input.</p>
-
-<p>Exactly one <code>InputHandler</code> instance is associated with
-every Ant process, users can specify the implementation using the
-<code>-inputhandler</code> command line switch.</p>
+<p>When a task wants to prompt a user for input, it doesn't simply read the input from the console
+as this would make it impossible to embed Apache Ant in an IDE. Instead it asks an implementation
+of the <code class="code">org.apache.tools.ant.input.InputHandler</code> interface to prompt the
+user and hand the user input back to the task.</p>
+
+<p>To do this, the task creates an <code class="code">InputRequest</code> object and passes it to
+the <code class="code">InputHandler</code>. Such an <code class="code">InputRequest</code> may know
+whether a given user input is valid and the <code class="code">InputHandler</code> is supposed to
+reject all invalid input.</p>
+
+<p>Exactly one <code class="code">InputHandler</code> instance is associated with every Ant process,
+users can specify the implementation using the <kbd>-inputhandler</kbd> command line switch.</p>
<h2>InputHandler</h2>
-<p>The <code>InputHandler</code> interface contains exactly one
-method</p>
+<p>The <code class="code">InputHandler</code> interface contains exactly one method</p>
<pre>
void handleInput(InputRequest request)
- throws org.apache.tools.ant.BuildException;</pre>
+ throws org.apache.tools.ant.BuildException;</pre>
-<p>with some pre- and postconditions. The main postcondition is that
-this method must not return unless the <code>request</code> considers
-the user input valid; it is allowed to throw an exception in this
-situation.</p>
+<p>with some pre- and postconditions. The main postcondition is that this method must not return
+unless the <code>request</code> considers the user input valid; it is allowed to throw an exception
+in this situation.</p>
<p>Ant comes with three built-in implementations of this interface:</p>
<h3 id="defaulthandler">DefaultInputHandler</h3>
-<p>This is the implementation you get, when you don't use
-the <code>-inputhandler</code> command line switch at all. This
-implementation will print the prompt encapsulated in
-the <code>request</code> object to Ant's logging system and
-re-prompt for input until the user enters something that is considered
-valid input by the <code>request</code> object. Input will be read
-from the console and the user will need to press the Return key.</p>
+<p>This is the implementation you get, when you don't use the <kbd>-inputhandler</kbd> command line
+switch at all. This implementation will print the prompt encapsulated in the <code>request</code>
+object to Ant's logging system and re-prompt for input until the user enters something that is
+considered valid input by the <code>request</code> object. Input will be read from the console and
+the user will need to press the Return key.</p>
<h3>PropertyFileInputHandler</h3>
-<p>This implementation is useful if you want to run unattended build
-processes. It reads all input from a properties file and makes the
-build fail if it cannot find valid input in this file. The name of
-the properties file must be specified in the Java system
+<p>This implementation is useful if you want to run unattended build processes. It reads all input
+from a properties file and makes the build fail if it cannot find valid input in this file. The
+name of the properties file must be specified in the Java system
property <code>ant.input.properties</code>.</p>
-<p>The prompt encapsulated in a <code>request</code> will be used as
-the key when looking up the input inside the properties file. If no
-input can be found, the input is considered invalid and an exception
-will be thrown.</p>
+<p>The prompt encapsulated in a <code>request</code> will be used as the key when looking up the
+input inside the properties file. If no input can be found, the input is considered invalid and an
+exception will be thrown.</p>
-<p><strong>Note</strong> that <code>ant.input.properties</code> must
-be a Java system property, not an Ant property. I.e. you cannot
-define it as a simple parameter to <code>ant</code>, but you can
+<p><strong>Note</strong> that <code>ant.input.properties</code> must be a Java system property, not
+an Ant property. I.e. you cannot define it as a simple parameter to <kbd>ant</kbd>, but you can
define it inside the <code>ANT_OPTS</code> environment variable.</p>
<h3>GreedyInputHandler</h3>
<p><em>Since Ant 1.7</em></p>
-<p>Like the default implementation, this InputHandler reads from standard
-input. However, it consumes <em>all</em> available input. This behavior is
-useful for sending Ant input via an OS pipe.</p>
+<p>Like the default implementation, this InputHandler reads from standard input. However, it
+consumes <em>all</em> available input. This behavior is useful for sending Ant input via an OS
+pipe.</p>
<h3>SecureInputHandler</h3>
<p><em>Since Ant 1.7.1</em></p>
-<p>This InputHandler calls <code>System.console().readPassword()</code>,
-available since Java 6. On earlier platforms it falls back to the
-behavior of DefaultInputHandler.</p>
+<p>This InputHandler calls <code class="code">System.console().readPassword()</code>, available
+since Java 6. On earlier platforms it falls back to the behavior
+of <code class="code">DefaultInputHandler</code>.</p>
<h2>InputRequest</h2>
-<p>Instances of <code>org.apache.tools.ant.input.InputRequest</code>
-encapsulate the information necessary to ask a user for input and
-validate this input.</p>
+<p>Instances of <code class="code">org.apache.tools.ant.input.InputRequest</code> encapsulate the
+information necessary to ask a user for input and validate this input.</p>
-<p>The instances of <code>InputRequest</code> itself will accept any
-input, but subclasses may use stricter
-validations. <code>org.apache.tools.ant.input.MultipleChoiceInputRequest</code>
-should be used if the user input must be part of a predefined set of
-choices.</p>
+<p>The instances of <code class="code">InputRequest</code> itself will accept any input, but
+subclasses may use stricter
+validations. <code class="code">org.apache.tools.ant.input.MultipleChoiceInputRequest</code> should
+be used if the user input must be part of a predefined set of choices.</p>
</body>
</html>
[6/6] ant git commit: , highlighting of input,
output and inlined code
Posted by gi...@apache.org.
<kbd>, highlighting of input, output and inlined code
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/14dfef58
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/14dfef58
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/14dfef58
Branch: refs/heads/master
Commit: 14dfef587dbe4e7e3b22d018191dabfe710fec33
Parents: 5c9cb3d
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sat Mar 10 20:17:33 2018 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sat Mar 10 20:17:33 2018 +0100
----------------------------------------------------------------------
manual/Tasks/BorlandEJBTasks.html | 4 +-
manual/Tasks/ant.html | 2 +-
manual/Tasks/antlr.html | 2 +-
manual/Tasks/antstructure.html | 2 +-
manual/Tasks/apply.html | 18 +-
manual/Tasks/attrib.html | 2 +-
manual/Tasks/available.html | 4 +-
manual/Tasks/cab.html | 2 +-
manual/Tasks/ccm.html | 20 +-
manual/Tasks/changelog.html | 12 +-
manual/Tasks/checksum.html | 2 +-
manual/Tasks/chgrp.html | 8 +-
manual/Tasks/chmod.html | 8 +-
manual/Tasks/chown.html | 12 +-
manual/Tasks/clearcase.html | 33 +--
manual/Tasks/conditions.html | 5 +-
manual/Tasks/copy.html | 4 +-
manual/Tasks/cvs.html | 28 +--
manual/Tasks/cvspass.html | 2 +-
manual/Tasks/cvstagdiff.html | 16 +-
manual/Tasks/delete.html | 4 +-
manual/Tasks/depend.html | 2 +-
manual/Tasks/diagnostics.html | 2 +-
manual/Tasks/echo.html | 10 +-
manual/Tasks/echoproperties.html | 8 +-
manual/Tasks/ejb.html | 85 ++++---
manual/Tasks/exec.html | 42 ++--
manual/Tasks/fail.html | 8 +-
manual/Tasks/ftp.html | 29 ++-
manual/Tasks/get.html | 2 +-
manual/Tasks/import.html | 4 +-
manual/Tasks/include.html | 4 +-
manual/Tasks/jarlib-resolve.html | 6 +-
manual/Tasks/java.html | 4 +-
manual/Tasks/javac.html | 85 ++++---
manual/Tasks/javadoc.html | 81 +++----
manual/Tasks/javah.html | 24 +-
manual/Tasks/jdepend.html | 4 +-
manual/Tasks/jjtree.html | 12 +-
manual/Tasks/junit.html | 67 +++---
manual/Tasks/loadfile.html | 2 +-
manual/Tasks/loadresource.html | 2 +-
manual/Tasks/local.html | 4 +-
manual/Tasks/macrodef.html | 28 ++-
manual/Tasks/makeurl.html | 8 +-
manual/Tasks/manifestclasspath.html | 8 +-
manual/Tasks/move.html | 2 +-
manual/Tasks/native2ascii.html | 17 +-
manual/Tasks/netrexxc.html | 7 +-
manual/Tasks/parallel.html | 10 +-
manual/Tasks/patch.html | 2 +-
manual/Tasks/pathconvert.html | 4 +-
manual/Tasks/presetdef.html | 18 +-
manual/Tasks/projecthelper.html | 7 +-
manual/Tasks/property.html | 20 +-
manual/Tasks/propertyhelper.html | 32 +--
manual/Tasks/pvcstask.html | 10 +-
manual/Tasks/recorder.html | Bin 5527 -> 5524 bytes
manual/Tasks/replaceregexp.html | 4 +-
manual/Tasks/retry.html | 4 +-
manual/Tasks/rmic.html | 32 +--
manual/Tasks/rpm.html | 14 +-
manual/Tasks/schemavalidate.html | 2 +-
manual/Tasks/scp.html | 6 +-
manual/Tasks/script.html | 23 +-
manual/Tasks/scriptdef.html | 33 +--
manual/Tasks/signjar.html | 10 +-
manual/Tasks/sos.html | 16 +-
manual/Tasks/sound.html | 2 +-
manual/Tasks/sql.html | 2 +-
manual/Tasks/sshexec.html | 8 +-
manual/Tasks/sshsession.html | 4 +-
manual/Tasks/style.html | 6 +-
manual/Tasks/subant.html | 4 +-
manual/Tasks/symlink.html | 4 +-
manual/Tasks/tar.html | 35 +--
manual/Tasks/telnet.html | 6 +-
manual/Tasks/tempfile.html | 4 +-
manual/Tasks/touch.html | 15 +-
manual/Tasks/translate.html | 2 +-
manual/Tasks/truncate.html | 4 +-
manual/Tasks/typedef.html | 13 +-
manual/Tasks/verifyjar.html | 12 +-
manual/Tasks/vss.html | 50 ++--
manual/Tasks/xmlvalidate.html | 6 +-
manual/Tasks/zip.html | 42 ++--
manual/Types/antlib.html | 8 +-
manual/Types/classfileset.html | 15 +-
manual/Types/custom-programming.html | 147 +++++-------
manual/Types/description.html | 2 +-
manual/Types/fileset.html | 2 +-
manual/Types/filterchain.html | 55 ++---
manual/Types/mapper.html | 52 ++--
manual/Types/namespace.html | 22 +-
manual/Types/permissions.html | 6 +-
manual/Types/regexp.html | 8 +-
manual/Types/resources.html | 10 +-
manual/Types/selectors-program.html | 153 ++++++------
manual/Types/selectors.html | 46 ++--
manual/Types/xmlcatalog.html | 40 ++--
manual/argumentprocessor.html | 46 ++--
manual/cover.html | 2 +-
manual/develop.html | 252 +++++++++++---------
manual/feedback.html | 4 +-
manual/inputhandler.html | 96 ++++----
manual/install.html | 64 ++---
manual/javacprops.html | 2 +-
manual/listeners.html | 88 +++----
manual/platform.html | 8 +-
manual/projecthelper.html | 136 +++++------
manual/properties.html | 68 +++---
manual/proxy.html | 10 +-
manual/running.html | 126 +++++-----
manual/stylesheets/style.css | 21 +-
manual/targets.html | 6 +-
manual/tasksoverview.html | 49 ++--
manual/tutorial-HelloWorldWithAnt.html | 64 ++---
manual/tutorial-tasks-filesets-properties.html | 148 ++++++------
manual/tutorial-writing-tasks.html | 145 +++++------
manual/using.html | 6 +-
120 files changed, 1574 insertions(+), 1546 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/BorlandEJBTasks.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/BorlandEJBTasks.html b/manual/Tasks/BorlandEJBTasks.html
index 4bf5976..7b1c2a3 100644
--- a/manual/Tasks/BorlandEJBTasks.html
+++ b/manual/Tasks/BorlandEJBTasks.html
@@ -107,8 +107,8 @@ target="_top">FAQ</a> for this task at his homepage.</p>
</tr>
<tr>
<td>java2iiopParams</td>
- <td>If filled, the params are added to the <code>java2iiop</code> command
- (ex: <code>-no_warn_missing_define</code>)</td>
+ <td>If filled, the params are added to the <kbd>java2iiop</kbd> command
+ (ex: <kbd>-no_warn_missing_define</kbd>)</td>
<td>No</td>
</tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/ant.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/ant.html b/manual/Tasks/ant.html
index 7830226..f417efd 100644
--- a/manual/Tasks/ant.html
+++ b/manual/Tasks/ant.html
@@ -281,7 +281,7 @@ omitted an even more complex situation arises:</p>
the above table recursively.</p>
<p>If the <var>basedir</var> of the outermost build has been specified as a property on the command
-line (i.e. <code>-Dbasedir=some-value</code> or a <code>-propertyfile</code> argument) the value
+line (i.e. <kbd>-Dbasedir=some-value</kbd> or a <kbd>-propertyfile</kbd> argument) the value
provided will get an even higher priority. For any <code><ant></code> task that doesn't
specify a <var>dir</var> attribute, the new project's <var>basedir</var> will be the value specified
on the command line—no matter how deeply nested into layers of build files the task may
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/antlr.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/antlr.html b/manual/Tasks/antlr.html
index b7783e5..996809b 100644
--- a/manual/Tasks/antlr.html
+++ b/manual/Tasks/antlr.html
@@ -38,7 +38,7 @@ the <var>glib</var> attribute) is newer than the generated files.</p>
distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a> for more
information.</p>
<p>Antlr 2.7.2 Note: <em>You will need <samp>antlrall.jar</samp> that can be created by
-the <code>antlr-all.jar</code> target of the Makefile provided with the download.</em></p>
+the <q>antlr-all.jar</q> target of the Makefile provided with the download.</em></p>
<h3>Parameters</h3>
<table class="attr">
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/antstructure.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/antstructure.html b/manual/Tasks/antstructure.html
index b903244..4b2988b 100644
--- a/manual/Tasks/antstructure.html
+++ b/manual/Tasks/antstructure.html
@@ -46,7 +46,7 @@ as <code>#IMPLIED</code>.</p>
<p><em>Since Ant 1.7</em> custom structure printers can be used instead of the one that emits a DTD.
In order to plug in your own structure, you have to implement the
-interface <code>org.apache.tools.ant.taskdefs.AntStructure.StructurePrinter</code>
+interface <code class="code">org.apache.tools.ant.taskdefs.AntStructure.StructurePrinter</code>
and <code><typedef></code> your class and use the new type as a nested element of this
task—see the example below.
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/apply.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/apply.html b/manual/Tasks/apply.html
index 24d03aa..d508c87 100644
--- a/manual/Tasks/apply.html
+++ b/manual/Tasks/apply.html
@@ -47,7 +47,7 @@ the <var>input</var> and <var>inputstring</var> attributes.</p>
<h4 id="background">Running Ant as a background process on Unix(-like) systems</h4>
-<p>If you run Ant as a background process (like <code>ant &</code>) and use
+<p>If you run Ant as a background process (like <kbd>ant &</kbd>) and use
the <code><apply></code> task with <var>spawn</var> set to <q>false</q>, you must provide
explicit input to the forked process or Ant will be suspended because it tries to read from the
standard input.</p>
@@ -214,7 +214,7 @@ standard input.</p>
<tr>
<td>vmlauncher</td>
<td>Run command using the JVM's execution facilities where available. If set to <q>false</q> the
- underlying OS's shell, either directly or through the <code>antRun</code> scripts, will be
+ underlying OS's shell, either directly or through the <kbd>antRun</kbd> scripts, will be
used. Under some operating systems, this gives access to facilities not normally available
through JVM including, under Windows, being able to execute scripts, rather than their
associated interpreter. If you want to specify the name of the executable as a relative path
@@ -360,9 +360,9 @@ of <code>exec</code>.</p>
</fileset>
<fileset refid="other.files"/>
</apply></pre>
-<p>invokes <code>ls -l</code>, 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>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>
<pre>
<apply executable="somecommand" parallel="false">
<arg value="arg1"/>
@@ -384,7 +384,7 @@ 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 <code>cc -c -o TARGETFILE SOURCEFILE</code> for each <samp>.c</samp> file that is newer
+<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>
@@ -400,7 +400,7 @@ file.</p>
<outputmapper refid="out"/>
</redirector>
</apply></pre>
-<p>Applies the fictitious <code>processfile</code> executable to all files
+<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
@@ -416,7 +416,7 @@ dependency checking against output files—the target files in this case.</p
</path>
<identitymapper/>
</apply></pre>
-<p>Applies the <code>ls</code> executable to all directories in the <code>PATH</code>, effectively
+<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>
<pre>
@@ -431,7 +431,7 @@ 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 <code>jsmin < src/a.js > dest/a.js</code> but for all files in
+<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>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/attrib.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/attrib.html b/manual/Tasks/attrib.html
index 1051644..07e5989 100644
--- a/manual/Tasks/attrib.html
+++ b/manual/Tasks/attrib.html
@@ -104,7 +104,7 @@ alternative.</p>
<!--tr>
<td>parallel</td>
<td>process all specified files using a single
- <code>chmod</code> command.</td>
+ <kbd>chmod</kbd> command.</td>
<td>No; defaults to <q>true</q></td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/available.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/available.html b/manual/Tasks/available.html
index 12224c3..d29e6ab 100644
--- a/manual/Tasks/available.html
+++ b/manual/Tasks/available.html
@@ -103,11 +103,11 @@ on system parameters.</p>
</table>
<h3>Parameters specified as nested elements</h3>
<h4>classpath</h4>
-<p><code>Available</code>'s <code>classpath</code> attribute is
+<p><code>Available</code>'s <var>classpath</var> attribute is
a <a href="../using.html#path">path-like structure</a> and can also be set via a nested
<code><classpath></code> element.</p>
<h4>filepath</h4>
-<p><code>Available</code>'s <code>filepath</code> attribute is
+<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>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/cab.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/cab.html b/manual/Tasks/cab.html
index d83487c..84c3b20 100644
--- a/manual/Tasks/cab.html
+++ b/manual/Tasks/cab.html
@@ -28,7 +28,7 @@
<h3>Description</h3>
<p>The cab task creates Microsoft cabinet archive files. It is invoked similar to
the <a href="../Tasks/jar.html">jar</a> or <a href="../Tasks/zip.html">zip</a> tasks. This task
-will work on Windows using the external <code>cabarc</code> tool (provided by Microsoft) which must
+will work on Windows using the external <kbd>cabarc</kbd> tool (provided by Microsoft) which must
be located in your executable path.</p>
<p>To use this task on other platforms you need to download and compile <code>libcabinet</code>
from <a href="https://www.freshports.org/archivers/libcabinet/"
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/ccm.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/ccm.html b/manual/Tasks/ccm.html
index 2b546b1..9541f33 100644
--- a/manual/Tasks/ccm.html
+++ b/manual/Tasks/ccm.html
@@ -34,14 +34,14 @@
</ul>
<p>These Apache Ant tasks are wrappers around Continuus Source Manager. They have been tested
-against versions 5.1/6.2 on Windows 2000, but should work on other platforms with <code>ccm</code>
+against versions 5.1/6.2 on Windows 2000, but should work on other platforms with <kbd>ccm</kbd>
installed.</p>
<hr/>
<h2 id="ccmcheckin">CCMCheckin</h2>
<h3>Description</h3>
-<p>Task to checkin a file</p>
+<p>Check in a file to Continuus</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
@@ -66,7 +66,7 @@ installed.</p>
</tr>
<tr>
<td>ccmdir</td>
- <td>path to the <code>ccm</code> executable file, required if it is not on
+ <td>path to the <kbd>ccm</kbd> executable file, required if it is not on
the <code>PATH</code></td>
<td>No</td>
</tr>
@@ -84,7 +84,7 @@ as a comment. The task used is the one set as the default.</p>
<h2 id="ccmcheckout">CCMCheckout</h2>
<h3>Description</h3>
-<p>Task to perform a checkout command to Continuus</p>
+<p>Run a Continuus checkout command</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
@@ -113,7 +113,7 @@ as a comment. The task used is the one set as the default.</p>
</tr>
<tr>
<td>ccmdir</td>
- <td>path to the <code>ccm</code> executable file, required if it is not on
+ <td>path to the <kbd>ccm</kbd> executable file, required if it is not on
the <code>PATH</code></td>
<td>No</td>
</tr>
@@ -143,7 +143,7 @@ the default.</p>
<h2 id="ccmcheckintask">CCMCheckinTask</h2>
<h3>Description</h3>
-<p>Task to perform a checkin default task command to Continuus</p>
+<p>Run a Continuus command to checkin default task</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
@@ -163,7 +163,7 @@ the default.</p>
</tr>
<tr>
<td>ccmdir</td>
- <td>path to the <code>ccm</code> executable file, required if it is not on
+ <td>path to the <kbd>ccm</kbd> executable file, required if it is not on
the <code>PATH</code></td>
<td>No</td>
</tr>
@@ -178,7 +178,7 @@ the default.</p>
<h2 id="ccmreconfigure">CCMReconfigure</h2>
<h3>Description</h3>
-<p>Task to perform an reconfigure command to Continuus.</p>
+<p>Run a Continuus reconfigure/update command</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
@@ -203,7 +203,7 @@ the default.</p>
</tr>
<tr>
<td>ccmdir</td>
- <td>path to the <code>ccm</code> executable file, required if it is not on
+ <td>path to the <kbd>ccm</kbd> executable file, required if it is not on
the <code>PATH</code></td>
<td>No</td>
</tr>
@@ -240,7 +240,7 @@ the default.</p>
</tr>
<tr>
<td>ccmdir</td>
- <td>path to the <code>ccm</code> executable file, required if it is not on
+ <td>path to the <kbd>ccm</kbd> executable file, required if it is not on
the <code>PATH</code></td>
<td>No</td>
</tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/changelog.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/changelog.html b/manual/Tasks/changelog.html
index 58c17b1..4b018ef 100644
--- a/manual/Tasks/changelog.html
+++ b/manual/Tasks/changelog.html
@@ -28,10 +28,10 @@
<h3>Description</h3>
<p>Generates an XML-formatted report file of the change logs recorded in
a <a href="https://www.nongnu.org/cvs/" target="_top">CVS</a> repository.</p>
-<p><strong>Important</strong>: This task needs <code>cvs</code> on the path. If it isn't, you will
-get an error (such as <code>error=2</code> on Windows). If <code><cvs></code> doesn't work,
-try to execute <code>cvs.exe</code> from the command line in the target directory in which you are
-working. Also note that this task assumes that the cvs executable is compatible with the Unix
+<p><strong>Important</strong>: This task needs <kbd>cvs</kbd> on the path. If it isn't, you will get
+an error (such as <code>error=2</code> on Windows). If <code><cvs></code> doesn't work, try to
+execute <kbd>cvs.exe</kbd> from the command line in the target directory in which you are working.
+Also note that this task assumes that the <kbd>cvs</kbd> executable is compatible with the Unix
version, this is not completely true for certain other CVS clients—like CVSNT for
example—and some operation may fail when using such an incompatible client.</p>
<h3>Parameters</h3>
@@ -87,7 +87,7 @@ example—and some operation may fail when using such an incompatible client
</tr>
<tr>
<td>dir</td>
- <td>The directory from which to run the CVS <em>log</em> command.</td>
+ <td>The directory from which to run the <kbd>cvs log</kbd> command.</td>
<td>No; defaults to <q>${basedir}</q></td>
</tr>
<tr>
@@ -119,7 +119,7 @@ example—and some operation may fail when using such an incompatible client
</tr>
<tr>
<td>remote</td>
- <td>If set to true, works against the repository (using <code>rlog</code>) without a working
+ <td>If set to true, works against the repository (using <kbd>cvs rlog</kbd>) without a working
copy. <em>Since Ant 1.8.0</em></td>
<td>No; default is <q>false</q></td>
</tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/checksum.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/checksum.html b/manual/Tasks/checksum.html
index 627e634..dadeb39 100644
--- a/manual/Tasks/checksum.html
+++ b/manual/Tasks/checksum.html
@@ -33,7 +33,7 @@ broken recently. If you are going to use the task to create checksums used in a
security is important, please take some time to investigate the algorithms offered by your JCE
provider. Note also that some JCE providers like the one by <a href="https://www.bouncycastle.org/"
target="_top">The Legion of the Bouncy Castle</a>,
-the <a href="https://www.gnu.org/software/gnu-crypto/" target="_top">GNU project</a>
+the <a href="https://www.gnu.org/software/gnu-crypto/" target="_top">GNU Crypto project</a>
or <a href="https://jce.iaik.tugraz.at/sic/Products" target="_top">the Technical University Graz</a>
offer more digest algorithms than those built-in into your JDK.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/chgrp.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/chgrp.html b/manual/Tasks/chgrp.html
index 941c949..29e8bf4 100644
--- a/manual/Tasks/chgrp.html
+++ b/manual/Tasks/chgrp.html
@@ -30,7 +30,7 @@
<p>Changes the group of a file or all files inside specified directories. Right now it has effect
only under Unix. The group attribute is equivalent to the corresponding argument for
-the <code>chgrp</code> command.</p>
+the <kbd>chgrp</kbd> command.</p>
<p><a href="../Types/fileset.html">FileSet</a>s, <a href="../Types/dirset.html">DirSet</a>s
or <a href="../Types/filelist.html">FileList</a>s can be specified using
@@ -41,7 +41,7 @@ elements.</p>
arbitrary <a href="../Types/resources.html#collection">resource collections</a> as nested
elements.</p>
-<p>By default this task will use a single invocation of the underlying <code>chgrp</code> command.
+<p>By default this task will use a single invocation of the underlying <kbd>chgrp</kbd> command.
If you are working on a large number of files this may result in a command line that is too long for
your operating system. If you encounter such problems, you should set the <var>maxparallel</var>
attribute of this task to a non-zero value. The number to use highly depends on the length of your
@@ -51,7 +51,7 @@ may give you an approximation for the number you could use as initial value for
experiments.</p>
<p>By default this task won't do anything unless it detects it is running on a Unix system. If you
-know for sure that you have a <code>chgrp</code> executable on your <code>PATH</code> that is
+know for sure that you have a <kbd>chgrp</kbd> executable on your <code>PATH</code> that is
command line compatible with the Unix command, you can use the task's <var>os</var> attribute and
set its value to your current OS.</p>
@@ -74,7 +74,7 @@ set its value to your current OS.</p>
</tr>
<tr>
<td>parallel</td>
- <td>process all specified files using a single <code>chgrp</code> command.</td>
+ <td>process all specified files using a single <kbd>chgrp</kbd> command.</td>
<td>No; defaults to <q>true</q></td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/chmod.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/chmod.html b/manual/Tasks/chmod.html
index e855e9e..8f79379 100644
--- a/manual/Tasks/chmod.html
+++ b/manual/Tasks/chmod.html
@@ -28,7 +28,7 @@
<h3>Description</h3>
<p>Changes the permissions of a file or all files inside specified directories. Right now it has
effect only under Unix or NonStop Kernel (Tandem). The permissions are also UNIX style, like the
-argument for the <code>chmod</code> command.</p>
+argument for the <kbd>chmod</kbd> command.</p>
<p>See the section on <a href="../dirtasks.html#directorybasedtasks">directory based tasks</a>, on
how the inclusion/exclusion of files works, and how to write patterns.</p>
@@ -44,7 +44,7 @@ nested <a href="../Types/filelist.html">filelist</a>s.</p>
arbitrary <a href="../Types/resources.html#collection">resource collections</a> as nested
elements.</p>
-<p>By default this task will use a single invocation of the underlying <code>chmod</code> command.
+<p>By default this task will use a single invocation of the underlying <kbd>chmod</kbd> command.
If you are working on a large number of files this may result in a command line that is too long for
your operating system. If you encounter such problems, you should set the <var>maxparallel</var>
attribute of this task to a non-zero value. The number to use highly depends on the length of your
@@ -54,7 +54,7 @@ may give you an approximation for the number you could use as initial value for
experiments.</p>
<p>By default this task won't do anything unless it detects it is running on a Unix system. If you
-know for sure that you have a <code>chmod</code> executable on your <code>PATH</code> that is
+know for sure that you have a <kbd>chmod</kbd> executable on your <code>PATH</code> that is
command line compatible with the Unix command, you can use the task's <var>os</var> attribute and
set its value to your current OS.</p>
@@ -103,7 +103,7 @@ alternative.</p>
</tr>
<tr>
<td>parallel</td>
- <td>process all specified files using a single <code>chmod</code> command.</td>
+ <td>process all specified files using a single <kbd>chmod</kbd> command.</td>
<td>No; defaults to <q>true</q></td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/chown.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/chown.html b/manual/Tasks/chown.html
index f00da0e..55a17ac 100644
--- a/manual/Tasks/chown.html
+++ b/manual/Tasks/chown.html
@@ -30,7 +30,7 @@
<p>Changes the owner of a file or all files inside specified directories. Right now it has effect
only under Unix. The owner attribute is equivalent to the corresponding argument for
-the <code>chown</code> command.</p>
+the <kbd>chown</kbd> command.</p>
<p><a href="../Types/fileset.html">FileSet</a>s, <a href="../Types/dirset.html">DirSet</a>s
or <a href="../Types/filelist.html">FileList</a>s can be specified using
@@ -41,7 +41,7 @@ elements.</p>
arbitrary <a href="../Types/resources.html#collection">resource collections</a> as nested
elements.</p>
-<p>By default this task will use a single invocation of the underlying <code>chown</code> command.
+<p>By default this task will use a single invocation of the underlying <kbd>chown</kbd> command.
If you are working on a large number of files this may result in a command line that is too long for
your operating system. If you encounter such problems, you should set the <var>maxparallel</var>
attribute of this task to a non-zero value. The number to use highly depends on the length of your
@@ -51,9 +51,9 @@ may give you an approximation for the number you could use as initial value for
experiments.</p>
<p>By default this task won't do anything unless it detects it is running on a Unix system. If you
-know for sure that you have a <code>chown</code> executable on your <code>PATH</code> that is
-command line compatible with the Unix command, you can use the task's os attribute and set its value
-to your current os.</p>
+know for sure that you have a <kbd>chown</kbd> executable on your <code>PATH</code> that is command
+line compatible with the Unix command, you can use the task's <var>os</var> attribute and set its
+value to your current OS.</p>
<h3>Parameters</h3>
<table class="attr">
@@ -75,7 +75,7 @@ to your current os.</p>
</tr>
<tr>
<td>parallel</td>
- <td>process all specified files using a single <code>chown</code> command.</td>
+ <td>process all specified files using a single <kbd>chown</kbd> command.</td>
<td>No; defaults to <q>true</q></td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/clearcase.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/clearcase.html b/manual/Tasks/clearcase.html
index 739a5b6..7b0e480 100644
--- a/manual/Tasks/clearcase.html
+++ b/manual/Tasks/clearcase.html
@@ -55,19 +55,20 @@ Sean Egan (sean at cm-logic dot com)</p>
<hr/>
<h2 id="introduction">Introduction</h2>
<p>Apache Ant provides several optional tasks for working with ClearCase. These tasks correspond to
-various ClearCase commands using the <code>cleartool</code> program. The current tasks available for
+various ClearCase commands using the <kbd>cleartool</kbd> program. The current tasks available for
Ant correspond to only a few of the significant ClearCase commands.</p>
<p>More tasks can be easily added by deriving from the ClearCase class and then adding functionality
that is specific to that ClearCase command.</p>
-<p>Important: these tasks all require <code>cleartool</code> on the command line. If a task fails
- with an IOException, especially <code>error=2</code> on Windows, this is your problem.</p>
+<p>Important: these tasks all require <kbd>cleartool</kbd> on the command line. If a task fails
+with an <code>IOException</code>, especially <code>error=2</code> on Windows, this is your
+problem.</p>
<hr/>
<h2 id="cccheckin">CCCheckin</h2>
<h3>Description</h3>
-<p>Task to perform a <code>cleartool checkin</code> command to ClearCase.</p>
+<p>Task to perform a <kbd>cleartool checkin</kbd> command to ClearCase.</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
@@ -132,7 +133,7 @@ original.</p>
<h2 id="cccheckout">CCCheckout</h2>
<h3>Description</h3>
-<p>Task to perform a <code>cleartool checkout</code> command to ClearCase.</p>
+<p>Task to perform a <kbd>cleartool checkout</kbd> command to ClearCase.</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
@@ -214,7 +215,7 @@ suppressed. A "<samp>Some comment text</samp>" is added to ClearCase a
<h2 id="ccuncheckout">CCUnCheckout</h2>
<h3>Description</h3>
-<p>Task to perform a <code>uncheckout</code> command to ClearCase.</p>
+<p>Task to perform a <kbd>cleartool uncheckout</kbd> command to ClearCase.</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
@@ -249,7 +250,7 @@ of the file called <samp>c:/views/viewdir/afile.keep</samp> is kept.</p>
<h2 id="ccupdate">CCUpdate</h2>
<h3>Description</h3>
-<p>Task to perform an <code>cleartool update</code> command to ClearCase.</p>
+<p>Task to perform an <kbd>cleartool update</kbd> command to ClearCase.</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
@@ -319,7 +320,7 @@ set to the current time.</p>
<h2 id="ccmklbtype">CCMklbtype</h2>
<h3>Description</h3>
-<p>Task to perform a <code>mklbtype</code> command to ClearCase.</p>
+<p>Task to perform a <kbd>cleartool mklbtype</kbd> command to ClearCase.</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
@@ -394,7 +395,7 @@ version 1</q> is added as a comment.</p>
<h2 id="ccmklabel">CCMklabel</h2>
<h3>Description</h3>
-<p>Task to perform a <code>mklabel</code> command to ClearCase.</p>
+<p>Task to perform a <kbd>cleartool mklabel</kbd> command to ClearCase.</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
@@ -466,7 +467,7 @@ added as a comment. It will <em>recurse</em> all subdirectories.</p>
<h2 id="ccrmtype">CCRmtype</h2>
<h3>Description</h3>
-<p>Task to perform a <code>rmtype</code> command to ClearCase.</p>
+<p>Task to perform a <kbd>cleartool rmtype</kbd> command to ClearCase.</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
@@ -557,7 +558,7 @@ comment. All instances of the type are removed, including the type object itself
<h2 id="cclock">CCLock</h2>
<h3>Description</h3>
-<p>Task to perform a <code>cleartool lock</code> command to ClearCase.</p>
+<p>Task to perform a <kbd>cleartool lock</kbd> command to ClearCase.</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
@@ -617,7 +618,7 @@ object <samp>stream:Application_Integration@\MyProject_PVOB</samp>.</p>
<h2 id="ccunlock">CCUnlock</h2>
<h3>Description</h3>
-<p>Task to perform a <code>cleartool unlock</code> command to ClearCase.</p>
+<p>Task to perform a <kbd>cleartool unlock</kbd> command to ClearCase.</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
@@ -662,7 +663,7 @@ object <samp>stream:Application_Integration@\MyProject_PVOB</samp>.</p>
<h2 id="ccmkbl">CCMkbl</h2>
<h3>Description</h3>
-<p>Task to perform a <code>cleartool mkbl</code> command to ClearCase.</p>
+<p>Task to perform a <kbd>cleartool mkbl</kbd> command to ClearCase.</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
@@ -727,7 +728,7 @@ named <samp>Application_Baseline_AUTO</samp>.</p>
<h2 id="ccmkattr">CCMkattr</h2>
<p><em>Since Ant 1.6.1</em></p>
<h3>Description</h3>
-<p>Task to perform a <code>cleartool mkattr</code> command to ClearCase.</p>
+<p>Task to perform a <kbd>cleartool mkattr</kbd> command to ClearCase.</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
@@ -796,7 +797,7 @@ the attribute <samp>BugFix</samp> with a value of <samp>34445</samp> to it.</p>
<h2 id="ccmkdir">CCMkdir</h2>
<p><em>Since Ant 1.6.1</em></p>
<h3>Description</h3>
-<p>Task to perform a <code>cleartool mkdir</code> command to ClearCase.</p>
+<p>Task to perform a <kbd>cleartool mkdir</kbd> command to ClearCase.</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
@@ -844,7 +845,7 @@ automatically check it out.</p>
<h2 id="ccmkelem">CCMkelem</h2>
<p><em>Since Ant 1.6.1</em></p>
<h3>Description</h3>
-<p>Task to perform a <code>cleartool mkelem</code> command to ClearCase.</p>
+<p>Task to perform a <kbd>cleartool mkelem</kbd> command to ClearCase.</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/conditions.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/conditions.html b/manual/Tasks/conditions.html
index 0efbb69..1a7b1ac 100644
--- a/manual/Tasks/conditions.html
+++ b/manual/Tasks/conditions.html
@@ -682,7 +682,7 @@ two resources can be checked; in this case all resources must match.</p>
<p><em>Since Ant 1.7.1</em></p>
<p>Tests whether a resource contains a given (sub)string.</p>
<p>The resources to check are specified via references or—in the case of file
-resources—via the resource attribute.</p>
+resources—via the <var>resource</var> attribute.</p>
<table class="attr">
<tr>
<th>Attribute</th>
@@ -755,7 +755,8 @@ fails.</p>
<p>There is also a nested <code><classpath></code> element, which can be used to specify a
classpath.</p>
<pre><hasmethod classname="java.util.ArrayList" method="trimToSize"/></pre>
-<p>Looks for the method <code>trimToSize()</code> in the <code>java.util.ArrayList</code> class.</p>
+<p>Looks for the method <code class="code">trimToSize()</code> in
+the <code class="code">java.util.ArrayList</code> class.</p>
<h4 id="matches">matches</h4>
<p><em>Since Ant 1.7</em></p>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/copy.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/copy.html b/manual/Tasks/copy.html
index 7ea31d2..49b21b8 100644
--- a/manual/Tasks/copy.html
+++ b/manual/Tasks/copy.html
@@ -279,8 +279,8 @@ default character encoding is Cp1252, on Unix it is usually UTF-8. For both of t
are illegal byte sequences (more in UTF-8 than for Cp1252).</p>
<p>How the Reader class deals with these illegal sequences is up to the implementation of the
character decoder. The current Sun Java implementation is to map them to legal characters. Previous
-Sun Java (1.3 and lower) threw a MalformedInputException. IBM Java 1.4 also throws this exception.
-It is the mapping of the characters that cause the corruption.</p>
+Sun Java (1.3 and lower) threw a <code>MalformedInputException</code>. IBM Java 1.4 also throws this
+exception. It is the mapping of the characters that cause the corruption.</p>
<p>On Unix, where the default is normally UTF-8, this is a <em>big</em> problem, as it is easy to
edit a file to contain non US-ASCII characters from ISO-8859-1, for example the Danish œ
character. When this is copied (with filtering) by Ant, the character get converted to a question
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/cvs.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/cvs.html b/manual/Tasks/cvs.html
index 3e18376..c8e5333 100644
--- a/manual/Tasks/cvs.html
+++ b/manual/Tasks/cvs.html
@@ -28,11 +28,11 @@
<h3>Description</h3>
<p>Handles packages/modules retrieved from a <a href="https://www.nongnu.org/cvs/"
target="_top">CVS</a> repository.</p>
-<p><strong>Important:</strong> This task needs <code>cvs</code> binary on the path. If it isn't, you
+<p><strong>Important:</strong> This task needs <kbd>cvs</kbd> binary on the path. If it isn't, you
will get an error (such as <code>error=2</code> on Windows). If <code><cvs></code> doesn't
-work, try to execute <code>cvs.exe</code> from the command line in the target directory in which you
-are working. Also note that this task assumes that the cvs executable is compatible with the Unix
-version, this is not completely true for certain other CVS clients—like CVSNT for
+work, try to execute <kbd>cvs.exe</kbd> from the command line in the target directory in which you
+are working. Also note that this task assumes that the <kbd>cvs</kbd> executable is compatible with
+the Unix version, this is not completely true for certain other CVS clients—like CVSNT for
example—and some operation may fail when using such an incompatible client.</p>
<p><strong>CVSNT Note</strong>: CVSNT prefers users to store the passwords inside the registry. If
@@ -61,7 +61,7 @@ report 21657</a> for recommended workarounds.</p>
<tr>
<td>compressionlevel</td>
<td>A number between <q>1</q> and <q>9</q> (corresponding to possible values for
- CVS <code>-z#</code> argument). Any other value is treated
+ CVS <kbd>-z#</kbd> argument). Any other value is treated
as <var>compression</var>=<q>false</q></td>
<td>No; defaults to no compression</td>
</tr>
@@ -78,7 +78,7 @@ report 21657</a> for recommended workarounds.</p>
<tr>
<td>dest</td>
<td>the directory where the checked out files should be placed. Note that this is different
- from CVS's <code>-d</code> command line switch as Apache Ant will never shorten pathnames to
+ from CVS's <kbd>-d</kbd> command line switch as Apache Ant will never shorten pathnames to
avoid empty directories.</td>
<td>No; default is project's <var>basedir</var></td>
</tr>
@@ -101,13 +101,13 @@ report 21657</a> for recommended workarounds.</p>
</tr>
<tr>
<td>quiet</td>
- <td>suppress informational messages. This is the same as <code>-q</code> on the command
+ <td>suppress informational messages. This is the same as <kbd>-q</kbd> on the command
line.</td>
<td>No; defaults to <q>false</q></td>
</tr>
<tr>
<td>reallyquiet</td>
- <td>suppress all messages. This is the same as <code>-Q</code> on the command line. <em>since
+ <td>suppress all messages. This is the same as <kbd>-Q</kbd> on the command line. <em>since
Ant 1.6</em>.</td>
<td>No; defaults to <q>false</q></td>
</tr>
@@ -181,9 +181,9 @@ the <var>cvsRoot</var> attribute, and stores the files in <samp>${ws.dir}</samp>
<pre><cvs command="-q diff -u -N" output="patch.txt"/></pre>
-<p>silently (<code>-q</code>) creates a file called <samp>patch.txt</samp> which contains a unified
-(<code>-u</code>) diff which includes new files added via <code>cvs add</code> (<code>-N</code>) and
-can be used as input to <code>patch</code>. The equivalent, using <code><commandline></code>
+<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>
<pre>
<cvs output="patch">
@@ -206,9 +206,9 @@ the <var>failonerror</var>, <var>compression</var>, and other "global"
the <code><cvs></code> element.</p>
<pre> <cvs command="update -A -d"/></pre>
-<p>Updates from the head of repository ignoring sticky bits (<code>-A</code>) and creating any new
-directories as necessary (<code>-d</code>).</p>
-<p>Note: the text of the command is passed to <code>cvs</code> "as-is" so any cvs options
+<p>Updates 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
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/cvspass.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/cvspass.html b/manual/Tasks/cvspass.html
index 64ed090..abcb7d2 100644
--- a/manual/Tasks/cvspass.html
+++ b/manual/Tasks/cvspass.html
@@ -27,7 +27,7 @@
<h2 id="cvs">cvspass</h2>
<h3>Description</h3>
<p>Adds entries to a <samp>.cvspass</samp> file. Adding entries to this file has the same affect as
-a <code>cvs login</code> command.</p>
+a <kbd>cvs login</kbd> command.</p>
<p><strong>CVSNT Note</strong>: CVSNT prefers users to store the passwords inside the registry. If
the task doesn't seem to work for you, the most likely reason is that CVSNT ignores
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/cvstagdiff.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/cvstagdiff.html b/manual/Tasks/cvstagdiff.html
index 7b4c358..dc9e66b 100644
--- a/manual/Tasks/cvstagdiff.html
+++ b/manual/Tasks/cvstagdiff.html
@@ -25,10 +25,10 @@
<h3>Description</h3>
<p>Generates an XML-formatted report file of the changes between two tags or dates recorded in
a <a href="https://www.nongnu.org/cvs/" target="_top">CVS</a> repository.</p>
-<p><strong>Important</strong>: This task needs <code>cvs</code> on the path. If it isn't, you will
-get an error (such as <code>error=2</code> on Windows). If <code><cvs></code> doesn't work,
-try to execute <code>cvs.exe</code> from the command line in the target directory in which you are
-working. Also note that this task assumes that the cvs executable is compatible with the Unix
+<p><strong>Important</strong>: This task needs <kbd>cvs</kbd> on the path. If it isn't, you will get
+an error (such as <code>error=2</code> on Windows). If <code><cvs></code> doesn't work, try to
+execute <kbd>cvs.exe</kbd> from the command line in the target directory in which you are working.
+Also note that this task assumes that the <kbd>cvs</kbd> executable is compatible with the Unix
version, this is not completely true for certain other CVS clients—like CVSNT for
example—and some operation may fail when using such an incompatible client.</p>
<h3>Parameters</h3>
@@ -46,8 +46,8 @@ example—and some operation may fail when using such an incompatible client
<tr>
<td>startDate</td>
<td class="left">The earliest date from which diffs are to be included in the
- report.<br/>Accepts all formats accepted by the <code>cvs</code> command for <code>-D
- date_spec</code> arguments.</td>
+ report.<br/>Accepts all formats accepted by the <kbd>cvs</kbd> command for <kbd>-D
+ date_spec</kbd> arguments.</td>
</tr>
<tr>
<td>endTag</td>
@@ -57,7 +57,7 @@ example—and some operation may fail when using such an incompatible client
<tr>
<td>endDate</td>
<td class="left">The latest date from which diffs are to be included in the report.<br/>Accepts
- all formats accepted by the <code>cvs</code> command for <code>-D date_spec</code>
+ all formats accepted by the <kbd>cvs</kbd> command for <kbd>-D date_spec</kbd>
arguments.</td>
</tr>
<tr>
@@ -82,7 +82,7 @@ example—and some operation may fail when using such an incompatible client
<tr>
<td>compression</td>
<td><q>true</q> (equivalent to <q>3</q>), <q>false</q>, or a number between <q>1</q>
- and <q>9</q> (corresponding to possible values for CVS <code>-z#</code> argument). Any other
+ and <q>9</q> (corresponding to possible values for CVS <kbd>-z#</kbd> argument). Any other
value is treated as <q>false</q></td>
<td>No; defaults to no compression</td>
</tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/delete.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/delete.html b/manual/Tasks/delete.html
index 81d1460..0ac5b77 100644
--- a/manual/Tasks/delete.html
+++ b/manual/Tasks/delete.html
@@ -77,10 +77,10 @@ nested <code><fileset></code>.</p>
<tr>
<td>quiet</td>
<td>If the specified file or directory does not exist, do not display a diagnostic message
- (unless Apache Ant has been invoked with the <code>-verbose</code> or <code>-debug</code>
+ (unless Apache Ant has been invoked with the <kbd>-verbose</kbd> or <kbd>-debug</kbd>
switches) or modify the exit status to reflect an error. When set to <q>true</q>, if a file
or directory cannot be deleted, no error is reported. This setting emulates
- the <code>-f</code> option to the Unix <em>rm</em> command. Setting this to <q>true</q>
+ the <kbd>-f</kbd> option to the Unix <em>rm</em> command. Setting this to <q>true</q>
implies setting <var>failonerror</var> to <q>false</q>.</td>
<td>No; default <q>false</q></td>
</tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/depend.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/depend.html b/manual/Tasks/depend.html
index a000010..01d0aa5 100644
--- a/manual/Tasks/depend.html
+++ b/manual/Tasks/depend.html
@@ -152,7 +152,7 @@ public final class Constants {
</tr>
<tr>
<td>warnOnRmiStubs</td>
- <td>Flag to disable warnings about files that look like <code>rmic</code> generated
+ <td>Flag to disable warnings about files that look like <kbd>rmic</kbd> generated
stub/skeleton classes and have no <samp>.java</samp> source. Useful when doing RMI
development.</td>
<td>No; default <q>true</q></td>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/diagnostics.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/diagnostics.html b/manual/Tasks/diagnostics.html
index c54cbee..82f3849 100644
--- a/manual/Tasks/diagnostics.html
+++ b/manual/Tasks/diagnostics.html
@@ -27,7 +27,7 @@
<h2 id="diagnostics">Diagnostics</h2>
<p><em>Since Ant 1.7.0</em></p>
<h3>Description</h3>
-<p>Runs Apache Ant's <code>-diagnostics</code> code inside Ant itself. This is good for debugging
+<p>Runs Apache Ant's <kbd>-diagnostics</kbd> code inside Ant itself. This is good for debugging
Ant's configuration under an IDE.</p>
<h3>Examples</h3>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/echo.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/echo.html b/manual/Tasks/echo.html
index 3294854..49cab16 100644
--- a/manual/Tasks/echo.html
+++ b/manual/Tasks/echo.html
@@ -100,12 +100,12 @@ parsers.<br/>See <a href="https://www.w3.org/TR/xml/#sec-line-ends" target="_top
26 November 2008 / End of Line handling</a> for more details.</p>
<pre><echo message="Deleting drive C:" level="debug"/></pre>
-<p>A message which only appears in <code>-debug</code> mode.</p>
+<p>A message which only appears in <kbd>-debug</kbd> mode.</p>
<pre><echo level="error">
Imminent failure in the antimatter containment facility.
Please withdraw to safe location at least 50km away.
</echo></pre>
-<p>A message which appears even in <code>-quiet</code> mode.</p>
+<p>A message which appears even in <kbd>-quiet</kbd> mode.</p>
<pre><echo file="runner.csh" append="false">#\!/bin/tcsh
java-1.3.1 -mx1024m ${project.entrypoint} $$*
@@ -117,10 +117,10 @@ Ant filtering out the single <q>$</q> during variable expansion.</p>
<table>
<tr>
<th>Ant command line</th>
- <th><code>-quiet</code>, <code>-q</code></th>
+ <th><kbd>-quiet</kbd>, <kbd>-q</kbd></th>
<th><em>no switch</em></th>
- <th><code>-verbose</code>, <code>-v</code></th>
- <th><code>-debug</code>, <code>-d</code></th>
+ <th><kbd>-verbose</kbd>, <kbd>-v</kbd></th>
+ <th><kbd>-debug</kbd>, <kbd>-d</kbd></th>
</tr>
<tr>
<td><pre><echo message="This is error message." level="error"/></pre></td>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/echoproperties.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/echoproperties.html b/manual/Tasks/echoproperties.html
index 03b12ee..9373e35 100644
--- a/manual/Tasks/echoproperties.html
+++ b/manual/Tasks/echoproperties.html
@@ -30,7 +30,7 @@
<p>Displays all the current properties (or a subset of them specified by a
nested <code><propertyset></code>) in the project. The output can be sent to a file if
desired. This task can be used as a somewhat contrived means of returning data from an
-<code>ant</code> invocation, but is really for debugging build
+<kbd>ant</kbd> invocation, but is really for debugging build
files.</p>
<h3>Parameters</h3>
@@ -62,9 +62,9 @@ files.</p>
<tr>
<td>failonerror</td>
<td>If an error occurs while writing the properties to a file, and this attribute is enabled,
- then a BuildException will be thrown, causing the build to fail. If disabled, then IO errors
- will be reported as a log statement, and the build will continue without failure from this
- task.</td>
+ then a <code>BuildException</code> will be thrown, causing the build to fail. If disabled,
+ then IO errors will be reported as a log statement, and the build will continue without
+ failure from this task.</td>
<td>No; default is <q>true</q></td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/ejb.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/ejb.html b/manual/Tasks/ejb.html
index 3e52b10..e9298b8 100644
--- a/manual/Tasks/ejb.html
+++ b/manual/Tasks/ejb.html
@@ -136,7 +136,7 @@ mechanisms.</p>
<hr/>
<h2 id="ejbc">ejbc</h2>
<h3>Description</h3>
-<p>The <code>ejbc</code> task will run WebLogic's <code>ejbc</code> tool. This tool will take a
+<p>The <code>ejbc</code> task will run WebLogic's <kbd>ejbc</kbd> tool. This tool will take a
serialized deployment descriptor, examine the various EJB interfaces and bean classes and then
generate the required support classes necessary to deploy the bean in a WebLogic EJB container. This
will include the RMI stubs and skeletons as well as the classes which implement the bean's home and
@@ -150,7 +150,7 @@ to be regenerated. The deployment descriptor is de-serialized to discover the ho
implementation classes. The corresponding source files are determined and checked to see their
modification times. These times and the modification time of the serialized descriptor itself are
compared with the modification time of the generated classes. If the generated classes are not
-present or are out of date, the <code>ejbc</code> tool is run to generate new versions.</p>
+present or are out of date, the <kbd>ejbc</kbd> tool is run to generate new versions.</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
@@ -189,7 +189,7 @@ present or are out of date, the <code>ejbc</code> tool is run to generate new ve
</tr>
<tr>
<td>keepgenerated</td>
- <td>Controls whether <code>ejbc</code> will keep the intermediate java files used to build the
+ <td>Controls whether <kbd>ejbc</kbd> will keep the intermediate java files used to build the
class files. This can be useful when debugging.</td>
<td>No; defaults to <q>false</q></td>
</tr>
@@ -216,7 +216,7 @@ EJBs, this is a convenient way of specifying many EJBs in a single Ant task.</p>
destination directory. If these class files cannot be located in the destination directory, the
task will fail. The task will also attempt to locate the EJB stubs and skeletons in this directory.
If found, the timestamps on the stubs and skeletons will be checked to ensure they are up to
-date. Only if these files cannot be found or if they are out of date will the iAS <code>ejbc</code>
+date. Only if these files cannot be found or if they are out of date will the iAS <kbd>ejbc</kbd>
utility be called to generate new stubs and skeletons.</p>
<h3>Parameters</h3>
@@ -256,14 +256,14 @@ utility be called to generate new stubs and skeletons.</p>
<tr>
<td>keepgenerated</td>
- <td>Indicates whether or not the Java source files which are generated by <code>ejbc</code> will
+ <td>Indicates whether or not the Java source files which are generated by <kbd>ejbc</kbd> will
be saved or automatically deleted. If <q>yes</q>, the source files will be retained.</td>
<td>No; defaults to <q>no</q></td>
</tr>
<tr>
<td>debug</td>
- <td>Indicates whether or not the <code>ejbc</code> utility should log additional debugging
+ <td>Indicates whether or not the <kbd>ejbc</kbd> utility should log additional debugging
statements to the standard output. If <q>yes</q>, the additional debugging statements will be
generated.</td>
<td>No; defaults to <q>no</q></td>
@@ -272,9 +272,9 @@ utility be called to generate new stubs and skeletons.</p>
<tr>
<td>iashome</td>
<td>May be used to specify the "home" directory for this iAS installation. This is used to find
- the <code>ejbc</code> utility if it isn't included in the user's system path. If specified, it
+ the <kbd>ejbc</kbd> utility if it isn't included in the user's system path. If specified, it
should refer to the <samp>[install-location]/iplanet/ias6/ias</samp> directory.</td>
- <td>No; by default the <code>ejbc</code> utility must be on the user's system path</td>
+ <td>No; by default the <kbd>ejbc</kbd> utility must be on the user's system path</td>
</tr>
</table>
@@ -820,7 +820,7 @@ skeletons.</p>
</tr>
<tr>
<td>keepgeneric</td>
- <td>This controls whether the generic file used as input to <code>ejbc</code> is retained.</td>
+ <td>This controls whether the generic file used as input to <kbd>ejbc</kbd> is retained.</td>
<td>No; defaults to <q>false</q></td>
</tr>
</table>
@@ -877,9 +877,9 @@ as <samp>META-INF/Customer-weblogic-cmp-rdbms-jar.xml</samp>.</p>
</tr>
<tr>
<td>classpath</td>
- <td>The classpath to be used when running the WebLogic <code>ejbc</code> tool. Note that this
+ <td>The classpath to be used when running the WebLogic <kbd>ejbc</kbd> tool. Note that this
tool typically requires the classes that make up the bean to be available on the classpath.
- Currently, however, this will cause the <code>ejbc</code> tool to be run in a separate
+ Currently, however, this will cause the <kbd>ejbc</kbd> tool to be run in a separate
JVM</td>
<td>No</td>
</tr>
@@ -893,7 +893,7 @@ as <samp>META-INF/Customer-weblogic-cmp-rdbms-jar.xml</samp>.</p>
</tr>
<tr>
<td>keepgeneric</td>
- <td>This controls whether the generic file used as input to <code>ejbc</code> is retained.</td>
+ <td>This controls whether the generic file used as input to <kbd>ejbc</kbd> is retained.</td>
<td>No; defaults to <q>false</q></td>
</tr>
<tr>
@@ -910,7 +910,7 @@ as <samp>META-INF/Customer-weblogic-cmp-rdbms-jar.xml</samp>.</p>
<td>This flag controls whether <code>weblogic.ejbc</code> is always invoked to build the jar
file. In certain circumstances, such as when only a bean class has been changed, the jar can
be generated by merely replacing the changed classes and not
- rerunning <code>ejbc</code>. Setting this to <q>false</q> will reduce the time to
+ rerunning <kbd>ejbc</kbd>. Setting this to <q>false</q> will reduce the time to
run <code>ejbjar</code>.</td>
<td>No; defaults to <q>true</q></td>
</tr>
@@ -962,13 +962,13 @@ as <samp>META-INF/Customer-weblogic-cmp-rdbms-jar.xml</samp>.</p>
</tr>
<tr>
<td>noEJBC</td>
- <td>If this attribute is set to <q>true</q>, WebLogic's <code>ejbc</code> will not be run on the
- EJB jar. Use this if you prefer to run <code>ejbc</code> at deployment time.</td>
+ <td>If this attribute is set to <q>true</q>, WebLogic's <kbd>ejbc</kbd> will not be run on the
+ EJB jar. Use this if you prefer to run <kbd>ejbc</kbd> at deployment time.</td>
<td>No</td>
</tr>
<tr>
<td>ejbcclass</td>
- <td>Specifies the classname of the <code>ejbc</code> compiler. Normally <code>ejbjar</code>
+ <td>Specifies the classname of the <kbd>ejbc</kbd> compiler. Normally <code>ejbjar</code>
determines the appropriate class based on the DTD used for the EJB. The EJB 2.0 compiler
featured in WebLogic 6 has, however, been deprecated in version 7. When using with version 7
this attribute should be set to <q>weblogic.ejbc</q> to avoid the deprecation warning.</td>
@@ -984,14 +984,14 @@ as <samp>META-INF/Customer-weblogic-cmp-rdbms-jar.xml</samp>.</p>
<tr>
<td>jvmdebuglevel</td>
<td>Sets the <code>weblogic.StdoutSeverityLevel</code> to use when running the JVM that
- executes <code>ejbc</code>. Set to <q>16</q> to avoid the warnings about EJB Home and Remotes
+ executes <kbd>ejbc</kbd>. Set to <q>16</q> to avoid the warnings about EJB Home and Remotes
being in the classpath</td>
<td>No</td>
</tr>
<tr>
<td>outputdir</td>
- <td>If set <code>ejbc</code> will be given this directory as the output destination rather than
- a jar file. This allows for the generation of "exploded" jars.</td>
+ <td>If set <kbd>ejbc</kbd> will be given this directory as the output destination rather than a
+ jar file. This allows for the generation of "exploded" jars.</td>
<td>No</td>
</tr>
</table>
@@ -1145,15 +1145,15 @@ adds them to the final EJB jar file. WebSphere has two specific descriptors for
</ul>
<p>In terms of WebSphere, the generation of container code and stubs is called <em>deployment</em>.
This step can be performed by the <code>websphere</code> element as part of the jar generation
-process. If the switch <var>ejbdeploy</var> is on, the <code>ejbdeploy</code> tool from the
+process. If the switch <var>ejbdeploy</var> is on, the <kbd>ejbdeploy</kbd> tool from the
WebSphere toolset is called for every EJB jar. Unfortunately, this step only works, if you use the
-IBM JDK. Otherwise, the <code>rmic</code> (called by <code>ejbdeploy</code>) throws
+IBM JDK. Otherwise, the <kbd>rmic</kbd> (called by <kbd>ejbdeploy</kbd>) throws
a <code>ClassFormatError</code>. Be sure to switch <var>ejbdeploy</var> off, if Ant runs with Oracle
JDK or OpenJDK.</p>
<p>For the <code>websphere</code> element to work, you have to provide a complete classpath, that
-contains all classes, that are required to reflect the bean classes. For <code>ejbdeploy</code> to
-work, you must also provide the classpath of the <code>ejbdeploy</code> tool and set
+contains all classes, that are required to reflect the bean classes. For <kbd>ejbdeploy</kbd> to
+work, you must also provide the classpath of the <kbd>ejbdeploy</kbd> tool and set
the <code>websphere.home</code> property (look at the examples below).</p>
<table class="attr">
@@ -1171,8 +1171,8 @@ the <code>websphere.home</code> property (look at the examples below).</p>
</tr>
<tr>
<td>ejbdeploy</td>
- <td>Decides whether <code>ejbdeploy</code> is called. When you set this to <q>true</q>, be
- sure, to run Ant with the IBM JDK.</td>
+ <td>Decides whether <kbd>ejbdeploy</kbd> is called. When you set this to <q>true</q>, be sure
+ to run Ant with the IBM JDK.</td>
<td>No; defaults to <q>true</q></td>
</tr>
<tr>
@@ -1183,44 +1183,43 @@ the <code>websphere.home</code> property (look at the examples below).</p>
</tr>
<tr>
<td>keepgeneric</td>
- <td>This controls whether the generic file used as input to <code>ejbdeploy</code> is
+ <td>This controls whether the generic file used as input to <kbd>ejbdeploy</kbd> is
retained.</td>
<td>No; defaults to <q>false</q></td>
</tr>
<tr>
<td>rebuild</td>
- <td>This controls whether <code>ejbdeploy</code> is called although no changes have
- occurred.</td>
+ <td>This controls whether <kbd>ejbdeploy</kbd> is called although no changes have occurred.</td>
<td>No; defaults to <q>false</q></td>
</tr>
<tr>
<td>tempdir</td>
- <td>A directory, where <code>ejbdeploy</code> will write temporary files</td>
+ <td>A directory, where <kbd>ejbdeploy</kbd> will write temporary files</td>
<td>No; defaults to <q>_ejbdeploy_temp</q></td>
</tr>
<tr>
<td>dbName<br/>dbSchema</td>
- <td>These options are passed to <code>ejbdeploy</code>.</td>
+ <td>These options are passed to <kbd>ejbdeploy</kbd>.</td>
<td>No</td>
</tr>
<tr>
<td>dbVendor</td>
- <td>This option is passed to <code>ejbdeploy</code>. Valid options can be obtained by running
- the following command: <pre><WAS_HOME>/bin/EJBDeploy.[sh/bat] -help</pre> This is also
- used to determine the name of the <code>Map.mapxmi</code> and <code>Schema.dbxmi</code> files,
- for example <samp>Account-DB2UDBWIN_V71-Map.mapxmi</samp>
+ <td>This option is passed to <kbd>ejbdeploy</kbd>. Valid options can be obtained by running the
+ following command: <pre><WAS_HOME>/bin/EJBDeploy.[sh/bat] -help</pre> This is also used
+ to determine the name of the <code>Map.mapxmi</code> and <code>Schema.dbxmi</code> files, for
+ example <samp>Account-DB2UDBWIN_V71-Map.mapxmi</samp>
and <samp>Account-DB2UDBWIN_V71-Schema.dbxmi</samp>.</td>
<td>No</td>
</tr>
<tr>
<td>codegen<br/>quiet<br/>novalidate<br/>noinform<br/>trace<br/>use35MappingRules</td>
- <td>These options are all passed to <code>ejbdeploy</code>.</td>
+ <td>These options are all passed to <kbd>ejbdeploy</kbd>.</td>
<td>No; default is <q>false</q> (except for <var>quiet</var>)</td>
</tr>
<tr>
<td>rmicOptions</td>
- <td>This option is passed to <code>ejbdeploy</code> and will be passed on
- to <code>rmic</code>.</td>
+ <td>This option is passed to <kbd>ejbdeploy</kbd> and will be passed on
+ to <kbd>rmic</kbd>.</td>
<td>No</td>
</tr>
</table>
@@ -1300,14 +1299,14 @@ example, <var>suffix</var>). Refer to the appropriate documentation for more de
<tr>
<td>keepgenerated</td>
- <td>Indicates whether or not the Java source files which are generated by <code>ejbc</code> will
+ <td>Indicates whether or not the Java source files which are generated by <kbd>ejbc</kbd> will
be saved or automatically deleted. If <q>yes</q>, the source files will be retained.</td>
<td>No; defaults to <q>no</q></td>
</tr>
<tr>
<td>debug</td>
- <td>Indicates whether or not the <code>ejbc</code> utility should log additional debugging
+ <td>Indicates whether or not the <kbd>ejbc</kbd> utility should log additional debugging
statements to the standard output. If <q>yes</q>, the additional debugging statements will be
generated.</td>
<td>No; defaults to <q>no</q></td>
@@ -1316,9 +1315,9 @@ example, <var>suffix</var>). Refer to the appropriate documentation for more de
<tr>
<td>iashome</td>
<td>May be used to specify the "home" directory for this iAS installation. This is used to find
- the <code>ejbc</code> utility if it isn't included in the user's system path. If specified,
- it should refer to the <samp>[install-location]/iplanet/ias6/ias</samp> directory.</td>
- <td>No; by default, the <code>ejbc</code> utility must be on the user's system path.</td>
+ the <kbd>ejbc</kbd> utility if it isn't included in the user's system path. If specified, it
+ should refer to the <samp>[install-location]/iplanet/ias6/ias</samp> directory.</td>
+ <td>No; by default, the <kbd>ejbc</kbd> utility must be on the user's system path.</td>
</tr>
<tr>
@@ -1497,7 +1496,7 @@ example, <var>suffix</var>). Refer to the appropriate documentation for more det
</tr>
<tr>
<td>verbose</td>
- <td>Indicates whether or not to use <code>-verbose</code> switch.</td>
+ <td>Indicates whether or not to use <kbd>-verbose</kbd> switch.</td>
<td>No; defaults to <q>false</q></td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/exec.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/exec.html b/manual/Tasks/exec.html
index edc8725..9be18fa 100644
--- a/manual/Tasks/exec.html
+++ b/manual/Tasks/exec.html
@@ -52,7 +52,7 @@ exact semantics of the call. In particular, if you do not put a file extension o
only <samp>.EXE</samp> files are looked for, not <samp>.COM</samp>, <samp>.CMD</samp> or other file
types listed in the environment variable <code>PATHEXT</code>. That is only used by the shell.</p>
<p>Note that <samp>.bat</samp> files cannot in general by executed directly. One normally needs to
-execute the command shell executable <code>cmd</code> using the <code>/c</code> switch.</p>
+execute the command shell executable <kbd>cmd</kbd> using the <kbd>/c</kbd> switch.</p>
<pre>
<target name="help">
<exec executable="cmd">
@@ -62,24 +62,25 @@ execute the command shell executable <code>cmd</code> using the <code>/c</code>
</exec>
</target></pre>
-<p>A common problem is not having the executable on the PATH. In case you get an error
-message <code>Cannot run program "...":CreateProcess error=2. The system cannot find the path
-specified.</code> have a look at your <code>PATH</code> variable. Just type the command directly on
-the command line and if Windows finds it, Ant should do it too. (Otherwise ask on the user
-mailinglist for help.) If Windows can not execute the program add the directory of the program to
-the <code>PATH</code> (<code>set PATH=%PATH%;dirOfProgram</code>) or specify the absolute path in
-the <var>executable</var> attribute in your buildfile.</p>
+<p>A common problem is not having the executable on the <code>PATH</code>code>. In case you get an
+error message <code class="output">Cannot run program "...":CreateProcess error=2. The system cannot
+find the path specified.</code> have a look at your <code>PATH</code> variable. Just type the
+command directly on the command line and if Windows finds it, Ant should do it too. (Otherwise ask
+on the user mailinglist for help.) If Windows can not execute the program, add the directory of the
+program to the <code>PATH</code> (<code>set PATH=%PATH%;dirOfProgram</code>) or specify the absolute
+path in the <var>executable</var> attribute in your buildfile.</p>
<h4>Cygwin Users</h4>
-<p>The <code><exec></code> task will not understand paths such as <code>/bin/sh</code> for the
-executable parameter. This is because JVM in which Ant is running is a standard Windows executable
-and is not aware of the Cygwin environment (i.e., doesn't load <samp>cygwin1.dll</samp>). The only
-work-around for this is to compile a JVM under Cygwin (at your own risk). See for
+<p>The <code><exec></code> task will not understand paths such as <q>/bin/sh</q> for
+the <var>executable</var> parameter. This is because JVM in which Ant is running is a standard
+Windows executable and is not aware of the Cygwin environment (i.e., doesn't
+load <samp>cygwin1.dll</samp>). The only work-around for this is to compile a JVM under Cygwin (at
+your own risk). See for
instance <a href="https://cdn.rawgit.com/AdoptOpenJDK/openjdk-jdk9/dev/common/doc/building.html#cygwin"
target="_top">OpenJDK build instructions for cygwin</a>.</p>
<h4>OpenVMS Users</h4>
-<p>The command specified using <code>executable</code> and <code><arg></code> elements is
+<p>The command specified using <var>executable</var> and <code><arg></code> elements is
executed exactly as specified inside a temporary DCL script. This has some implications:</p>
<ul>
<li>paths have to be written in VMS style</li>
@@ -93,7 +94,7 @@ to <code>TRUE</code> in the job table (see the <em>JDK Release Notes</em>).</p>
<p>Please note that JVM provided by HP doesn't follow OpenVMS' conventions of exit codes. If you
run a JVM with this task, the task may falsely claim that an error occurred (or silently ignore an
-error). Don't use this task to run <code>JAVA.EXE</code>, use a <code><java></code> task with
+error). Don't use this task to run <kbd>JAVA.EXE</kbd>, use a <code><java></code> task with
the <var>fork</var> attribute set to <q>true</q> instead as this task will follow the JVM's
interpretation of exit codes.</p>
@@ -104,13 +105,13 @@ their interpreter specified, i.e., the scripts must start with something like:</
<pre>#!/bin/bash</pre>
<p>or the task will fail as follows:</p>
-<pre>
+<pre class="output">
[exec] Warning: UNIXProcess.forkAndExec native error: Exec format error
[exec] Result: 255</pre>
<h4 id="background">Running Ant as a background process on Unix(-like) systems</h4>
-<p>If you run Ant as a background process (like <code>ant &</code>) and use
+<p>If you run Ant as a background process (like <kbd>ant &</kbd>) and use
the <code><exec></code> task with <var>spawn</var> set to <q>false</q>, you must provide
explicit input to the forked process or Ant will be suspended because it tries to read from the
standard input.</p>
@@ -240,7 +241,7 @@ standard input.</p>
<tr>
<td>vmlauncher</td>
<td>Run command using the JVM's execution facilities where available. If set to <q>false</q> the
- underlying OS's shell, either directly or through the <code>antRun</code> scripts, will be
+ underlying OS's shell, either directly or through the <kbd>antRun</kbd> scripts, will be
used. Under some operating systems, this gives access to facilities not normally available
through JVM including, under Windows, being able to execute scripts, rather than their
associated interpreter. If you want to specify the name of the executable as a relative path
@@ -369,14 +370,15 @@ process. The browser will remain.</p>
</exec>
</pre>
-<p>Sends the string <q>blah before blah</q> to the <code>cat</code> executable, using
+<p>Sends the string <q>blah before blah</q> to the <kbd>cat</kbd> executable, using
an <a href="../Types/filterchain.html"><inputfilterchain></a> to replace <q>before</q>
with <q>after</q> on the way in. Output is sent to the file <samp>redirector.out</samp> and stored
in a property of the same name. Similarly, error output is sent to a file and a property, both
named <samp>redirector.err</samp>.</p>
-<p><strong>Note</strong>: do not try to specify arguments using a simple arg-element and separate
-them by spaces. This results in only a single argument containing the entire string.</p>
+<p><strong>Note</strong>: do not try to specify arguments using a simple <code>arg</code>-element
+and separate them by spaces. This results in only a single argument containing the entire
+string.</p>
<p><strong>Timeouts</strong>: If a timeout is specified, when it is reached the sub process is
killed and a message printed to the log. The return value of the execution will be <q>-1</q>, which
will halt the build if <var>failonerror</var>=<q>true</q>, but be ignored otherwise.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/fail.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/fail.html b/manual/Tasks/fail.html
index d1e22bc..7f67f05 100644
--- a/manual/Tasks/fail.html
+++ b/manual/Tasks/fail.html
@@ -75,7 +75,7 @@ see <a href="conditions.html">here</a>.<br/><em>Since Ant 1.6.2</em>
<pre><fail/></pre>
<p>will exit the current build with no further information given.</p>
-<pre>
+<pre class="output">
BUILD FAILED
build.xml:4: No message</pre>
@@ -83,7 +83,7 @@ build.xml:4: No message</pre>
<pre><fail message="Something wrong here."/></pre>
<p>will exit the current build and print something like the following to wherever your output
goes:</p>
-<pre>
+<pre class="output">
BUILD FAILED
build.xml:4: Something wrong here.</pre>
@@ -94,7 +94,7 @@ build.xml:4: Something wrong here.</pre>
<pre><fail unless="thisdoesnotexist"/></pre>
<p>will exit the current build and print something like the following to wherever your output
goes:</p>
-<pre>
+<pre class="output">
BUILD FAILED
build.xml:2: unless=thisdoesnotexist</pre>
@@ -111,7 +111,7 @@ Using a condition to achieve the same effect:
</fail></pre>
<p>Output:</p>
-<pre>
+<pre class="output">
BUILD FAILED
build.xml:2: condition satisfied</pre>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/ftp.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/ftp.html b/manual/Tasks/ftp.html
index d47bb57..e993587 100644
--- a/manual/Tasks/ftp.html
+++ b/manual/Tasks/ftp.html
@@ -45,10 +45,10 @@ the <a href="setproxy.html"><code><setproxy></code></a> task, and cannot g
via socks.</p>
<p><strong>Warning</strong>: there have been problems reported concerning
the <code>ftp</code> <q>get</q> with the <var>newer</var> attribute. Problems might be due to
-format of <code>ls -l</code> differing from what is expected by commons-net, for instance due to
+format of <kbd>ls -l</kbd> differing from what is expected by commons-net, for instance due to
specifics of language used by the FTP server in the directory listing. If you encounter such a
problem, please send an email including a sample directory listing coming from your FTP server
-(<code>ls -l</code> on the FTP prompt).</p>
+(<kbd>ls -l</kbd> on the FTP prompt).</p>
<p>If you can connect but not upload or download, try setting the <var>passive</var> attribute
to <q>true</q> to use the existing (open) channel, instead of having the server try to set up a new
connection.</p>
@@ -134,15 +134,15 @@ connection.</p>
</tr>
<tr id="timestampGranularity">
<td>timestampGranularity</td>
- <td>Specify either <q>MINUTE</q>, <q>NONE</q>, (or you may specify <q></q> which is equivalent
- to not specifying a value, useful for property-file driven scripts). Allows override of the
- typical situation in <q>PUT</q> and <q>GET</q> where local filesystem timestamps
+ <td>Specify either <q>MINUTE</q> or <q>NONE</q> (you may specify <q></q> which is equivalent to
+ not specifying a value, useful for property-file driven scripts). Allows override of the
+ typical situation in <q>put</q> and <q>get</q> where local filesystem timestamps
are <code>HH:mm:ss</code> and the typical FTP server's timestamps are <code>HH:mm</code>.
This can throw off <var>uptodate</var> calculations. However, the default values should
suffice for most applications.<br/><em>Since Ant 1.7</em></td>
- <td>No; only applies in <q>put</q> and <q>get</q> where the default values are <q>MINUTE</q>
- for <code>PUT</code> and <q>NONE</q> for <code>GET</code>. (It is not as necessary
- in <q>get</q> because we have the <var>preservelastmodified</var> option.)</td>
+ <td>No; only applies for <q>put</q> (default is <q>MINUTE</q>) and <q>get</q> (default
+ is <q>NONE</q>; not as necessary because we have the <var>preservelastmodified</var>
+ option)</td>
</tr>
<tr>
<td>timediffmillis</td>
@@ -167,14 +167,13 @@ connection.</p>
<tr>
<td>chmod</td>
<td>sets or changes file permissions for new or existing files, Unix only. If used with
- a <q>put</q> action, <code>chmod</code> will be issued for each file.</td>
+ a <q>put</q> action, <q>chmod</q> will be issued for each file.</td>
<td>No</td>
</tr>
<tr>
<td>listing</td>
- <td>the file to write results of the <q>list</q> action. Required for the <q>list</q> action,
- ignored otherwise.</td>
- <td>No</td>
+ <td>the file to write results of the <q>list</q> action.</td>
+ <td>Yes, for the <q>list</q> action; ignored otherwise</td>
</tr>
<tr>
<td>ignoreNoncriticalErrors</td>
@@ -531,7 +530,7 @@ directory. In fact, the <var>dir</var> attribute of the fileset is ignored comp
</ftp></pre>
<p>Logs in to <samp>ftp.apache.org</samp> as <samp>anonymous</samp> and tries to delete
all <samp>*.tmp</samp> files from the default directory for that user. If you don't have permission
-to delete a file, a BuildException is thrown.</p>
+to delete a file, a <code>BuildException</code> is thrown.</p>
<h3>Listing Files</h3>
<pre>
<ftp action="list"
@@ -564,8 +563,8 @@ of the FTP server.</p>
server. The filesets are relative to the remote directory, not a local directory.
The <var>dir</var> attribute of the fileset is ignored completely. The directories to be removed
must be empty, or contain only other directories that have been also selected to be removed by the
-filesets patterns, otherwise a BuildException will be thrown. Also, if you don't have permission to
-remove a directory, a BuildException is thrown.</p>
+filesets patterns, otherwise a <code>BuildException</code> will be thrown. Also, if you don't have
+permission to remove a directory, a <code>BuildException</code> is thrown.</p>
<pre>
<ftp action="rmdir"
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/get.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/get.html b/manual/Tasks/get.html
index 46f1944..2f5bc04 100644
--- a/manual/Tasks/get.html
+++ b/manual/Tasks/get.html
@@ -39,7 +39,7 @@ authentication is used. This is only secure over an HTTPS link.</p>
<p><strong>Proxies</strong>. <em>Since Apache Ant 1.7.0</em>, Ant running on Java 5 or later
can <a href="../proxy.html">use the proxy settings of the operating system</a> if enabled with
-the <code>-autoproxy</code> command line option. There is also
+the <kbd>-autoproxy</kbd> command line option. There is also
the <a href="../Tasks/setproxy.html"><setproxy></a> task for earlier Java versions. With
proxies turned on, <code><get></code> requests against localhost may not work as expected, if
the request is relayed to the proxy.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/import.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/import.html b/manual/Tasks/import.html
index ebdd394..531f420 100644
--- a/manual/Tasks/import.html
+++ b/manual/Tasks/import.html
@@ -247,7 +247,7 @@ it is not possible to <code>import</code> the same file more than once.</p>
<p>Running the build file will emit:</p>
-<pre>
+<pre class="output">
setUp:
nested.echo:
@@ -272,7 +272,7 @@ test:
<p>Running the target build file will emit:</p>
-<pre>
+<pre class="output">
nested.setUp:
nested.echo:
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/include.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/include.html b/manual/Tasks/include.html
index 620e71e..eaab62e 100644
--- a/manual/Tasks/include.html
+++ b/manual/Tasks/include.html
@@ -242,7 +242,7 @@ it is not possible to <code>import</code> the same file more than once.</p>
<p>Running the build file will emit:</p>
-<pre>
+<pre class="output">
setUp:
nested.echo:
@@ -267,7 +267,7 @@ test:
<p>Running the target build file will emit:</p>
-<pre>
+<pre class="output">
nested.setUp:
nested.echo:
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/jarlib-resolve.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/jarlib-resolve.html b/manual/Tasks/jarlib-resolve.html
index 0c2cf65..b60f83b 100644
--- a/manual/Tasks/jarlib-resolve.html
+++ b/manual/Tasks/jarlib-resolve.html
@@ -29,8 +29,8 @@
<p>Try to locate a jar to satisfy an extension and place location of jar into property. The task
allows you to add a number of resolvers that are capable of locating a library for a specific
extension. Each resolver will be attempted in specified order until library is found or no resolvers
-are left. If no resolvers are left and <var>failOnError</var> is true then a BuildException will be
-thrown.</p>
+are left. If no resolvers are left and <var>failOnError</var> is true then
+a <code>BuildException</code> will be thrown.</p>
<p>Note that this task works with extensions as defined by the "Optional Package" specification.
For more information about optional packages, see the document <em>Optional Package Versioning</em>
@@ -104,7 +104,7 @@ to project directory.</p>
</tr>
<tr>
<td>destdir</td>
- <td>The directory in which to place downloaded file.</td>
+ <td class="left">The directory in which to place downloaded file.</td>
</tr>
</table>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/java.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/java.html b/manual/Tasks/java.html
index ac1829f..9e59a17 100644
--- a/manual/Tasks/java.html
+++ b/manual/Tasks/java.html
@@ -35,7 +35,7 @@ the <var>input</var> and <var>inputstring</var> attributes.</p>
<h4 id="background">Running Ant as a background process on Unix(-like) systems</h4>
-<p>If you run Ant as a background process (like <code>ant &</code>) and use
+<p>If you run Ant as a background process (like <kbd>ant &</kbd>) and use
the <code><java></code> task with <var>spawn</var> set to <q>false</q> and <var>fork</var>
to <q>true</q>, you must provide explicit input to the forked process or Ant will be suspended
because it tries to read from the standard input.</p>
@@ -112,7 +112,7 @@ because it tries to read from the standard input.</p>
<td>the command used to invoke JVM. The command is resolved
by <code>java.lang.Runtime.exec()</code>. Ignored if <var>fork</var> is <q>false</q>.
</td>
- <td>No, default is <q>java</q></td>
+ <td>No, default is <kbd>java</kbd></td>
</tr>
<tr>
<td>jvmargs</td>
[5/6] ant git commit: , highlighting of input,
output and inlined code
Posted by gi...@apache.org.
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/javac.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/javac.html b/manual/Tasks/javac.html
index 951937b..f4dd3f4 100644
--- a/manual/Tasks/javac.html
+++ b/manual/Tasks/javac.html
@@ -85,7 +85,7 @@ in <code>JAVA_HOME</code>.</p>
when it puts together the command line switches—even if you set <var>fork</var>=<q>true</q>.
This is useful if you want to run the compiler of JDK 1.1 while your current JDK is 1.2+. If you
use <var>compiler</var>=<q>javac1.1</q> and (for example) <var>depend</var>=<q>true</q>, Ant will
-use the command line switch <code>-depend</code> instead of <code>-Xdepend</code>.</p>
+use the command line switch <kbd>-depend</kbd> instead of <kbd>-Xdepend</kbd>.</p>
<p>This task will drop all entries that point to non-existent files/directories from the classpath
it passes to the compiler.</p>
<p>The working directory for a forked executable (if any) is the project's base directory.</p>
@@ -95,7 +95,7 @@ release them. The side effect of this is that you will not be able to delete or
later on in the build. The workaround is to fork when invoking the compiler.</p>
<p>If you are using Java 8 or above and your source contains native methods or fields annotated with
the <code>@Native</code> annotation you can set the <var>nativeheaderdir</var> attribute in order to
-use the <code>-h</code> switch of <code>javac</code> to generate the native header files. Note that
+use the <kbd>-h</kbd> switch of <kbd>javac</kbd> to generate the native header files. Note that
the logic Ant uses to determine which files to compile does not take native headers into account,
i.e. if the <samp>.class</samp> is more recent than the corresponding <samp>.java</samp> file the
file will not get compiled even if a native header file generated for it would be outdated.</p>
@@ -157,7 +157,7 @@ file will not get compiled even if a native header file generated for it would b
<tr>
<td>bootclasspath</td>
<td>Location of bootstrap class files. (See <a href="#bootstrap">below</a> for using
- the <code>-X</code> and <code>-J-X</code> parameters for specifying the bootstrap
+ the <kbd>-X</kbd> and <kbd>-J-X</kbd> parameters for specifying the bootstrap
classpath).</td>
<td>No</td>
</tr>
@@ -192,13 +192,13 @@ file will not get compiled even if a native header file generated for it would b
</tr>
<tr>
<td>nowarn</td>
- <td>Indicates whether the <code>-nowarn</code> switch should be passed to the compiler.</td>
+ <td>Indicates whether the <kbd>-nowarn</kbd> switch should be passed to the compiler.</td>
<td>No; defaults to <q>off</q></td>
</tr>
<tr>
<td>debug</td>
<td>Indicates whether source should be compiled with debug information. If set
- to <q>off</q>, <code>-g:none</code> will be passed on the command line for compilers that
+ to <q>off</q>, <kbd>-g:none</kbd> will be passed on the command line for compilers that
support it (for other compilers, no command line argument will be used). If set
to <q>true</q>, the value of the <var>debuglevel</var> attribute determines the command line
argument.</td>
@@ -206,17 +206,17 @@ file will not get compiled even if a native header file generated for it would b
</tr>
<tr>
<td>debuglevel</td>
- <td>Keyword list to be appended to the <code>-g</code> command-line switch. Legal values
+ <td>Keyword list to be appended to the <kbd>-g</kbd> command-line switch. Legal values
are <q>none</q> or a comma-separated list of the following
keywords: <q>lines</q>, <q>vars</q>, and <q>source</q>.</td>
<td>No; ignored when <var>debug</var> is <q>false</q> or any implementation other
than <q>modern</q>, <q>javac1.2</q> and <q>jikes</q>; by default, nothing will be appended
- to <code>-g</code></td>
+ to <kbd>-g</kbd></td>
</tr>
<tr>
<td>optimize</td>
<td>Indicates whether source should be compiled with optimization. <strong>Note</strong> that
- this flag is just ignored by Sun's <code>javac</code> since JDK 1.3 (because compile-time
+ this flag is just ignored by Sun's <kbd>javac</kbd> since JDK 1.3 (because compile-time
optimization is unnecessary).</td>
<td>No; defaults to <q>off</q></td>
</tr>
@@ -259,21 +259,21 @@ file will not get compiled even if a native header file generated for it would b
</tr>
<tr>
<td>executable</td>
- <td>Complete path to the <code>javac</code> executable to use in case of <var>fork</var>
+ <td>Complete path to the <kbd>javac</kbd> executable to use in case of <var>fork</var>
is <q>yes</q>.<br/><em>Since Ant 1.6</em> this attribute can also be used to specify the path
to the executable when using <q>jikes</q>, <q>jvc</q>, <q>gcj</q> or <q>sj</q>.</td>
<td>No; defaults to the compiler of current JDK, ignored if <var>fork</var> is <q>no</q></td>
</tr>
<tr>
<td>memoryInitialSize</td>
- <td>The initial size of the memory for the underlying JVM, if <code>javac</code> is run
+ <td>The initial size of the memory for the underlying JVM, if <kbd>javac</kbd> is run
externally. (Examples: <q>83886080</q>, <q>81920k</q>, or <q>80m</q>)</td>
<td>No; defaults to the standard JVM memory setting, ignored if <var>fork</var>
is <q>no</q></td>
</tr>
<tr>
<td>memoryMaximumSize</td>
- <td>The maximum size of the memory for the underlying JVM, if <code>javac</code> is run
+ <td>The maximum size of the memory for the underlying JVM, if <kbd>javac</kbd> is run
externally; ignored otherwise. (Examples: <q>83886080</q>, <q>81920k</q>, or <q>80m</q>)</td>
<td>No; defaults to the standard JVM memory setting, ignored if <var>fork</var>
is <q>no</q></td>
@@ -290,14 +290,14 @@ file will not get compiled even if a native header file generated for it would b
</tr>
<tr>
<td>source</td>
- <td>Java language features accepted by compiler, as specified by the <code>-source</code>
+ <td>Java language features accepted by compiler, as specified by the <kbd>-source</kbd>
command-line switch. Valid feature versions are <q>1.3</q>, <q>1.4</q>, <q>1.5</q>
or <q>5</q>, etc. The attribute will be ignored by all implementations prior
to <q>javac1.4</q> (or <q>modern</q> when Ant is not running in a JVM 1.3), <q>gcj</q>
and <q>jikes</q>.<br/> If you use this attribute together with <q>gcj</q> or <q>jikes</q>, you
- must make sure that your version supports the <code>-source</code> (or <code>-fsource</code>
- for <code>gcj</code>) switch.</td>
- <td>No; by default, no <code>-source</code> argument will be used at all unless the magic
+ must make sure that your version supports the <kbd>-source</kbd> (or <kbd>-fsource</kbd>
+ for <kbd>gcj</kbd>) switch.</td>
+ <td>No; by default, no <kbd>-source</kbd> argument will be used at all unless the magic
<a href="../javacprops.html#source"><code>ant.build.javac.source</code></a> property is
set<br/><strong>Note that the default value depends on JDK that is running Ant. We highly
recommend to always specify this attribute.</strong></td>
@@ -305,7 +305,7 @@ file will not get compiled even if a native header file generated for it would b
<tr>
<td>target</td>
<td>Generate class files for specific JVM version (cross-compile).</td>
- <td>No; by default, no <code>-target</code> argument will be used at all unless the
+ <td>No; by default, no <kbd>-target</kbd> argument will be used at all unless the
magic <a href="../javacprops.html#target"><code>ant.build.javac.target</code></a> property is
set<br/><strong>Note that the default value depends on JDK that is running Ant and
on <var>source</var>
@@ -344,7 +344,7 @@ file will not get compiled even if a native header file generated for it would b
are on the classpath for the compiler. This means that "greedy" compilers will not recompile
dependent classes that are already compiled. In general this is a good thing as it stops the
compiler for doing unnecessary work. However, for some edge cases, involving generics,
- the <code>javac</code> compiler needs to compile the dependent classes to get the generics
+ the <kbd>javac</kbd> compiler needs to compile the dependent classes to get the generics
information. One example is documented in the bug
report: <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=40776" target="_top">Bug
40776 - a problem compiling a Java 5 project with generics</a>. Setting the attribute
@@ -371,7 +371,7 @@ file will not get compiled even if a native header file generated for it would b
<tr>
<td>modulepathref</td>
<td>The <var>modulepath</var> to use, given as <a href="../using.html#references">reference</a>
- to a PATH defined elsewhere. <em>since Ant 1.9.7</em></td>
+ to a path defined elsewhere. <em>since Ant 1.9.7</em></td>
<td>No</td>
</tr>
<tr>
@@ -384,7 +384,7 @@ file will not get compiled even if a native header file generated for it would b
<tr>
<td>modulesourcepathref</td>
<td>The <var>modulesourcepath</var> to use, given
- as <a href="../using.html#references">reference</a> to a PATH defined elsewhere. <em>since
+ as <a href="../using.html#references">reference</a> to a path defined elsewhere. <em>since
Ant 1.9.7</em></td>
<td>No</td>
</tr>
@@ -397,22 +397,21 @@ file will not get compiled even if a native header file generated for it would b
<tr>
<td>upgrademodulepathref</td>
<td>The <var>upgrademodulepath</var> to use, given
- as <a href="../using.html#references">reference</a> to a PATH defined elsewhere. <em>since Ant
+ as <a href="../using.html#references">reference</a> to a path defined elsewhere. <em>since Ant
1.9.7</em></td>
<td>No</td>
</tr>
<tr>
<td>nativeheaderdir</td>
- <td>Specify where to place generated native header files. Ignored when running on JDK <
- 8. <em>Since Ant 1.9.8</em>.
- <td>No</td>
+ <td>Specify where to place generated native header files. <em>Since Ant 1.9.8</em>.
+ <td>No, ignored when running on JDK 7 or earlier</td>
</tr>
<tr>
<td>release</td>
- <td>Specify the value for the <code>--release</code> switch. Ignored when running on JDK <
- 9.<br/>When set and running on JDK >= 9 the <var>source</var> and <var>target</var>
- attributes as well as the <var>bootclasspath</var> will be ignored. <em>Since Ant 1.9.8</em>.
- <td>No</td>
+ <td>Specify the value for the <kbd>--release</kbd> switch.<br/>When set and running on JDK 9+
+ the <var>source</var> and <var>target</var> attributes as well as the <var>bootclasspath</var>
+ will be ignored. <em>Since Ant 1.9.8</em>.
+ <td>No, ignored when running on JDK 8 or earlier</td>
</tr>
</table>
@@ -510,7 +509,7 @@ is <q>1.4</q>, so you can use <code>assert</code> statements.</p>
<p>compiles all <samp>.java</samp> files under the <samp>${src}</samp> directory, and stores
the <samp>.class</samp> files in the <samp>${build}</samp> directory. This will fork off the Java
-compiler using the default <code>javac</code> executable. The source level is <q>1.2</q> (similar
+compiler using the default <kbd>javac</kbd> executable. The source level is <q>1.2</q> (similar
to <q>1.1</q> or <q>1.3</q>) and the class files should be runnable under JDK 1.2+ as well.</p>
<pre>
@@ -521,7 +520,7 @@ to <q>1.1</q> or <q>1.3</q>) and the class files should be runnable under JDK 1.
<p>compiles all <samp>.java</samp> files under the <samp>${src}</samp> directory, and stores
the <samp>.class</samp> files in the <samp>${build}</samp> directory. This will fork off the Java
-compiler, using the executable named <code>java$javac.exe</code>. Note that the <q>$</q> sign needs
+compiler, using the executable named <kbd>java$javac.exe</kbd>. Note that the <q>$</q> sign needs
to be escaped by a second one. The source level is <q>1.5</q>, so you can use generics.</p>
<pre>
@@ -563,9 +562,9 @@ elements as follows:</p>
<exclude name="mypackage/p1/testpackage/**"/>
</javac></pre>
-<p>If you want to run the <code>javac</code> compiler of a different JDK, you should tell Ant, where
+<p>If you want to run the <kbd>javac</kbd> compiler of a different JDK, you should tell Ant, where
to find the compiler and which version of JDK you will be using so it can choose the correct command
-line switches. The following example executes a JDK 1.1 <code>javac</code> in a new process and
+line switches. The following example executes a JDK 1.1 <kbd>javac</kbd> in a new process and
uses the correct command line switches even when Ant is running in a JVM of a different version:</p>
<pre>
@@ -610,7 +609,7 @@ log, that these settings are fix.</p>
<p><strong>Note</strong>: If you are using Ant on Windows and a new DOS window pops up for every use
of an external compiler, this may be a problem of the JDK you are using. This problem may occur
-with all JDKs < 1.2.</p>
+with all JDKs prior to 1.2.</p>
<p>If you want to activate other compiler options like <code>lint</code> you could use
the <code><compilerarg></code> element:</p>
@@ -670,7 +669,7 @@ compilation module set. The <code>{ ... , ... }</code> express alternates for e
compilation uses application modules located in <code>modules</code> folder.The source level
is <q>9</q> to enable modules.</p>
-<h3>Jikes notes</h3>
+<h3 id="jikes">Jikes notes</h3>
<p>You need Jikes 1.15 or later.</p>
@@ -682,7 +681,7 @@ and must be set to <q>true</q> or <q>yes</q> to be interpreted as anything other
than <q>false</q>. By default, <code>build.compiler.warnings</code> is <q>true</q>, while all others
are <q>false</q>.</p>
-<table class="attr">
+<table>
<tr>
<th>Property</th>
<th>Description</th>
@@ -705,24 +704,24 @@ are <q>false</q>.</p>
<td><q>false</q></td>
</tr>
<tr>
- <td>build.compiler.warnings<br/><em><u>Deprecated</u></em>. Use <code><javac></code>'s <var>nowarn</var>
- attribute instead.</td>
+ <td><code>build.compiler.warnings</code><br/><em><u>Deprecated</u></em>.
+ Use <code><javac></code>'s <var>nowarn</var> attribute instead.</td>
<td>Don't disable warning messages.</td>
<td><q>true</q></td>
</tr>
</table>
-<h3>Jvc notes</h3>
+<h3 id="jvc">Jvc notes</h3>
<p><q>Jvc</q> will enable Microsoft extensions unless you set the
property <code>build.compiler.jvc.extensions</code> to <q>false</q> before
invoking <code><javac></code>.</p>
<h3 id="bootstrap">Bootstrap options</h3>
-<p>The Sun <code>javac</code> compiler has a <code>bootclasspath</code> command line
+<p>The Sun <kbd>javac</kbd> compiler has a <kbd>-bootclasspath</kbd> command line
option—this corresponds to the <var>bootclasspath</var> attribute/element of
the <code><javac></code> task. The Sun compiler also allows more control over the boot
-classpath using the <code>-X</code> and <code>-J-X</code> attributes. One can set these by using
+classpath using the <kbd>-X</kbd> and <kbd>-J-X</kbd> attributes. One can set these by using
the <code><compilerarg></code>. <em>Since Ant 1.6.0</em>, there is a shortcut to convert path
references to strings that can by used in an OS independent fashion
(see <a href="../using.html#pathshortcut">pathshortcut</a>). For example:</p>
@@ -739,10 +738,10 @@ references to strings that can by used in an OS independent fashion
<p>The <a href="http://openjdk.java.net/" target="_top">OpenJDK</a> project has provided
the <code>javac</code> <a href="http://openjdk.java.net/groups/compiler/" target="_top">compiler</a>
as an open source project. The output of this project is a <code>javac.jar</code> which contains
-the <code>javac</code> compiler. This compiler may be used with the <code><javac></code> task
-with the use of a <code>-Xbootclasspath/p</code> Java argument. The argument needs to be given to
-the runtime system of the <code>javac</code> executable, so it needs to be prepended with
-a <code>-J</code>, for example:</p>
+the <kbd>javac</kbd> compiler. This compiler may be used with the <code><javac></code> task
+with the use of a <kbd>-Xbootclasspath/p</kbd> Java argument. The argument needs to be given to the
+runtime system of the <kbd>javac</kbd> executable, so it needs to be prepended with a <kbd>-J</kbd>,
+for example:</p>
<pre>
<property name="patched.javac.jar"
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/javadoc.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/javadoc.html b/manual/Tasks/javadoc.html
index 829faec..d1acb0e 100644
--- a/manual/Tasks/javadoc.html
+++ b/manual/Tasks/javadoc.html
@@ -29,23 +29,23 @@
task and it's there for backwards compatibility reasons. Since this task will be removed in future
versions, you are strongly encouraged to use <a href="javadoc.html">javadoc</a> instead.</em></p>
<h3>Description</h3>
-<p>Generates code documentation using the <code>javadoc</code> tool.</p>
+<p>Generates code documentation using the <kbd>javadoc</kbd> tool.</p>
<p>The source directory will be recursively scanned for Java source files to process but only those
matching the inclusion rules, and not matching the exclusions rules will be passed to
-the <code>javadoc</code> tool. This allows wildcards to be used to choose between package names,
+the <kbd>javadoc</kbd> tool. This allows wildcards to be used to choose between package names,
reducing verbosity and management costs over time. This task, however, has no notion of
"changed" files, unlike the <a href="javac.html">javac</a> task. This means all packages
will be processed each time this task is run. In general, however, this task is used much less
frequently.</p>
-<p><strong>Note</strong>: since <code>javadoc</code>
-calls <code>System.exit()</code>, <code>javadoc</code> cannot be run inside the same JVM as Apache
-Ant without breaking functionality. For this reason, this task always forks JVM. This overhead is
-not significant since <code>javadoc</code> is normally a heavy application and will be called
-infrequently.</p>
+<p><strong>Note</strong>: since <kbd>javadoc</kbd>
+calls <code class="code">System.exit()</code>, <kbd>javadoc</kbd> cannot be run inside the same
+JVM as Apache Ant without breaking functionality. For this reason, this task always forks JVM. This
+overhead is not significant since <kbd>javadoc</kbd> is normally a heavy application and will be
+called infrequently.</p>
<p><strong>Note</strong>: the <var>packagelist</var> attribute allows you to specify the list of
packages to document outside of the Ant file. It's a much better practice to include everything
inside the <code>build.xml</code> file. This option was added in order to make it easier to migrate
-from regular makefiles, where you would use this option of <code>javadoc</code>. The packages
+from regular makefiles, where you would use this option of <kbd>javadoc</kbd>. The packages
listed in <var>packagelist</var> are not checked, so the task performs even if some packages are
missing or broken. Use this option if you wish to convert from an existing makefile. Once things are
running you should then switch to the regular notation.</p>
@@ -56,20 +56,22 @@ acceptable. JDKs < 1.4 are no longer supported. If you specify the <var>exec
attribute it is up to you to ensure that this command supports the attributes you wish to use.</p>
<p><strong>Note</strong>: When generating the JavaDocs for classes which contains annotations you
-maybe get a <code>java.lang.ClassCastException: com.sun.tools.javadoc.ClassDocImpl</code>. This is
-due <a href="https://bugs.openjdk.java.net/browse/JDK-6442982" target="_top">bug-6442982</a>. The
-cause is that JavaDoc cannot find the implementations of used annotations. The workaround is
-providing the jars with these implementations (like JAXBs <code>@XmlType</code>, ...)
-to <code><javadoc></code> using <var>classpath</var>, <var>classpathref</var> attributes or
+maybe get a <code class="output">java.lang.ClassCastException:
+com.sun.tools.javadoc.ClassDocImpl</code>. This is
+due <a href="https://bugs.openjdk.java.net/browse/JDK-6442982" target="_top">bug 6442982</a>. The
+cause is that <kbd>javadoc</kbd> cannot find the implementations of used annotations. The
+workaround is providing the jars with these implementations (like
+JAXBs <code class="code">@XmlType</code>, ...) to <code><javadoc></code>
+using <var>classpath</var>, <var>classpathref</var> attributes or
nested <code><classpath></code> element.</p>
-<p><strong>Note</strong>: many problems with running <code>javadoc</code> stem from command lines
+<p><strong>Note</strong>: many problems with running <kbd>javadoc</kbd> stem from command lines
that have become too long—even though the error message doesn't give the slightest hint this
may be the problem. If you encounter problems with the task, try to set
the <var>useexternalfile</var> attribute to <q>true</q> first.</p>
-<p>If you use multiple ways to specify where <code>javadoc</code> should be looking for sources,
-your result will be the union of all specified documentations. If you, e.g., specify
+<p>If you use multiple ways to specify where <kbd>javadoc</kbd> should be looking for sources, your
+result will be the union of all specified documentations. If you, e.g., specify
a <var>sourcepath</var> attribute and also a nested <code>packageset</code> both pointing at the
same directory your <var>excludepackagenames</var> attribute won't have any effect unless it agrees
with the <var>exclude</var> patterns of the <code>packageset</code> (and vice versa).</p>
@@ -110,7 +112,7 @@ with the <var>exclude</var> patterns of the <code>packageset</code> (and vice ve
</tr>
<tr>
<td>maxmemory</td>
- <td>Max amount of memory to allocate to the <code>javadoc</code> JVM</td>
+ <td>Max amount of memory to allocate to the <kbd>javadoc</kbd> JVM</td>
<td>all</td>
<td>No</td>
</tr>
@@ -199,14 +201,14 @@ with the <var>exclude</var> patterns of the <code>packageset</code> (and vice ve
<tr>
<td>Old</td>
<td>Generate output using JDK 1.1 emulating doclet.<br/><strong>Note</strong>: <em>Since Ant
- 1.8.0</em> this attribute has no effect because <code>javadoc</code> of Java 1.4 and later
- does not support the <code>-1.1</code> switch anymore.</td>
+ 1.8.0</em> this attribute has no effect because <kbd>javadoc</kbd> of Java 1.4 and later
+ does not support the <kbd>-1.1</kbd> switch anymore.</td>
<td>1.2</td>
<td>No</td>
</tr>
<tr>
<td>Verbose</td>
- <td>Output messages about what Javadoc is doing</td>
+ <td>Output messages about what <kbd>javadoc</kbd> is doing</td>
<td>all</td>
<td>No</td>
</tr>
@@ -375,24 +377,23 @@ with the <var>exclude</var> patterns of the <code>packageset</code> (and vice ve
</tr>
<tr>
<td>docletpath</td>
- <td>Specifies the path to the doclet class file that is specified with the <code>-doclet</code>
+ <td>Specifies the path to the doclet class file that is specified with the <kbd>-doclet</kbd>
option.</td>
<td>all</td>
<td>No</td>
</tr>
<tr>
<td>docletpathref</td>
- <td>Specifies the path to the doclet class file that is specified with the <code>-doclet</code>
- option by <a href="../using.html#references">reference</a> to a PATH defined elsewhere.</td>
+ <td>Specifies the path to the doclet class file that is specified with the <kbd>-doclet</kbd>
+ option by <a href="../using.html#references">reference</a> to a path defined elsewhere.</td>
<td>all</td>
<td>No</td>
</tr>
<tr>
<td>additionalparam</td>
- <td>Lets you add additional parameters to the <code>javadoc</code> command line. Useful for
+ <td>Lets you add additional parameters to the <kbd>javadoc</kbd> command line. Useful for
doclets. Parameters containing spaces need to be quoted using &quot;—see also the
- nested
- <code>arg</code> element.</td>
+ nested <code>arg</code> element.</td>
<td>all</td>
<td>No</td>
</tr>
@@ -404,7 +405,7 @@ with the <var>exclude</var> patterns of the <code>packageset</code> (and vice ve
</tr>
<tr>
<td>failonwarning</td>
- <td>Stop the build process if a warning is emitted—i.e. if <code>javadoc</code>'s output
+ <td>Stop the build process if a warning is emitted—i.e. if <kbd>javadoc</kbd>'s output
contains the word <q>warning</q>. <em>since Ant 1.9.4</em></td>
<td>all</td>
<td>No</td>
@@ -434,8 +435,8 @@ with the <var>exclude</var> patterns of the <code>packageset</code> (and vice ve
</tr>
<tr>
<td>source</td>
- <td>Enable <code>javadoc</code> to handle Java language features. Set this to <q>1.4</q> to
- document code that compiles using <code>javac -source 1.4</code>, etc.</td>
+ <td>Enable <kbd>javadoc</kbd> to handle Java language features. Set this to <q>1.4</q> to
+ document code that compiles using <kbd>javac -source 1.4</kbd>, etc.</td>
<td>1.4+</td>
<td>No; default can be provided using the magic
<a href="../javacprops.html#source"><code>ant.build.javac.source</code></a> property.</td>
@@ -454,7 +455,7 @@ with the <var>exclude</var> patterns of the <code>packageset</code> (and vice ve
</tr>
<tr>
<td>noqualifier</td>
- <td>Enables the <code>-noqualifier</code> argument—must be <q>all</q> or a colon separated
+ <td>Enables the <kbd>-noqualifier</kbd> argument—must be <q>all</q> or a colon separated
list of packages. <em>since Ant 1.6</em>.</td>
<td>1.4+</td>
<td>No</td>
@@ -468,7 +469,7 @@ with the <var>exclude</var> patterns of the <code>packageset</code> (and vice ve
</tr>
<tr>
<td>executable</td>
- <td>Specify a particular <code>javadoc</code> executable to use in place of the default binary
+ <td>Specify a particular <kbd>javadoc</kbd> executable to use in place of the default binary
(found in the same JDK as Ant is running in). <em>since Ant 1.6.3</em>.</td>
<td>all</td>
<td>No</td>
@@ -514,7 +515,7 @@ recommended.</p>
<h4>packageset</h4>
<p>A <a href="../Types/dirset.html">DirSet</a>. All matched directories that contain Java source
-files will be passed to <code>javadoc</code> as package names. Package names are created from the
+files will be passed to <kbd>javadoc</kbd> as package names. Package names are created from the
directory names by translating the directory separator into dots. Ant assumes the base directory of
the <code>packageset</code> points to the root of a package hierarchy.</p>
@@ -524,14 +525,14 @@ attributes of the task have no effect on the nested <code><packageset></co
<h4>fileset</h4>
<p>A <a href="../Types/fileset.html">FileSet</a>. All matched files will be passed
-to <code>javadoc</code> as source files. Ant will automatically add the include
+to <kbd>javadoc</kbd> as source files. Ant will automatically add the include
pattern <samp>**/*.java</samp> (and <samp>**/package.html</samp>
if <var>includenosourcepackages</var> is <q>true</q>) to these filesets.</p>
<p>Nested filesets can be used to document sources that are in the default package or if you want to
exclude certain files from documentation. If you want to document all source files and don't use
the default package, <code>packageset</code>s should be used instead as this increases performance
-of <code>javadoc</code>.</p>
+of <kbd>javadoc</kbd>.</p>
<p>The <var>packagenames</var>, <var>excludepackagenames</var> and <var>defaultexcludes</var>
attributes of the task have no effect on the nested <code><fileset></code> elements.</p>
@@ -602,7 +603,7 @@ and set it to <q>true</q>.</p>
<p>Similar to <code><doctitle></code>.</p>
<h4>link</h4>
-<p>Create link to <code>javadoc</code> output at the given URL. This performs the same role as
+<p>Create link to <kbd>javadoc</kbd> output at the given URL. This performs the same role as
the <var>link</var> and <var>linkoffline</var> attributes. You can use either syntax (or both at
once), but with the nested elements you can easily specify multiple occurrences of the
arguments.</p>
@@ -642,7 +643,7 @@ arguments.</p>
<td>If the <var>link</var> attribute is a relative file name, Ant will first try to locate the
file relative to the current project's <var>basedir</var> and if it finds a file there use an
absolute URL for the <var>link</var> attribute, otherwise it will pass the file name verbatim
- to the <code>javadoc</code> command.</td>
+ to the <kbd>javadoc</kbd> command.</td>
<td>No; default is <q>false</q></td>
</tr>
</table>
@@ -679,8 +680,8 @@ task.</p>
<h4>doclet</h4>
<p>The doclet nested element is used to specify
the <a href="https://docs.oracle.com/javase/8/docs/technotes/guides/javadoc/doclet/overview.html"
-target="_top">doclet</a> that <code>javadoc</code> will use to process the input source files. A
-number of the standard <code>javadoc</code> arguments are actually arguments of the standard
+target="_top">doclet</a> that <kbd>javadoc</kbd> will use to process the input source files. A
+number of the standard <kbd>javadoc</kbd> arguments are actually arguments of the standard
doclet. If these are specified in the <code>javadoc</code> task's attributes, they will be passed to
the doclet specified in the <code><doclet></code> nested element. Such attributes should only
be specified, therefore, if they can be interpreted by the doclet in use.</p>
@@ -721,7 +722,7 @@ those tags.</p>
<td>description</td>
<td>Description for tag (e.g. <q>To do:</q>)</td>
<td>
- No, the <code>javadoc</code> executable will pick a default if this is not specified
+ No, the <kbd>javadoc</kbd> executable will pick a default if this is not specified
</td>
</tr>
<tr>
@@ -748,7 +749,7 @@ those tags.</p>
todo:a:To Do</pre>
<strong>Note</strong>: The Javadoc reference quide has double quotes around the description
part of the definition. This will not work when used in a file, as the definition is quoted
- again when given to the <code>javadoc</code> program.<br/>
+ again when given to the <kbd>javadoc</kbd> program.<br/>
<strong>Note</strong>: If this attribute is specified, all the other attributes in this
element will be ignored.</td>
<td>No</td>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/javah.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/javah.html b/manual/Tasks/javah.html
index ec767dd..0b5c0e8 100644
--- a/manual/Tasks/javah.html
+++ b/manual/Tasks/javah.html
@@ -52,13 +52,13 @@ attribute:</p>
<li><q>gcjh</q>—the native standard compiler
of <a href="https://gcc.gnu.org/gcc-7/changes.html#java" target="_top">gcj and
gij</a>. <em>Since Apache Ant 1.8.2</em></li>
- <li><q>forking</q>—runs the <code>javah</code> executable via its command line interface in
+ <li><q>forking</q>—runs the <kbd>javah</kbd> executable via its command line interface in
a separate process. Default when not running on Kaffe or gcj/gij <em>since Ant 1.9.8</em></li>
</ul>
<p><strong>Note</strong>: if you are using this task to work on multiple files the command line may
-become too long on some operating systems. Unfortunately the <code>javah</code> command doesn't
-support command argument files the way <code>javac</code> (for example) does, so all that can be
+become too long on some operating systems. Unfortunately the <kbd>javah</kbd> command doesn't
+support command argument files the way <kbd>javac</kbd> (for example) does, so all that can be
done is breaking the amount of classes to compile into smaller chunks.</p>
<h3>Parameters</h3>
@@ -81,7 +81,7 @@ done is breaking the amount of classes to compile into smaller chunks.</p>
</tr>
<tr>
<td>destdir</td>
- <td class="left">sets the directory where <code>javah</code> saves the header files or the stub
+ <td class="left">sets the directory where <kbd>javah</kbd> saves the header files or the stub
files.</td>
</tr>
<tr>
@@ -102,8 +102,7 @@ done is breaking the amount of classes to compile into smaller chunks.</p>
</tr>
<tr>
<td>verbose</td>
- <td>causes <code>Javah</code> to print a message concerning the status of the generated
- files</td>
+ <td>causes <kbd>javah</kbd> to print a message concerning the status of the generated files</td>
<td>No</td>
</tr>
<tr>
@@ -185,8 +184,8 @@ using one of the built-in compilers.</p>
<h4>Any nested element of a type that implements JavahAdapter</h4>
<p><em>Since Ant 1.8.0</em></p>
-<p>If a defined type implements the <code>JavahAdapter</code> interface a nested element of that
-type can be used as an alternative to the <var>implementation</var> attribute.</p>
+<p>If a defined type implements the <code class="code">JavahAdapter</code> interface a nested
+element of that type can be used as an alternative to the <var>implementation</var> attribute.</p>
<h3>Examples</h3>
<pre><javah destdir="c" class="org.foo.bar.Wibble"/></pre>
@@ -220,11 +219,12 @@ already exist.</p>
<class name="org.foo.bar.Tribble"/>
</javah></pre>
<p>writes the headers for the three classes using the 'old' JNI format, then writes the
-corresponding <samp>.c</samp> stubs. The verbose option will cause <code>Javah</code> to describe
-its progress.</p>
+corresponding <samp>.c</samp> stubs. The <var>verbose</var> option will cause <code>Javah</code> to
+describe its progress.</p>
-<p>If you want to use a custom JavahAdapter <code>org.example.MyAdapter</code> you can either use
-the implementation attribute:</p>
+<p>If you want to use a
+custom <code class="code">JavahAdapter</code> <code>org.example.MyAdapter</code> you can either use
+the <var>implementation</var> attribute:</p>
<pre>
<javah destdir="c" class="org.foo.bar.Wibble"
implementation="org.example.MyAdapter"/></pre>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/jdepend.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/jdepend.html b/manual/Tasks/jdepend.html
index 6273332..ef72bfb 100644
--- a/manual/Tasks/jdepend.html
+++ b/manual/Tasks/jdepend.html
@@ -82,7 +82,7 @@ default the task writes its report to the standard output.</p>
<td>jvm</td>
<td>The command used to invoke JVM. The command is resolved
by <code>java.lang.Runtime.exec()</code>.</td>
- <td>No; default <q>java</q>, ignored if <var>fork</var> is <q>false</q></td>
+ <td>No; default <kbd>java</kbd>, ignored if <var>fork</var> is <q>false</q></td>
</tr>
<tr>
<td>dir</td>
@@ -97,7 +97,7 @@ default the task writes its report to the standard output.</p>
</tr>
<tr>
<td>classpathref</td>
- <td>the <var>classpath</var> to use, given as reference to a PATH defined elsewhere.</td>
+ <td>the <var>classpath</var> to use, given as reference to a path defined elsewhere.</td>
<td>No</td>
</tr>
</table>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/jjtree.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/jjtree.html b/manual/Tasks/jjtree.html
index 5ef0f39..b73664f 100644
--- a/manual/Tasks/jjtree.html
+++ b/manual/Tasks/jjtree.html
@@ -494,18 +494,18 @@ versions</h3>
</table>
<p id="footnote-1"><a href="#footnote-1-back"><strong>Note</strong></a>: When running JJTree with
-the Ant <code>taskdef jjtree</code> the option <code>-OUTPUT_DIRECTORY</code> must always be set,
+the Ant <code>taskdef jjtree</code> the option <kbd>-OUTPUT_DIRECTORY</kbd> must always be set,
because the project's <var>basedir</var> and the Ant working directory might differ. So even if you
don't specify the <var>outputdirectory</var> for <code>taskdef jjtree</code>, JJTree will be called
-with the <code>-OUTPUT_DIRECTORY</code> set to the project's <var>basedir</var>. But when
-the <code>-OUTPUT_DIRECTORY</code> is set, the <code>-OUTPUT_FILE</code> setting is handled as if
-relative to this <code>-OUTPUT_DIRECTORY</code>. Thus when the <code>-OUTPUT_FILE</code> is absolute
+with the <kbd>-OUTPUT_DIRECTORY</kbd> set to the project's <var>basedir</var>. But when
+the <kbd>-OUTPUT_DIRECTORY</kbd> is set, the <kbd>-OUTPUT_FILE</kbd> setting is handled as if
+relative to this <kbd>-OUTPUT_DIRECTORY</kbd>. Thus when the <kbd>-OUTPUT_FILE</kbd> is absolute
or contains a drive letter we have a problem. Therefore absolute <var>outputfile</var>s (when
the <var>outputdirectory</var> isn't specified) are made relative to the default directory. And for
this reason <var>outputfile</var>s that contain a drive letter can't be supported.</p>
-<p>By the way: specifying a drive letter in the <code>-OUTPUT_FILE</code> when
-the <code>-OUTPUT_DIRECTORY</code> is set, also results in strange behavior when running JJTree from
+<p>By the way: specifying a drive letter in the <kbd>-OUTPUT_FILE</kbd> when
+the <kbd>-OUTPUT_DIRECTORY</kbd> is set, also results in strange behavior when running JJTree from
the command line.</p>
</body>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/junit.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/junit.html b/manual/Tasks/junit.html
index e2e7a96..a83f57d 100644
--- a/manual/Tasks/junit.html
+++ b/manual/Tasks/junit.html
@@ -38,7 +38,7 @@ Library Dependencies</a> for more information.</p>
in <code>ANT_HOME/lib</code>.</li>
<li>Do not put either in <code>ANT_HOME/lib</code>, and instead include their locations in
your <code>CLASSPATH</code> environment variable.</li>
- <li>Add both JARs to your classpath using <code>-lib</code>.</li>
+ <li>Add both JARs to your classpath using <kbd>-lib</kbd>.</li>
<li>Specify the locations of both JARs using a <code><classpath></code> element in
a <code><taskdef></code> in the build file.</li>
<li>Leave <samp>ant-junit.jar</samp> in its default location in <code>ANT_HOME/lib</code> but
@@ -129,7 +129,7 @@ for details.</p>
<td>jvm</td>
<td>The command used to invoke JVM. The command is resolved
by <code>java.lang.Runtime.exec()</code>.</td>
- <td>No; default is <q>java</q>, ignored if <var>fork</var> is <q>false</q></td>
+ <td>No; default is <kbd>java</kbd>, ignored if <var>fork</var> is <q>false</q></td>
</tr>
<tr>
<td>dir</td>
@@ -227,7 +227,7 @@ the following string patterns:</p>
<h3 id="nested">Parameters specified as nested elements</h3>
<p>The <code><junit></code> task supports a nested <code><classpath></code> element that
-represents a <a href="../using.html#path">PATH like structure</a>.</p>
+represents a <a href="../using.html#path">path-like structure</a>.</p>
<p><em>Since Ant 1.7</em>, this classpath may be used to refer to <samp>junit.jar</samp> as well as
your tests and the tested code.</p>
@@ -286,7 +286,7 @@ element's attributes, see the description in the <a href="../Tasks/exec.html#env
<p><em>Since Ant 1.6</em>.</p>
<p>The location of bootstrap class files can be specified using
-this <a href="../using.html#path">PATH like structure</a>—will be ignored if <var>fork</var>
+this <a href="../using.html#path">path-like structure</a>—will be ignored if <var>fork</var>
is <q>false</q> or the target JVM doesn't support it (i.e. Java 1.1).</p>
<h4>permissions</h4>
@@ -312,7 +312,7 @@ an <a href="../Types/assertions.html"><code><assertions></code></a> subele
<p><em>Since Ant 1.9.8</em></p>
-<p>The location of modules can be specified using this <a href="../using.html#path">PATH like
+<p>The location of modules can be specified using this <a href="../using.html#path">path-like
structure</a>.<br/>The <code>modulepath</code> requires <var>fork</var> to be set to <q>true</q>.
<h4>upgrademodulepath</h4>
@@ -320,7 +320,7 @@ structure</a>.<br/>The <code>modulepath</code> requires <var>fork</var> to be se
<p><em>Since Ant 1.9.8</em></p>
<p>The location of modules that replace upgradeable modules in the runtime image can be specified
-using this <a href="../using.html#path">PATH like
+using this <a href="../using.html#path">path-like
structure</a>.<br/>The <code>upgrademodulepath</code> requires <var>fork</var> to be set
to <q>true</q>.</p>
@@ -335,15 +335,16 @@ of <code><test></code>.</p>
emits plain text. The formatter named <q>brief</q> will only print detailed information for test
cases that failed, while <q>plain</q> gives a little statistics line for all test cases. Custom
formatters that need to
-implement <code>org.apache.tools.ant.taskdefs.optional.junit.JUnitResultFormatter</code> can be
-specified.</p>
+implement <code class="code">org.apache.tools.ant.taskdefs.optional.junit.JUnitResultFormatter</code>
+can be specified.</p>
<p>If you use the XML formatter, it may not include the same output that your tests have written as
some characters are illegal in XML documents and will be dropped.</p>
<p>The fourth formatter named <q>failure</q> (<em>since Ant 1.8.0</em>) collects all
-failing <code>testXXX()</code> methods and creates a new <code>TestCase</code> which delegates only
-these failing methods. The name and the location can be specified via Java System property or Ant
+failing <code class="code">testXXX()</code> methods and creates a
+new <code class="code">TestCase</code> which delegates only these failing methods. The name and the
+location can be specified via Java system property or Ant
property <code>ant.junit.failureCollector</code>. The value has to point to the directory and the
name of the resulting class (without suffix). It defaults
to <samp><i>java-tmp-dir</i>/FailedTests</samp>.</p>
@@ -362,7 +363,7 @@ to <samp><i>java-tmp-dir</i>/FailedTests</samp>.</p>
</tr>
<tr>
<td>classname</td>
- <td>Name of a custom formatter class.</td>
+ <td class="left">Name of a custom formatter class.</td>
</tr>
<tr>
<td>extension</td>
@@ -480,14 +481,14 @@ to <samp><i>java-tmp-dir</i>/FailedTests</samp>.</p>
<tr>
<td>skipNonTests</td>
<td>Do not pass any classes that do not contain JUnit tests to the test runner. This prevents
- non tests from appearing as test errors in test results.<br/> Tests are identified by looking
+ non tests from appearing as test errors in test results.<br/>Tests are identified by looking
for the <code>@Test</code> annotation on any methods in concrete classes that don't
extend <code>junit.framework.TestCase</code>, or for public/protected methods with names
starting with <q>test</q> in concrete classes that
extend <code>junit.framework.TestCase</code>. Classes marked with the JUnit
4 <code>org.junit.runner.RunWith</code> or <code>org.junit.runner.Suite.SuiteClasses</code>
annotations are also passed to JUnit for execution, as is any class with a public/protected
- no-argument <code>suite</code> method.</td>
+ no-argument <code>suite()</code> method.</td>
<td>No; default is <q>false</q></td>
</tr>
</table>
@@ -569,10 +570,11 @@ only <code><fileset></code> has been supported.</p>
non tests from appearing as test errors in test results.<br/>Tests are identified by looking
for the <code>@Test</code> annotation on any methods in concrete classes that don't
extend <code>junit.framework.TestCase</code>, or for public/protected methods with names
- starting with 'test' in concrete classes that extend <code>junit.framework.TestCase</code>.
- Classes marked with the JUnit4 <code>org.junit.runner.RunWith</code>
- or <code>org.junit.runner.Suite.SuiteClasses</code> annotations are also passed to JUnit for
- execution, as is any class with a public/protected no-argument <code>suite</code> method.</td>
+ starting with <q>test</q> in concrete classes that
+ extend <code>junit.framework.TestCase</code>. Classes marked with the JUnit
+ 4 <code>org.junit.runner.RunWith</code> or <code>org.junit.runner.Suite.SuiteClasses</code>
+ annotations are also passed to JUnit for execution, as is any class with a public/protected
+ no-argument <code>suite()</code> method.</td>
<td>No; default is <q>false</q></td>
</tr>
</table>
@@ -583,25 +585,26 @@ elements.</p>
<h3>Forked tests and <code>tearDown()</code></h3>
<p>If a forked test runs into a timeout, Ant will terminate the JVM process it has created, which
-probably means the test's <code>tearDown()</code> method will never be called. The same is true if
-the forked JVM crashes for some other reason.</p>
+probably means the test's <code class="code">tearDown()</code> method will never be called. The
+same is true if the forked JVM crashes for some other reason.</p>
<p><em>Since Ant 1.8.0</em>, a special formatter is distributed with Ant that tries to load the
-testcase that was in the forked JVM and invoke that class' <code>tearDown()</code> method. This
-formatter has the following limitations:</p>
+testcase that was in the forked JVM and invoke that class' <code class="code">tearDown()</code>
+method. This formatter has the following limitations:</p>
<ul>
<li>It runs in the same JVM as Ant itself, this is a different JVM than the one that was executing
the test and it may see a different classloader (and thus may be unable to load the test
class).</li>
<li>It cannot determine which test was run when the timeout/crash occurred if the forked JVM was
- running multiple test. I.e. the formatter cannot work with any <var>forkMode</var> other
- than <q>perTest</q> and it won't do anything if the test class contains a <code>suite()</code>
- method.</li>
+ running multiple tests. I.e. the formatter cannot work with any <var>forkMode</var> other
+ than <q>perTest</q> and it won't do anything if the test class contains
+ a <code class="code">suite()</code> method.</li>
</ul>
-<p>If the formatter recognizes an incompatible <var>forkMode</var> or a <code>suite</code> method or
-fails to load the test class it will silently do nothing.</p>
+<p>If the formatter recognizes an incompatible <var>forkMode</var> or
+a <code class="code">suite()</code> method or fails to load the test class it will silently do
+nothing.</p>
<p>The formatter doesn't have any effect on tests that were not forked or didn't cause timeouts or
JVM crashes.</p>
@@ -734,11 +737,11 @@ updating the collector class.</p>
the <code>platform.java</code> property. The JUnit library is a part of an unnamed module while the
tested project and required modules are on the module path. The tests do not have module-info file
and are executed in the project module given by <code>module.name</code> property.<br/>
-The <code>--patch-module</code> Java option executes the tests built
+The <kbd>--patch-module</kbd> Java option executes the tests built
into <samp>${build.test.classes}</samp> in a module given by <code>module.name</code> property.<br/>
-The <code>--add-modules</code> Java option enables the tested module.<br/>
-The <code>--add-reads</code> Java option makes the unnamed module containing JUnit readable by
-tested module.<br/> The <code>--add-exports</code> Java option makes the non-exported test
+The <kbd>--add-modules</kbd> Java option enables the tested module.<br/>
+The <kbd>--add-reads</kbd> Java option makes the unnamed module containing JUnit readable by
+tested module.<br/> The <kbd>--add-exports</kbd> Java option makes the non-exported test
package <code>my.test</code> accessible from the unnamed module containing JUnit.</p>
<pre>
<junit fork="true"
@@ -754,8 +757,8 @@ package <code>my.test</code> accessible from the unnamed module containing JUnit
</pre>
<p>Runs <code>my.test.TestCase</code> as a black-box test in the forked JVM given by
the <code>platform.java</code> property. The JUnit library is used as an automatic module. The
-tests' module-info requires the tested module and JUnit.<br/> The <code>--add-modules</code> Java
-option enables the test module.<br/> The <code>--add-exports</code> Java option makes the
+tests' module-info requires the tested module and JUnit.<br/> The <kbd>--add-modules</kbd> Java
+option enables the test module.<br/> The <kbd>--add-exports</kbd> Java option makes the
non-exported test package <code>my.test</code> accessible from the JUnit module and Ant's test
runner. Another possibility is to export the test package in the tests' module-info
by <code>exports my.test</code> directive.</p>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/loadfile.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/loadfile.html b/manual/Tasks/loadfile.html
index 4a251ae..81a2899 100644
--- a/manual/Tasks/loadfile.html
+++ b/manual/Tasks/loadfile.html
@@ -60,7 +60,7 @@ is not set.</p>
<tr>
<td>quiet</td>
<td>Do not display a diagnostic message (unless Apache Ant has been invoked with
- the <code>-verbose</code> or <code>-debug</code> switches) or modify the exit status to
+ the <kbd>-verbose</kbd> or <kbd>-debug</kbd> switches) or modify the exit status to
reflect an error. Setting this to <q>true</q> implies setting <var>failonerror</var>
to <q>false</q>. <em>Since Ant 1.7.0</em>.
</td>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/loadresource.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/loadresource.html b/manual/Tasks/loadresource.html
index af86248..2e274af 100644
--- a/manual/Tasks/loadresource.html
+++ b/manual/Tasks/loadresource.html
@@ -61,7 +61,7 @@ the property is not set.</p>
<tr>
<td>quiet</td>
<td>Do not display a diagnostic message (unless Ant has been invoked with
- the <code>-verbose</code> or <code>-debug</code> switches) or modify the exit status to
+ the <kbd>-verbose</kbd> or <kbd>-debug</kbd> switches) or modify the exit status to
reflect an error. Setting this to <q>true</q> implies setting <var>failonerror</var>
to <q>false</q>.</td>
<td>No; default is <q>false</q></td>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/local.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/local.html b/manual/Tasks/local.html
index 4e76db1..f8ad0fc 100644
--- a/manual/Tasks/local.html
+++ b/manual/Tasks/local.html
@@ -73,7 +73,7 @@ examples section.</p>
<p>outputs</p>
-<pre>
+<pre class="output">
step1:
[echo] Before local: foo is foo
[echo] After local: foo is bar
@@ -110,7 +110,7 @@ remainder of the target <q>step1</q>.</p>
<p>outputs something similar to</p>
-<pre>
+<pre class="output">
[echo] global 3: foo is foo
[echo] global 1: foo is foo
[echo] First sequential: foo is bar.1
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/macrodef.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/macrodef.html b/manual/Tasks/macrodef.html
index ffde288..7d821a2 100644
--- a/manual/Tasks/macrodef.html
+++ b/manual/Tasks/macrodef.html
@@ -186,7 +186,7 @@
<h3>Examples</h3>
<p>The following example defined a task called testing and runs it.</p>
- <pre class="code">
+ <pre>
<macrodef name="testing">
<attribute name="v" default="NOT SET"/>
<element name="some-tasks" optional="yes"/>
@@ -206,7 +206,7 @@
element <code>cc-elements</code>. The body of the task uses the <code><cc></code> task
from the <a href="http://ant-contrib.sourceforge.net/" target="_top">ant-contrib</a>
project.</p>
- <pre class="code">
+ <pre>
<macrodef name="call-cc">
<attribute name="target"/>
<attribute name="link"/>
@@ -223,7 +223,7 @@
</sequential>
</macrodef></pre>
<p>This then can be used as follows:</p>
- <pre class="code">
+ <pre>
<call-cc target="unittests" link="executable"
target.dir="${build.bin.dir}">
<cc-elements>
@@ -234,9 +234,10 @@
<linker refid="linker-libs"/>
</cc-elements>
</call-cc></pre>
- <p>The following fragment shows <call-cc>, but this time using an implicit element and
- with the <var>link</var> and <var>target.dir</var> arguments having default values.</p>
- <pre class="code">
+ <p>The following fragment shows <code><call-cc></code>, but this time using an implicit
+ element and with the <var>link</var> and <var>target.dir</var> arguments having default
+ values.</p>
+ <pre>
<macrodef name="call-cc">
<attribute name="target"/>
<attribute name="link" default="executable"/>
@@ -252,8 +253,9 @@
</cc>
</sequential>
</macrodef></pre>
- <p>This then can be used as follows, note that <cc-elements> is not specified.</p>
- <pre class="code">
+ <p>This then can be used as follows, note that <code><cc-elements></code> is not
+ specified.</p>
+ <pre>
<call-cc target="unittests">
<includepath location="${gen.dir}"/>
<includepath location="test"/>
@@ -263,7 +265,7 @@
</call-cc>
</pre>
<p>The following shows the use of the <code>text</code> element.</p>
- <pre class="code">
+ <pre>
<macrodef name="echotest">
<text name="text"/>
<sequential>
@@ -275,10 +277,10 @@
</echotest>
</pre>
<p>The following uses a prior defined attribute for setting the default value of another. The
- output would be <code>one=test two=test</code>. If you change the order of lines *1 and *2 the
- output would be <code>one=test two=@{one}</code>, because while processing
- the <var>two</var>-line the value for <var>one</var> is not set.</p>
- <pre class="code">
+ output would be <code class="output">one=test two=test</code>. If you change the order of
+ lines *1 and *2 the output would be <code class="output">one=test two=@{one}</code>, because
+ while processing the <var>two</var>-line the value for <var>one</var> is not set.</p>
+ <pre>
<macrodef name="test">
<attribute name="one"/> <strong>*1</strong>
<attribute name="two" default="@{one}"/> <strong>*2</strong>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/makeurl.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/makeurl.html b/manual/Tasks/makeurl.html
index a02c46f..c53f004 100644
--- a/manual/Tasks/makeurl.html
+++ b/manual/Tasks/makeurl.html
@@ -31,8 +31,8 @@ property. Useful when setting up RMI or JNLP codebases, for example. Nested fi
supported; if present, these are turned into the URLs with the supplied <var>separator</var> between
them.</p>
<h3 id="attributes">Parameters</h3>
-<table>
- <tr class="attr">
+<table class="attr">
+ <tr>
<th>Attribute</th>
<th>Description</th>
<th>Type</th>
@@ -75,7 +75,9 @@ them.</p>
<pre><makeurl file="${user.home}/.m2/repository" property="m2.repository.url"/></pre>
<p>Sets the property <code>m2.repository.url</code> to the file: URL of the local Maven2
repository.</p>
-<pre><makeurl property="codebase"><fileset dir="lib includes="*.jar"/></makeurl></pre>
+<pre><makeurl property="codebase">
+ <fileset dir="lib includes="*.jar"/>
+</makeurl></pre>
<p>Set the property <code>codebase</code> to the three URLs of the files provided as nested
elements.</p>
</body>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/manifestclasspath.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/manifestclasspath.html b/manual/Tasks/manifestclasspath.html
index 5cf25b6..0035515 100644
--- a/manual/Tasks/manifestclasspath.html
+++ b/manual/Tasks/manifestclasspath.html
@@ -89,10 +89,10 @@ This classpath must not be empty, and is required.</p>
jarfile="build/acme.jar">
<classpath refid="classpath"/>
</manifestclasspath></pre>
-<p>Assuming a path of id <q>classpath</q> was already defined, convert this path relatively to
-the <samp>build/</samp> directory that will contain <samp>acme.jar</samp>, which can later be
-created with <code><jar></code> with a nested <code><manifest></code> element that lists
-an <code><attribute name="Class-Path" value="${jar.classpath}"/></code>.</p>
+<p>Assuming a path with <var>id</var> <q>classpath</q> was already defined, convert this path
+relatively to the <samp>build/</samp> directory that will contain <samp>acme.jar</samp>, which can
+later be created with <code><jar></code> with a nested <code><manifest></code> element
+that lists an <code><attribute name="Class-Path" value="${jar.classpath}"/></code>.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/move.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/move.html b/manual/Tasks/move.html
index d93095c..895bc13 100644
--- a/manual/Tasks/move.html
+++ b/manual/Tasks/move.html
@@ -31,7 +31,7 @@ the destination file is overwritten if it already exists. When <var>overwrite</
then files are only moved if the source file is newer than the destination file, or when the
destination file does not exist.</p>
-<p><a href="../Types/resources.html#collection">resource collections</a> are used to select a group
+<p><a href="../Types/resources.html#collection">Resource collections</a> are used to select a group
of files to move. Only file system based resource collections are supported, this
includes <a href="../Types/fileset.html">fileset</a>s, <a href="../Types/filelist.html">filelist</a>
and <a href="../using.html#path">path</a>. Prior to Apache Ant 1.7
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/native2ascii.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/native2ascii.html b/manual/Tasks/native2ascii.html
index d53628a..4d8f231 100644
--- a/manual/Tasks/native2ascii.html
+++ b/manual/Tasks/native2ascii.html
@@ -52,7 +52,7 @@
<ul>
<li><q>default</q>—the default converter for the platform: kaffe when run on Kaffe,
builtin otherwise.</li>
- <li><q>sun</q>—used to be the standard converter of the JDK < 9</li>
+ <li><q>sun</q>—used to be the standard converter of the JDK 8 or earlier</li>
<li><q>kaffe</q>—the standard converter of <a href="http://www.kaffe.org"
target="_top">Kaffe</a></li>
<li><q>builtin</q>—Ant's internal implementation. <em>Since Ant 1.9.8</em></li>
@@ -66,7 +66,7 @@
</tr>
<tr>
<td>reverse</td>
- <td>Reverse the sense of the conversion, i.e. convert from ASCII to native <strong>only
+ <td>Reverse the sense of the conversion, i.e. convert from ASCII to native<br/><strong>Only
supported by the <q>sun</q> and <q>builtin</q> converters</strong></td>
<td>No</td>
</tr>
@@ -169,8 +169,8 @@ using one of the built-in converters.</p>
<h4>Any nested element of a type that implements Native2AsciiAdapter</h4>
<p><em>Since Ant 1.8.0</em></p>
-<p>If a defined type implements the <code>Native2AsciiAdapter</code> interface a nested element of
-that type can be used as an alternative to the <var>implementation</var> attribute.</p>
+<p>If a defined type implements the <code class="code">Native2AsciiAdapter</code> interface a nested
+element of that type can be used as an alternative to the <var>implementation</var> attribute.</p>
<h3>Examples</h3>
@@ -189,8 +189,9 @@ EUCJIS encoding to ASCII and renames them to end in <samp>.java</samp>.</p>
to ASCII, placing the results in the directory <samp>src</samp>. The names of the files remain the
same.</p>
-<p>If you want to use a custom Native2AsciiAdapter <code>org.example.MyAdapter</code> you can either
-use the implementation attribute:</p>
+<p>If you want to use a
+custom <code class="code">Native2AsciiAdapter</code> <code>org.example.MyAdapter</code> you can
+either use the implementation attribute:</p>
<pre>
<native2ascii encoding="EUCJIS" src="srcdir" dest="srcdir"
includes="**/*.eucjis" ext=".java"
@@ -203,8 +204,8 @@ use the implementation attribute:</p>
includes="**/*.eucjis" ext=".java">
<myadapter/>
</native2ascii></pre>
-<p>in which case your native2ascii adapter can support attributes and nested elements of its
-own.</p>
+<p>in which case your <code>native2ascii</code> adapter can support attributes and nested elements
+of its own.</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/netrexxc.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/netrexxc.html b/manual/Tasks/netrexxc.html
index f3c3a7e..6ca54d1 100644
--- a/manual/Tasks/netrexxc.html
+++ b/manual/Tasks/netrexxc.html
@@ -50,8 +50,9 @@ nested <code><include></code>, <code><exclude></code>
and <code><patternset></code> elements.</p>
<p>All attributes except <var>classpath</var>, <var>srcdir</var> and <var>destDir</var> are also
available as properties in the form <code>ant.netrexxc.<i>attributename</i></code>,
-eg.<br/><code><property name="ant.netrexxc.verbose" value="noverbose"/></code><br/> or from the
-command line as<br/><code>ant -Dant.netrexxc.verbose=noverbose ...</code></p>
+eg.<br/><code class="code"><property name="ant.netrexxc.verbose"
+value="noverbose"/></code><br/> or from the command line as<br/><kbd>ant
+-Dant.netrexxc.verbose=noverbose ...</kbd></p>
<p><strong>Note</strong>: This task depends on external libraries not included in the Apache Ant
distribution. See <a href="../install.html#librarydependencies">Library Dependencies</a> for more
information.</p>
@@ -174,7 +175,7 @@ information.</p>
<td>removeKeepExtension</td>
<td>Tells whether the trailing <samp>.keep</samp> in <var>compile</var>=<q>false</q> mode should
be removed so that the resulting Java source file really ends on <samp>.java</samp>. This
- facilitates the use of the <code>javadoc</code> tool later on.</td>
+ facilitates the use of the <kbd>javadoc</kbd> tool later on.</td>
<td>No</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/parallel.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/parallel.html b/manual/Tasks/parallel.html
index b84cb12..77c0c56 100644
--- a/manual/Tasks/parallel.html
+++ b/manual/Tasks/parallel.html
@@ -100,7 +100,7 @@ is not set, the remaining tasks in other threads will continue to run until all
completed. In this situation, the <code>parallel</code> task will also fail.</p>
<p>The <code>parallel</code> task may be combined with the <a href="sequential.html">sequential</a>
-task to define sequences of tasks to be executed on each thread within the parallel block</p>
+task to define sequences of tasks to be executed on each thread within the parallel block.</p>
<p>The <var>threadCount</var> attribute can be used to place a maximum number of available threads
for the execution. When not present all child tasks will be executed at once. When present then
@@ -125,9 +125,9 @@ occur. This is not a replacement for Java Language level thread semantics and i
<h4>daemons</h4>
<p>The <code>parallel</code> task supports a <code><daemons></code> nested element. This is a
-list of tasks which are to be run in parallel daemon threads. The parallel task will not wait for
-these tasks to complete. Being daemon threads, however, they will not prevent Ant from completing,
-whereupon the threads are terminated. Failures in daemon threads which occur before
+list of tasks which are to be run in parallel daemon threads. The <code>parallel</code> task will
+not wait for these tasks to complete. Being daemon threads, however, they will not prevent Ant from
+completing, whereupon the threads are terminated. Failures in daemon threads which occur before
the <code>parallel</code> task itself finishes will be reported and can cause <code>parallel</code>
to throw an exception. Failures which occur after <code>parallel</code> has completed are not
reported.</p>
@@ -166,7 +166,7 @@ the build. In this instance, some servlets are being compiled in one thread and
being precompiled in another. Developers need to be careful that the two tasks are independent, both
in terms of their dependencies and in terms of their potential interactions in Ant's external
environment. Here we set <var>fork</var>=<q>true</q> for the <code><javac></code> task, so
-that it runs in a new process; if the <code><wljspc></code> task used the <code>javac</code>
+that it runs in a new process; if the <code><wljspc></code> task used the <kbd>javac</kbd>
compiler in-VM (it may), concurrency problems may arise.</p>
<pre>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/patch.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/patch.html b/manual/Tasks/patch.html
index c910736..6f651f2 100644
--- a/manual/Tasks/patch.html
+++ b/manual/Tasks/patch.html
@@ -26,7 +26,7 @@
<h2 id="patch">Patch</h2>
<h3>Description</h3>
-<p>Applies a diff file to originals. Requires <code>patch</code> to be on the execution path.</p>
+<p>Applies a diff file to originals. Requires <kbd>patch</kbd> to be on the execution path.</p>
<h3>Parameters</h3>
<table class="attr">
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/pathconvert.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/pathconvert.html b/manual/Tasks/pathconvert.html
index b6478fe..373cc25 100644
--- a/manual/Tasks/pathconvert.html
+++ b/manual/Tasks/pathconvert.html
@@ -140,7 +140,7 @@ value <samp>/weblogic</samp>.</p>
</pathconvert></pre>
<p>will generate the path shown below and store it in the property
named <code>wl.path.unix</code>.</p>
-<pre>/weblogic/lib/weblogicaux.jar:/weblogic/classes:/weblogic/mssqlserver4/classes:/WINNT/SYSTEM32</pre>
+<pre class="output">/weblogic/lib/weblogicaux.jar:/weblogic/classes:/weblogic/mssqlserver4/classes:/WINNT/SYSTEM32</pre>
<h4>Example 2</h4>
<p>Given a FileList defined as:</p>
@@ -154,7 +154,7 @@ named <code>wl.path.unix</code>.</p>
<map from="${env.HOME}" to="/usr/local"/>
</pathconvert></pre>
<p>will convert the list of files to the following Unix path:</p>
-<pre>/usr/local/ant/lib/njavac.jar:/usr/local/ant/lib/xproperty.jar</pre>
+<pre class="output">/usr/local/ant/lib/njavac.jar:/usr/local/ant/lib/xproperty.jar</pre>
<h4>Example 3</h4>
<pre>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/presetdef.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/presetdef.html b/manual/Tasks/presetdef.html
index 5e0c246..a37284d 100644
--- a/manual/Tasks/presetdef.html
+++ b/manual/Tasks/presetdef.html
@@ -60,7 +60,7 @@
the <var>debug</var>, <var>deprecation</var>, <var>srcdir</var> and <var>destdir</var>
attributes set. It also has a <code>src</code> element to source files from a generated
directory.</p>
- <pre class="code">
+ <pre>
<presetdef name="my.javac">
<javac debug="${debug}" deprecation="${deprecation}"
srcdir="${src.dir}" destdir="${classes.dir}">
@@ -68,13 +68,13 @@
</javac>
</presetdef></pre>
<p>This can be used as a normal <code>javac</code> task—for example:</p>
- <pre class="code"><my.javac/></pre>
+ <pre><my.javac/></pre>
<p>The attributes specified in the preset task may be overridden—i.e. they may be seen as
optional attributes—for example:</p>
- <pre class="code"><my.javac srcdir="${test.src}" deprecation="no"/></pre>
+ <pre><my.javac srcdir="${test.src}" deprecation="no"/></pre>
<p>One may put a <code>presetdef</code> definition in an antlib. For example suppose the jar
file <samp>antgoodies.jar</samp> has the <samp>antlib.xml</samp> as follows:</p>
- <pre class="code">
+ <pre>
<antlib>
<taskdef resource="com/acme/antgoodies/tasks.properties"/>
<!-- Implement the common use of the javac command -->
@@ -84,7 +84,7 @@
</presetdef>
</antlib></pre>
<p>One may then use this in a build file as follows:</p>
- <pre class="code">
+ <pre>
<project default="example" xmlns:antgoodies="antlib:com.acme.antgoodies">
<target name="example">
<!-- Compile source -->
@@ -94,7 +94,7 @@
</target>
</project></pre>
<p>The following is an example of evaluation of properties when the definition is used:</p>
- <pre class="code">
+ <pre>
<target name="defineandcall">
<presetdef name="showmessage">
<echo>message is '${message}'</echo>
@@ -109,8 +109,8 @@
<target name="called">
<showmessage/>
</target></pre>
- <p>The command <code>ant defineandcall</code> results in the output:</p>
- <pre class="code">
+ <p>The command <kbd>ant defineandcall</kbd> results in the output:</p>
+ <pre class="output">
defineandcall:
[showmessage] message is '${message}'
[showmessage] message is 'Message 1'
@@ -120,7 +120,7 @@ called:
<p>It is possible to use a trick to evaluate properties when the definition is <em>made</em>
rather than used. This can be useful if you do not expect some properties to be available in
child builds run with <code><ant ... inheritall="false"></code>:</p>
- <pre class="code">
+ <pre>
<macrodef name="showmessage-presetdef">
<attribute name="messageval"/>
<presetdef name="showmessage">
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/projecthelper.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/projecthelper.html b/manual/Tasks/projecthelper.html
index 9a51c52..46d17b3 100644
--- a/manual/Tasks/projecthelper.html
+++ b/manual/Tasks/projecthelper.html
@@ -36,12 +36,13 @@ information.</p>
<h3>Parameters specified as nested elements</h3>
-<p>You may specify many configured <code>org.apache.tools.ant.ProjectHelper</code> instances.</p>
+<p>You may specify many configured <code class="code">org.apache.tools.ant.ProjectHelper</code>
+instances.</p>
<h3>Example</h3>
-<p>Install a custom ProjectHelper implementation (assuming <code>MyProjectHelper extends
-ProjectHelper</code>):</p>
+<p>Install a custom ProjectHelper implementation (assuming <code class="code">MyProjectHelper
+extends ProjectHelper</code>):</p>
<pre>
<typedef classname="org.example.MyProjectHelper"
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/property.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/property.html b/manual/Tasks/property.html
index 0dcc263..ed2c784 100644
--- a/manual/Tasks/property.html
+++ b/manual/Tasks/property.html
@@ -38,11 +38,11 @@ they are most definitely not variables.</p>
<li>By supplying both the <var>name</var> and <var>refid</var> attributes.</li>
<li>By setting the <var>file</var> attribute with the filename of the property file to load. This
property file has the format as defined by the file used in the
- class <code>java.util.Properties</code>, with the same rules about how non-ISO-8859-1 characters
- must be escaped.</li>
+ class <code class="code">java.util.Properties</code>, with the same rules about how
+ non-ISO-8859-1 characters must be escaped.</li>
<li>By setting the <var>url</var> attribute with the URL from which to load the properties. This
URL must be directed to a file that has the format as defined by the file used in the
- class <code>java.util.Properties</code>.</li>
+ class <code class="code">java.util.Properties</code>.</li>
<li>By setting the <var>resource</var> attribute with the resource name of the property file to
load. A resource is a property file on the current classpath, or on the specified
classpath.</li>
@@ -164,16 +164,16 @@ local definition is available (the table priority order being PROCESS, JOB, GROU
<h4>Any OS except OpenVMS</h4>
<p><em>Since Ant 1.8.2</em>, if Ant detects it is running on a Java 5 or newer, Ant will
-use <code>System.getenv()</code> rather than its own OS dependent native implementation. For some
-OSes this causes minor differences when compared to older versions of Ant. For a full list
-see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=49366" target="_top">Bugzilla Issue
-49366</a>. In particular:</p>
+use <code class="code">System.getenv()</code> rather than its own OS dependent native
+implementation. For some OSes this causes minor differences when compared to older versions of Ant.
+For a full list see <a href="https://issues.apache.org/bugzilla/show_bug.cgi?id=49366"
+target="_top">Bugzilla Issue 49366</a>. In particular:</p>
<ul>
<li>On Windows, Ant will now return additional "environment variables" that correspond to the
drive specific current working directories when Ant is run from the command line. The keys of
these variables starts with an equals sign.</li>
<li>Some users reported that some Cygwin specific variables (in particular <code>PROMPT</code>)
- was no longer present.</li>
+ were no longer present.</li>
<li>On OS/2, Ant no longer returns the <code>BEGINLIBPATH</code> variable.</li>
</ul>
@@ -241,7 +241,7 @@ personal settings with a file per user.</p>
<p>As stated, this task will load in a properties file stored in the file system, or as a resource
on a classpath. Here are some interesting facts about this feature</p>
<ol>
- <li>If the file is not there, nothing is printed except at <code>-verbose</code> log level. This
+ <li>If the file is not there, nothing is printed except at <kbd>-verbose</kbd> log level. This
lets you have optional configuration files for every project, that team members can customize.
<li>The rules for this format
match <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html#load-java.io.InputStream-"
@@ -267,7 +267,7 @@ variables. So it starts a command in a new process which prints the environment
the output and creates the properties.<br/> There are commands for the following operating systems
implemented
in <a href="https://git-wip-us.apache.org/repos/asf?p=ant.git;a=blob;f=src/main/org/apache/tools/ant/taskdefs/Execute.java;hb=refs/heads/master"
-target="_top">Execute.java</a> (method <code>getProcEnvCommand()</code>):
+target="_top">Execute.java</a> (method <code class="code">getProcEnvCommand()</code>):
</p>
<table>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/propertyhelper.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/propertyhelper.html b/manual/Tasks/propertyhelper.html
index bc7894f..64ed2c7 100644
--- a/manual/Tasks/propertyhelper.html
+++ b/manual/Tasks/propertyhelper.html
@@ -29,8 +29,9 @@
<h3>Description</h3>
<p>This task is provided for the purpose of allowing the user to <strong>(a)</strong> install a
different <code>PropertyHelper</code> at runtime, or <strong>(b)</strong> (hopefully more often)
-install one or more <code>PropertyHelper</code> Delegates into the <code>PropertyHelper</code>
-active on the current <code>Project</code>. This is somewhat advanced Apache Ant usage and assumes a
+install one or more <code class="code">PropertyHelper</code> Delegates into
+the <code class="code">PropertyHelper</code> active on the
+current <code class="code">Project</code>. This is somewhat advanced Apache Ant usage and assumes a
working familiarity with the modern Ant APIs. See the description of
Ant's <a href="../properties.html#propertyHelper">Property Helper</a> for more information.</p>
@@ -41,11 +42,12 @@ Ant's <a href="../properties.html#propertyHelper">Property Helper</a> for more i
instance.</p>
<h4>PropertyHelper.Delegate</h4>
-<p>You may specify, either in conjunction with a new <code>PropertyHelper</code> or not, one or more
-configured implementations of the <code>org.apache.tools.ant.PropertyHelper.Delegate</code>
-interface. A deeper understanding of the API is required here, however, as <code>Delegate</code> is
-a marker interface only: the nested arguments must implement a <code>Delegate</code> subinterface in
-order to do anything meaningful.</p>
+<p>You may specify, either in conjunction with a new <code class="code">PropertyHelper</code> or
+not, one or more configured implementations of
+the <code class="code">org.apache.tools.ant.PropertyHelper.Delegate</code> interface. A deeper
+understanding of the API is required here, however, as <code class="code">Delegate</code> is a
+marker interface only: the nested arguments must implement a <code class="code">Delegate</code>
+subinterface in order to do anything meaningful.</p>
<h4>delegate</h4>
<p>A generic <code><delegate></code> element which can use project references is also
@@ -67,8 +69,8 @@ provided:</p>
<h3>Examples</h3>
-<p>Install a completely different <code>PropertyHelper</code> implementation
-(assuming <code>MyPropertyHelper extends PropertyHelper</code>):</p>
+<p>Install a completely different <code class="code">PropertyHelper</code> implementation
+(assuming <code class="code">MyPropertyHelper extends PropertyHelper</code>):</p>
<pre>
<componentdef classname="org.example.MyPropertyHelper"
@@ -78,10 +80,11 @@ provided:</p>
</propertyhelper>
</pre>
-<p>Add a new <code>PropertyEvaluator</code> delegate (assuming <code>MyPropertyEvaluator implements
-PropertyHelper.PropertyEvaluator</code>). Note that <code>PropertyHelper</code> uses the configured
-delegates in LIFO order. I.e. the delegate added by this task will be consulted before any
-previously defined delegate and in particular before the built-in ones.</p>
+<p>Add a new <code class="code">PropertyEvaluator</code> delegate
+(assuming <code class="code">MyPropertyEvaluator implements
+PropertyHelper.PropertyEvaluator</code>). Note that <code class="code">PropertyHelper</code> uses
+the configured delegates in LIFO order. I.e. the delegate added by this task will be consulted
+before any previously defined delegate and in particular before the built-in ones.</p>
<pre>
<componentdef classname="org.example.MyPropertyEvaluator"
@@ -91,7 +94,8 @@ previously defined delegate and in particular before the built-in ones.</p>
</propertyhelper>
</pre>
-<p>Add a new <code>PropertyEvaluator</code> delegate using the <var>refid</var> syntax:</p>
+<p>Add a new <code class="code">PropertyEvaluator</code> delegate using the <var>refid</var>
+syntax:</p>
<pre>
<typedef classname="org.example.MyPropertyEvaluator"
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/pvcstask.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/pvcstask.html b/manual/Tasks/pvcstask.html
index fb45b36..5db446e 100644
--- a/manual/Tasks/pvcstask.html
+++ b/manual/Tasks/pvcstask.html
@@ -116,7 +116,7 @@ the repository.</p>
</tr>
<tr>
<td>pvcsbin</td>
- <td>On some systems the PVCS executables <code>pcli</code> and <code>get</code> are not found in
+ <td>On some systems the PVCS executables <kbd>pcli</kbd> and <kbd>get</kbd> are not found in
the <code>PATH</code>. In such cases this attribute should be set to the <code>bin</code>
directory of the PVCS installation containing the executables mentioned before. If this
attribute isn't specified the tag expects the executables to be found using
@@ -190,9 +190,9 @@ multiple projects can be specified.</p>
<target name="getlatest">
<pvcs repository="/mnt/pvcs" pvcsproject="/myprj"/>
</target></pre>
-<p>Now run: <code>ant getlatest</code></p>
+<p>Now run: <kbd>ant getlatest</kbd></p>
<p>This will cause the following output to appear:</p>
-<pre>
+<pre class="output">
getlatest:
[pvcs] PVCS Version Manager (VMGUI) v6.6.10 (Build 870) for Windows NT/80x86
[pvcs] Copyright 1985-2000 MERANT. All rights reserved.
@@ -219,9 +219,9 @@ projects using nested <code><pvcsproject></code> elements.</p>
<pvcsproject name="/myprj2"/>
</pvcs>
</target></pre>
-<p>Now run: <code>ant getlatest2</code></p>
+<p>Now run: <kbd>ant getlatest2</kbd></p>
<p>This will cause the following output to appear:</p>
-<pre>
+<pre class="output">
getlatest2:
[pvcs] PVCS Version Manager (VMGUI) v6.6.10 (Build 870) for Windows NT/80x86
[pvcs] Copyright 1985-2000 MERANT. All rights reserved.
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/recorder.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/recorder.html b/manual/Tasks/recorder.html
index f920de1..329e9d4 100644
Binary files a/manual/Tasks/recorder.html and b/manual/Tasks/recorder.html differ
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/replaceregexp.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/replaceregexp.html b/manual/Tasks/replaceregexp.html
index 4224a85..eefdf6b 100644
--- a/manual/Tasks/replaceregexp.html
+++ b/manual/Tasks/replaceregexp.html
@@ -33,8 +33,8 @@ rebuilds based on unchanged files which have been regenerated by this task.</p>
<p>Similar to <a href="../Types/mapper.html#regexp-mapper">regexp type mappers</a> this task needs a
supporting regular expression library and an implementation
-of <code>org.apache.tools.ant.util.regexp.Regexp</code>. See details in the documentation of
-the <a href="../Types/regexp.html#implementation">Regexp Type</a>.</p>
+of <code class="code">org.apache.tools.ant.util.regexp.Regexp</code>. See details in the
+documentation of the <a href="../Types/regexp.html#implementation">Regexp Type</a>.</p>
<h3>Parameters</h3>
<table class="attr">
http://git-wip-us.apache.org/repos/asf/ant/blob/14dfef58/manual/Tasks/retry.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/retry.html b/manual/Tasks/retry.html
index 8aef602..6e1b217 100644
--- a/manual/Tasks/retry.html
+++ b/manual/Tasks/retry.html
@@ -26,8 +26,8 @@
<p><em>Since Apache Ant 1.7.1</em></p>
<h3>Description</h3>
<p><code>Retry</code> is a container which executes a single nested task until either: there is no
-failure; or: its <var>retrycount</var> has been exceeded. If this happens a BuildException is
-thrown.</p>
+failure; or: its <var>retrycount</var> has been exceeded. If this happens
+a <code>BuildException</code> is thrown.</p>
<h3>Parameters</h3>
<table class="attr">