From 93ee07ad351d8fc5216adc5b3028ef9ee1ec9f3d Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 30 Oct 2001 10:05:39 +0000
Subject: [PATCH] Show that Ant is an Apache project.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269839 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                        | 16 ++++++++--------
 docs/ant_in_anger.html                           |  6 +++---
 docs/ant_task_guidelines.html                    |  4 ++--
 docs/antnews.html                                |  2 +-
 docs/external.html                               |  4 ++--
 docs/faq.html                                    |  8 ++++----
 docs/index.html                                  |  8 ++++----
 docs/logos.html                                  |  2 +-
 docs/manual/CoreTasks/ant.html                   |  2 +-
 docs/manual/CoreTasks/antcall.html               |  2 +-
 docs/manual/CoreTasks/antstructure.html          |  2 +-
 docs/manual/CoreTasks/apply.html                 |  2 +-
 docs/manual/CoreTasks/available.html             |  2 +-
 docs/manual/CoreTasks/chmod.html                 |  2 +-
 docs/manual/CoreTasks/common.html                |  2 +-
 docs/manual/CoreTasks/condition.html             |  2 +-
 docs/manual/CoreTasks/copy.html                  |  2 +-
 docs/manual/CoreTasks/copydir.html               |  2 +-
 docs/manual/CoreTasks/copyfile.html              |  2 +-
 docs/manual/CoreTasks/cvs.html                   |  2 +-
 docs/manual/CoreTasks/cvspass.html               |  2 +-
 docs/manual/CoreTasks/delete.html                |  2 +-
 docs/manual/CoreTasks/deltree.html               |  2 +-
 docs/manual/CoreTasks/dependset.html             |  2 +-
 docs/manual/CoreTasks/ear.html                   |  2 +-
 docs/manual/CoreTasks/echo.html                  |  2 +-
 docs/manual/CoreTasks/exec.html                  |  2 +-
 docs/manual/CoreTasks/fail.html                  |  2 +-
 docs/manual/CoreTasks/filter.html                |  2 +-
 docs/manual/CoreTasks/fixcrlf.html               |  2 +-
 docs/manual/CoreTasks/genkey.html                |  2 +-
 docs/manual/CoreTasks/get.html                   |  2 +-
 docs/manual/CoreTasks/gunzip.html                |  2 +-
 docs/manual/CoreTasks/gzip.html                  |  2 +-
 docs/manual/CoreTasks/jar.html                   |  2 +-
 docs/manual/CoreTasks/java.html                  |  2 +-
 docs/manual/CoreTasks/javac.html                 |  2 +-
 docs/manual/CoreTasks/javadoc.html               |  2 +-
 docs/manual/CoreTasks/mail.html                  |  2 +-
 docs/manual/CoreTasks/mkdir.html                 |  2 +-
 docs/manual/CoreTasks/move.html                  |  2 +-
 docs/manual/CoreTasks/parallel.html              |  2 +-
 docs/manual/CoreTasks/patch.html                 |  2 +-
 docs/manual/CoreTasks/pathconvert.html           |  2 +-
 docs/manual/CoreTasks/property.html              |  2 +-
 docs/manual/CoreTasks/recorder.html              |  2 +-
 docs/manual/CoreTasks/rename.html                |  2 +-
 docs/manual/CoreTasks/replace.html               |  2 +-
 docs/manual/CoreTasks/rmic.html                  |  2 +-
 docs/manual/CoreTasks/sequential.html            |  2 +-
 docs/manual/CoreTasks/signjar.html               |  2 +-
 docs/manual/CoreTasks/sql.html                   |  2 +-
 docs/manual/CoreTasks/style.html                 |  2 +-
 docs/manual/CoreTasks/tar.html                   |  2 +-
 docs/manual/CoreTasks/taskdef.html               |  2 +-
 docs/manual/CoreTasks/touch.html                 |  2 +-
 docs/manual/CoreTasks/tstamp.html                |  2 +-
 docs/manual/CoreTasks/typedef.html               |  2 +-
 docs/manual/CoreTasks/untar.html                 |  2 +-
 docs/manual/CoreTasks/unzip.html                 |  2 +-
 docs/manual/CoreTasks/uptodate.html              |  2 +-
 docs/manual/CoreTasks/war.html                   |  2 +-
 docs/manual/CoreTasks/zip.html                   |  2 +-
 docs/manual/CoreTypes/description.html           |  2 +-
 docs/manual/CoreTypes/filelist.html              |  2 +-
 docs/manual/CoreTypes/fileset.html               |  2 +-
 docs/manual/CoreTypes/mapper.html                |  2 +-
 docs/manual/CoreTypes/patternset.html            |  2 +-
 docs/manual/Integration/jext-plugin.html         |  2 +-
 docs/manual/OptionalTasks/BorlandEJBTasks.html   |  2 +-
 .../OptionalTasks/BorlandGenerateClient.html     |  2 +-
 docs/manual/OptionalTasks/cab.html               |  2 +-
 docs/manual/OptionalTasks/ccm.html               |  2 +-
 docs/manual/OptionalTasks/clearcase.html         |  2 +-
 docs/manual/OptionalTasks/depend.html            |  2 +-
 docs/manual/OptionalTasks/ejb.html               |  2 +-
 docs/manual/OptionalTasks/ftp.html               |  2 +-
 docs/manual/OptionalTasks/icontract.html         |  2 +-
 docs/manual/OptionalTasks/javah.html             |  2 +-
 docs/manual/OptionalTasks/jspc.html              |  2 +-
 docs/manual/OptionalTasks/mimemail.html          |  2 +-
 docs/manual/OptionalTasks/netrexxc.html          |  2 +-
 docs/manual/OptionalTasks/propertyfile.html      |  2 +-
 docs/manual/OptionalTasks/renameextensions.html  |  2 +-
 docs/manual/OptionalTasks/script.html            |  2 +-
 docs/manual/OptionalTasks/sound.html             |  2 +-
 docs/manual/OptionalTasks/starteam.html          |  2 +-
 docs/manual/OptionalTasks/stylebook.html         |  2 +-
 docs/manual/OptionalTasks/telnet.html            |  2 +-
 docs/manual/OptionalTasks/test.html              |  2 +-
 docs/manual/api/index.html                       |  4 ++--
 docs/manual/api/packages.html                    |  4 ++--
 docs/manual/coretasklist.html                    |  2 +-
 docs/manual/credits.html                         |  4 ++--
 docs/manual/develop.html                         |  2 +-
 docs/manual/dirtasks.html                        |  2 +-
 docs/manual/feedback.html                        |  2 +-
 docs/manual/ide.html                             |  2 +-
 docs/manual/index.html                           |  6 +++---
 docs/manual/install.html                         |  2 +-
 docs/manual/intro.html                           |  4 ++--
 docs/manual/optionaltasklist.html                |  2 +-
 docs/manual/running.html                         |  2 +-
 docs/manual/sysclasspath.html                    |  2 +-
 docs/manual/toc.html                             |  2 +-
 docs/manual/using.html                           |  2 +-
 docs/problems.html                               |  2 +-
 docs/resources.html                              |  4 ++--
 src/main/org/apache/tools/ant/Main.java          |  2 +-
 src/main/org/apache/tools/ant/defaultManifest.mf |  2 +-
 xdocs/external.xml                               |  2 +-
 xdocs/faq.xml                                    |  4 ++--
 xdocs/index.xml                                  |  6 +++---
 xdocs/resources.xml                              |  2 +-
 xdocs/stylesheets/project.xml                    |  2 +-
 115 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/build.xml b/build.xml
