diff --git a/docs/antlibs/antunit/index.html b/docs/antlibs/antunit/index.html
index 9fdc2b5f1..e2506ff59 100644
--- a/docs/antlibs/antunit/index.html
+++ b/docs/antlibs/antunit/index.html
@@ -165,6 +165,12 @@
   <div class="content">
     <h1 class="title">Apache AntUnit</h1>
             <h3 class="section">
+      <a name="Apache AntUnit&amp;#x2122;"></a>
+      Apache AntUnit&#x2122;
+    </h3>
+                        <p>Apache AntUnit is an Antlib that provides a test framework
+        for Apache Ant tasks and types.</p>
+                        <h3 class="section">
       <a name="Apache AntUnit 1.1"></a>
       Apache AntUnit 1.1
     </h3>
@@ -380,6 +386,7 @@ Total time: 1 second
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/antlibs/compress/index.html b/docs/antlibs/compress/index.html
index 0df0e7fcb..e3761f6ba 100644
--- a/docs/antlibs/compress/index.html
+++ b/docs/antlibs/compress/index.html
@@ -165,8 +165,17 @@
   <div class="content">
     <h1 class="title">Apache Compress Antlib</h1>
             <h3 class="section">
-      <a name="Apache Compress Ant Library 1.0"></a>
-      Apache Compress Ant Library 1.0
+      <a name="Apache Compress Antlib&amp;#x2122;"></a>
+      Apache Compress Antlib&#x2122;
+    </h3>
+                        <p>This Antlib contains tasks and resources that provide
+        compression/uncompression and archival/unarchival capabilities
+        based on <a href="http://commons.apache.org/compress/">Apache
+          Commons Compress</a>.  Using Apache Commons Compress 1.1
+        this.</p>
+                        <h3 class="section">
+      <a name="Compress Ant Library 1.0"></a>
+      Compress Ant Library 1.0
     </h3>
                         <h3>August 30, 2010 - Apache Compress Ant Library 1.0
       Available</h3>
@@ -175,15 +184,11 @@
       or <a href="http://ant.apache.org/antlibs/srcdownload.cgi">source</a>
       release.</p>
                         <h3 class="section">
-      <a name="Compress Antlib"></a>
-      Compress Antlib
+      <a name="Introduction"></a>
+      Introduction
     </h3>
-                        <p>This Antlib contains tasks and resources that provide
-        compression/uncompression and archival/unarchival capabilities
-        based on <a href="http://commons.apache.org/compress/">Apache
-        Commons Compress</a>.  Using Apache Commons Compress 1.1 this
-        Antlib supports gzip and bzip2 compression and ar, cpio, tar
-        and zip archives.</p>
+                        <p>Using Apache Commons Compress this Antlib supports gzip and
+        bzip2 compression and ar, cpio, tar and zip archives.</p>
                                 <p>The current code base is based on the 1.1 release of Commons
         Compress but it is expected that this Antlib follows Commons
         Compress' development and will add new compression or
@@ -208,6 +213,7 @@
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/antlibs/dotnet/index.html b/docs/antlibs/dotnet/index.html
index e4c631e69..f52868f6a 100644
--- a/docs/antlibs/dotnet/index.html
+++ b/docs/antlibs/dotnet/index.html
@@ -165,6 +165,12 @@
   <div class="content">
     <h1 class="title">Apache .NET Ant Library</h1>
             <h3 class="section">
+      <a name="Apache .NET Ant Library&amp;#x2122;"></a>
+      Apache .NET Ant Library&#x2122;
+    </h3>
+                        <p>The Apache .NET Antlib provides tasks that support
+        development of .NET software with Apache Ant.</p>
+                        <h3 class="section">
       <a name="Apache .NET Ant Library 1.0"></a>
       Apache .NET Ant Library 1.0
     </h3>
