Merge pull request #72 from twasyl/JENKINS-65398

[JENKINS-65398] Terminology update

README.md

@@ -52,13 +52,13 @@ be changed later. If you skip this step, you will be very confused and not get v
  You have to drill into each configuration to see the history and console logs.
 
 ## Executors used by a multi-configuration project
-Reference: [Re: Will a multi-configuration / matrix job always use up one executor on the master?](http://groups.google.com/group/jenkinsci-users/msg/eb809fb06759d861)
+Reference: [Re: Will a multi-configuration / matrix job always use up one executor on the built-in node?](http://groups.google.com/group/jenkinsci-users/msg/eb809fb06759d861)
 
-A matrix build project (that uses the Agent axis) will use one additional executor ("master executor"?)
+A matrix build project (that uses the Agent axis) will use one additional executor
 on a random node to coordinate the executions on the nodes defined by the Agent axis.
 This executor is added as a temporary executor (also called as "flyweight task") to the node and does not
 use up a configured executor slot on this node (this behavior is controlled by hudson.model.Hudson.flyweightSupport).
-Only this "master executor" or "flyweight task" will be affected by the "Restrict where this project can be run"
+Only this "flyweight task" will be affected by the "Restrict where this project can be run"
 option, under Advanced Project Options. "Actual" or non-flyweight build execution can be controlled with 
 the "Agents" axis that can be added under the project's Configuration Matrix: individual nodes and/or labels 
 containing multiple nodes can be selected, as well as filtering axis combinations.

src/main/java/hudson/matrix/FilterScript.java

@@ -137,7 +137,7 @@ public boolean apply(AxisList axes, Combination combination, Binding binding) {
         }
     };
 
-    // TODO JENKINS-25804: harmless generic methods like this should be whitelisted in script-security
+    // TODO JENKINS-25804: harmless generic methods like this should be allowlisted in script-security
     @Extension public static class ImpliesWhitelist extends ProxyWhitelist {
         public ImpliesWhitelist() throws IOException {
             super(new StaticWhitelist("staticMethod org.codehaus.groovy.runtime.DefaultGroovyMethods implies java.lang.Boolean java.lang.Boolean"));

src/main/java/hudson/matrix/MatrixConfiguration.java

@@ -129,7 +129,7 @@ public EnvVars getEnvironment(Node node, TaskListener listener) throws IOExcepti
 
     @Override
     public final boolean isDisabled() {
-        // Matrix configurations cannot be disabled independently from the master
+        // Matrix configurations cannot be disabled independently from the controller
         return getParent().isDisabled(); 
     }
 

src/main/resources/hudson/matrix/MatrixProject/help-slaveAffinity.html

@@ -5,5 +5,5 @@
 
     <p>
     If you need to control where this parent build runs, please use this option to specify
-    its label/slave.
+    its label/agent.
 </div>

src/main/resources/hudson/matrix/Messages_da.properties

@@ -23,7 +23,7 @@
 TextArea.DisplayName=Brugerdefineret akse
 MatrixProject.DuplicateAxisName=Dupliker akse navn
 MatrixBuild.Triggering=Starter {0}
-LabelAxis.DisplayName=Slaver
+LabelAxis.DisplayName=Agenter
 JDKAxis.DisplayName=JDK
 MatrixBuild.AppearsCancelled={0} ser ud til at v\u00E6re aflyst
 MatrixConfiguration.Pronoun=Konfiguration

src/main/webapp/help/matrix/combinationfilter.html

@@ -12,7 +12,7 @@
   <h4>Filtering based on values</h4>
   <p>
   For example, let's say you are building on different operating systems for
-  different compilers. Assume that your slave labels are <b>label=[linux,solaris]</b> and you have
+  different compilers. Assume that your agent labels are <b>label=[linux,solaris]</b> and you have
   created an axis as <b>compiler=[gcc,cc].</b>
 
   Any of the following expressions will filter out <b>cc</b> builds on <b>linux</b>. Depending on

src/test/java/hudson/matrix/MatrixProjectTest.java

@@ -554,10 +554,10 @@ public void testUpgrade() throws Exception {
     }
 
     /**
-     * Given a small master and a big exclusive slave, the fair scheduling would prefer running the flyweight job
-     * in the slave. But if the scheduler honors the EXCLUSIVE flag, then we should see it built on the master.
+     * Given a small controller and a big exclusive agent, the fair scheduling would prefer running the flyweight job
+     * in the agent. But if the scheduler honors the EXCLUSIVE flag, then we should see it built on the controller.
      *
-     * Since there's a chance that the fair scheduling just so happens to pick up the master by chance,
+     * Since there's a chance that the fair scheduling just so happens to pick up the controller by chance,
      * we try multiple jobs to reduce the chance of that happening.
      */
     @Issue("JENKINS-5076")