Merge branch 'master' into remove-enable-disable-toggle

Jenkinsfile

@@ -1,4 +1,7 @@
 #!/usr/bin/env groovy
 
 /* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
-buildPlugin(useAci: true)
+buildPlugin(useContainerAgent: true, configurations: [
+  [ platform: "linux", jdk: "11" ],
+  [ platform: "windows", jdk: "11" ],
+])

src/main/java/hudson/matrix/AxisDescriptor.java

@@ -80,7 +80,7 @@ public FormValidation doCheckName(@QueryParameter String value) {
      * necessary to disallow '=' in value as everything after the first
      * occurrence is considered to be a value.
      *
-     * Subclasses are expected to expose own <tt>doCheck</tt> method possibly delegating to this one.
+     * Subclasses are expected to expose own <code>doCheck</code> method possibly delegating to this one.
      */
     public FormValidation checkValue(@QueryParameter String value) {
         if(Util.fixEmpty(value)==null)

src/main/java/hudson/matrix/Combination.java

@@ -84,7 +84,7 @@ public int toIndex(AxisList axis) {
      * Evaluates the given Groovy expression with values bound from this combination.
      *
      * <p>
-     * For example, if this combination is a=X,b=Y, then expressions like <tt>a=="X"</tt> would evaluate to
+     * For example, if this combination is a=X,b=Y, then expressions like <code>a=="X"</code> would evaluate to
      * true.
      */
     public boolean evalGroovyExpression(AxisList axes, String expression) {
@@ -147,7 +147,7 @@ public List<String> values(Collection<? extends Axis> axes) {
 
     /**
      * Converts to the ID string representation:
-     * <tt>axisName=value,axisName=value,...</tt>
+     * <code>axisName=value,axisName=value,...</code>
      *
      * @param sep1
      *      The separator between multiple axes.