@@ -305,6 +311,7 @@ Total time: 0 seconds
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/antlibs/index.html b/docs/antlibs/index.html
index ccbe807cb..2ccf35562 100644
--- a/docs/antlibs/index.html
+++ b/docs/antlibs/index.html
@@ -21,7 +21,7 @@
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
       <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-        <title>Apache Ant - The Apache Ant Libraries Subproject</title>
+        <title>Apache Ant - The Apache Ant&#2122; Libraries Subproject</title>
         <link type="text/css" href="../page.css" rel="stylesheet">
         </head>
 
@@ -163,7 +163,7 @@
       <div class="lightbluebar">&nbsp;</div>
   <div class="main">
   <div class="content">
-    <h1 class="title">The Apache Ant Libraries Subproject</h1>
+    <h1 class="title">The Apache Ant&#2122; Libraries Subproject</h1>
             <h3 class="section">
       <a name="The Apache Ant Libraries Subproject"></a>
       The Apache Ant Libraries Subproject
@@ -184,6 +184,7 @@
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/antlibs/proper.html b/docs/antlibs/proper.html
index 728a35262..832e3047d 100644
--- a/docs/antlibs/proper.html
+++ b/docs/antlibs/proper.html
@@ -21,7 +21,7 @@
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
       <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-        <title>Apache Ant - Apache Ant Libraries</title>
+        <title>Apache Ant - Apache Ant&#2122; Libraries</title>
         <link type="text/css" href="../page.css" rel="stylesheet">
         </head>
 
@@ -163,15 +163,15 @@
       <div class="lightbluebar">&nbsp;</div>
   <div class="main">
   <div class="content">
-    <h1 class="title">Apache Ant Libraries</h1>
+    <h1 class="title">Apache Ant&#2122; Libraries</h1>
             <h3 class="section">
       <a name="Apache Ant Libraries"></a>
       Apache Ant Libraries
     </h3>
                         <a name="antunit" />
                                       <h4 class="subsection">
-        <a name="Apache AntUnit - Unit Test Framework for Ant Tasks"></a>
-        Apache AntUnit - Unit Test Framework for Ant Tasks
+        <a name="Apache AntUnit&amp;#2122; - Unit Test Framework for Ant Tasks"></a>
+        Apache AntUnit&#2122; - Unit Test Framework for Ant Tasks
       </h4>
                         <p>Apache AntUnit borrows ideas from JUnit 3.x and the &lt;junit&gt;
         task.  It provides a task that runs build files as unit tests
@@ -251,8 +251,8 @@
           </table>
                                                     <a name="compress" />
                                       <h4 class="subsection">
-        <a name="Compress"></a>
-        Compress
+        <a name="Apache Compress Antlib&amp;#2122;"></a>
+        Apache Compress Antlib&#2122;
       </h4>
                         <p>The Apache Compress Antlib offers tasks and types for additional
         archive formats like CPIO and AR supported
@@ -567,6 +567,7 @@
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/antlibs/props/index.html b/docs/antlibs/props/index.html
index 2ca8395b6..1c72cf74f 100644
--- a/docs/antlibs/props/index.html
+++ b/docs/antlibs/props/index.html
@@ -165,8 +165,8 @@
   <div class="content">
     <h1 class="title">Apache Props Antlib</h1>
             <h3 class="section">
-      <a name="Apache Props Antlib"></a>
-      Apache Props Antlib
+      <a name="Apache Props Antlib&amp;#2122;"></a>
+      Apache Props Antlib&#2122;
     </h3>
                         <p>This is a library of supplementary handlers for Apache Ant
         properties resolution.</p>
@@ -256,6 +256,7 @@
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/antlibs/sandbox.html b/docs/antlibs/sandbox.html
index e57bb07e7..998b09083 100644
--- a/docs/antlibs/sandbox.html
+++ b/docs/antlibs/sandbox.html
@@ -21,7 +21,7 @@
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
       <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-        <title>Apache Ant - Apache Ant Libraries - The Sandbox</title>