index 70b158d11..3e54f45f9 100644
--- a/build.xml
+++ b/build.xml
@@ -2,7 +2,7 @@
 
 <!-- 
   =======================================================================
-    Ant own build file                                                      
+    Apache Ant own build file                                                      
   ======================================================================= 
 -->
 <project default="main" basedir=".">
@@ -12,7 +12,7 @@
   <property file=".ant.properties" />
   <property file="${user.home}/.ant.properties" />
 
-  <property name="Name" value="Ant"/>
+  <property name="Name" value="Apache Ant"/>
   <property name="name" value="ant"/>
   <property name="version" value="1.5alpha"/>
 
@@ -299,12 +299,12 @@
   
   <!-- 
        =================================================================== 
-         Create the ant jars: ant.jar and optional.jar
+         Create the Apache Ant jars: ant.jar and optional.jar
        =================================================================== 
   -->
   <target name="jars" 
           depends="build" 
-          description="--> creates the ant jars">
+          description="--> creates the Apache Ant jars">
 
     <jar file="${build.lib}/${name}.jar" 
          basedir="${build.classes}" 
@@ -325,12 +325,12 @@
 
   <!--
        ===================================================================
-         Create the essential distribution that can run ant
+         Create the essential distribution that can run Apache Ant
        ===================================================================
   -->
   <target name="dist-lite" 
           depends="jars"
-          description="--> creates a minimum distribution to run ant">
+          description="--> creates a minimum distribution to run Apache Ant">
 
     <mkdir dir="${dist.dir}"/>
     <mkdir dir="${dist.bin}"/>
@@ -596,7 +596,7 @@
 
   <!--
        ===================================================================
-         Installs ant
+         Installs Apache Ant
        ===================================================================
   -->
   <target name="install" if="ant.install">
@@ -635,7 +635,7 @@
              version="true"
              windowtitle="${Name} API"
              doctitle="${Name}">
-      <group title="Ant Core" packages="org.apache.tools.ant*" />
+      <group title="Apache Ant Core" packages="org.apache.tools.ant*" />
       <group title="Core Tasks" packages="org.apache.tools.ant.taskdefs*" />
       <group title="Optional Tasks" packages="org.apache.tools.ant.taskdefs.optional*" />
 
diff --git a/docs/ant_in_anger.html b/docs/ant_in_anger.html
index edb6d7ea0..ee5da4179 100644
--- a/docs/ant_in_anger.html
+++ b/docs/ant_in_anger.html
@@ -1,11 +1,11 @@
 <head>
 <title>
-	Ant in Anger
+	Apache Ant in Anger
 </title>
 </head>
 
 <body bgcolor="#FFFFFF" text="#000000">
-<h1 align="center">Ant in Anger:
+<h1 align="center">Apache Ant in Anger:
 </h1>
 <h2 align="center">
 	Using Ant in a Production Development System
@@ -20,7 +20,7 @@ Steve Loughran
 <h2>Introduction</h2>
 </a>
 
-<a href="http://jakarta.apache.org/ant/">Ant</a>
+<a href="http://jakarta.apache.org/ant/">Apache Ant</a>
  can be an invaluable tool in a team development process -or it can
 be yet another source of problems in that ongoing crises we call
 development . This
diff --git a/docs/ant_task_guidelines.html b/docs/ant_task_guidelines.html
index 0c15937b3..8e4f72382 100644
--- a/docs/ant_task_guidelines.html
+++ b/docs/ant_task_guidelines.html
@@ -1,10 +1,10 @@
 <html><head>
 <title>
-Ant Task Design Guidelines
+Apache Ant Task Design Guidelines
 </title>
 </head><body>
 
-<h1>Ant Task Design Guidelines</h1>
+<h1>Apache Ant Task Design Guidelines</h1>
 
 This document covers how to write ant tasks to a standard required to be
 incorporated into the Ant distribution. You may find it useful when
diff --git a/docs/antnews.html b/docs/antnews.html
index b1cbbc1c3..486939791 100644
--- a/docs/antnews.html
+++ b/docs/antnews.html
@@ -33,7 +33,7 @@
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
           <td valign="top" nowrap="true">
