diff options
| author | Stefan Bodewig <bodewig@apache.org> | 2018-09-29 18:01:36 +0200 |
|---|---|---|
| committer | Stefan Bodewig <bodewig@apache.org> | 2018-09-29 18:01:36 +0200 |
| commit | 2a359a6d3d13c572b4bac8e8c2fc21ad5001e32c (patch) | |
| tree | 20436dc2be42b446271877bcd3e04314dca3c1b5 | |
| parent | 872a9bcdedc9611e3703cfe739dc53896adce4ee (diff) | |
| parent | 6b76234c3c551addb35345af29123ffcf24f2064 (diff) | |
| download | ant-2a359a6d3d13c572b4bac8e8c2fc21ad5001e32c.tar.gz | |
Merge branch '1.9.x'
4 files changed, 7 insertions, 4 deletions
diff --git a/manual/Tasks/javadoc.html b/manual/Tasks/javadoc.html index c818e92a4..2f0abe367 100644 --- a/manual/Tasks/javadoc.html +++ b/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><sourcepath></code>, <code><fileset></code>, <code>module</code> or <code><packageset></code></td> - or <code><packageset></code></td> </tr> <tr> <td>sourcepathref</td> diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java index 72eee20db..6f96497a5 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java +++ b/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) { diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index 13b8fed37..710f188f6 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/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 */ diff --git a/src/main/org/apache/tools/ant/types/Commandline.java b/src/main/org/apache/tools/ant/types/Commandline.java index a39099053..54ff1f583 100644 --- a/src/main/org/apache/tools/ant/types/Commandline.java +++ b/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) { |