+        <title>Apache Ant - Apache Ant&#2122; Libraries - The Sandbox</title>
         <link type="text/css" href="../page.css" rel="stylesheet">
         </head>
 
@@ -163,7 +163,7 @@
       <div class="lightbluebar">&nbsp;</div>
   <div class="main">
   <div class="content">
-    <h1 class="title">Apache Ant Libraries - The Sandbox</h1>
+    <h1 class="title">Apache Ant&#2122; Libraries - The Sandbox</h1>
             <h3 class="section">
       <a name="Apache Ant Libraries - The Sandbox"></a>
       Apache Ant Libraries - The Sandbox
@@ -710,6 +710,7 @@
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/antnews.html b/docs/antnews.html
index 819507fc3..d587bec5e 100644
--- a/docs/antnews.html
+++ b/docs/antnews.html
@@ -21,7 +21,7 @@
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
       <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-        <title>Apache Ant - News</title>
+        <title>Apache Ant - Apache Ant&#2122; Project News</title>
         <link type="text/css" href="./page.css" rel="stylesheet">
           <meta name="author" content="Conor MacNeill">
   <meta name="email" content="">
@@ -108,8 +108,8 @@
                                     <a href="http://www.apache.org/licenses/LICENSE-2.0.html">License</a>
                                 </li>
                             <li>
-                              <span class="sel">News</span>
-                              </li>
+                                    <a href="./antnews.html">News</a>
+                                </li>
                       </ul>
         </li>
               <li class="menuheader">Documentation
@@ -206,7 +206,7 @@
       <div class="lightbluebar">&nbsp;</div>
   <div class="main">
   <div class="content">
-    <h1 class="title">News</h1>
+    <h1 class="title">Apache Ant&#2122; Project News</h1>
             <h3 class="section">
       <a name="Apache Ant 1.8.1"></a>
       Apache Ant 1.8.1
@@ -705,6 +705,7 @@ did) or could be explained better, feel free to help us out in the
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/bindownload.html b/docs/bindownload.html
index 5dd872851..1b376706c 100644
--- a/docs/bindownload.html
+++ b/docs/bindownload.html
@@ -200,8 +200,8 @@
   <div class="content">
     <h1 class="title">Binary Distributions</h1>
             <h3 class="section">
-      <a name="Apache Ant"></a>
-      Apache Ant
+      <a name="Apache Ant&amp;#x2122;"></a>
+      Apache Ant&#x2122;
     </h3>
                         <p>Apache Ant is a Java library and command-line tool that help
   building software.</p>
@@ -337,6 +337,7 @@ SHA1.</p>
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/bylaws.html b/docs/bylaws.html
index 42d1c3682..866d71b65 100644
--- a/docs/bylaws.html
+++ b/docs/bylaws.html
@@ -202,8 +202,8 @@
   <div class="content">
     <h1 class="title">Project Bylaws</h1>
             <h3 class="section">
-      <a name="Apache Ant Project Bylaws"></a>
-      Apache Ant Project Bylaws
+      <a name="Apache Ant&amp;#2122; Project Bylaws"></a>
+      Apache Ant&#2122; Project Bylaws
     </h3>
                         <p>
       This document defines the bylaws under which the Apache Ant project
@@ -806,6 +806,7 @@
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/index.html b/docs/index.html
index 869ab51f8..09ba31be6 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -204,8 +204,8 @@
   <div class="content">
     <h1 class="title">Welcome</h1>
             <h3 class="section">
-      <a name="Apache Ant"></a>
-      Apache Ant
+      <a name="Apache Ant&amp;#x2122;"></a>
+      Apache Ant&#x2122;
     </h3>
                         <p>Apache Ant is a Java library and command-line tool who's
 		mission is to drive processes described in build files as targets
@@ -311,6 +311,7 @@ Comprehensive documentation is included in the source and binary distributions.
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/legal.html b/docs/legal.html
index fddb03f4e..86004a4b1 100644
--- a/docs/legal.html
+++ b/docs/legal.html
@@ -207,6 +207,9 @@
     </h3>
                         <p>All material on this website is Copyright © 1999-2010,
       The Apache Software Foundation.</p>