-                <p><strong>Ant</strong></p>
+                <p><strong>Apache Ant</strong></p>
     <ul>
           <li>      <a href="./index.html">Front Page</a>
   </li>
diff --git a/docs/external.html b/docs/external.html
index 252181b3c..ab049d5ff 100644
--- a/docs/external.html
+++ b/docs/external.html
@@ -31,7 +31,7 @@
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
           <td valign="top" nowrap="true">
-                <p><strong>Ant</strong></p>
+                <p><strong>Apache Ant</strong></p>
     <ul>
           <li>      <a href="./index.html">Front Page</a>
   </li>
@@ -91,7 +91,7 @@
     </td></tr>
     <tr><td>
       <blockquote>
-                        <p>This page lists external resources for Ant: tasks, IDE
+                        <p>This page lists external resources for Apache Ant: tasks, IDE
       integration tools, loggers, you name it. If you've written
       something that should be included, please post all relevant
       information to one of the mailing lists.</p>
diff --git a/docs/faq.html b/docs/faq.html
index 26602900e..5d08b8da1 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -31,7 +31,7 @@
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
           <td valign="top" nowrap="true">
-                <p><strong>Ant</strong></p>
+                <p><strong>Apache Ant</strong></p>
     <ul>
           <li>      <a href="./index.html">Front Page</a>
   </li>
@@ -101,7 +101,7 @@
       <blockquote>
         <ul>
                     <li><a href="#what-is-ant">
-  What is Ant?
+  What is Apache Ant?
   </a></li>
                     <li><a href="#ant-name">
   Why do you call it Ant?
@@ -242,7 +242,7 @@
     <tr><td bgcolor="#828DA6">
       <font color="#ffffff" face="arial,helvetica,sanserif">
         <strong>
-          What is Ant?
+          What is Apache Ant?
         </strong>
       </font>
     </td></tr>
@@ -301,7 +301,7 @@
         tool of choice for a lot of projects.</p>
                                         <p>In January 2000 Ant was moved to a separate CVS module and
         was promoted to a project of its own, independent of
-        Tomcat.</p>
+        Tomcat.  Ant became Apache Ant.</p>
                                         <p>The first version of Ant that was exposed a lager audience
         was the one that shipped with Tomcat's 3.1 release on 19 April
         2000.  This version has later been referenced to as Ant
diff --git a/docs/index.html b/docs/index.html
index abd5f6f1b..1cdec7fe3 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -33,7 +33,7 @@
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
           <td valign="top" nowrap="true">
-                <p><strong>Ant</strong></p>
+                <p><strong>Apache Ant</strong></p>
     <ul>
           <li>      <a href="./index.html">Front Page</a>
   </li>
@@ -93,7 +93,7 @@
     </td></tr>
     <tr><td>
       <blockquote>
-                        <h3>Ant 1.4.1 Available !</h3>
+                        <h3>Apache Ant 1.4.1 Available !</h3>
                                 <p>Version 1.4.1 of Ant has been released. This is a bugfix release which corrects a few problems
      in the 1.4 release. It is available for download 
      <a href="http://www.apache.org/dist/jakarta/jakarta-ant/release/v1.4.1/">
@@ -105,13 +105,13 @@
         <table border="0" cellspacing="0" cellpadding="2" width="100%">
     <tr><td bgcolor="#525D76">
       <font color="#ffffff" face="arial,helvetica,sanserif">
-        <a name="Ant"><strong>Ant</strong></a>
+        <a name="Apache Ant"><strong>Apache Ant</strong></a>
       </font>
     </td></tr>
     <tr><td>
       <blockquote>
                         <p>
-Ant is a Java based build tool. In theory it is kind of like make without
+Apache Ant is a Java based build tool. In theory it is kind of like make without
 make's wrinkles.
 </p>
                                 <p>
diff --git a/docs/logos.html b/docs/logos.html
index 792b1096e..55abf482e 100644
--- a/docs/logos.html
+++ b/docs/logos.html
@@ -31,7 +31,7 @@
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
           <td valign="top" nowrap="true">
-                <p><strong>Ant</strong></p>
+                <p><strong>Apache Ant</strong></p>
     <ul>
           <li>      <a href="./index.html">Front Page</a>
   </li>
