diff --git a/docs/manual/OptionalTasks/scp.html b/docs/manual/OptionalTasks/scp.html
index 3f129a42c..2de478b49 100644
--- a/docs/manual/OptionalTasks/scp.html
+++ b/docs/manual/OptionalTasks/scp.html
@@ -20,8 +20,9 @@ remote machine.</p>
 <p><b>Note:</b> This task depends on external libraries not included
 in the Ant distribution.  See <a
 href="../install.html#librarydependencies">Library Dependencies</a>
-for more information.  This task has been tested with jsch-0.1.2 to
-jsch-0.1.14.</p>
+for more information.  This task has been tested with jsch-0.1.2 and later.</p>
+
+<p>See also the <a href="scp.html">scp task</a></p>
 
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
diff --git a/docs/manual/OptionalTasks/sshexec.html b/docs/manual/OptionalTasks/sshexec.html
index 34ec4ba09..32de820eb 100644
--- a/docs/manual/OptionalTasks/sshexec.html
+++ b/docs/manual/OptionalTasks/sshexec.html
@@ -19,10 +19,12 @@
 <p><b>Note:</b> This task depends on external libraries not included
 in the Ant distribution.  See <a
 href="../install.html#librarydependencies">Library Dependencies</a>
-for more information.  This task has been tested with jsch-0.1.7 to
-jsch-0.1.9 and won't work with versions of jsch earlier than
+for more information.  This task has been tested with jsch-0.1.7 and above
+and won't work with versions of jsch earlier than
 0.1.7.</p>
 
+<p>See also the <a href="scp.html">scp task</a></p>
+
 <h3>Parameters</h3>
 <table border="1" cellpadding="2" cellspacing="0">
   <tr>
diff --git a/xdocs/external.xml b/xdocs/external.xml
index d3cb1a7b0..541472e00 100644
--- a/xdocs/external.xml
+++ b/xdocs/external.xml
@@ -3336,42 +3336,16 @@
         </table>
       </subsection>
 
-      <subsection name="HP RadPak">
 
-        <p>
-        RadPak comes with the (free) HP Bluestone HPAS J2EE server, and is primarily
-        a GUI tool for packaging and deploying java web and EJB applications
-        as WAR and EAR files. The tool is ant based, and can be used with
-        as a GUI for general ant development, providing form based entry
-        of task attributes, and an animated display of task
-        execution.
-        </p>
+      <subsection name="IntelliJ IDEA 5.0">
+      <p>Java IDE with refactoring support and Ant integration.
+      The IDE has special editing and navigation support for Ant.
+      </p>
 
         <table class="externals">
           <tr>
             <th>Compatibility:</th>
-            <td>bundles Ant 1.3 and docs; adds a jar of extra tasks
-            to any existing ant installation under ANT_HOME</td>
-          </tr>
-          <tr>
-            <th>URL:</th>
-            <td><a href="http://www.bluestone.com/products/hp-as/">http://www.bluestone.com/products/hp-as/</a></td>
-          </tr>
-          <tr>
-            <th>License:</th>
-            <td>Proprietary but free to download</td>
-          </tr>
-        </table>
-      </subsection>
-
-      <subsection name="IntelliJ IDEA 2.0">
-
-        <p>Java IDE with refactoring support and Ant integration.</p>
-
-        <table class="externals">
-          <tr>
-            <th>Compatibility:</th>
-            <td>bundles Ant 1.3</td>
+            <td>bundles Ant 1.6.5</td>
           </tr>
           <tr>
             <th>URL:</th>
@@ -3383,22 +3357,21 @@
           </tr>
           <tr>
             <th>License:</th>
-            <td>Commercial</td>
+            <td>Commercial; Academic and OpenSource licenses available.</td>
           </tr>
         </table>
       </subsection>
 
-      <subsection name="JBuilder 8 Enterprise">
+      <subsection name="JBuilder">
 
-        <p>JBuilder 8 Enterprise and &quot;Performance Bundle&quot;
-        come with built-in Ant support.  JBuilder 8 Personal and SE
-        don't support Ant directly, but <a href="#AntRunner">an
-        OpenTool</a> is available for them.</p>
+        <p>Borland JBuilder
+        comes with built-in Ant support, including build file editing.
+        Some versions come with Ant debugging support.</p>
 
         <table class="externals">
           <tr>
             <th>Compatibility:</th>
-            <td>Bundles Ant 1.5.1</td>
+            <td>Bundles Ant 1.6</td>
           </tr>
           <tr>
             <th>URL:</th>
@@ -3410,7 +3383,7 @@
           </tr>
           <tr>
             <th>License:</th>
-            <td>Commercial</td>
+            <td>Commercial; foundation edition is free.</td>
           </tr>
         </table>
       </subsection>
@@ -3444,7 +3417,9 @@
       <subsection name="NetBeans">
 
         <p>A module that integrates Ant into the NetBeans IDE, as well as derivative products such as Sun Java
-        Studio (formerly Forte for Java and Sun ONE Studio) and Sun Java Studio Creator.</p>
+        Studio (formerly Forte for Java and Sun ONE Studio) and Sun Java Studio Creator.
+        This IDE uses Ant as its <i>sole</i> means of building applications, 
+        with custom tasks and an Ant-aware editor.</p>
 
         <table class="externals">
           <tr>