Merge branch 'master' of github.com:jenkinsci/jenkins

core/src/main/java/hudson/matrix/MatrixAggregator.java

@@ -74,7 +74,7 @@ public abstract class MatrixAggregator implements ExtensionPoint {
      * @return
      *      true if the build can continue, false if there was an error
      *      and the build needs to be aborted.
-     * @see BuildStep#prebuild(Build,BuildListener)
+     * @see BuildStep#prebuild(AbstractBuild,BuildListener)
      */
     public boolean startBuild() throws InterruptedException, IOException {
         return true;

core/src/main/java/hudson/matrix/MatrixExecutionStrategy.java

@@ -47,7 +47,7 @@ public abstract class MatrixExecutionStrategy extends AbstractDescribableImpl<Ma
 
     /**
      * @deprecated
-     *      Override {@link #run(MatrixBuildExecution)}
+     *      Override {@link #run(MatrixBuild.MatrixBuildExecution)}
      */
     public Result run(MatrixBuild build, List<MatrixAggregator> aggregators, BuildListener listener) throws InterruptedException, IOException {
         throw new UnsupportedOperationException(getClass()+" needs to override run(MatrixBuildExecution)");

core/src/main/java/hudson/model/queue/QueueTaskDispatcher.java

@@ -64,7 +64,7 @@ public abstract class QueueTaskDispatcher implements ExtensionPoint {
      * (This relationship is also the same with built-in check logic.)
      *
      * @deprecated since 1.413
-     *      Use {@link #canTake(Node, BuildableItem)}
+     *      Use {@link #canTake(Node, Queue.BuildableItem)}
      */
     public CauseOfBlockage canTake(Node node, Task task) {
         return null;
@@ -85,7 +85,7 @@ public abstract class QueueTaskDispatcher implements ExtensionPoint {
      *
      * <p>
      * This method is primarily designed to fine-tune where the execution should take place. If the execution
-     * shouldn't commence anywhere at all, implementation should use {@link #canRun(Item)} instead so
+     * shouldn't commence anywhere at all, implementation should use {@link #canRun(Queue.Item)} instead so
      * that Jenkins understands the difference between "this node isn't the right place for this work"
      * vs "the time isn't right for this work to execute." This affects the provisioning behaviour
      * with elastic Jenkins deployments.
@@ -107,9 +107,9 @@ public abstract class QueueTaskDispatcher implements ExtensionPoint {
      * executor availability), or if it should be considered blocked.
      *
      * <p>
-     * Compared to {@link #canTake(Node, BuildableItem)}, this version tells Jenkins that the task is
+     * Compared to {@link #canTake(Node, Queue.BuildableItem)}, this version tells Jenkins that the task is
      * simply not ready to execute, even if there's available executor. This is more efficient
-     * than {@link #canTake(Node, BuildableItem)}, and it sends the right signal to Jenkins so that
+     * than {@link #canTake(Node, Queue.BuildableItem)}, and it sends the right signal to Jenkins so that
      * it won't use {@link Cloud} to try to provision new executors.
      *
      * <p>

core/src/main/java/hudson/slaves/NodeProperty.java

@@ -90,7 +90,7 @@ public abstract class NodeProperty<N extends Node> implements ReconfigurableDesc
      *
      * @since 1.360
      * @deprecated as of 1.413
-     *      Use {@link #canTake(BuildableItem)}
+     *      Use {@link #canTake(Queue.BuildableItem)}
      */
     public CauseOfBlockage canTake(Task task) {
         return null;

core/src/main/java/hudson/triggers/SCMTrigger.java

@@ -520,7 +520,7 @@ public class SCMTrigger extends Trigger<SCMedItem> {
 
         /**
          * @deprecated
-         *      Use {@link #SCMTriggerCause(String)}.
+         *      Use {@link #SCMTrigger.SCMTriggerCause(String)}.
          */
         public SCMTriggerCause() {
             this("");