Change the J/W gif to "Winner"; add links to the J/W article;

tweak the announcement a bit; make the intro to Ant match the
user man; add non-break where needed (now that I know the code :)
PR:
Obtained from:
Submitted by:
Reviewed by:


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

docs/antnews.html

@@ -25,7 +25,7 @@
     <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" border="0"/></a>
     </td>
     <td align="center">
-    <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_finalist2002.gif" border="0"/></a>
+    <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_winner2002.gif" border="0"/></a>
     </td>
     <td align="right">
               <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
@@ -103,9 +103,12 @@
     <tr><td>
       <blockquote>
                         <h3>Mar 26, 2002: Ant wins the JavaWorld Editors' Choice
-    award</h3>
-                                <p>Ant has won the JavaWorld Editors' Choice award for
-    "Most Useful Java Community-Developed Technology".</p>
+    Award</h3>
+                                <p>Ant has won the JavaWorld Editors' Choice Award for
+    <strong>Most Useful Java Community-Developed Technology</strong>.
+    Read the
+    <a href="http://www.javaworld.com/javaworld/jw-03-2002/jw-0326-awards.html "> full article</a> -- or jump directly to the bit about
+    <a href="http://www.javaworld.com/javaworld/jw-03-2002/jw-0326-awards-p3.html"> our award</a> <code>:)</code></p>
                     </blockquote>
     </td></tr>
   </table>

docs/external.html

@@ -23,7 +23,7 @@
     <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" border="0"/></a>
     </td>
     <td align="center">
-    <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_finalist2002.gif" border="0"/></a>
+    <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_winner2002.gif" border="0"/></a>
     </td>
     <td align="right">
               <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>

docs/faq.html

@@ -23,7 +23,7 @@
     <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" border="0"/></a>
     </td>
     <td align="center">
-    <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_finalist2002.gif" border="0"/></a>
+    <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_winner2002.gif" border="0"/></a>
     </td>
     <td align="right">
               <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>

docs/index.html

@@ -25,7 +25,7 @@
     <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" border="0"/></a>
     </td>
     <td align="center">
-    <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_finalist2002.gif" border="0"/></a>
+    <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_winner2002.gif" border="0"/></a>
     </td>
     <td align="right">
               <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
@@ -103,8 +103,9 @@
     <tr><td>
       <blockquote>
                         <p>We are proud to announce that Ant has won the JavaWorld
-    Editors' Choice award for "Most Useful Java
-    Community-Developed Technology"</p>
+    Editors' Choice Award for <strong>Most Useful Java
+    Community-Developed Technology</strong>. Click on the "News" link
+    to learn more.</p>
                     </blockquote>
     </td></tr>
   </table>
@@ -134,15 +135,16 @@
     <tr><td>
       <blockquote>
                         <p>
-Apache Ant is a Java based build tool. In theory it is kind of like make without
-make's wrinkles.
+Apache Ant is a Java-based build tool. In theory, it is kind of like
+Make, but without Make's wrinkles.
 </p>
                                 <p>
-Why another build tool when there is already make, gnumake, nmake, jam, and
-others? Because all of those tools have limitations that Ant's original author
+Why another build tool when there is already <em>make</em>, <em>gnumake</em>,
+<em>nmake</em>, <em>jam</em>, and
+others? Because all those tools have limitations that Ant's original author
 couldn't live with when developing software across multiple platforms. Make-like
-tools are inherently shell based. They evaluate a set of dependencies and then
-execute commands not unlike what you would issue on a shell. This means that you
+tools are inherently shell-based -- they evaluate a set of dependencies, then
+execute commands not unlike what you would issue in a shell. This means that you
 can easily extend these tools by using or writing any program for the OS that
 you are working on. However, this also means that you limit yourself to the OS,
 or at least the OS type such as Unix, that you are working on.
@@ -152,20 +154,22 @@ Makefiles are inherently evil as well. Anybody who has worked on them for any
 time has run into the dreaded tab problem. "Is my command not executing
 because I have a space in front of my tab!!!" said the original author of
 Ant way too many times. Tools like Jam took care of this to a great degree, but
