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/01 05:46:08 UTC
[1/2] ant git commit: Convert tabs into spaces
Repository: ant
Updated Branches:
refs/heads/master 92af47011 -> 6659d122b
Convert tabs into spaces
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/b08077b2
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/b08077b2
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/b08077b2
Branch: refs/heads/master
Commit: b08077b2d6927e4cdc777de01d2ec73bed4a1c7e
Parents: 92af470
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Thu Mar 1 06:44:53 2018 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Thu Mar 1 06:44:53 2018 +0100
----------------------------------------------------------------------
manual/Tasks/ejb.html | 12 +--
manual/Tasks/fixcrlf.html | 12 +--
manual/Tasks/ftp.html | 6 +-
manual/Tasks/input.html | 2 +-
manual/Tasks/jar.html | 9 +-
manual/Tasks/javah.html | 2 +-
manual/Tasks/junit.html | 4 +-
manual/Tasks/propertyfile.html | 4 +-
manual/Tasks/signjar.html | 3 +-
manual/Tasks/sos.html | 4 +-
manual/Tasks/style.html | 6 +-
manual/Tasks/wljspc.html | 2 +-
manual/Types/custom-programming.html | 16 ++-
manual/install.html | 160 +++++++++++++++---------------
14 files changed, 117 insertions(+), 125 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/b08077b2/manual/Tasks/ejb.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/ejb.html b/manual/Tasks/ejb.html
index e113eea..b90de3c 100644
--- a/manual/Tasks/ejb.html
+++ b/manual/Tasks/ejb.html
@@ -1433,8 +1433,8 @@ example, <var>suffix</var>). Refer to the appropriate documentation for more det
<tr>
<td>destdir</td>
<td>The base directory into which the generated JAR files will be written. Each JAR file is
- written in directories which correspond to their location within
- the <var>descriptordir</var> namespace.</td>
+ written in directories which correspond to their location within
+ the <var>descriptordir</var> namespace.</td>
<td>Yes</td>
</tr>
<tr>
@@ -1445,9 +1445,9 @@ example, <var>suffix</var>). Refer to the appropriate documentation for more det
<tr>
<td>classpath</td>
<td>The classpath used when generating EJB stubs and skeletons. If
- specified, <var>classpath</var> will be prepended to the classpath specified in the
- parent <code>ejbjar</code> task (see also the ORB attribute documentation below). Note that
- nested <code>classpath</code> elements may also be used.</td>
+ specified, <var>classpath</var> will be prepended to the classpath specified in the
+ parent <code>ejbjar</code> task (see also the ORB attribute documentation below). Note that
+ nested <code>classpath</code> elements may also be used.</td>
<td>No; defaults to the classpath specified in the <code>ejbjar</code> parent task</td>
</tr>
<tr>
@@ -1486,7 +1486,7 @@ example, <var>suffix</var>). Refer to the appropriate documentation for more det
<tr>
<td>secpropag</td>
<td><q>true</q> if the RMI skeletons and stubs must be modified to implement the implicit
- propagation of the security context (the transactional context is always provided).</td>
+ propagation of the security context (the transactional context is always provided).</td>
<td>No; defaults to <q>false</q></td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/b08077b2/manual/Tasks/fixcrlf.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/fixcrlf.html b/manual/Tasks/fixcrlf.html
index c594290..06a2f6b 100644
--- a/manual/Tasks/fixcrlf.html
+++ b/manual/Tasks/fixcrlf.html
@@ -169,9 +169,9 @@
<td>tab</td>
<td>Specifies how tab characters are to be handled. Valid values for this property are:
<ul>
- <li><q>add</q>: convert sequences of spaces which span a tab stop to tabs</li>
- <li><q>asis</q>: leave tab and space characters alone</li>
- <li><q>remove</q>: convert tabs to spaces</li>
+ <li><q>add</q>: convert sequences of spaces which span a tab stop to tabs</li>
+ <li><q>asis</q>: leave tab and space characters alone</li>
+ <li><q>remove</q>: convert tabs to spaces</li>
</ul>
<p><strong>Note</strong>: When the attribute <var>javafiles</var> (see above) is <q>true</q>,
literal TAB characters occurring within Java string or character constants are never
@@ -192,9 +192,9 @@
<td>Specifies how DOS end of file (control-Z) characters are to be handled. Valid values for
this property are:
<ul>
- <li><q>add</q>: ensure that there is an EOF character at the end of the file</li>
- <li><q>asis</q>: leave EOF characters alone</li>
- <li><q>remove</q>: remove any EOF character found at the end</li>
+ <li><q>add</q>: ensure that there is an EOF character at the end of the file</li>
+ <li><q>asis</q>: leave EOF characters alone</li>
+ <li><q>remove</q>: remove any EOF character found at the end</li>
</ul>
</td>
<td colspan="2">No; default is platform-specific: <q>remove</q> for Unix platforms, <q>asis</q>
http://git-wip-us.apache.org/repos/asf/ant/blob/b08077b2/manual/Tasks/ftp.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/ftp.html b/manual/Tasks/ftp.html
index c4f01f8..0000478 100644
--- a/manual/Tasks/ftp.html
+++ b/manual/Tasks/ftp.html
@@ -227,9 +227,9 @@ connection.</p>
greater</a>.</strong></p>
<p>Use these options when the standard options don't work, because</p>
<ul>
- <li>the server is in a different timezone and you need timestamp dependency checking</li>
- <li>the default timestamp formatting doesn't match the server display and list parsing
- therefore fails</li>
+ <li>the server is in a different timezone and you need timestamp dependency checking</li>
+ <li>the default timestamp formatting doesn't match the server display and list parsing
+ therefore fails</li>
</ul>
<p>If none of these is specified, the default mechanism of letting the system auto-detect the
server OS type based on the FTP <code>SYST</code> command and assuming standard formatting
http://git-wip-us.apache.org/repos/asf/ant/blob/b08077b2/manual/Tasks/input.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/input.html b/manual/Tasks/input.html
index a2829f2..0281c43 100644
--- a/manual/Tasks/input.html
+++ b/manual/Tasks/input.html
@@ -104,7 +104,7 @@ different <code>Input</code> tasks.</p>
<tr id="handler.type">
<td>type</td>
<td>one of <q>default</q>, <q>propertyfile</q>, <q>greedy</q>, or <q>secure</q> (<em>since Ant
- 1.8</em>).</td>
+ 1.8</em>).</td>
<td rowspan="3">One of these</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/b08077b2/manual/Tasks/jar.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/jar.html b/manual/Tasks/jar.html
index 5eebfba..fb633f2 100644
--- a/manual/Tasks/jar.html
+++ b/manual/Tasks/jar.html
@@ -245,11 +245,10 @@ e.g. decreasing the size by deleting 'same' classes from the versions-branches,
<td>strict</td>
<td>Configures how to handle breaks of the packaging version specification:
<ul>
- <li><q>fail</q> = throws a BuildException</li>
- <li><q>warn</q> = logs a message on warn level</li>
- <li><q>ignore</q> = logs a message on verbose level (default)</li>
- </ul>
- <em>Since Ant 1.7.1</em></td>
+ <li><q>fail</q> = throws a BuildException</li>
+ <li><q>warn</q> = logs a message on warn level</li>
+ <li><q>ignore</q> = logs a message on verbose level (default)</li>
+ </ul><em>Since Ant 1.7.1</em></td>
<td>No; defaults to <q>ignore</q></td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/b08077b2/manual/Tasks/javah.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/javah.html b/manual/Tasks/javah.html
index e62ad31..354af20 100644
--- a/manual/Tasks/javah.html
+++ b/manual/Tasks/javah.html
@@ -160,7 +160,7 @@ can be used to enable arguments only if a given compiler implementation will be
<tr>
<td>prefix</td>
<td rowspan="2">See <a href="../using.html#arg">Command-line Arguments</a>. <em>Since Ant
- 1.8</em>.</td>
+ 1.8</em>.</td>
<td>No</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/b08077b2/manual/Tasks/junit.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/junit.html b/manual/Tasks/junit.html
index 572e20d..6e6befa 100644
--- a/manual/Tasks/junit.html
+++ b/manual/Tasks/junit.html
@@ -376,7 +376,7 @@ to <samp><i>java-tmp-dir</i>/FailedTests</samp>.</p>
<tr>
<td>if</td>
<td>Only use formatter <a href="../properties.html#if+unless">if the named property is
- set</a>.</td>
+ set</a>.</td>
<td>No; default is <q>true</q></td>
</tr>
<tr>
@@ -415,7 +415,7 @@ to <samp><i>java-tmp-dir</i>/FailedTests</samp>.</p>
methods are being executed).</li>
</ul>
<p>If the <var>methods</var> attribute is used but no test method is specified, then no test
- method from the suite will be executed.</p>
+ method from the suite will be executed.</p>
</td>
<td>No; default is to run all test methods in the suite</td>
</tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/b08077b2/manual/Tasks/propertyfile.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/propertyfile.html b/manual/Tasks/propertyfile.html
index 10470b2..f30bcd6 100644
--- a/manual/Tasks/propertyfile.html
+++ b/manual/Tasks/propertyfile.html
@@ -99,10 +99,10 @@ file itself.</p>
</tr>
<tr>
<td>operation</td>
- <td>One of the following operations:<br><br>
+ <td>One of the following operations:<br/>
<strong>for all datatypes:</strong>
<ul>
- <li><q>del</q> : deletes an entry</li>
+ <li><q>del</q> : deletes an entry</li>
<li><q>+</q> : adds a value to the existing value</li>
<li><q>=</q> : sets a value instead of the existing value (default)</li>
</ul>
http://git-wip-us.apache.org/repos/asf/ant/blob/b08077b2/manual/Tasks/signjar.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/signjar.html b/manual/Tasks/signjar.html
index 2d6abf6..d4d3c5c 100644
--- a/manual/Tasks/signjar.html
+++ b/manual/Tasks/signjar.html
@@ -201,12 +201,11 @@ name is not provided, JARs are signed in place.</p>
<tr>
<td>sysproperty</td>
<td>JVM system properties, with the syntax of Ant <a href="exec.html#env">environment
- variables</a></td>
+ variables</a></td>
<td>No, and only one can be supplied</td>
</tr>
</table>
-
<h3>Examples</h3>
<p>For instructions on generating a code signing certificate, see the <a target="_blank"
href="https://docs.oracle.com/javase/8/docs/technotes/tools/windows/keytool.html">keytool
http://git-wip-us.apache.org/repos/asf/ant/blob/b08077b2/manual/Tasks/sos.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/sos.html b/manual/Tasks/sos.html
index f071fe2..9b40ded 100644
--- a/manual/Tasks/sos.html
+++ b/manual/Tasks/sos.html
@@ -161,7 +161,7 @@ Linux, Solaris & Windows 2000.</p>
<tr>
<td>nocache</td>
<td><q>true|false</q>—Only needed if <code>SOSHOME</code> is set as an environment
- variable</td>
+ variable</td>
<td>No</td>
</tr>
<tr>
@@ -339,7 +339,7 @@ the <samp>$/SourceRoot/project1</samp> project with <q>test label</q>.</p>
<tr>
<td>nocache</td>
<td><q>true|false</q>—Only needed if <code>SOSHOME</code> is set as an environment
- variable</td>
+ variable</td>
<td>No</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/b08077b2/manual/Tasks/style.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/style.html b/manual/Tasks/style.html
index 199a585..28d7d17 100644
--- a/manual/Tasks/style.html
+++ b/manual/Tasks/style.html
@@ -134,7 +134,7 @@ path-like structure).</p>
<td>name of the XSLT processor to use. Permissible value is:
<ul>
<li><q>trax</q> for a TraX compliant processor (ie JAXP interface implementation such as
- Xalan 2 or Saxon)</li>
+ Xalan 2 or Saxon)</li>
</ul>
Support for Xalan 1 has been removed <em>since Ant 1.7</em>.
</td>
@@ -298,13 +298,13 @@ resolution.</p>
<tr>
<td>if</td>
<td>The param will only be passed <a href="../properties.html#if+unless">if this property is
- set</a>.</td>
+ set</a>.</td>
<td>No</td>
</tr>
<tr>
<td>unless</td>
<td>The param will not be passed <a href="../properties.html#if+unless">if this property is
- set</a>.</td>
+ set</a>.</td>
<td>No</td>
</tr>
</table>
http://git-wip-us.apache.org/repos/asf/ant/blob/b08077b2/manual/Tasks/wljspc.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/wljspc.html b/manual/Tasks/wljspc.html
index 1af7ad9..efe4f5d 100644
--- a/manual/Tasks/wljspc.html
+++ b/manual/Tasks/wljspc.html
@@ -42,7 +42,7 @@
<tr>
<td>dest</td>
<td>root of destination directory, what you have set as <code>WorkingDir</code> in the
- WebLogic properties</td>
+ WebLogic properties</td>
<td>Yes</td>
</tr>
<tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/b08077b2/manual/Types/custom-programming.html
----------------------------------------------------------------------
diff --git a/manual/Types/custom-programming.html b/manual/Types/custom-programming.html
index caf3b94..fd776d3 100644
--- a/manual/Types/custom-programming.html
+++ b/manual/Types/custom-programming.html
@@ -251,17 +251,16 @@ public class MatchNumberSelectors extends BaseSelectorContainer {
<tr>
<td>classname</td>
<td>
- The name of your class that
- implements <code>org.apache.tools.ant.types.selectors.FileSelector</code>.
+ The name of your class that
+ implements <code>org.apache.tools.ant.types.selectors.FileSelector</code>.
</td>
<td>Yes</td>
</tr>
<tr>
<td>classpath</td>
<td>
- The classpath to use in order to load the custom selector
- class. If neither <var>classpath</var> nor
- <var>classpathref</var> are specified, the class will be
+ The classpath to use in order to load the custom selector class. If
+ neither <var>classpath</var> nor <var>classpathref</var> are specified, the class will be
loaded from the classpath that Ant uses.
</td>
<td>No</td>
@@ -269,10 +268,9 @@ public class MatchNumberSelectors extends BaseSelectorContainer {
<tr>
<td>classpathref</td>
<td>
- A reference to a classpath previously defined. If
- neither <var>classpathref</var> nor <var>classpath</var> above are
- specified, the class will be loaded from the classpath that Ant
- uses.
+ A reference to a classpath previously defined. If neither <var>classpathref</var>
+ nor <var>classpath</var> above are specified, the class will be loaded from the classpath
+ that Ant uses.
</td>
<td>No</td>
</tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/b08077b2/manual/install.html
----------------------------------------------------------------------
diff --git a/manual/install.html b/manual/install.html
index b100d8a..030e927 100644
--- a/manual/install.html
+++ b/manual/install.html
@@ -70,8 +70,8 @@ target="_top">https://ant.apache.org/</a>
The binary distribution of Ant is available as 3 different archives
</p>
<ol>
-<li><samp>.zip</samp>—Recommended compression format for Windows, can also be used on other platforms. Supported by many
-programs and some operating systems natively.</li>
+<li><samp>.zip</samp>—Recommended compression format for Windows, can also be used on other platforms. Supported
+by many programs and some operating systems natively.</li>
<li><samp>.tar.gz</samp>—Using the tar program to gather files together, and gzip to compress and uncompress.</li>
<li><samp>.tar.bz2</samp>—Using the tar program to gather files together, and bzip2 to compress and uncompress.</li>
</ol>
@@ -111,14 +111,15 @@ the <a href="#diagnostics">diagnostics</a> advice.
<h3 id="sourceEdition">Source Distribution</h3>
<p>
-If you prefer the source distribution, you can download the source for the latest Ant release from
-<a href="https://ant.apache.org/srcdownload.cgi" target="_top">https://ant.apache.org/srcdownload.cgi</a>.
+If you prefer the source distribution, you can download the source for the latest Ant release
+from <a href="https://ant.apache.org/srcdownload.cgi" target="_top">https://ant.apache.org/srcdownload.cgi</a>.
</p>
<p>
If you prefer the leading-edge code, you can access the code as it is being developed via Git. The Ant website has
details on <a href="https://ant.apache.org/git.html" target="_top">accessing Git</a>. All bug fixes will go in against
-the HEAD of the source tree, and the first response to many bug reports will be "have you tried the latest version". Don't
-be afraid to download and build a prerelease distribution, as everything other than new features are usually stable.
+the HEAD of the source tree, and the first response to many bug reports will be "have you tried the latest
+version". Don't be afraid to download and build a prerelease distribution, as everything other than new features are
+usually stable.
</p>
<p>
See the section <a href="#buildingant">Building Ant</a> on how to build Ant from the source code. You can also access
@@ -150,40 +151,39 @@ target="_top">https://archive.apache.org/dist/ant/</a>. The files are organized
<tr>
<td><samp>ant-current-bin.zip</samp></td>
<td>
- ZIP archive containing the compiled version of Ant in the last released version. It is recommended that
- you do not download the latest version this way, as the standard way of downloading described above will
- redirect you to a mirror closer to you, thus making the download faster for you and reducing the load
- on Apache servers.
+ ZIP archive containing the compiled version of Ant in the last released version. It is recommended that you do not
+ download the latest version this way, as the standard way of downloading described above will redirect you to a
+ mirror closer to you, thus making the download faster for you and reducing the load on Apache servers.
</td>
</tr>
<tr>
<td><samp>ant-current-src.zip</samp></td>
<td>
- ZIP archive containing the sources of Ant. If you have this you can compile Ant. If you do not have the
- <em>required</em> dependencies, the classes depending on them are just not built. Again, it is preferred to use the
- standard way of getting the source package described above to make your download quicker and to reduce the load on
- Apache servers.
+ ZIP archive containing the sources of Ant. If you have this you can compile Ant. If you do not have
+ the <em>required</em> dependencies, the classes depending on them are just not built. Again, it is preferred to use
+ the standard way of getting the source package described above to make your download quicker and to reduce the load
+ on Apache servers.
</td>
</tr>
<tr>
<td><samp>ant-current-*.asc</samp></td>
<td>
- Security file for checking the correctness of the zip file. This one is the
- <a href="https://en.wikipedia.org/wiki/Pretty_Good_Privacy" target="_blank">PGP</a> signature.
+ Security file for checking the correctness of the zip file. This one is
+ the <a href="https://en.wikipedia.org/wiki/Pretty_Good_Privacy" target="_blank">PGP</a> signature.
</td>
</tr>
<tr>
<td><samp>ant-current-*.md5</samp></td>
<td>
- Security file for checking the correctness of the zip file. This one is the
- <a href="https://en.wikipedia.org/wiki/Md5" target="_blank">MD5</a> checksum.
+ Security file for checking the correctness of the zip file. This one is
+ the <a href="https://en.wikipedia.org/wiki/Md5" target="_blank">MD5</a> checksum.
</td>
</tr>
<tr>
<td><samp>ant-current-*.sha1</samp></td>
<td>
- Security file for checking the correctness of the zip file. This one is the
- <a href="https://en.wikipedia.org/wiki/SHA-1" target="_blank">SHA1</a> checksum.
+ Security file for checking the correctness of the zip file. This one is
+ the <a href="https://en.wikipedia.org/wiki/SHA-1" target="_blank">SHA1</a> checksum.
</td>
</tr>
<tr>
@@ -222,9 +222,9 @@ target="_top">https://archive.apache.org/dist/ant/</a>. The files are organized
<h2 id="sysrequirements">System Requirements</h2>
<p>
Ant has been used successfully on many platforms, including Linux, commercial flavours of Unix such as Solaris and
-HP-UX, macOS, Windows NT descendants, OS/2 Warp, Novell Netware 6, OpenVMS. The platforms used most for development
-are, in no particular order, Linux, macOS, Microsoft Windows and Unix; these are therefore that platforms that tend to
-work best. <em>Since Ant 1.7</em>, Windows 9x is no longer supported.
+HP-UX, macOS, Windows NT descendants, OS/2 Warp, Novell Netware 6, OpenVMS. The platforms used most for development are,
+in no particular order, Linux, macOS, Microsoft Windows and Unix; these are therefore that platforms that tend to work
+best. <em>Since Ant 1.7</em>, Windows 9x is no longer supported.
</p>
<p>
For the current version of Ant (1.10), you will also need a JDK installed on your system, version 8 or later required.
@@ -271,8 +271,8 @@ other open source Java runtimes, and so strives to have a product that works wel
Only the <samp>bin</samp> and <samp>lib</samp> directories are required to run Ant.
</p>
<p>
-To install Ant, choose a directory and copy the distribution files there. This directory will be known as
-<code>ANT_HOME</code>.
+To install Ant, choose a directory and copy the distribution files there. This directory will be known
+as <code>ANT_HOME</code>.
</p>
<h3>Windows 95, Windows 98 & Windows ME Note</h3>
@@ -280,20 +280,20 @@ To install Ant, choose a directory and copy the distribution files there. This d
<em>Note that current releases of Ant no longer support these systems. If you are using an older version of Ant,
however, the script used to launch Ant will have problems if <code>ANT_HOME</code> is a long filename (i.e. a
filename which is not of the format known as "8.3"). This is due to limitations in the OS's handling of
- the <code>"for"</code> batch file statement. It is recommended, therefore, that Ant be installed in a
- <strong>short</strong>, 8.3 path, such as <samp>C:\Ant</samp>.</em>
+ the <code>"for"</code> batch file statement. It is recommended, therefore, that Ant be installed in
+ a <strong>short</strong>, 8.3 path, such as <samp>C:\Ant</samp>.</em>
</p>
<p>
On these systems you will also need to configure more environment space to cater for the environment variables used
- in the Ant launch script. To do this, you will need to add or update the following line in the
- <samp>config.sys</samp> file
+ in the Ant launch script. To do this, you will need to add or update the following line in
+ the <samp>config.sys</samp> file
</p>
<pre>shell=c:\command.com c:\ /p /e:32768</pre>
<h3 id="setup">Setup</h3>
<p>
-Before you can run Ant there is some additional setup you will need to do unless you are installing the
-<a href="#jpackage">RPM version from jpackage.org</a>:
+Before you can run Ant there is some additional setup you will need to do unless you are installing
+the <a href="#jpackage">RPM version from jpackage.org</a>:
</p>
<ul>
<li>Add the <samp>bin</samp> directory to your path.</li>
@@ -304,9 +304,9 @@ better to not rely on this behavior.</li>
below). This should be set to the directory where your JDK is installed.</li>
</ul>
<p>
-Operating System-specific instructions for doing this from the command line are in the <a href="#windows">Windows</a>,
-<a href="#bash">Linux/Unix (bash)</a>, and <a href="#tcshcsh">Linux/Unix (csh)</a> sections. Note that using this
-method, the settings will only be valid for the command line session you run them in.
+Operating System-specific instructions for doing this from the command line are in
+the <a href="#windows">Windows</a>, <a href="#bash">Linux/Unix (bash)</a>, and <a href="#tcshcsh">Linux/Unix (csh)</a>
+sections. Note that using this method, the settings will only be valid for the command line session you run them in.
</p>
<p>
<strong>Note</strong>: Do not install Ant's <samp>ant.jar</samp> file into the <samp>lib/ext</samp> directory of the
@@ -316,10 +316,11 @@ security restrictions on the classes which may be loaded by an extension.
<h3>Windows Note</h3>
<p>
- The <samp>ant.bat</samp> script makes use of three environment variables—<code>ANT_HOME</code>,
- <code>CLASSPATH</code> and <code>JAVA_HOME</code>. <strong>Ensure</strong> that <code>ANT_HOME</code> and
- <code>JAVA_HOME</code> variables are set, and that they do <strong>not</strong> have quotes (either ' or ") and
- they do <strong>not</strong> end with \ or with /. <code>CLASSPATH</code> should be unset or empty.
+ The <samp>ant.bat</samp> script makes use of three environment
+ variables—<code>ANT_HOME</code>, <code>CLASSPATH</code> and <code>JAVA_HOME</code>. <strong>Ensure</strong>
+ that <code>ANT_HOME</code> and <code>JAVA_HOME</code> variables are set, and that they do <strong>not</strong> have
+ quotes (either ' or ") and they do <strong>not</strong> end with \ or with /. <code>CLASSPATH</code> should be
+ unset or empty.
</p>
<h3 id="checkInstallation">Check Installation</h3>
@@ -347,11 +348,11 @@ If this does not work, ensure your environment variables are set right. E.g., on
<li>required: <code>%PATH%=...<i>maybe-other-entries</i>...;%ANT_HOME%\bin;...<i>maybe-other-entries</i>...</code></li>
</ul>
<p>
-<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 typing
-<samp>the/complete/path/to/your/ant/installation/bin/ant</samp>.
+<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
+typing <samp>the/complete/path/to/your/ant/installation/bin/ant</samp>.
</p>
<h3 id="optionalTasks">Optional Tasks</h3>
@@ -373,8 +374,8 @@ In <code><i>ANT_HOME</i>/lib</code>. This makes the JAR files available to all A
<li>
<p>
-In <code>${user.home}/.ant/lib</code> (<em>since Ant 1.6</em>). This allows different users to add new libraries to Ant. All JAR
-files added to this directory are available to command-line Ant.
+In <code>${user.home}/.ant/lib</code> (<em>since Ant 1.6</em>). This allows different users to add new libraries to
+Ant. All JAR files added to this directory are available to command-line Ant.
</p>
</li>
@@ -773,16 +774,16 @@ these tasks available. Please refer to the <a href="#optionalTasks">Installing A
<tr>
<td>jakarta-regexp-1.4.jar</td>
<td><a href="Types/mapper.html#regexp-mapper">regexp</a> type with mappers (if you do not wish to use
- java.util.regex)</td>
+ java.util.regex)</td>
<td><a href="https://attic.apache.org/projects/jakarta-regexp.html"
- target="_top">https://attic.apache.org/projects/jakarta-regexp.html</a></td>
+ target="_top">https://attic.apache.org/projects/jakarta-regexp.html</a></td>
</tr>
<tr>
<td>jakarta-oro-2.0.8.jar</td>
<td><a href="Types/mapper.html#regexp-mapper">regexp</a> type with mappers (if you do not wish to use
- java.util.regex) or <a href="Tasks/ftp.html">ftp</a> task with <a href="#commons-net">commons-net</a> 1.4.1</td>
+ java.util.regex) or <a href="Tasks/ftp.html">ftp</a> task with <a href="#commons-net">commons-net</a> 1.4.1</td>
<td><a href="https://attic.apache.org/projects/jakarta-oro.html"
- target="_top">https://attic.apache.org/projects/jakarta-oro.html</a></td>
+ target="_top">https://attic.apache.org/projects/jakarta-oro.html</a></td>
</tr>
<tr>
<td>junit.jar</td>
@@ -812,23 +813,20 @@ these tasks available. Please refer to the <a href="#optionalTasks">Installing A
<td>Groovy JARs</td>
<td>Groovy Ant tasks with bindings or Groovy with <a href="Tasks/script.html">script</a>
and <a href="Tasks/scriptdef.html">scriptdef</a> tasks</td>
- <td>
- <a href="http://groovy-lang.org/" target="_top">http://groovy-lang.org/</a><br/>
- Use either groovy-ant for Groovy Ant tasks with bindings or groovy-bsf for Groovy with script and scriptdef tasks
- (or groovy-all)
+ <td><a href="http://groovy-lang.org/" target="_top">http://groovy-lang.org/</a><br/> Use either groovy-ant for
+ Groovy Ant tasks with bindings or groovy-bsf for Groovy with script and scriptdef tasks (or groovy-all)
</td>
</tr>
<tr>
<td>netrexx.jar</td>
<td><a href="Tasks/netrexxc.html">netrexxc</a> task, Rexx with <a href="Tasks/script.html">script</a> task</td>
<td><a href="https://www.ibm.com/software/awdtools/netrexx/library.html"
- target="_top">https://www.ibm.com/software/awdtools/netrexx/library.html</a></td>
+ target="_top">https://www.ibm.com/software/awdtools/netrexx/library.html</a></td>
</tr>
<tr>
- <td>rhino.jar<br/>
- (included in Java 7 runtime, replaced by Nashorn in Java 8 and later)</td>
- <td>JavaScript with <a href="Tasks/script.html">script</a> task<br/>
- <strong>Note</strong>: Apache BSF 2.4.0 works only with Rhino 1.5R4 and later versions.</td>
+ <td>rhino.jar<br/>(included in Java 7 runtime, replaced by Nashorn in Java 8 and later)</td>
+ <td>JavaScript with <a href="Tasks/script.html">script</a> task<br/><strong>Note</strong>: Apache BSF 2.4.0 works
+ only with Rhino 1.5R4 and later versions.</td>
<td><a href="https://www.mozilla.org/rhino/" target="_top">https://www.mozilla.org/rhino/</a></td>
</tr>
<tr>
@@ -848,8 +846,8 @@ these tasks available. Please refer to the <a href="#optionalTasks">Installing A
</tr>
<tr>
<td>BeanShell JAR(s)</td>
- <td>BeanShell with <a href="Tasks/script.html">script</a> task.<br/>
- <strong>Note</strong>: Ant requires BeanShell version 1.3 or later</td>
+ <td>BeanShell with <a href="Tasks/script.html">script</a> task.<br/><strong>Note</strong>: Ant requires BeanShell
+ version 1.3 or later</td>
<td><a href="http://www.beanshell.org/" target="_top">http://www.beanshell.org/</a></td>
</tr>
<tr>
@@ -875,33 +873,30 @@ these tasks available. Please refer to the <a href="#optionalTasks">Installing A
<tr id="commons-net">
<td>commons-net.jar</td>
<td><a href="Tasks/ftp.html">ftp</a>, <a href="Tasks/rexec.html">rexec</a>
- and <a href="Tasks/telnet.html">telnet</a> tasks<br/>
- A minimum version of commons-net of 1.4.0 is needed to compile Ant, earlier versions did not support the full range
- of configuration options.<br/>
- jakarta-oro 2.0.8 is required together with commons-net 1.4.x at run time.<br/>
- <strong>Note</strong>: do not use commons-net 3.2 because
- of <a href="https://issues.apache.org/jira/browse/NET-493">performance issues</a>
+ and <a href="Tasks/telnet.html">telnet</a> tasks<br/> A minimum version of commons-net of 1.4.0 is needed to
+ compile Ant, earlier versions did not support the full range of configuration options.<br/>jakarta-oro 2.0.8 is
+ required together with commons-net 1.4.x at run time.<br/><strong>Note</strong>: do not use commons-net 3.2
+ because of <a href="https://issues.apache.org/jira/browse/NET-493">performance issues</a>
</td>
<td><a href="https://commons.apache.org/net/" target="_top">https://commons.apache.org/net/</a></td>
</tr>
<tr>
<td>bcel.jar</td>
<td><a href="Types/classfileset.html">classfileset</a> data type, JavaClassHelper used by the ClassConstants filter
- reader and optionally used by <a href="Tasks/ejb.html#ejbjar">ejbjar</a> task for dependency determination</td>
+ reader and optionally used by <a href="Tasks/ejb.html#ejbjar">ejbjar</a> task for dependency determination</td>
<td><a href="https://commons.apache.org/bcel/" target="_top">https://commons.apache.org/bcel/</a></td>
</tr>
<tr>
<td>javax.mail-api.jar</td>
<td><a href="Tasks/mail.html">mail</a> task with MIME encoding,
- and <em><u>deprecated</u></em> <a href="Tasks/mimemail.html">mimemail</a> task</td>
+ and <em><u>deprecated</u></em> <a href="Tasks/mimemail.html">mimemail</a> task</td>
<td><a href="https://javaee.github.io/javamail/"
- target="_top">https://javaee.github.io/javamail/</a></td>
+ target="_top">https://javaee.github.io/javamail/</a></td>
</tr>
<tr>
- <td>activation.jar<br/>
- (included in Java 6 and later runtime)</td>
+ <td>activation.jar<br/>(included in Java 6 and later runtime)</td>
<td><a href="Tasks/mail.html">mail</a> task with MIME encoding,
- and <em><u>deprecated</u></em> <a href="Tasks/mimemail.html">mimemail</a> task</td>
+ and <em><u>deprecated</u></em> <a href="Tasks/mimemail.html">mimemail</a> task</td>
<td><a href="https://www.oracle.com/technetwork/java/javase/jaf-135115.html"
target="_top">https://www.oracle.com/technetwork/java/javase/jaf-135115.html</a></td>
</tr>
@@ -914,9 +909,9 @@ these tasks available. Please refer to the <a href="#optionalTasks">Installing A
<tr>
<td>resolver.jar <strong>1.1 or later</strong></td>
<td><a href="Types/xmlcatalog.html">xmlcatalog</a> datatype <em>only if support for external catalog files is
- desired</em></td>
+ desired</em></td>
<td><a href="https://xerces.apache.org/xml-commons/components/resolver/"
- target="_top">https://xerces.apache.org/xml-commons/components/resolver/</a></td>
+ target="_top">https://xerces.apache.org/xml-commons/components/resolver/</a></td>
</tr>
<tr>
<td>jsch.jar <strong>0.1.54 or later</strong></td>
@@ -927,13 +922,13 @@ these tasks available. Please refer to the <a href="#optionalTasks">Installing A
<td>JAI—Java Advanced Imaging</td>
<td><a href="Tasks/image.html">image</a> task</td>
<td><a href="https://download.java.net/media/jai/builds/release/1_1_3/INSTALL.html"
- target="_top">https://download.java.net/media/jai/builds/release/1_1_3/INSTALL.html</a></td>
+ target="_top">https://download.java.net/media/jai/builds/release/1_1_3/INSTALL.html</a></td>
</tr>
<tr>
<td>XZ—XZ for Java <strong>1.6 or later</strong></td>
<td><a href="Tasks/pack.html">xz</a> and <a href="Tasks/unpack.html">unxz</a>
- tasks, <a href="Types/resources.html#xzresource">xzresource</a>, xz compression
- in <a href="Tasks/tar.html">tar</a>/<a href="Tasks/unzip.html">untar</a> tasks</td>
+ tasks, <a href="Types/resources.html#xzresource">xzresource</a>, xz compression
+ in <a href="Tasks/tar.html">tar</a>/<a href="Tasks/unzip.html">untar</a> tasks</td>
<td><a href="https://www.tukaani.org/xz/java.html" target="_top">https://www.tukaani.org/xz/java.html</a></td>
</tr>
</table>
@@ -943,15 +938,16 @@ 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 and
-print it out. This code will check and print the following things.
+Ant has a built in diagnostics feature. If you run <code>ant -diagnostics</code>, Ant will look at its internal state
+and print it out. This code will check and print the following things.
</p>
<ul>
<li>Where Ant is running from. Sometimes you can be surprised.</li>
-<li>The version of <samp>ant.jar</samp> and of the <samp>ant-*.jar</samp> containing the optional tasks—and whether they match</li>
+<li>The version of <samp>ant.jar</samp> and of the <samp>ant-*.jar</samp> containing the optional tasks—and
+whether they match</li>
<li>Which JAR files are in <code>ANT_HOME/lib</code></li>
@@ -962,8 +958,8 @@ libraries that it depends on are absent.</li>
<li>JVM system properties</li>
-<li>The status of the <samp>temp</samp> directory. If this is not writable, or its timestamp is horribly wrong (possible if it is on a
-network drive), a lot of tasks may fail with obscure error messages.</li>
+<li>The status of the <samp>temp</samp> directory. If this is not writable, or its timestamp is horribly wrong (possible
+if it is on a network drive), a lot of tasks may fail with obscure error messages.</li>
<li>The current time zone as Java sees it. If this is not what it should be for your location, then dependency logic may
get confused.</li>
[2/2] ant git commit: Adjust markup
Posted by gi...@apache.org.
Adjust markup
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/6659d122
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/6659d122
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/6659d122
Branch: refs/heads/master
Commit: 6659d122b49c65276da6a2a4b75456dcf0186e1e
Parents: b08077b
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Thu Mar 1 06:45:19 2018 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Thu Mar 1 06:45:19 2018 +0100
----------------------------------------------------------------------
manual/Tasks/conditions.html | 2 +-
manual/install.html | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/6659d122/manual/Tasks/conditions.html
----------------------------------------------------------------------
diff --git a/manual/Tasks/conditions.html b/manual/Tasks/conditions.html
index 73efda4..65cef41 100644
--- a/manual/Tasks/conditions.html
+++ b/manual/Tasks/conditions.html
@@ -155,7 +155,7 @@ and the result is true only if <em>all</em> the tests succeed.
</tr>
<tr>
<td>forcestring</td>
- <td>Force string comparison of <code>arg1/arg2</code>. <em>Since Apache Ant 1.8.1</em>
+ <td>Force string comparison of <var>arg1</var>/<var>arg2</var>. <em>Since Apache Ant 1.8.1</em>
</td>
<td>No; default is <q>false</q></td>
</tr>
http://git-wip-us.apache.org/repos/asf/ant/blob/6659d122/manual/install.html
----------------------------------------------------------------------
diff --git a/manual/install.html b/manual/install.html
index 030e927..a061f3d 100644
--- a/manual/install.html
+++ b/manual/install.html
@@ -197,8 +197,8 @@ target="_top">https://archive.apache.org/dist/ant/</a>. The files are organized
<td><samp>binaries/</samp></td>
<td>
The binaries directory holds specific Ant releases bundled in both ZIP and tar.gz archive formats. The named
- releases are in contrast to the ant-current-bin.zip file in the parent directory, which is always guaranteed to be
- the most current release of Ant.
+ releases are in contrast to the <samp>ant-current-bin.zip</samp> file in the parent directory, which is always
+ guaranteed to be the most current release of Ant.
</td>
</tr>
<tr>
@@ -212,8 +212,8 @@ target="_top">https://archive.apache.org/dist/ant/</a>. The files are organized
<td><samp>source/</samp></td>
<td>
The source directory holds the source code for specific Ant releases bundled in both ZIP and tar.gz archive
- formats. The named releases are in contrast to the ant-current-src.zip file in the parent directory, which is always
- guaranteed to hold the source code for the most current release of Ant.
+ formats. The named releases are in contrast to the <samp>ant-current-src.zip</samp> file in the parent directory,
+ which is always guaranteed to hold the source code for the most current release of Ant.
</td>
</tr>
</table>