+                                <p>Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather
+      logo, and the Apache Ant project logos are trademarks of The
+      Apache Software Foundation.</p>
                                 <p>Sun, Sun Microsystems, Solaris, Java, JavaServer Web
       Development Kit, and JavaServer Pages are trademarks or
       registered trademarks of Oracle Corporation. UNIX is a
@@ -221,6 +224,7 @@
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/manualdownload.html b/docs/manualdownload.html
index 43fb2f950..cc0d1cb11 100644
--- a/docs/manualdownload.html
+++ b/docs/manualdownload.html
@@ -200,8 +200,8 @@
   <div class="content">
     <h1 class="title">Ant Manual Distributions</h1>
             <h3 class="section">
-      <a name="Downloading Ant's Manual"></a>
-      Downloading Ant's Manual
+      <a name="Downloading Apache Ant&amp;#2122;'s Manual"></a>
+      Downloading Apache Ant&#2122;'s Manual
     </h3>
                         <p>Apache Ant's manual is part of the binary distribution but is also
   available as a stand-alone download.</p>
@@ -331,6 +331,7 @@ SHA1.</p>
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/mission.html b/docs/mission.html
index e1aaa85d9..432e812f1 100644
--- a/docs/mission.html
+++ b/docs/mission.html
@@ -21,7 +21,7 @@
     <!-- GENERATED FILE, DO NOT EDIT, EDIT THE XML FILE IN xdocs INSTEAD! -->
     <head>
       <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-        <title>Apache Ant - Apache Ant Mission</title>
+        <title>Apache Ant - Apache Ant&#2122; Mission</title>
         <link type="text/css" href="./page.css" rel="stylesheet">
           <meta name="author" content="Apache Ant PMC">
   <meta name="email" content="">
@@ -179,8 +179,8 @@
                                     <a href="./contributors.html">Contributors</a>
                                 </li>
                             <li>
-                              <span class="sel">Apache Ant Mission</span>
-                              </li>
+                                    <a href="./mission.html">Apache Ant Mission</a>
+                                </li>
                             <li>
                                     <a href="./bylaws.html">Project Bylaws</a>
                                 </li>
@@ -200,7 +200,7 @@
       <div class="lightbluebar">&nbsp;</div>
   <div class="main">
   <div class="content">
-    <h1 class="title">Apache Ant Mission</h1>
+    <h1 class="title">Apache Ant&#2122; Mission</h1>
             <h3 class="section">
       <a name="Board Resolution"></a>
       Board Resolution
@@ -275,6 +275,7 @@ hereby created.
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/projects/index.html b/docs/projects/index.html
index f885f57c3..667c91ad8 100644
--- a/docs/projects/index.html
+++ b/docs/projects/index.html
@@ -167,8 +167,8 @@
   <div class="content">
     <h1 class="title">Welcome</h1>
             <h3 class="section">
-      <a name="Welcome to the Apache Ant Projects Area"></a>
-      Welcome to the Apache Ant Projects Area
+      <a name="Welcome to the Apache Ant&amp;#x2122; Projects Area"></a>
+      Welcome to the Apache Ant&#x2122; Projects Area
     </h3>
                         <h3>This is where the Apache Ant sub-projects live!</h3>
                                 <p>Now, that Apache Ant has become an Apache Top-Level Project it is time to make space on this
@@ -180,6 +180,7 @@
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/projects/ivy.html b/docs/projects/ivy.html
index e064ab157..fed1f1e8d 100644
--- a/docs/projects/ivy.html
+++ b/docs/projects/ivy.html
@@ -165,8 +165,8 @@
   <div class="content">
     <h1 class="title">The Apache Ivy Subproject</h1>
             <h3 class="section">