-still use yet another format to use and remember.
+still have yet another format to use and remember.
 </p>
                                 <p>
-Ant is different. Instead of a model where it is extended with shell based
-commands, it is extended using Java classes. Instead of writing shell commands,
-the configuration files are XML based calling out a target tree where various
-tasks get executed. Each task is run by an object which implements a particular
+Ant is different. Instead of a model where it is extended with shell-based
+commands, Ant is extended using Java classes. Instead of writing shell commands,
+the configuration files are XML-based, calling out a target tree where various
+tasks get executed. Each task is run by an object that implements a particular
 Task interface.
 </p>
                                 <p>
 Granted, this removes some of the expressive power that is inherent by being
-able to construct a shell command such as `find . -name foo -exec rm {}` but it
-gives you the ability to be cross platform. To work anywhere and everywhere. And
-hey, if you really need to execute a shell command, Ant has an exec rule that
+able to construct a shell command such as
+<code>`find . -name foo -exec rm {}`</code>, but it
+gives you the ability to be cross platform -- to work anywhere and everywhere.
+And hey, if you really need to execute a shell command, Ant has an
+<code>&lt;exec&gt;</code> task that
 allows different commands to be executed based on the OS that it is executing
 on.
 </p>

docs/problems.html

@@ -23,7 +23,7 @@
     <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" border="0"/></a>
     </td>
     <td align="center">
-    <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_finalist2002.gif" border="0"/></a>
+    <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_winner2002.gif" border="0"/></a>
     </td>
     <td align="right">
               <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>
@@ -179,13 +179,13 @@ Complete build sequence is [debug, gensrc, compile, jar, test]<br />
               You should be able to see from the trace more about what Ant
               is doing and why it's taking a particular course of action.
               If you need even more information, you can use the
-              <code>-debug</code> flag rather than
-              <code>-verbose</code>.
+              <nobr><code>-debug</code></nobr> flag rather than
+              <nobr><code>-verbose</code></nobr>.
               This will generally produce so much
               output that you may want to save the output to a file and
               analyze it in an editor. You can save the output using the
-              <code>-logfile &lt;filename&gt;</code> flag, or using
-              redirection.
+              <nobr><code>-logfile &lt;filename&gt;</code></nobr> flag, or
+              using redirection.
            </p>
                                 <p>
               Once you have all this debug information, how can you use it
@@ -309,7 +309,8 @@ D:\src\java\Unset.java<br />
                         <p>
             By this time, you may have decided that there is an unreported
             bug in Ant. You have a few choices at this point. You can send
-            an email to the <code>ant-user</code> mailing list to see if
+            an email to the <nobr><code>ant-user</code></nobr> mailing list
+            to see if
             others have encountered your issue and find out how they may
             have worked around it. If after some discussion, you feel it
             is time to create
@@ -385,18 +386,20 @@ D:\src\java\Unset.java<br />
             <a href="http://jakarta.apache.org/builds/jakarta-ant/release/v1.4.1/src/">
             source distributions</a>. If you
             are going to tackle the problem at this level, you may want to
-            discuss some details first on the <code>ant-dev</code> mailing
-            list. Once you have a fix for the problem, you may submit
-            the fix as a <i>patch</i> to either the <code>ant-dev</code> mailing
+            discuss some details first on the <nobr><code>ant-dev</code></nobr>
+            mailing list. Once you have a fix for the problem, you may submit
+            the fix as a <i>patch</i> to either the
+            <nobr><code>ant-dev</code></nobr> mailing
             list, or enter the bug database as described above and attach the
             patch to the bug report. Using the bug database has the advantage
             of being able to track the progress of your patch.
          </p>
                                 <p>
             If you have a patch to submit and are sending it to the
-            <code>ant-dev</code> mailing list, prefix "[PATCH]"
+            <nobr><code>ant-dev</code></nobr> mailing list,
+            prefix "[PATCH]"
             to your message subject. Please include any relevant bug numbers.
-            Patch files should be created with the <code>-u</code>
+            Patch files should be created with the <nobr><code>-u</code></nobr>
             option of the
             <code>diff</code> or <code>cvs diff</code> command. For
             example:<br /><br />