diff --git a/docs/manual/CoreTasks/ant.html b/docs/manual/CoreTasks/ant.html
index 5604b4cb3..6e835bc9d 100644
--- a/docs/manual/CoreTasks/ant.html
+++ b/docs/manual/CoreTasks/ant.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/antcall.html b/docs/manual/CoreTasks/antcall.html
index e612a76e0..f08072996 100644
--- a/docs/manual/CoreTasks/antcall.html
+++ b/docs/manual/CoreTasks/antcall.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/antstructure.html b/docs/manual/CoreTasks/antstructure.html
index 708edfc3b..0d3a066d6 100644
--- a/docs/manual/CoreTasks/antstructure.html
+++ b/docs/manual/CoreTasks/antstructure.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/apply.html b/docs/manual/CoreTasks/apply.html
index a7aa77f71..1ecd7b7ba 100644
--- a/docs/manual/CoreTasks/apply.html
+++ b/docs/manual/CoreTasks/apply.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/available.html b/docs/manual/CoreTasks/available.html
index 471a2f9c8..4d50c428a 100644
--- a/docs/manual/CoreTasks/available.html
+++ b/docs/manual/CoreTasks/available.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/chmod.html b/docs/manual/CoreTasks/chmod.html
index fefd8f63a..fdfd055a8 100644
--- a/docs/manual/CoreTasks/chmod.html
+++ b/docs/manual/CoreTasks/chmod.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/common.html b/docs/manual/CoreTasks/common.html
index 2c489ca77..23440579c 100644
--- a/docs/manual/CoreTasks/common.html
+++ b/docs/manual/CoreTasks/common.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/condition.html b/docs/manual/CoreTasks/condition.html
index 6802c7abf..c877e9b60 100644
--- a/docs/manual/CoreTasks/condition.html
+++ b/docs/manual/CoreTasks/condition.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/copy.html b/docs/manual/CoreTasks/copy.html
index 544ab3c3d..20fb2715e 100644
--- a/docs/manual/CoreTasks/copy.html
+++ b/docs/manual/CoreTasks/copy.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/copydir.html b/docs/manual/CoreTasks/copydir.html
index d57bfeb44..fc126b893 100644
--- a/docs/manual/CoreTasks/copydir.html
+++ b/docs/manual/CoreTasks/copydir.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/copyfile.html b/docs/manual/CoreTasks/copyfile.html
index 129cfadbc..c997fc52c 100644
--- a/docs/manual/CoreTasks/copyfile.html
+++ b/docs/manual/CoreTasks/copyfile.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/cvs.html b/docs/manual/CoreTasks/cvs.html
index 78d328c13..4c6bd4b16 100644
--- a/docs/manual/CoreTasks/cvs.html
+++ b/docs/manual/CoreTasks/cvs.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/cvspass.html b/docs/manual/CoreTasks/cvspass.html
index 789a5739c..218ba991b 100644
--- a/docs/manual/CoreTasks/cvspass.html
+++ b/docs/manual/CoreTasks/cvspass.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/delete.html b/docs/manual/CoreTasks/delete.html
index b8ece05b2..1cec380c9 100644
--- a/docs/manual/CoreTasks/delete.html
+++ b/docs/manual/CoreTasks/delete.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/deltree.html b/docs/manual/CoreTasks/deltree.html
index 576b76959..d55316970 100644
--- a/docs/manual/CoreTasks/deltree.html
+++ b/docs/manual/CoreTasks/deltree.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/dependset.html b/docs/manual/CoreTasks/dependset.html
index 3112ecd6f..fe0aa92d6 100644
--- a/docs/manual/CoreTasks/dependset.html
+++ b/docs/manual/CoreTasks/dependset.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/ear.html b/docs/manual/CoreTasks/ear.html
index 63ec69fa9..a1184ceed 100644
--- a/docs/manual/CoreTasks/ear.html
+++ b/docs/manual/CoreTasks/ear.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/echo.html b/docs/manual/CoreTasks/echo.html
index f1e0aaae0..af147853d 100644
--- a/docs/manual/CoreTasks/echo.html
+++ b/docs/manual/CoreTasks/echo.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/exec.html b/docs/manual/CoreTasks/exec.html
index d7364e9b0..7abadc86a 100644
--- a/docs/manual/CoreTasks/exec.html
+++ b/docs/manual/CoreTasks/exec.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/fail.html b/docs/manual/CoreTasks/fail.html
index 3b7c26650..8a666efcc 100644
--- a/docs/manual/CoreTasks/fail.html
+++ b/docs/manual/CoreTasks/fail.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/filter.html b/docs/manual/CoreTasks/filter.html
index f9ffed5b7..5e6bba468 100644
--- a/docs/manual/CoreTasks/filter.html
+++ b/docs/manual/CoreTasks/filter.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/fixcrlf.html b/docs/manual/CoreTasks/fixcrlf.html
index 131340ab7..76173eb12 100644
--- a/docs/manual/CoreTasks/fixcrlf.html
+++ b/docs/manual/CoreTasks/fixcrlf.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/genkey.html b/docs/manual/CoreTasks/genkey.html
index 855983433..ec0784b51 100644
--- a/docs/manual/CoreTasks/genkey.html
+++ b/docs/manual/CoreTasks/genkey.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/get.html b/docs/manual/CoreTasks/get.html
index 7337de5d2..f5bef9bc5 100644
--- a/docs/manual/CoreTasks/get.html
+++ b/docs/manual/CoreTasks/get.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/gunzip.html b/docs/manual/CoreTasks/gunzip.html
index b18fcd688..ccac55199 100644
--- a/docs/manual/CoreTasks/gunzip.html
+++ b/docs/manual/CoreTasks/gunzip.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/gzip.html b/docs/manual/CoreTasks/gzip.html
index a0aa30c9d..1c2b98ce4 100644
--- a/docs/manual/CoreTasks/gzip.html
+++ b/docs/manual/CoreTasks/gzip.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/jar.html b/docs/manual/CoreTasks/jar.html
index 477d558d2..6f14da36f 100644
--- a/docs/manual/CoreTasks/jar.html
+++ b/docs/manual/CoreTasks/jar.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/java.html b/docs/manual/CoreTasks/java.html
index 8ffa6eca6..4b5684596 100644
--- a/docs/manual/CoreTasks/java.html
+++ b/docs/manual/CoreTasks/java.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/javac.html b/docs/manual/CoreTasks/javac.html
index c79522663..05bc9c0c2 100644
--- a/docs/manual/CoreTasks/javac.html
+++ b/docs/manual/CoreTasks/javac.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/javadoc.html b/docs/manual/CoreTasks/javadoc.html
index 5e9ff9861..88ebc0297 100644
--- a/docs/manual/CoreTasks/javadoc.html
+++ b/docs/manual/CoreTasks/javadoc.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/mail.html b/docs/manual/CoreTasks/mail.html
index 43a8add67..1cb3490fa 100644
--- a/docs/manual/CoreTasks/mail.html
+++ b/docs/manual/CoreTasks/mail.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/mkdir.html b/docs/manual/CoreTasks/mkdir.html
index 76ae61f7b..15ac55a04 100644
--- a/docs/manual/CoreTasks/mkdir.html
+++ b/docs/manual/CoreTasks/mkdir.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/move.html b/docs/manual/CoreTasks/move.html
index 8eb6ba07a..052676398 100644
--- a/docs/manual/CoreTasks/move.html
+++ b/docs/manual/CoreTasks/move.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/parallel.html b/docs/manual/CoreTasks/parallel.html
index 9de110acb..2f9cdbdfe 100644
--- a/docs/manual/CoreTasks/parallel.html
+++ b/docs/manual/CoreTasks/parallel.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/patch.html b/docs/manual/CoreTasks/patch.html
index aa84ce93c..8fde0d148 100644
--- a/docs/manual/CoreTasks/patch.html
+++ b/docs/manual/CoreTasks/patch.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/pathconvert.html b/docs/manual/CoreTasks/pathconvert.html
index 20e45ca8e..eb290a7f6 100644
--- a/docs/manual/CoreTasks/pathconvert.html
+++ b/docs/manual/CoreTasks/pathconvert.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/property.html b/docs/manual/CoreTasks/property.html
index 7e19368bb..1f4b58873 100644
--- a/docs/manual/CoreTasks/property.html
+++ b/docs/manual/CoreTasks/property.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/recorder.html b/docs/manual/CoreTasks/recorder.html
index 295b81cbe..5207b7cf9 100644
--- a/docs/manual/CoreTasks/recorder.html
+++ b/docs/manual/CoreTasks/recorder.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/rename.html b/docs/manual/CoreTasks/rename.html
index 6c2d1339a..696fe97a3 100644
--- a/docs/manual/CoreTasks/rename.html
+++ b/docs/manual/CoreTasks/rename.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/replace.html b/docs/manual/CoreTasks/replace.html
index 80d092ed3..39888031b 100644
--- a/docs/manual/CoreTasks/replace.html
+++ b/docs/manual/CoreTasks/replace.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/rmic.html b/docs/manual/CoreTasks/rmic.html
index 5e65d9e10..aed6413a5 100644
--- a/docs/manual/CoreTasks/rmic.html
+++ b/docs/manual/CoreTasks/rmic.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/sequential.html b/docs/manual/CoreTasks/sequential.html
index 62bae9c7e..740f8c7ba 100644
--- a/docs/manual/CoreTasks/sequential.html
+++ b/docs/manual/CoreTasks/sequential.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/signjar.html b/docs/manual/CoreTasks/signjar.html
index c093e1442..b8b934cec 100644
--- a/docs/manual/CoreTasks/signjar.html
+++ b/docs/manual/CoreTasks/signjar.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/sql.html b/docs/manual/CoreTasks/sql.html
index d2440a5ce..1dff835cf 100644
--- a/docs/manual/CoreTasks/sql.html
+++ b/docs/manual/CoreTasks/sql.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 <body>
 
