From 34ef3390094ebee20d04217b1af993785061f732 Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Sun, 4 Mar 2018 10:36:45 +0100 Subject: [PATCH] Small edits in the manual --- manual/Integration/jext-plugin.html | 2 +- manual/Tasks/filter.html | 8 ++++---- manual/Tasks/junitreport.html | 11 +++++++---- manual/Tasks/vss.html | 17 ++--------------- manual/develop.html | 8 ++++---- manual/install.html | 6 +++--- manual/proxy.html | 2 +- 7 files changed, 22 insertions(+), 32 deletions(-) diff --git a/manual/Integration/jext-plugin.html b/manual/Integration/jext-plugin.html index 83628d5a2..cf0734fc8 100644 --- a/manual/Integration/jext-plugin.html +++ b/manual/Integration/jext-plugin.html @@ -27,7 +27,7 @@ by -
+

You can download the plugin at: http://sourceforge.net/projects/jext/files/OldFiles/antwork_plugin.zip/download

diff --git a/manual/Tasks/filter.html b/manual/Tasks/filter.html index 3525756aa..a6fe45e1b 100644 --- a/manual/Tasks/filter.html +++ b/manual/Tasks/filter.html @@ -26,10 +26,10 @@

Filter

Description

-

Sets a token filter for this project or read multiple token filter from an input file and sets -these as filters. Token filters are used by all tasks that perform file copying operations through -the Project commodity methods. See the warning here -before using.

+

Sets a token filter for this project or reads a properties file as multiple token filter +definitions and sets them. Token filters are used by all tasks that perform file copying operations +through the Project commodity methods. See the +warning here before using.

The task uses @ as token separator. Token strings cannot contain separator characters; incorrect tokens are ignored.

diff --git a/manual/Tasks/junitreport.html b/manual/Tasks/junitreport.html index bc0afb9d8..ebf79bcc6 100644 --- a/manual/Tasks/junitreport.html +++ b/manual/Tasks/junitreport.html @@ -42,8 +42,9 @@ out of the box. The table below summarize the compatibility status.

XalanSun JDK BundleStatus 2.4.1+JDK 1.4.2-01+OK XSLTCJDK 1.5.xOK -2.xJDK 1.4.xDeprecated, use ${ant.home}/etc/junit-frames-xalan1.xsl -
Upgrade Xalan using the JDK endorsement mechanism +2.xJDK 1.4.xDeprecated, +use ${ant.home}/etc/junit-frames-xalan1.xsl
Upgrade Xalan using the JDK endorsement +mechanism

In Ant 1.6.2, we had to decide between supporting Xalan 1/Xalan 2.4.1- and Xalan 2.4.1+/XSLTC, @@ -94,8 +95,10 @@ using the nested <FileSet>The directory where the stylesheets are defined. They must be conforming to the following conventions:

