diff --git a/docs/external.html b/docs/external.html
index f1960e23a..7b2e7cd89 100644
--- a/docs/external.html
+++ b/docs/external.html
@@ -262,7 +262,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License
+          Eclipse Public License
       </td>
       </tr>
           </table>
@@ -290,7 +290,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://jakarta.apache.org/velocity/anakia.html">http://jakarta.apache.org/velocity/anakia.html</a>
+          <a href="http://velocity.apache.org/anakia/devel/">http://velocity.apache.org/anakia/devel/</a>
       </td>
       </tr>
                   <tr>
@@ -300,7 +300,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://jakarta.apache.org/site/mail2.html">Velocity mailing lists</a>
+          <a href="http://velocity.apache.org/contact.html">Velocity mailing lists</a>
       </td>
       </tr>
                   <tr>
@@ -310,7 +310,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License
+          Apache License 2.0
       </td>
       </tr>
           </table>
@@ -410,7 +410,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          The Apache Software License 2.0
+          Apache License 2.0
       </td>
       </tr>
           </table>
@@ -578,7 +578,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          The Apache Software License
+          Apache Software License 1.1
       </td>
       </tr>
           </table>
@@ -683,7 +683,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License
+          Apache Software License 1.1
       </td>
       </tr>
           </table>
@@ -936,7 +936,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License
+          Apache Software License 1.1
       </td>
       </tr>
           </table>
@@ -1026,7 +1026,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License 2.0
+          Apache License 2.0
       </td>
       </tr>
           </table>
@@ -1283,7 +1283,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License
+          Apache Software License 1.1
       </td>
       </tr>
           </table>
@@ -1447,7 +1447,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License
+          Apache License 2.0
       </td>
       </tr>
           </table>
@@ -1500,7 +1500,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          License derived from Apache Software License
+          License derived from Apache Software License 1.1
       </td>
       </tr>
           </table>
@@ -1667,52 +1667,7 @@
         <a name="Doxygen task"></a>
         Doxygen task
       </h4>
-                        <p>There are two Ant tasks for running the Doxygen
-        documentation system.</p>
-                                      <table class="externals" cellspacing="1" cellpadding="4">
-              <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          Compatibility:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          Ant 1.1 and later
-      </td>
-      </tr>
-                  <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          URL:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          <a href="http://www.bgw.org/projects/java/ant/">http://www.bgw.org/projects/java/ant/</a>
-      </td>
-      </tr>
-                  <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          Contact:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          <a href="mailto:mortis@voicenet.com">Kyle R. Burton</a>
-      </td>
-      </tr>
-                  <tr>
-                      <th colspan="1" rowspan="1"
-      valign="top" align="left">
-          License:
-      </th>
-                          <td colspan="1" rowspan="1"
-      valign="top" align="left">
-          Apache Software Foundation License
-      </td>
-      </tr>
-          </table>
-                                <p>and</p>
-                                      <table class="externals" cellspacing="1" cellpadding="4">
+                              <table class="externals" cellspacing="1" cellpadding="4">
               <tr>
                       <th colspan="1" rowspan="1"
       valign="top" align="left">
@@ -1750,7 +1705,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software Foundation License
+          Apache License 2.0
       </td>
       </tr>
           </table>
@@ -1994,7 +1949,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software Foundation License
+          Apache Software License 1.1
       </td>
       </tr>
           </table>
@@ -2098,7 +2053,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License
+          Apache Software License 1.1
       </td>
       </tr>
           </table>
@@ -2380,7 +2335,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License
+          Apache Software License 1.1
       </td>
       </tr>
           </table>
@@ -2592,7 +2547,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          1.5.1 (1.6.5 or 1.7.0 recommended)
+          1.5.1 (1.6.5 or 1.7.1 recommended)
       </td>
       </tr>
                   <tr>
@@ -2602,7 +2557,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://incubator.apache.org/ivy/">http://incubator.apache.org/ivy/</a>
+          <a href="http://ant.apache.org/ivy/">http://ant.apache.org/ivy/</a>
       </td>
       </tr>
                   <tr>
@@ -2612,7 +2567,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          ivy-user (at) incubator (dot) apache (dot) org [User Mailinglist]
+          ivy-user (at) ant (dot) apache (dot) org [User Mailinglist]
       </td>
       </tr>
                   <tr>
@@ -2622,7 +2577,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License
+          Apache License 2.0
       </td>
       </tr>
           </table>
@@ -2786,7 +2741,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License
+          Apache Software License 1.1
       </td>
       </tr>
           </table>