diff --git a/docs/manual/CoreTasks/style.html b/docs/manual/CoreTasks/style.html
index 1918ad48c..967827e37 100644
--- a/docs/manual/CoreTasks/style.html
+++ b/docs/manual/CoreTasks/style.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/tar.html b/docs/manual/CoreTasks/tar.html
index d237625df..af2f63b31 100644
--- a/docs/manual/CoreTasks/tar.html
+++ b/docs/manual/CoreTasks/tar.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/taskdef.html b/docs/manual/CoreTasks/taskdef.html
index 9d24fbed5..777dbf3bf 100644
--- a/docs/manual/CoreTasks/taskdef.html
+++ b/docs/manual/CoreTasks/taskdef.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/touch.html b/docs/manual/CoreTasks/touch.html
index 6393813f8..29f89bd6e 100644
--- a/docs/manual/CoreTasks/touch.html
+++ b/docs/manual/CoreTasks/touch.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/tstamp.html b/docs/manual/CoreTasks/tstamp.html
index 81dd19a41..d98855aa7 100644
--- a/docs/manual/CoreTasks/tstamp.html
+++ b/docs/manual/CoreTasks/tstamp.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/typedef.html b/docs/manual/CoreTasks/typedef.html
index a5c927dce..35a75023e 100644
--- a/docs/manual/CoreTasks/typedef.html
+++ b/docs/manual/CoreTasks/typedef.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/untar.html b/docs/manual/CoreTasks/untar.html
index f2c183589..cd678ebbb 100644
--- a/docs/manual/CoreTasks/untar.html
+++ b/docs/manual/CoreTasks/untar.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/unzip.html b/docs/manual/CoreTasks/unzip.html
index dd7415bc1..a7d0f39d5 100644
--- a/docs/manual/CoreTasks/unzip.html
+++ b/docs/manual/CoreTasks/unzip.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/uptodate.html b/docs/manual/CoreTasks/uptodate.html
index de5329206..df628cbe7 100644
--- a/docs/manual/CoreTasks/uptodate.html
+++ b/docs/manual/CoreTasks/uptodate.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/war.html b/docs/manual/CoreTasks/war.html
index bf5c87d9d..50214aa4c 100644
--- a/docs/manual/CoreTasks/war.html
+++ b/docs/manual/CoreTasks/war.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTasks/zip.html b/docs/manual/CoreTasks/zip.html
index e070e3147..f4e762502 100644
--- a/docs/manual/CoreTasks/zip.html
+++ b/docs/manual/CoreTasks/zip.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTypes/description.html b/docs/manual/CoreTypes/description.html
index 02d1a2af4..b1ab2e263 100644
--- a/docs/manual/CoreTypes/description.html
+++ b/docs/manual/CoreTypes/description.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTypes/filelist.html b/docs/manual/CoreTypes/filelist.html
index 353e7f580..2f377e9fb 100644
--- a/docs/manual/CoreTypes/filelist.html
+++ b/docs/manual/CoreTypes/filelist.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTypes/fileset.html b/docs/manual/CoreTypes/fileset.html
index 318d93144..e6019d007 100644
--- a/docs/manual/CoreTypes/fileset.html
+++ b/docs/manual/CoreTypes/fileset.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTypes/mapper.html b/docs/manual/CoreTypes/mapper.html
index 72f434164..f32fc499c 100644
--- a/docs/manual/CoreTypes/mapper.html
+++ b/docs/manual/CoreTypes/mapper.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/CoreTypes/patternset.html b/docs/manual/CoreTypes/patternset.html
index 44d21732d..fbdaa8717 100644
--- a/docs/manual/CoreTypes/patternset.html
+++ b/docs/manual/CoreTypes/patternset.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/Integration/jext-plugin.html b/docs/manual/Integration/jext-plugin.html
index a9bd83842..0041a9cb4 100644
--- a/docs/manual/Integration/jext-plugin.html
+++ b/docs/manual/Integration/jext-plugin.html
@@ -3,7 +3,7 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <meta http-equiv="Content-Language" content="en-us">
-  <title>AntWork Plugin for the Jext - Java Text Editor</title>
+  <title>Apache AntWork Plugin for the Jext - Java Text Editor</title>
 </head>
 <body>
 