-      <a name="The Apache Ivy Subproject"></a>
-      The Apache Ivy Subproject
+      <a name="The Apache Ivy&amp;#x2122; Subproject"></a>
+      The Apache Ivy&#x2122; Subproject
     </h3>
                         <h3>Apache Ivy</h3>
                                 <p>Apache Ivy is a simple yet powerful dependency manager featuring continuous integration,
@@ -177,6 +177,7 @@
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/projects/ivyde.html b/docs/projects/ivyde.html
index 81bb09767..22daa40ba 100644
--- a/docs/projects/ivyde.html
+++ b/docs/projects/ivyde.html
@@ -165,8 +165,8 @@
   <div class="content">
     <h1 class="title">The Apache IvyDE Subproject</h1>
             <h3 class="section">
-      <a name="The Apache IvyDE Subproject"></a>
-      The Apache IvyDE Subproject
+      <a name="The Apache IvyDE&amp;#x2122; Subproject"></a>
+      The Apache IvyDE&#x2122; Subproject
     </h3>
                         <h3>Apache IvyDE</h3>
                                 <ul>Apache IvyDE is the Eclipse plugin which intergrates Apache Ivy into your java development enviromnent. It includes:
@@ -180,6 +180,7 @@
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/resources.html b/docs/resources.html
index e29f165e1..75aa13023 100644
--- a/docs/resources.html
+++ b/docs/resources.html
@@ -204,8 +204,8 @@
       FAQs
     </h3>
                               <h4 class="subsection">
-        <a name="At Apache Ant's website"></a>
-        At Apache Ant's website
+        <a name="At Apache Ant&amp;#2122;'s website"></a>
+        At Apache Ant&#2122;'s website
       </h4>
                         <p>Starting with the release of Apache Ant 1.4 the Ant's FAQ is
         bundled with the distribution, the most recent version can
@@ -1455,6 +1455,7 @@
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/docs/srcdownload.html b/docs/srcdownload.html
index 756aa9cc3..b73e1299f 100644
--- a/docs/srcdownload.html
+++ b/docs/srcdownload.html
@@ -200,8 +200,8 @@
   <div class="content">
     <h1 class="title">Source Distributions</h1>
             <h3 class="section">
-      <a name="Apache Ant"></a>
-      Apache Ant
+      <a name="Apache Ant&amp;#x2122;"></a>
+      Apache Ant&#x2122;
     </h3>
                         <p>Apache Ant is a Java library and command-line tool that help
   building software.</p>
@@ -331,6 +331,7 @@ SHA1.</p>
   </div>
 
         <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->
diff --git a/xdocs/antlibs/antunit/index.xml b/xdocs/antlibs/antunit/index.xml
index f6e69b8dc..6bf7b30aa 100644
--- a/xdocs/antlibs/antunit/index.xml
+++ b/xdocs/antlibs/antunit/index.xml
@@ -24,6 +24,11 @@
 
   <body>
 
+    <section name="Apache AntUnit&amp;#x2122;">
+      <p>Apache AntUnit is an Antlib that provides a test framework
+        for Apache Ant tasks and types.</p>
+    </section>
+
     <section name="Apache AntUnit 1.1">
       <h3>September 26, 2008 - Apache AntUnit 1.1 Released</h3>
 
diff --git a/xdocs/antlibs/compress/index.xml b/xdocs/antlibs/compress/index.xml
index 4a24f99fe..a7e18a660 100644
--- a/xdocs/antlibs/compress/index.xml
+++ b/xdocs/antlibs/compress/index.xml
@@ -23,7 +23,15 @@
   </properties>
 
   <body>
-    <section name="Apache Compress Ant Library 1.0">
+    <section name="Apache Compress Antlib&amp;#x2122;">
+      <p>This Antlib contains tasks and resources that provide
+        compression/uncompression and archival/unarchival capabilities
+        based on <a href="http://commons.apache.org/compress/">Apache
+          Commons Compress</a>.  Using Apache Commons Compress 1.1
+        this.</p>
+    </section>
+
+    <section name="Compress Ant Library 1.0">
       <h3>August 30, 2010 - Apache Compress Ant Library 1.0
       Available</h3>
 