@@ -3363,7 +3318,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License
+          Apache Software License 1.1
       </td>
       </tr>
           </table>
@@ -3464,7 +3419,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          The Apache Software License 2.0
+          Apache License 2.0
       </td>
       </tr>
           </table>
@@ -3927,7 +3882,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License
+          Apache License 2.0
       </td>
       </tr>
           </table>
@@ -4456,7 +4411,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software Foundation License
+          Apache Software License 1.1
       </td>
       </tr>
           </table>
@@ -4711,7 +4666,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software Foundation License
+          Apache License 2.0
       </td>
       </tr>
           </table>
@@ -4800,7 +4755,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software Foundation License
+          BSD style license
       </td>
       </tr>
           </table>
@@ -4953,7 +4908,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License 2.0
+          Apache License 2.0
       </td>
       </tr>
           </table>
@@ -5101,7 +5056,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          The Apache Software License
+          Apache License 2.0
       </td>
       </tr>
           </table>
@@ -5206,7 +5161,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License
+          Apache Software License 1.1
       </td>
       </tr>
           </table>
@@ -6327,7 +6282,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License
+          Apache Software License 1.1
       </td>
       </tr>
           </table>
@@ -6379,7 +6334,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License
+          Apache Software License 1.1
       </td>
       </tr>
           </table>
@@ -6526,7 +6481,8 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache Software License</a>
+          <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
+            License 2.0</a>
       </td>
       </tr>
           </table>
@@ -6681,7 +6637,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          Apache Software License
+          GNU General Public License
       </td>
       </tr>
           </table>
@@ -7349,7 +7305,7 @@
       </th>
                           <td colspan="1" rowspan="1"
       valign="top" align="left">
-          The Apache Software License 2.0
+          Apache License 2.0
       </td>
       </tr>
           </table>
diff --git a/docs/faq.html b/docs/faq.html
index 4bdba2524..b52d42735 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -379,6 +379,11 @@
             </ul>
                 <h4 class="toc">Known Problems</h4>
         <ul>
+                <li><a href="#input-makes-exec-hang">
+  <code>&lt;exec&gt;</code> causes other tasks to hang
+        or leads to strange behaviour of <code>&lt;input&gt;</code>
+        tasks.
+      </a></li>
                 <li><a href="#170-requires-junit">
   Ant 1.7.0 doesn't build from sources without
         JUnit
@@ -1700,6 +1705,30 @@ public void buildFinished(BuildEvent e) {
         files that your project does, since it will give the correct
         results for properties that were specified on the Ant command line.</p>
                                 <p class="faq">
+      <a name="input-makes-exec-hang"></a>
+      <code>&lt;exec&gt;</code> causes other tasks to hang
+        or leads to strange behaviour of <code>&lt;input&gt;</code>
+        tasks.
+    </p>
+                  <p>When Ant forks a new process for example by using the
+          <code>&lt;exec&gt;</code>, <code>&lt;apply&gt;</code>
+          or <code>&lt;java&gt;</code> tasks, it will also start a
+          new thread reading from standard input and sending
+          everything that it has read to that process.</p>
+                        <p>Unfortunately Ant has no way to know whether the forked
+          process is ever going to read any input, so it will start such
+          a thread even if the process doesn't need one.</p>
+                        <p>This behaviour leads to strange side effects like the Ant
+          process being suspended when a build forking new process is
+          run as a background process on Unix-like systems or
+          <code>&lt;input&gt;</code> tasks requiring additional inputs
+          if they come after an <code>&lt;exec&gt;</code> task.</p>
+                        <p>Fortunately there is a workaround for this, always specify
+          <code>inputstring=""</code> for
+          any <code>&lt;exec&gt;</code> task (or one of its sibblings)
+          if you know the forked process doesn't consume any
+          input.</p>
+                    <p class="faq">
       <a name="170-requires-junit"></a>
       Ant 1.7.0 doesn't build from sources without
         JUnit
diff --git a/docs/license.html b/docs/license.html
index 021e2ff93..22d34db07 100644
--- a/docs/license.html
+++ b/docs/license.html
@@ -199,10 +199,10 @@
   <div class="content">
     <h1 class="title">License</h1>
             <h3 class="section">
-      <a name="The Apache Software License Version 2.0"></a>
-      The Apache Software License Version 2.0
+      <a name="The Apache License Version 2.0"></a>
+      The Apache License Version 2.0
     </h3>
-                        <p>The Apache Software License Version 2.0 applies 
+                        <p>The Apache License Version 2.0 applies 
     to all releases of Ant starting with ant 1.6.1</p>
                                 <pre class="code">/*
  *                                 Apache License