diff --git a/docs/manual/OptionalTasks/BorlandEJBTasks.html b/docs/manual/OptionalTasks/BorlandEJBTasks.html
index 8759b5197..c51c43341 100644
--- a/docs/manual/OptionalTasks/BorlandEJBTasks.html
+++ b/docs/manual/OptionalTasks/BorlandEJBTasks.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/OptionalTasks/BorlandGenerateClient.html b/docs/manual/OptionalTasks/BorlandGenerateClient.html
index 2a0c9f3a1..68108232d 100644
--- a/docs/manual/OptionalTasks/BorlandGenerateClient.html
+++ b/docs/manual/OptionalTasks/BorlandGenerateClient.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/OptionalTasks/cab.html b/docs/manual/OptionalTasks/cab.html
index ddd974bac..e5d694244 100644
--- a/docs/manual/OptionalTasks/cab.html
+++ b/docs/manual/OptionalTasks/cab.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/OptionalTasks/ccm.html b/docs/manual/OptionalTasks/ccm.html
index 0b405a783..7c8b6b501 100644
--- a/docs/manual/OptionalTasks/ccm.html
+++ b/docs/manual/OptionalTasks/ccm.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant</title>
+<title>Apache Ant</title>
 </head>
 
 <body>
diff --git a/docs/manual/OptionalTasks/clearcase.html b/docs/manual/OptionalTasks/clearcase.html
index 82fb7e385..f7784528d 100644
--- a/docs/manual/OptionalTasks/clearcase.html
+++ b/docs/manual/OptionalTasks/clearcase.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant</title>
+<title>Apache Ant</title>
 </head>
 
 <body>
diff --git a/docs/manual/OptionalTasks/depend.html b/docs/manual/OptionalTasks/depend.html
index 1e6547d1e..2f1f15222 100644
--- a/docs/manual/OptionalTasks/depend.html
+++ b/docs/manual/OptionalTasks/depend.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/OptionalTasks/ejb.html b/docs/manual/OptionalTasks/ejb.html
index ad1fffcba..c568886b5 100644
--- a/docs/manual/OptionalTasks/ejb.html
+++ b/docs/manual/OptionalTasks/ejb.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant EJB Tasks</title>
+<title>Apache Ant EJB Tasks</title>
 
 </head>
 
diff --git a/docs/manual/OptionalTasks/ftp.html b/docs/manual/OptionalTasks/ftp.html
index 21c54d3e0..703531372 100644
--- a/docs/manual/OptionalTasks/ftp.html
+++ b/docs/manual/OptionalTasks/ftp.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/OptionalTasks/icontract.html b/docs/manual/OptionalTasks/icontract.html
index a8fe2319a..da2eff8db 100644
--- a/docs/manual/OptionalTasks/icontract.html
+++ b/docs/manual/OptionalTasks/icontract.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/OptionalTasks/javah.html b/docs/manual/OptionalTasks/javah.html
index 5787fe19d..f35b88e05 100644
--- a/docs/manual/OptionalTasks/javah.html
+++ b/docs/manual/OptionalTasks/javah.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant</title>
+<title>Apache Ant</title>
 </head>
 
 <body>
diff --git a/docs/manual/OptionalTasks/jspc.html b/docs/manual/OptionalTasks/jspc.html
index bdedbb0f8..7e671d99b 100644
--- a/docs/manual/OptionalTasks/jspc.html
+++ b/docs/manual/OptionalTasks/jspc.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/OptionalTasks/mimemail.html b/docs/manual/OptionalTasks/mimemail.html
index 2747ac8c7..587abeb6f 100644
--- a/docs/manual/OptionalTasks/mimemail.html
+++ b/docs/manual/OptionalTasks/mimemail.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/OptionalTasks/netrexxc.html b/docs/manual/OptionalTasks/netrexxc.html
index cc4530d9d..81fe3b13c 100644
--- a/docs/manual/OptionalTasks/netrexxc.html
+++ b/docs/manual/OptionalTasks/netrexxc.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/OptionalTasks/propertyfile.html b/docs/manual/OptionalTasks/propertyfile.html
index 73290199e..bdd6aeba8 100644
--- a/docs/manual/OptionalTasks/propertyfile.html
+++ b/docs/manual/OptionalTasks/propertyfile.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant PropertyFile Task</title>
+<title>Apache Ant PropertyFile Task</title>
 
 </head>
 
diff --git a/docs/manual/OptionalTasks/renameextensions.html b/docs/manual/OptionalTasks/renameextensions.html
index 430b31185..14de9edbb 100644
--- a/docs/manual/OptionalTasks/renameextensions.html
+++ b/docs/manual/OptionalTasks/renameextensions.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/OptionalTasks/script.html b/docs/manual/OptionalTasks/script.html
index 6ec82118e..e80d7ca84 100644
--- a/docs/manual/OptionalTasks/script.html
+++ b/docs/manual/OptionalTasks/script.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/OptionalTasks/sound.html b/docs/manual/OptionalTasks/sound.html
index da360a20b..5709265e9 100644
--- a/docs/manual/OptionalTasks/sound.html
+++ b/docs/manual/OptionalTasks/sound.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/OptionalTasks/starteam.html b/docs/manual/OptionalTasks/starteam.html
index 40b20470f..c2eae873f 100644
--- a/docs/manual/OptionalTasks/starteam.html
+++ b/docs/manual/OptionalTasks/starteam.html
@@ -1,7 +1,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 <body>
 