docs/projects.html

@@ -23,7 +23,7 @@
     <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" border="0"/></a>
     </td>
     <td align="center">
-    <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_finalist2002.gif" border="0"/></a>
+    <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_winner2002.gif" border="0"/></a>
     </td>
     <td align="right">
               <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>

docs/resources.html

@@ -23,7 +23,7 @@
     <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" border="0"/></a>
     </td>
     <td align="center">
-    <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_finalist2002.gif" border="0"/></a>
+    <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_winner2002.gif" border="0"/></a>
     </td>
     <td align="right">
               <a href="http://jakarta.apache.org/ant/"><img src="./images/ant_logo_large.gif" alt="Apache Ant" border="0"/></a>

xdocs/antnews.xml

@@ -10,10 +10,14 @@
 <body>
   <section name="Ant has won!">
     <h3>Mar 26, 2002: Ant wins the JavaWorld Editors&apos; Choice
-    award</h3>
+    Award</h3>
 
-    <p>Ant has won the JavaWorld Editors&apos; Choice award for
-    &quot;Most Useful Java Community-Developed Technology&quot;.</p>
+    <p>Ant has won the JavaWorld Editors&apos; Choice Award for
+    <strong>Most Useful Java Community-Developed Technology</strong>.
+    Read the
+    <a href="http://www.javaworld.com/javaworld/jw-03-2002/jw-0326-awards.html
+"> full article</a> -- or jump directly to the bit about
+    <a href="http://www.javaworld.com/javaworld/jw-03-2002/jw-0326-awards-p3.html"> our award</a> <code>:)</code></p>
   </section>
   
   <section name="Java 1.4 Support">

xdocs/index.xml

@@ -11,8 +11,9 @@
 
   <section name="Ant has won!">
     <p>We are proud to announce that Ant has won the JavaWorld
-    Editors&apos; Choice award for &quot;Most Useful Java
-    Community-Developed Technology&quot;</p>
+    Editors&apos; Choice Award for <strong>Most Useful Java
+    Community-Developed Technology</strong>. Click on the &quot;News&quot; link
+    to learn more.</p>
   </section>
 
   <section name="Ant 1.4.1">
@@ -27,16 +28,17 @@
   <section name="Apache Ant">
 
 <p>
-Apache Ant is a Java based build tool. In theory it is kind of like make without
-make's wrinkles.
+Apache Ant is a Java-based build tool. In theory, it is kind of like
+Make, but without Make's wrinkles.
 </p>
 
 <p>
-Why another build tool when there is already make, gnumake, nmake, jam, and
-others? Because all of those tools have limitations that Ant's original author
+Why another build tool when there is already <em>make</em>, <em>gnumake</em>,
+<em>nmake</em>, <em>jam</em>, and
+others? Because all those tools have limitations that Ant's original author
 couldn't live with when developing software across multiple platforms. Make-like
-tools are inherently shell based. They evaluate a set of dependencies and then
-execute commands not unlike what you would issue on a shell. This means that you
+tools are inherently shell-based -- they evaluate a set of dependencies, then
+execute commands not unlike what you would issue in a shell. This means that you
 can easily extend these tools by using or writing any program for the OS that
 you are working on. However, this also means that you limit yourself to the OS,
 or at least the OS type such as Unix, that you are working on.
@@ -47,22 +49,24 @@ Makefiles are inherently evil as well. Anybody who has worked on them for any
 time has run into the dreaded tab problem. &quot;Is my command not executing
 because I have a space in front of my tab!!!&quot; said the original author of
 Ant way too many times. Tools like Jam took care of this to a great degree, but
-still use yet another format to use and remember.
+still have yet another format to use and remember.
 </p>
 
 <p>
-Ant is different. Instead of a model where it is extended with shell based
-commands, it is extended using Java classes. Instead of writing shell commands,
-the configuration files are XML based calling out a target tree where various
-tasks get executed. Each task is run by an object which implements a particular
+Ant is different. Instead of a model where it is extended with shell-based
+commands, Ant is extended using Java classes. Instead of writing shell commands,
+the configuration files are XML-based, calling out a target tree where various
+tasks get executed. Each task is run by an object that implements a particular
 Task interface.
 </p>
 
 <p>
 Granted, this removes some of the expressive power that is inherent by being