@@ -35,13 +43,9 @@
       release.</p>
     </section>
 
-    <section name="Compress Antlib">
-      <p>This Antlib contains tasks and resources that provide
-        compression/uncompression and archival/unarchival capabilities
-        based on <a href="http://commons.apache.org/compress/">Apache
-        Commons Compress</a>.  Using Apache Commons Compress 1.1 this
-        Antlib supports gzip and bzip2 compression and ar, cpio, tar
-        and zip archives.</p>
+    <section name="Introduction">
+      <p>Using Apache Commons Compress this Antlib supports gzip and
+        bzip2 compression and ar, cpio, tar and zip archives.</p>
 
       <p>The current code base is based on the 1.1 release of Commons
         Compress but it is expected that this Antlib follows Commons
diff --git a/xdocs/antlibs/dotnet/index.xml b/xdocs/antlibs/dotnet/index.xml
index 868a56f37..7fd867687 100644
--- a/xdocs/antlibs/dotnet/index.xml
+++ b/xdocs/antlibs/dotnet/index.xml
@@ -24,6 +24,11 @@
 
   <body>
 
+    <section name="Apache .NET Ant Library&amp;#x2122;">
+      <p>The Apache .NET Antlib provides tasks that support
+        development of .NET software with Apache Ant.</p>
+    </section>
+
     <section name="Apache .NET Ant Library 1.0">
       <h3>November 6, 2006 - Apache .NET Ant Library 1.0
       Available</h3>
diff --git a/xdocs/antlibs/index.xml b/xdocs/antlibs/index.xml
index 91c6d5902..8ffcc6d01 100644
--- a/xdocs/antlibs/index.xml
+++ b/xdocs/antlibs/index.xml
@@ -19,7 +19,7 @@
 
   <properties>
     <index value="1"/>
-    <title>The Apache Ant Libraries Subproject</title>
+    <title>The Apache Ant&amp;#2122; Libraries Subproject</title>
   </properties>
 
   <body>
diff --git a/xdocs/antlibs/proper.xml b/xdocs/antlibs/proper.xml
index b443af637..126256de1 100644
--- a/xdocs/antlibs/proper.xml
+++ b/xdocs/antlibs/proper.xml
@@ -19,7 +19,7 @@
 
   <properties>
     <index value="1"/>
-    <title>Apache Ant Libraries</title>
+    <title>Apache Ant&amp;#2122; Libraries</title>
   </properties>
 
   <body>
@@ -27,7 +27,7 @@
     <section name="Apache Ant Libraries">
 
       <a name="antunit"/>
-      <subsection name="Apache AntUnit - Unit Test Framework for Ant Tasks">
+      <subsection name="Apache AntUnit&amp;#2122; - Unit Test Framework for Ant Tasks">
 
         <p>Apache AntUnit borrows ideas from JUnit 3.x and the &lt;junit&gt;
         task.  It provides a task that runs build files as unit tests
@@ -67,7 +67,7 @@
       </subsection>
 
       <a name="compress"/>
-      <subsection name="Compress">
+      <subsection name="Apache Compress Antlib&amp;#2122;">
         <p>The Apache Compress Antlib offers tasks and types for additional
         archive formats like CPIO and AR supported
         by <a href="http://commons.apache.org/compress/">Apache
diff --git a/xdocs/antlibs/props/index.xml b/xdocs/antlibs/props/index.xml
index 97e83adc2..9733099f4 100644
--- a/xdocs/antlibs/props/index.xml
+++ b/xdocs/antlibs/props/index.xml
@@ -24,7 +24,7 @@
 
   <body>
 
-    <section name="Apache Props Antlib">
+    <section name="Apache Props Antlib&amp;#2122;">
 
       <p>This is a library of supplementary handlers for Apache Ant
         properties resolution.</p>
