doc updates.

PR: 13422, 13431
Submitted by:	Jesse Glick <jesse.glick at netbeans.com>,
                Paul Cantrell <cantrell at pobox.com>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273424 13f79535-47bb-0310-9956-ffa450edef68

docs/external.html

@@ -1629,6 +1629,83 @@
         </table>
                     </blockquote>
     </td></tr>
+  </table>
+                                  <table border="0" cellspacing="0" cellpadding="2" width="100%">
+    <tr><td bgcolor="#828DA6">
+      <font color="#ffffff" face="arial,helvetica,sanserif">
+        <a name="Macker"><strong>Macker</strong></a>
+      </font>
+    </td></tr>
+    <tr><td>
+      <blockquote>
+                        <p>A build-time architectural testing tool, designed
+        to maintain clean layering / tiering / modularity.
+        Macker works against compiled class files, checking
+        dependencies between classes against a set of
+        pattern-based access rules you specify for your
+        project in an XML rules file.  Macker doesn't presume
+        anything about your architecture -- you write the
+        rules, and Macker keeps you honest about them.</p>
+                                  <table>
+              <tr>
+                  <td bgcolor="#039acc" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          Compatibility:
+        </font>
+  </td>
+                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          Ant 1.5 and higher (1.4 untested but may work)
+        </font>
+  </td>
+      </tr>
+                  <tr>
+                  <td bgcolor="#039acc" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          URL:
+        </font>
+  </td>
+                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          <a href="http://innig.net/macker/">http://innig.net/macker/</a>
+        </font>
+  </td>
+      </tr>
+                  <tr>
+                  <td bgcolor="#039acc" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          Contact:
+        </font>
+  </td>
+                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          <a href="http://innig.net/macker/contact.html">Paul Cantrell</a>
+        </font>
+  </td>
+      </tr>
+                  <tr>
+                  <td bgcolor="#039acc" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          License:
+        </font>
+  </td>
+                      <td bgcolor="#a0ddf0" colspan="" rowspan="" 
+      valign="top" align="left">
+    <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+          GNU GPL 2.0
+        </font>
+  </td>
+      </tr>
+        </table>
+                    </blockquote>
+    </td></tr>
   </table>
                                   <table border="0" cellspacing="0" cellpadding="2" width="100%">
     <tr><td bgcolor="#828DA6">
@@ -2805,12 +2882,12 @@
                                   <table border="0" cellspacing="0" cellpadding="2" width="100%">
     <tr><td bgcolor="#828DA6">
       <font color="#ffffff" face="arial,helvetica,sanserif">
-        <a name="NetBeans / Forte for Java"><strong>NetBeans / Forte for Java</strong></a>
+        <a name="NetBeans / Sun ONE Studio"><strong>NetBeans / Sun ONE Studio</strong></a>
       </font>
     </td></tr>
     <tr><td>
       <blockquote>
-                        <p>A module that integrates Ant into the NetBeans or Forte for Java IDEs.</p>
+                        <p>A module that integrates Ant into the NetBeans or Sun ONE Studio (formerly Forte for Java) IDEs.</p>
                                   <table>
               <tr>
                   <td bgcolor="#039acc" colspan="" rowspan="" 

docs/manual/ide.html

@@ -25,8 +25,8 @@ errors. Installation: built-in JDE  2.2.8 or later. Configuration: through
 customize menu "Jde Build Function"<br><br>
 <a href="http://www.intellij.com/idea/">IDEA</a> has built-in GUI ANT integration: GUI
 selection of targets, execution, hyperlink to compilation errors<br><br>
-<a href="http://www.netbeans.org/">NetBeans</a>
-NetBeans 3.3 has very good Ant integration indeed.
+<a href="http://ant.netbeans.org/">NetBeans</a>
+NetBeans 3.4 has very good Ant integration indeed.
 </a><br><br>
 
 <a href="http://jedit.org/">jEdit</a>
@@ -35,7 +35,7 @@ good XML editor and the Antfarm plugin to execute targets in a build
 file.
 <br><br>
 <a href="http://eclipse.org/">Eclipse</a>
-Eclipse is IBM's counterpoint to Netbeans; an open source IDE with Java and ant
+Eclipse is IBM's counterpoint to NetBeans; an open source IDE with Java and ant
 support.
 <br><br>
 <a href="Integration/VAJAntTool.html">VisualAge for Java</a><br><br>

xdocs/external.xml

@@ -597,6 +597,36 @@
         </table>
       </subsection>
 
+     <subsection name="Macker">
+
+        <p>A build-time architectural testing tool, designed
+        to maintain clean layering / tiering / modularity.
+        Macker works against compiled class files, checking
+        dependencies between classes against a set of
+        pattern-based access rules you specify for your
+        project in an XML rules file.  Macker doesn't presume
+        anything about your architecture -- you write the
+        rules, and Macker keeps you honest about them.</p>
+
+        <table>
+          <tr>
+            <th>Compatibility:</th>
+            <td>Ant 1.5 and higher (1.4 untested but may work)</td>
+          </tr>
+          <tr>
+            <th>URL:</th>
+            <td><a href="http://innig.net/macker/">http://innig.net/macker/</a></td>
+          </tr>
+          <tr>
+            <th>Contact:</th>
+            <td><a href="http://innig.net/macker/contact.html">Paul Cantrell</a></td>
+          </tr>
+          <tr>
+            <th>License:</th>
+            <td>GNU GPL 2.0</td>
+          </tr>
+        </table>
+      </subsection>
 
       <subsection name="PMD">
 
@@ -1029,9 +1059,9 @@
         </table>
       </subsection>
 
-      <subsection name="NetBeans / Forte for Java">
+      <subsection name="NetBeans / Sun ONE Studio">
 
-        <p>A module that integrates Ant into the NetBeans or Forte for Java IDEs.</p>
+        <p>A module that integrates Ant into the NetBeans or Sun ONE Studio (formerly Forte for Java) IDEs.</p>
 
         <table>
           <tr>