Merge branch '1.9.x'

manual/Tasks/javadoc.html

@@ -89,10 +89,9 @@ with the <var>exclude</var> patterns of the <code>packageset</code> (and vice ve
     <td>sourcepath</td>
     <td>Specify where to find source files</td>
     <td>all</td>
-    <td rowspan="4">At least one of the three or
+    <td rowspan="4">At least one of the four or
       nested <code>&lt;sourcepath&gt;</code>, <code>&lt;fileset&gt;</code>,
       <code>module</code> or <code>&lt;packageset&gt;</code></td>
-      or <code>&lt;packageset&gt;</code></td>
   </tr>
   <tr>
     <td>sourcepathref</td>

src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java

@@ -279,6 +279,8 @@ public abstract class AbstractJarSignerTask extends Task {
      * Adds a nested <arg> element that can be used to specify
      * command line arguments not supported via specific attributes.
      *
+     * @param arg the argument to add
+     *
      * @since Ant 1.10.6
      */
     public void addArg(Commandline.Argument arg) {

src/main/org/apache/tools/ant/taskdefs/Javadoc.java

@@ -572,7 +572,7 @@ public class Javadoc extends Task {
     /**
      * Specify where to find modules
      *
-     * @param src a Path instance containing the modules.
+     * @param mp a Path instance containing the modules.
      *
      * @since Ant 1.10.6
      */
@@ -613,7 +613,7 @@ public class Javadoc extends Task {
     /**
      * Specify where to find sources for modules
      *
-     * @param src a Path instance containing the sources for modules.
+     * @param mp a Path instance containing the sources for modules.
      *
      * @since Ant 1.10.6
      */

src/main/org/apache/tools/ant/types/Commandline.java

@@ -181,6 +181,8 @@ public class Commandline implements Cloneable {
         /**
          * Copies settings from a different argument.
          *
+         * @param other the argument to copy setting from
+         *
          * @since Ant 1.10.6
          */
         public void copyFrom(Argument other) {