diff --git a/docs/manual/OptionalTasks/stylebook.html b/docs/manual/OptionalTasks/stylebook.html
index e52056cdb..ff53501cb 100644
--- a/docs/manual/OptionalTasks/stylebook.html
+++ b/docs/manual/OptionalTasks/stylebook.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/OptionalTasks/telnet.html b/docs/manual/OptionalTasks/telnet.html
index 96337770a..3e419303c 100644
--- a/docs/manual/OptionalTasks/telnet.html
+++ b/docs/manual/OptionalTasks/telnet.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/OptionalTasks/test.html b/docs/manual/OptionalTasks/test.html
index 880be1f98..5c430c104 100644
--- a/docs/manual/OptionalTasks/test.html
+++ b/docs/manual/OptionalTasks/test.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/api/index.html b/docs/manual/api/index.html
index ca2f42ad3..7eab05e23 100644
--- a/docs/manual/api/index.html
+++ b/docs/manual/api/index.html
@@ -1,10 +1,10 @@
 <html>
 <head>
 <meta http-equiv="refresh" content="1; URL=packages.html">
-<title>Ant API</title>
+<title>Apache Ant API</title>
 </head>
 <body>
-Redirecting to <a href="packages.html">Ant API ...</a>
+Redirecting to <a href="packages.html">Apache Ant API ...</a>
 </body>
 </html>
 
diff --git a/docs/manual/api/packages.html b/docs/manual/api/packages.html
index f03d66d6b..3c9772c5a 100644
--- a/docs/manual/api/packages.html
+++ b/docs/manual/api/packages.html
@@ -1,9 +1,9 @@
 <html>
 <head>
-<title>Ant API</title>
+<title>Apache Ant API</title>
 </head>
 <body>
-<b>Ant API has not been generated</b>
+<b>Apache Ant API has not been generated</b>
 </body>
 </html>
 
diff --git a/docs/manual/coretasklist.html b/docs/manual/coretasklist.html
index 74f1b9743..31bff46b0 100644
--- a/docs/manual/coretasklist.html
+++ b/docs/manual/coretasklist.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 <base target="mainFrame">
 </head>
 
diff --git a/docs/manual/credits.html b/docs/manual/credits.html
index 077700f69..2c8104393 100644
--- a/docs/manual/credits.html
+++ b/docs/manual/credits.html
@@ -2,13 +2,13 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
 
 <div align="center">
-<h1>Ant User Manual</h1>
+<h1>Apache Ant User Manual</h1>
 <p>by</p>
 </div>
 <!-- Names are in alphabetical order, on last name -->
diff --git a/docs/manual/develop.html b/docs/manual/develop.html
index c9c28622b..4d65d1ec4 100644
--- a/docs/manual/develop.html
+++ b/docs/manual/develop.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/dirtasks.html b/docs/manual/dirtasks.html
index 7a7946ed9..9cefc73bc 100644
--- a/docs/manual/dirtasks.html
+++ b/docs/manual/dirtasks.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/feedback.html b/docs/manual/feedback.html
index fe2f25134..352e0923e 100644
--- a/docs/manual/feedback.html
+++ b/docs/manual/feedback.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/ide.html b/docs/manual/ide.html
index cb4af029f..84e864643 100644
--- a/docs/manual/ide.html
+++ b/docs/manual/ide.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 <base target="mainFrame">
 </head>
 
diff --git a/docs/manual/index.html b/docs/manual/index.html
index 3b17dbad3..18be35d54 100644
--- a/docs/manual/index.html
+++ b/docs/manual/index.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <frameset cols="20%,80%">
@@ -10,8 +10,8 @@
 <frame src="credits.html" name="mainFrame">
 </frameset>
 <noframes>
-<H2>Ant User Manual</H2>
+<H2>Apache Ant User Manual</H2>
 
-<a href="toc.html">Ant User Manual</a></noframes>
+<a href="toc.html">Apache Ant User Manual</a></noframes>
 
 </html>
diff --git a/docs/manual/install.html b/docs/manual/install.html
index 8f20d833f..2651ed4d3 100644
--- a/docs/manual/install.html
+++ b/docs/manual/install.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/intro.html b/docs/manual/intro.html
index 45f997a33..34d59fdbe 100644
--- a/docs/manual/intro.html
+++ b/docs/manual/intro.html
@@ -2,12 +2,12 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
 <h1><a name="introduction">Introduction</a></h1>
-<p>Ant is a Java-based build tool. In theory, it is kind of like
+<p>Apache Ant is a Java-based build tool. In theory, it is kind of like
 <i>make</i>, without <i>make</i>'s wrinkles.</p>
 <h3>Why?</h3>
 <p>Why another build tool when there is already
diff --git a/docs/manual/optionaltasklist.html b/docs/manual/optionaltasklist.html
index 0d097749c..8dbe2e71d 100644
--- a/docs/manual/optionaltasklist.html
+++ b/docs/manual/optionaltasklist.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 <base target="mainFrame">
 </head>
 
diff --git a/docs/manual/running.html b/docs/manual/running.html
index bc6237e22..4f442074e 100644
--- a/docs/manual/running.html
+++ b/docs/manual/running.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/sysclasspath.html b/docs/manual/sysclasspath.html
index 6806a79ba..9ed1db3f6 100644
--- a/docs/manual/sysclasspath.html
+++ b/docs/manual/sysclasspath.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/manual/toc.html b/docs/manual/toc.html
index 697d0c081..c6776fa7f 100644
--- a/docs/manual/toc.html
+++ b/docs/manual/toc.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 <base target="mainFrame">
 </head>
 