diff --git a/xdocs/antlibs/sandbox.xml b/xdocs/antlibs/sandbox.xml
index 3607a3b12..990d68491 100644
--- a/xdocs/antlibs/sandbox.xml
+++ b/xdocs/antlibs/sandbox.xml
@@ -19,7 +19,7 @@
 
   <properties>
     <index value="1"/>
-    <title>Apache Ant Libraries - The Sandbox</title>
+    <title>Apache Ant&amp;#2122; Libraries - The Sandbox</title>
   </properties>
 
   <body>
diff --git a/xdocs/antnews.xml b/xdocs/antnews.xml
index c80cb494e..0103de763 100644
--- a/xdocs/antnews.xml
+++ b/xdocs/antnews.xml
@@ -22,7 +22,7 @@
     <author email="">Stefan Bodewig</author>
     <author email="">Magesh Umasankar</author>
     <author email="">Antoine Levy-Lambert</author>
-    <title>News</title>
+    <title>Apache Ant&amp;#2122; Project News</title>
   </properties>
 
 <body>
diff --git a/xdocs/bindownload.xml b/xdocs/bindownload.xml
index d2a481566..6c955d067 100644
--- a/xdocs/bindownload.xml
+++ b/xdocs/bindownload.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-     Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You under the Apache License, Version 2.0
@@ -24,7 +24,7 @@
 
 <body>
 
-<section name="Apache Ant">
+<section name="Apache Ant&amp;#x2122;">
   <p>Apache Ant is a Java library and command-line tool that help
   building software.</p>
 </section>
diff --git a/xdocs/bylaws.xml b/xdocs/bylaws.xml
index f1a87a6d1..f008899ae 100644
--- a/xdocs/bylaws.xml
+++ b/xdocs/bylaws.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-     Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You under the Apache License, Version 2.0
@@ -23,7 +23,7 @@
   </properties>
 
 <body>
-  <section name="Apache Ant Project Bylaws">
+  <section name="Apache Ant&amp;#2122; Project Bylaws">
     <p>
       This document defines the bylaws under which the Apache Ant project
       operates. It defines the roles and responsibilities of the
diff --git a/xdocs/index.xml b/xdocs/index.xml
index 5ee504a86..a42a9a26b 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-     Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You under the Apache License, Version 2.0
@@ -25,7 +25,7 @@
 
 <body>
 
-  <section name="Apache Ant">
+  <section name="Apache Ant&amp;#x2122;">
 
     <p>Apache Ant is a Java library and command-line tool who's
 		mission is to drive processes described in build files as targets
diff --git a/xdocs/legal.xml b/xdocs/legal.xml
index 9b887050c..76328f5a6 100644
--- a/xdocs/legal.xml
+++ b/xdocs/legal.xml
@@ -29,6 +29,10 @@
       <p>All material on this website is Copyright &#169; 1999-2010,
       The Apache Software Foundation.</p>
 
+      <p>Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather
+      logo, and the Apache Ant project logos are trademarks of The
+      Apache Software Foundation.</p>
+
       <p>Sun, Sun Microsystems, Solaris, Java, JavaServer Web
       Development Kit, and JavaServer Pages are trademarks or
       registered trademarks of Oracle Corporation. UNIX is a
diff --git a/xdocs/manualdownload.xml b/xdocs/manualdownload.xml
index 3a160c9a9..c6c89d376 100644
--- a/xdocs/manualdownload.xml
+++ b/xdocs/manualdownload.xml
@@ -24,7 +24,7 @@
 
 <body>
 
-<section name="Downloading Ant's Manual">
+<section name="Downloading Apache Ant&amp;#2122;'s Manual">
 
 <p>Apache Ant's manual is part of the binary distribution but is also
   available as a stand-alone download.</p>
diff --git a/xdocs/mission.xml b/xdocs/mission.xml
index 4032aebc2..3ad79efa3 100644
--- a/xdocs/mission.xml
+++ b/xdocs/mission.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-     Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You under the Apache License, Version 2.0
@@ -18,7 +18,7 @@
 <document>
 
   <properties>
