From d8b1423fa1c87598017a9c01024cb3a836ee9f87 Mon Sep 17 00:00:00 2001
From: Gintas Grigelionis <gintas@apache.org>
Date: Wed, 21 Mar 2018 21:24:41 +0100
Subject: [PATCH 1/3] Easier to read buildfile (cf master)

---
 build.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.xml b/build.xml
index 7f9c9f410..89e9d2b1e 100644
--- a/build.xml
+++ b/build.xml
@@ -31,7 +31,7 @@
   -->
   <property name="Name" value="Apache Ant"/>
   <property name="name" value="ant"/>
-  <!-- this is the groupId of ant in the Maven repository -->
+  <!-- this is the directory corresponding to groupId of Ant in the Maven repository -->
   <property name="groupid" value="org/apache/ant"/>
   <property name="project.version" value="1.9.11alpha"/>
   <!-- pom.version is used when doing a distribution and must match with what is checked in under src/etc/poms -->
@@ -45,7 +45,7 @@
   <property name="optional.package" value="${taskdefs.package}/optional"/>
   <property name="type.package" value="${ant.package}/types"/>
   <property name="optional.type.package" value="${type.package}/optional"/>
-  <property name="apache.resolver.type.package" value="${ant.package}/types/resolver"/>
+  <property name="apache.resolver.type.package" value="${type.package}/resolver"/>
   <property name="util.package" value="${ant.package}/util"/>
   <property name="regexp.package" value="${util.package}/regexp"/>
 
@@ -60,14 +60,14 @@
   <property name="src.dir" value="src"/>
   <property name="java.dir" value="${src.dir}/main"/>
   <property name="script.dir" value="${src.dir}/script"/>
-  <property name="lib.dir" value="lib"/>
-  <property name="manual.dir" value="manual"/>
-  <property name="etc.dir" value="${src.dir}/etc"/>
+  <property name="resource.dir" value="${src.dir}/resources"/>
   <property name="src.junit" value="${src.dir}/tests/junit"/>
   <property name="src.antunit" value="${src.dir}/tests/antunit"/>
-  <property name="tests.etc.dir" value="${src.dir}/etc/testcases"/>
-  <property name="manifest" value="${src.dir}/etc/manifest"/>
-  <property name="resource.dir" value="${src.dir}/resources"/>
+  <property name="etc.dir" value="${src.dir}/etc"/>
+  <property name="tests.etc.dir" value="${etc.dir}/testcases"/>
+  <property name="manifest" value="${etc.dir}/manifest"/>
+  <property name="lib.dir" value="lib"/>
+  <property name="manual.dir" value="manual"/>
 
   <!--
        ===================================================================
@@ -84,11 +84,11 @@
   <property name="build.tests.javadocs" value="${build.dir}/javadocs.test/"/>
   <property name="build.junit.xml" location="${build.tests}/xml"/>
   <property name="build.junit.tmpdir" location="${build.tests}/tmp"/>
+  <property name="build.junit.reports" location="${build.tests}/reports"/>
   <property name="antunit.xml" location="${build.dir}/antunit/xml"/>
   <property name="antunit.tmpdir" location="${build.dir}/antunit/tmp"/>
   <property name="antunit.reports" location="${build.dir}/antunit/reports"/>
   <property name="antunit.loglevel" value="none"/>
-  <property name="build.junit.reports" location="${build.tests}/reports"/>
   <property name="manifest.tmp" value="${build.dir}/optional.manifest"/>
   <!-- the absolute path -->
   <property name="build.tests.value" location="${build.tests}"/>

From a3b065b967b87641dc0e5a154a44002395f656c8 Mon Sep 17 00:00:00 2001
From: Jaikiran Pai <jaikiran@apache.org>
Date: Sat, 24 Mar 2018 12:05:43 +0530
Subject: [PATCH 2/3] Fix binary distribution directory layout in documentation

---
 manual/install.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/manual/install.html b/manual/install.html
index 7bcab8c40..ccaeb3e04 100644
--- a/manual/install.html
+++ b/manual/install.html
@@ -256,11 +256,7 @@ other open source Java runtimes, and so strives to have a product that works wel
    |
    +--- lib  // contains Ant JARs plus necessary dependencies
    |
-   +--- docs // contains documentation
-   |      |
-   |      +--- images  // various logos for html documentation
-   |      |
-   |      +--- manual  // Ant documentation (a must read ;-)
+   +--- manual  // Ant documentation (a must read ;-)
    |
    +--- etc // contains xsl goodies to:
             //   - create an enhanced report from xml output of various tasks.

From 3f1cec6f033959549a2e9c8ea847d7074b1d186a Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Sat, 24 Mar 2018 13:52:24 +0100
Subject: [PATCH 3/3] typos in release instructions

---
 ReleaseInstructions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ReleaseInstructions b/ReleaseInstructions
index a68dccfad..762450f4e 100644
--- a/ReleaseInstructions
+++ b/ReleaseInstructions
@@ -21,7 +21,7 @@ Note: This document was updated in the context of releasing Ant
     release and wait for a few days whether anybody objects.
 
     We haven't created extra branches for releases in a long time and
-    with out new 1.9.x LTS policy there is a permanent branch for
+    with our new 1.9.x LTS policy there is a permanent branch for
     Java5 compatible releases anyway. So no extra branch for the
     releases is needed.
 
@@ -37,7 +37,7 @@ Note: This document was updated in the context of releasing Ant
     the build with -verbose option and scan for lines beginning with
     "Unable to load...". 
 
-3.  We don't want tags for failed votes to end up on out branches so
+3.  We don't want tags for failed votes to end up on our branches so
     the release is first created from a detached head.
 
     Checkout the HEAD of the 1.9.x branch as a detached head: