ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/xdocs faq.xml
Date Tue, 30 Jul 2002 15:00:40 GMT
bodewig     2002/07/30 08:00:40

  Modified:    docs     faq.html
               docs/manual/CoreTasks javac.html
               xdocs    faq.xml
  Log:
  Fixing some typos - has been submitted as part of
  PR: 11056
  
  Revision  Changes    Path
  1.34      +7 -4      jakarta-ant/docs/faq.html
  
  Index: faq.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/faq.html,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- faq.html	30 Jul 2002 14:52:10 -0000	1.33
  +++ faq.html	30 Jul 2002 15:00:39 -0000	1.34
  @@ -771,6 +771,9 @@
     </td>
         </tr>
           </table>
  +                                        <p>With Ant &gt;= 1.5, you can also use
nested
  +          <code>&lt;compilerarg&gt;</code> elements with the
  +          <code>&lt;javac&gt;</code> task.</p>
                           </blockquote>
       </td></tr>
     </table>
  @@ -1290,8 +1293,8 @@
           your build file uses, this is done inside the <a href="http://www.w3.org/TR/2000/REC-xml-20001006#sec-prolog-dtd">XML
           declaration</a>.</p>
                                           <p>By default the parser assumes you are
using the UTF-8
  -        encoding instead of your platform's default.  For most western
  -        european contries you should set the encoding to
  +        encoding instead of your platform's default.  For most Western
  +        European countries you should set the encoding to
           <code>ISO-8859-1</code>.  To do so, make the very first line
           of you build file read like</p>
                                             <div align="left">
  @@ -1666,7 +1669,7 @@
        * Determine the status of the build and the actions to follow, now that
        * the build has completed.
        *
  -     * @param       e       Event describing the build tatus.
  +     * @param       e       Event describing the build status.
        */
       public void buildFinished(BuildEvent e) {
           Throwable th = e.getException();
  @@ -1994,7 +1997,7 @@
           is in <code>CLASSPATH</code> as well.</p>
                                           <p>To solve this, you have two major options:</p>
                                           <ol>
  -          <li>put all external libaries you need in
  +          <li>put all external libraries you need in
             <code>CLASSPATH</code> as well this is not what you want,
             otherwise you wouldn't have found this FAQ entry.</li>
   
  
  
  
  1.36      +6 -9      jakarta-ant/docs/manual/CoreTasks/javac.html
  
  Index: javac.html
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/javac.html,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- javac.html	22 Jun 2002 23:38:27 -0000	1.35
  +++ javac.html	30 Jul 2002 15:00:39 -0000	1.36
  @@ -1,4 +1,4 @@
  -<html>
  +<html lang="en-us">
   
   <head>
   <meta http-equiv="Content-Language" content="en-us">
  @@ -21,7 +21,7 @@
   from the source file, and so on. See the
   <a href="../OptionalTasks/depend.html"><code>&lt;depend&gt;</code></a>
task
   for dependency checking based on other than just
  -existence/modification times.
  +existence/modification times.</p>
   <p>When the source files are part of a package, the directory structure of
   the source tree should follow the package
   hierarchy.</p>
  @@ -47,7 +47,7 @@
   <code>&lt;javac&gt;</code> task.
   <a name="compilervalues">Valid values for either the
   <code>build.compiler</code> property or the <code>compiler</code>
  -attribute are:</p>
  +attribute are:</a></p>
   <ul>
     <li><code>classic</code> (the standard compiler of JDK 1.1/1.2) &ndash;
         <code>javac1.1</code> and
  @@ -56,7 +56,7 @@
         <code>javac1.3</code> and
         <code>javac1.4</code> can be used as aliases.</li>
     <li><code>jikes</code> (the <a
  -    href="http://oss.software.ibm.com/developerworks/opensource/jikes/project" target="_top">Jikes</a>
  +    href="http://oss.software.ibm.com/developerworks/opensource/jikes/" target="_top">Jikes</a>
       compiler).</li>
     <li><code>jvc</code> (the Command-Line Compiler from Microsoft's SDK
         for Java / Visual J++) &ndash; <code>microsoft</code> can be used
  @@ -69,7 +69,6 @@
     <li><code>extJavac</code> (run either modern or classic in a JVM of
         its own).</li>
   </ul>
  -</a>
   <p>The default is <code>javac1.x</code> with <code>x</code>
depending
   on the JDK version you use while you are running Ant.
   If you wish to use a different compiler interface than those
  @@ -98,7 +97,6 @@
   The side effect of this is that you will not be able to delete or move
   those files later on in the build.  The workaround is to fork when
   invoking the compiler.</p>
  -</p>
   <h3>Parameters</h3>
   <table border="1" cellpadding="2" cellspacing="0">
     <tr>
  @@ -109,7 +107,7 @@
     <tr>
       <td valign="top">srcdir</td>
       <td valign="top">Location of the java files. (See the
  -     <a href="#srcdirnote">Note</a> below.)</td>
  +     <a href="#srcdirnote">note</a> below.)</td>
       <td align="center" valign="top">Yes, unless nested <code>&lt;src&gt;</code>
elements are present.</td>
     </tr>
     <tr>
  @@ -492,7 +490,7 @@
   
   <h3>Jikes Notes</h3>
   
  -Jikes supports some extra options, which can be set be defining
  +<p>Jikes supports some extra options, which can be set be defining
   the properties shown below prior to invoking the task. The setting
   for each property will be in affect for all <code>&lt;javac&gt;</code>
   tasks throughout the build.
  @@ -559,7 +557,6 @@
   	</td>
     </tr>
   </table>
  -</p>
   
   <hr>
   <p align="center">Copyright &copy; 2000-2002 Apache Software Foundation.
  
  
  
  1.21      +8 -4      jakarta-ant/xdocs/faq.xml
  
  Index: faq.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/xdocs/faq.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- faq.xml	30 Jul 2002 14:52:10 -0000	1.20
  +++ faq.xml	30 Jul 2002 15:00:40 -0000	1.21
  @@ -270,6 +270,10 @@
   
           </table>
   
  +        <p>With Ant &gt;= 1.5, you can also use nested
  +          <code>&lt;compilerarg&gt;</code> elements with the
  +          <code>&lt;javac&gt;</code> task.</p>
  +
         </answer>
       </faq>
   
  @@ -580,8 +584,8 @@
           declaration</a>.</p>  
   
           <p>By default the parser assumes you are using the UTF-8
  -        encoding instead of your platform's default.  For most western
  -        european contries you should set the encoding to
  +        encoding instead of your platform's default.  For most Western
  +        European countries you should set the encoding to
           <code>ISO-8859-1</code>.  To do so, make the very first line
           of you build file read like</p>
   
  @@ -802,7 +806,7 @@
        * Determine the status of the build and the actions to follow, now that
        * the build has completed.
        *
  -     * @param       e       Event describing the build tatus.
  +     * @param       e       Event describing the build status.
        */
       public void buildFinished(BuildEvent e) {
           Throwable th = e.getException();
  @@ -1041,7 +1045,7 @@
           <p>To solve this, you have two major options:</p>
   
           <ol>
  -          <li>put all external libaries you need in
  +          <li>put all external libraries you need in
             <code>CLASSPATH</code> as well this is not what you want,
             otherwise you wouldn&apos;t have found this FAQ entry.</li>
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message