From 3629ace7b026df2c60620e46320376dbfb6dbda2 Mon Sep 17 00:00:00 2001
From: Diane Holt <holtdl@apache.org>
Date: Wed, 13 Mar 2002 17:02:35 +0000
Subject: [PATCH] Clarify the shell-script-running stuff a bit.
 (faq.{xml,html}) Add needed jars for <junitreport> to lib deps table.
 (install.html) PR: Obtained from: Submitted by: Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271840 13f79535-47bb-0310-9956-ffa450edef68
---
 docs/faq.html            | 12 ++++++++----
 docs/manual/install.html |  5 +++++
 xdocs/faq.xml            | 12 ++++++++----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/docs/faq.html b/docs/faq.html
index db9402bf4..38345216b 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -895,12 +895,16 @@ shell-prompt&gt; cat &lt; foo
     </td></tr>
     <tr><td>
       <blockquote>
-                              <p>Execute the command shell instead, then pass the batch file or
-           shell script as a single command, using the <code>/c</code> or
+                              <p>On native Unix systems, you should be able to run shell scripts
+           directly. On systems running a Unix-type shell (for example, Cygwin
+           on Windows) execute the (command) shell instead - <code>cmd</code>
+           for batch files, <code>sh</code> for shell scripts - then pass the
+           batch file or shell script (plus any arguments to the script)
+           as a single command, using the <code>/c</code> or
            <code>-c</code> switch, respectively. See
            <a href="#shell-redirect-2">the above section</a>
            for example <code>&lt;exec&gt;</code> tasks
-           executing <code>sh</code>. On Windows, use something like:</p>
+           executing <code>sh</code>. For batch files, use something like:</p>
                                           <div align="left">
     <table cellspacing="4" cellpadding="0" border="0">
       <tr>
@@ -911,7 +915,7 @@ shell-prompt&gt; cat &lt; foo
       <tr>
         <td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
         <td bgcolor="#ffffff"><pre>
-&lt;exec dir=&quot;.&quot; executable=&quot;cmd.exe&quot; os=&quot;Windows NT&quot;&gt;
+&lt;exec dir=&quot;.&quot; executable=&quot;cmd&quot; os=&quot;Windows NT&quot;&gt;
   &lt;arg line=&quot;/c test.bat&quot;/&gt;
 &lt;/exec&gt;
 </pre></td>
diff --git a/docs/manual/install.html b/docs/manual/install.html
index dd4e03896..3cb8ff92d 100644
--- a/docs/manual/install.html
+++ b/docs/manual/install.html
@@ -287,6 +287,11 @@ Installing Ant / Optional Tasks</a> section above.</p>
     <td>junit tasks</td>
     <td><a href="http://www.junit.org/" target="_top">www.junit.org</a></td>
   </tr>
+  <tr>
+    <td>xerces.jar and xalan.jar</td>
+    <td>junitreport task</td>
+    <td><a href="http://xml.apache.org/" target="_top">xml.apache.org</a></td>
+  </tr>
   <tr>
     <td>stylebook.jar</td>
     <td>stylebook task</td>
diff --git a/xdocs/faq.xml b/xdocs/faq.xml
index 6f233bcea..a6205a5a5 100644
--- a/xdocs/faq.xml
+++ b/xdocs/faq.xml
@@ -330,14 +330,18 @@ shell-prompt> cat < foo
       <question>How do I execute a batch file or shell script from Ant?</question>
       <answer>
 
-        <p>Execute the command shell instead, then pass the batch file or
-           shell script as a single command, using the <code>/c</code> or
+        <p>On native Unix systems, you should be able to run shell scripts
+           directly. On systems running a Unix-type shell (for example, Cygwin
+           on Windows) execute the (command) shell instead - <code>cmd</code>
+           for batch files, <code>sh</code> for shell scripts - then pass the
+           batch file or shell script (plus any arguments to the script)
+           as a single command, using the <code>/c</code> or
            <code>-c</code> switch, respectively. See
            <a href="#shell-redirect-2">the above section</a>
            for example <code>&lt;exec&gt;</code> tasks
-           executing <code>sh</code>. On Windows, use something like:</p>
+           executing <code>sh</code>. For batch files, use something like:</p>
         <source><![CDATA[
-<exec dir="." executable="cmd.exe" os="Windows NT">
+<exec dir="." executable="cmd" os="Windows NT">
   <arg line="/c test.bat"/>
 </exec>
 ]]></source>