diff --git a/docs/manual/using.html b/docs/manual/using.html
index 7eee5a62b..7a66ba34b 100644
--- a/docs/manual/using.html
+++ b/docs/manual/using.html
@@ -2,7 +2,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<title>Ant User Manual</title>
+<title>Apache Ant User Manual</title>
 </head>
 
 <body>
diff --git a/docs/problems.html b/docs/problems.html
index 0d4c187c5..f60137ca8 100644
--- a/docs/problems.html
+++ b/docs/problems.html
@@ -31,7 +31,7 @@
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
           <td valign="top" nowrap="true">
-                <p><strong>Ant</strong></p>
+                <p><strong>Apache Ant</strong></p>
     <ul>
           <li>      <a href="./index.html">Front Page</a>
   </li>
diff --git a/docs/resources.html b/docs/resources.html
index 16a3519c2..c06f9e5b9 100644
--- a/docs/resources.html
+++ b/docs/resources.html
@@ -31,7 +31,7 @@
         <tr>
           <!-- LEFT SIDE NAVIGATION -->
           <td valign="top" nowrap="true">
-                <p><strong>Ant</strong></p>
+                <p><strong>Apache Ant</strong></p>
     <ul>
           <li>      <a href="./index.html">Front Page</a>
   </li>
@@ -174,7 +174,7 @@
     </td></tr>
     <tr><td>
       <blockquote>
-                        <p>The following sections list articles and presentations written about Ant.  If
+                        <p>The following sections list articles and presentations written about Apache Ant.  If
       you've written something that should be included, please post it to one
       of the mailing lists.</p>
                     </blockquote>
diff --git a/src/main/org/apache/tools/ant/Main.java b/src/main/org/apache/tools/ant/Main.java
index 13972cba2..182f2b3d1 100644
--- a/src/main/org/apache/tools/ant/Main.java
+++ b/src/main/org/apache/tools/ant/Main.java
@@ -579,7 +579,7 @@ public class Main {
                 
                 String lSep = System.getProperty("line.separator");
                 StringBuffer msg = new StringBuffer();
-                msg.append("Ant version ");
+                msg.append("Apache Ant version ");
                 msg.append(props.getProperty("VERSION"));
                 msg.append(" compiled on ");
                 msg.append(props.getProperty("DATE"));
diff --git a/src/main/org/apache/tools/ant/defaultManifest.mf b/src/main/org/apache/tools/ant/defaultManifest.mf
index ce5678fb9..1dc733da7 100644
--- a/src/main/org/apache/tools/ant/defaultManifest.mf
+++ b/src/main/org/apache/tools/ant/defaultManifest.mf
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Created-By: Ant @VERSION@
+Created-By: Apache Ant @VERSION@
 
diff --git a/xdocs/external.xml b/xdocs/external.xml
index 54308a63c..cd9637656 100644
--- a/xdocs/external.xml
+++ b/xdocs/external.xml
@@ -10,7 +10,7 @@
     
     <section name="External Tools and Tasks">
 
-      <p>This page lists external resources for Ant: tasks, IDE
+      <p>This page lists external resources for Apache Ant: tasks, IDE
       integration tools, loggers, you name it. If you've written
       something that should be included, please post all relevant
       information to one of the mailing lists.</p>
diff --git a/xdocs/faq.xml b/xdocs/faq.xml
index f9f0aab72..afeaa9c3a 100644
--- a/xdocs/faq.xml
+++ b/xdocs/faq.xml
@@ -8,7 +8,7 @@
 
   <faqsection title="General">
     <faq id="what-is-ant">
-      <question>What is Ant?</question>
+      <question>What is Apache Ant?</question>
       <answer>
         <p> Ant is a Java based build tool. In theory it is kind of
         like &quot;make&quot; without makes wrinkles and with the full
@@ -50,7 +50,7 @@
 
         <p>In January 2000 Ant was moved to a separate CVS module and
         was promoted to a project of its own, independent of
-        Tomcat.</p>
+        Tomcat.  Ant became Apache Ant.</p>
 
         <p>The first version of Ant that was exposed a lager audience
         was the one that shipped with Tomcat&apos;s 3.1 release on 19 April
diff --git a/xdocs/index.xml b/xdocs/index.xml
index 10ebd6f95..aa67eb523 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -10,7 +10,7 @@
 <body>
 
   <section name="Ant 1.4.1">
-  <h3>Ant 1.4.1 Available !</h3>
+  <h3>Apache Ant 1.4.1 Available !</h3>
   <p>Version 1.4.1 of Ant has been released. This is a bugfix release which corrects a few problems
      in the 1.4 release. It is available for download 
      <a href="http://www.apache.org/dist/jakarta/jakarta-ant/release/v1.4.1/">
@@ -18,10 +18,10 @@
      </p>
   </section>
 
-  <section name="Ant">
+  <section name="Apache Ant">
 
 <p>
-Ant is a Java based build tool. In theory it is kind of like make without
+Apache Ant is a Java based build tool. In theory it is kind of like make without
 make's wrinkles.
 </p>
 
diff --git a/xdocs/resources.xml b/xdocs/resources.xml
index 36dd4c78b..80aa82f25 100644
--- a/xdocs/resources.xml
+++ b/xdocs/resources.xml
@@ -40,7 +40,7 @@
     
     <section name="Articles and Presentations">
 
-      <p>The following sections list articles and presentations written about Ant.  If
+      <p>The following sections list articles and presentations written about Apache Ant.  If
       you've written something that should be included, please post it to one
       of the mailing lists.</p>
 
diff --git a/xdocs/stylesheets/project.xml b/xdocs/stylesheets/project.xml
index a49a230a2..98f045a20 100644
--- a/xdocs/stylesheets/project.xml
+++ b/xdocs/stylesheets/project.xml
@@ -8,7 +8,7 @@
     -->
     
     <body>
-    <menu name="Ant">
+    <menu name="Apache Ant">
         <item name="Front Page"            
               href="/index.html"/>
         <item name="News"