fixing a merge failure.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@3703 71c3de6d-444a-0410-be80-ed276b4c234a

core/src/main/java/hudson/model/AbstractBuild.java

@@ -42,7 +42,7 @@ import java.util.ArrayList;
 public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends AbstractBuild<P,R>> extends Run<P,R> implements Queue.Executable {
 
     /**
-     * PluginName of the slave this project was built on.
+     * Name of the slave this project was built on.
      * Null or "" if built by the master. (null happens when we read old record that didn't have this information.)
      */
     private String builtOn;

core/src/main/java/hudson/model/DirectoryBrowserSupport.java

@@ -168,7 +168,7 @@ public final class DirectoryBrowserSupport {
          */
         private final String href;
         /**
-         * PluginName of this path. Just the file name portion.
+         * Name of this path. Just the file name portion.
          */
         private final String title;
 

core/src/main/java/hudson/model/Node.java

@@ -14,7 +14,7 @@ import java.util.Set;
  */
 public interface Node {
     /**
-     * PluginName of this node.
+     * Name of this node.
      *
      * @return
      *      "" if this is master

core/src/main/java/hudson/model/PeriodicWork.java

@@ -12,7 +12,7 @@ import java.util.logging.Logger;
 public abstract class PeriodicWork extends TimerTask {
 
     /**
-     * PluginName of the work.
+     * Name of the work.
      */
     private final String name;
     private Thread thread;

core/src/main/java/hudson/model/Slave.java

@@ -49,7 +49,7 @@ import java.util.logging.Logger;
  */
 public final class Slave implements Node, Serializable {
     /**
-     * PluginName of this slave node.
+     * Name of this slave node.
      */
     protected final String name;
 
@@ -108,7 +108,7 @@ public final class Slave implements Node, Serializable {
         getAssignedLabels();    // compute labels now
 
         if (name.equals(""))
-            throw new FormException("Invalid slave configuration. PluginName is empty", null);
+            throw new FormException("Invalid slave configuration. Name is empty", null);
 
         // this prevents the config from being saved when slaves are offline.
         // on a large deployment with a lot of slaves, some slaves are bound to be offline,

core/src/main/java/hudson/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java

@@ -55,7 +55,7 @@ import java.util.Vector;
  * <FONT color=#6a5acd>&lt;!ELEMENT</FONT> msg <FONT color=#ff00ff>(#PCDATA)</FONT><FONT color=#6a5acd>&gt;</FONT>
  * <FONT color=#0000ff>&lt;!-- File changed --&gt;</FONT>
  * <FONT color=#6a5acd>&lt;!ELEMENT</FONT> file <FONT color=#ff00ff>(name,revision,prevrevision</FONT><FONT color=#ff00ff>?</FONT><FONT color=#ff00ff>)</FONT><FONT color=#6a5acd>&gt;</FONT>
- * <FONT color=#0000ff>&lt;!-- PluginName of the file --&gt;</FONT>
+ * <FONT color=#0000ff>&lt;!-- Name of the file --&gt;</FONT>
  * <FONT color=#6a5acd>&lt;!ELEMENT</FONT> name <FONT color=#ff00ff>(#PCDATA)</FONT><FONT color=#6a5acd>&gt;</FONT>
  * <FONT color=#0000ff>&lt;!-- Revision number --&gt;</FONT>
  * <FONT color=#6a5acd>&lt;!ELEMENT</FONT> revision <FONT color=#ff00ff>(#PCDATA)</FONT><FONT color=#6a5acd>&gt;</FONT>