No; defaults to embedded stylesheets diff --git a/manual/Tasks/vss.html b/manual/Tasks/vss.html index 99d6c1d62..8e6117cda 100644 --- a/manual/Tasks/vss.html +++ b/manual/Tasks/vss.html @@ -34,7 +34,7 @@
  • Gary S. Weaver
  • Jesse Stockall
    • -
    +

    Contents

    • Introduction
      • @@ -207,9 +207,7 @@ and write them to the local directory C:\mysrc\myproject. The local writable.

      - -

      VssLabel

      Description

      Task to perform LABEL commands to Microsoft Visual SourceSafe.

      @@ -291,9 +289,7 @@ label 1.03.004. If this version already has a label, the operation (and t fail.

      - -

      VssHistory

      Description

      Task to perform HISTORY commands to Microsoft Visual SourceSafe. @@ -423,10 +419,9 @@ specified according to your locale).

      toDate="${to.tstamp}"/>

      Shows all changes in the 14 days before today.

      -
      +
      -

      VssCheckin

      Description

      Task to perform CHECKIN commands to Microsoft Visual SourceSafe.

      @@ -503,9 +498,7 @@ specified according to your locale).

      directory D:\build.

      - -

      VssCheckout

      Description

      Task to perform CHECKOUT commands to Microsoft Visual SourceSafe.

      @@ -605,9 +598,7 @@ order version, date, label.

      directory D:\build.

      - -

      VssAdd

      Description

      Task to perform ADD commands to Microsoft Visual SourceSafe. @@ -677,9 +668,7 @@ Task to perform ADD commands to Microsoft Visual SourceSafe. (see vsscp).

      - -

      VssCp

      Description

      Task to perform CP (Change Project) commands to Microsoft Visual SourceSafe.

      @@ -727,9 +716,7 @@ Task to perform ADD commands to Microsoft Visual SourceSafe.

      Sets the current VSS project to $/Projects/ant.

      - -

      VssCreate

      Description

      Task to perform CREATE commands to Microsoft Visual Source Safe.

      diff --git a/manual/develop.html b/manual/develop.html index 424e54ce5..ab6552bb7 100644 --- a/manual/develop.html +++ b/manual/develop.html @@ -61,7 +61,7 @@ a BuildException. This method implements the task itself. -
      +

      * Actually the case of the letters after the first one doesn't really matter to Ant, using all lower case is a good convention, though.

      @@ -108,7 +108,7 @@ one doesn't really matter to Ant, using all lower case is a good convention, tho
    • execute() is called at runtime. If target1 and target2 both depend on target3, then running 'ant target1 - target2' will run all tasks in target3 twice.
      • + target2' will run all tasks in target3 twice.

      Conversions Ant will perform for attributes

      @@ -381,7 +381,7 @@ just been compiled.

      to the default.properties file in the org.apache.tools.ant.taskdefs package. Then you can use it as if it were a built-in task.

      -
      +

      Build Events

      Ant is capable of generating build events as it performs the tasks necessary to build a project. Listeners can be attached to Ant to receive these events. This capability could be used, for @@ -466,7 +466,7 @@ public class MyLogAdapter implements BuildListener { // implement all methods in that way } -

      +

      Source code integration

      The other way to extend Ant through Java is to make changes to existing tasks, which is diff --git a/manual/install.html b/manual/install.html index a061f3da1..6fb04ae53 100644 --- a/manual/install.html +++ b/manual/install.html @@ -31,11 +31,11 @@ To get up and running with the binary distribution of Ant quickly, follow these steps:

        -
      1. Make sure you have a Java environment installed, See System Requirements for +
      2. Make sure you have a Java environment installed. See System Requirements for details.
      3. Download Ant. See Binary Distribution for details.
      4. Uncompress the downloaded file into a directory.
        5. -
      5. Set environmental variables JAVA_HOME to your Java environment, ANT_HOME to the directory +
      6. Set environmental variables: JAVA_HOME to your Java environment, ANT_HOME to the directory you uncompressed Ant to, and add ${ANT_HOME}/bin (Unix) or %ANT_HOME%/bin (Windows) to your PATH. See Setup for details.
      7. Optionally, from the ANT_HOME directory run ant -f fetch.xml -Ddest=system to get the @@ -615,7 +615,7 @@ proprietary packages. For example, suppose you want to install support for NetRe usually /usr/share/ant/lib. Another, less messy option is to create an .ant/lib subdirectory of your home directory and place your non-JPackage Ant JARs there, thereby avoiding mixing JPackage libraries with non-JPackage stuff in the same folder. More information on where Ant finds its libraries is -available here
        8. +available here
      8. Download a non-JPackage binary distribution from the regular Apache Ant site
      9. Unzip or untar the distribution into a temporary directory
        10. diff --git a/manual/proxy.html b/manual/proxy.html index b10d81f4d..5b0b61fd6 100644 --- a/manual/proxy.html +++ b/manual/proxy.html @@ -71,7 +71,7 @@ access, although in practise the results are inconsistent.

        - It is has also been reported a breaking the IBM Java 5 JRE on AIX, + It is has also been reported a breaking the IBM Java 5 runtime on AIX, and does not always work on Linux (presumably due to missing gconf settings) Other odd things can go wrong, like Oracle JDBC drivers or pure Java SVN clients.