-    <title>Apache Ant Mission</title>
+    <title>Apache Ant&amp;#2122; Mission</title>
     <author email="">Apache Ant PMC</author>
   </properties>
 
diff --git a/xdocs/projects/index.xml b/xdocs/projects/index.xml
index 6fbed0fc3..c0bf3b68a 100644
--- a/xdocs/projects/index.xml
+++ b/xdocs/projects/index.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-     Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You under the Apache License, Version 2.0
@@ -25,7 +25,7 @@
 
 <body>
 
-  <section name="Welcome to the Apache Ant Projects Area">
+  <section name="Welcome to the Apache Ant&amp;#x2122; Projects Area">
     <h3>This is where the Apache Ant sub-projects live!</h3>
 
     <p>Now, that Apache Ant has become an Apache Top-Level Project it is time to make space on this
diff --git a/xdocs/projects/ivy.xml b/xdocs/projects/ivy.xml
index 56871ab7d..8508a4eb0 100644
--- a/xdocs/projects/ivy.xml
+++ b/xdocs/projects/ivy.xml
@@ -24,7 +24,7 @@
 
   <body>
 
-    <section name="The Apache Ivy Subproject">
+    <section name="The Apache Ivy&amp;#x2122; Subproject">
       <h3>Apache Ivy</h3>
 
       <p>Apache Ivy is a simple yet powerful dependency manager featuring continuous integration,
diff --git a/xdocs/projects/ivyde.xml b/xdocs/projects/ivyde.xml
index f22209b6d..bd257601e 100644
--- a/xdocs/projects/ivyde.xml
+++ b/xdocs/projects/ivyde.xml
@@ -24,7 +24,7 @@
 
   <body>
 
-    <section name="The Apache IvyDE Subproject">
+    <section name="The Apache IvyDE&amp;#x2122; Subproject">
       <h3>Apache IvyDE</h3>
 
       <ul>Apache IvyDE is the Eclipse plugin which intergrates Apache Ivy into your java development enviromnent. It includes:
diff --git a/xdocs/resources.xml b/xdocs/resources.xml
index a64019ef5..a9d8eb393 100644
--- a/xdocs/resources.xml
+++ b/xdocs/resources.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!--
-     Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You under the Apache License, Version 2.0
@@ -23,7 +23,7 @@
 
   <body>
     <section name="FAQs">
-      <subsection name="At Apache Ant's website">
+      <subsection name="At Apache Ant&amp;#2122;'s website">
 
         <p>Starting with the release of Apache Ant 1.4 the Ant's FAQ is
         bundled with the distribution, the most recent version can
diff --git a/xdocs/srcdownload.xml b/xdocs/srcdownload.xml
index cf3414d82..bac6b6b4d 100644
--- a/xdocs/srcdownload.xml
+++ b/xdocs/srcdownload.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-     Licensed to the Apache Software Foundation (ASF) under one or more
+   Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You under the Apache License, Version 2.0
@@ -24,7 +24,7 @@
 
 <body>
 
-<section name="Apache Ant">
+<section name="Apache Ant&amp;#x2122;">
   <p>Apache Ant is a Java library and command-line tool that help
   building software.</p>
 </section>
diff --git a/xdocs/stylesheets/templates.vm b/xdocs/stylesheets/templates.vm
index 2e788b934..b8b8c6d04 100644
--- a/xdocs/stylesheets/templates.vm
+++ b/xdocs/stylesheets/templates.vm
@@ -285,6 +285,7 @@
 
 #macro (footer)
       <p class="copyright">
+      Apache Ant, Apache Ivy, Ant, Ivy, Apache, the Apache feather logo, and the Apache Ant project logos are trademarks of The Apache Software Foundation.
         <script type="text/javascript" language="JavaScript"><!--
                 document.write(" - "+"Last Published: " + document.lastModified);
               //  -->