-able to construct a shell command such as `find . -name foo -exec rm {}` but it
-gives you the ability to be cross platform. To work anywhere and everywhere. And
-hey, if you really need to execute a shell command, Ant has an exec rule that
+able to construct a shell command such as
+<code>`find . -name foo -exec rm {}`</code>, but it
+gives you the ability to be cross platform -- to work anywhere and everywhere.
+And hey, if you really need to execute a shell command, Ant has an
+<code>&lt;exec&gt;</code> task that
 allows different commands to be executed based on the OS that it is executing
 on.
 </p>

xdocs/problems.xml

@@ -67,13 +67,13 @@ Complete build sequence is [debug, gensrc, compile, jar, test]<br></br>
               You should be able to see from the trace more about what Ant
               is doing and why it's taking a particular course of action.
               If you need even more information, you can use the
-              <code>-debug</code> flag rather than
-              <code>-verbose</code>.
+              <nobr><code>-debug</code></nobr> flag rather than
+              <nobr><code>-verbose</code></nobr>.
               This will generally produce so much
               output that you may want to save the output to a file and
               analyze it in an editor. You can save the output using the
-              <code>-logfile &lt;filename&gt;</code> flag, or using
-              redirection.
+              <nobr><code>-logfile &lt;filename&gt;</code></nobr> flag, or
+              using redirection.
            </p>
            <p>
               Once you have all this debug information, how can you use it
@@ -169,7 +169,8 @@ D:\src\java\Unset.java<br></br>
          <p>
             By this time, you may have decided that there is an unreported
             bug in Ant. You have a few choices at this point. You can send
-            an email to the <code>ant-user</code> mailing list to see if
+            an email to the <nobr><code>ant-user</code></nobr> mailing list
+            to see if
             others have encountered your issue and find out how they may
             have worked around it. If after some discussion, you feel it
             is time to create
@@ -229,18 +230,20 @@ D:\src\java\Unset.java<br></br>
             <a href="http://jakarta.apache.org/builds/jakarta-ant/release/v1.4.1/src/">
             source distributions</a>. If you
             are going to tackle the problem at this level, you may want to
-            discuss some details first on the <code>ant-dev</code> mailing
-            list. Once you have a fix for the problem, you may submit
-            the fix as a <i>patch</i> to either the <code>ant-dev</code> mailing
+            discuss some details first on the <nobr><code>ant-dev</code></nobr>
+            mailing list. Once you have a fix for the problem, you may submit
+            the fix as a <i>patch</i> to either the
+            <nobr><code>ant-dev</code></nobr> mailing
             list, or enter the bug database as described above and attach the
             patch to the bug report. Using the bug database has the advantage
             of being able to track the progress of your patch.
          </p>
          <p>
             If you have a patch to submit and are sending it to the
-            <code>ant-dev</code> mailing list, prefix &quot;[PATCH]&quot;
+            <nobr><code>ant-dev</code></nobr> mailing list,
+            prefix &quot;[PATCH]&quot;
             to your message subject. Please include any relevant bug numbers.
-            Patch files should be created with the <code>-u</code>
+            Patch files should be created with the <nobr><code>-u</code></nobr>
             option of the
             <code>diff</code> or <code>cvs diff</code> command. For
             example:<br></br><br></br>

xdocs/stylesheets/templates.vm

@@ -130,7 +130,7 @@
     <a href="http://jakarta.apache.org"><img src="http://jakarta.apache.org/images/jakarta-logo.gif" border="0"/></a>
     </td>
     <td align="center">
-    <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_finalist2002.gif" border="0"/></a>
+    <a href="http://www.javaworld.com"><img src="images/jw_ec_logo_winner2002.gif" border="0"/></a>
     </td>
     <td align="right">
     #set ( $logoString = $project.getChild("logo").getAttributeValue("href") )