[FIXED JENKINS-40558] Remove "pipeline script" and replace with "pipe…

…line"
jenkinsci · Mar 9, 2017 · 3aac892 · 3aac892
1 parent 3043437
commit 3aac892
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/multibranch/SCMBinder.java b/src/main/java/org/jenkinsci/plugins/workflow/multibranch/SCMBinder.java
@@ -107,7 +107,7 @@ class SCMBinder extends FlowDefinition {
     @Extension public static class DescriptorImpl extends FlowDefinitionDescriptor {
 
         @Override public String getDisplayName() {
-            return "Pipeline script from " + WorkflowBranchProjectFactory.SCRIPT;
+            return "Pipeline from " + WorkflowBranchProjectFactory.SCRIPT;
         }
 
     }

diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/multibranch/ReadTrustedStep/help.html b/src/main/resources/org/jenkinsci/plugins/workflow/multibranch/ReadTrustedStep/help.html
@@ -3,6 +3,6 @@
     Unlike the <code>readFile</code> step, no workspace is required.
     If the associated branch is not trusted, yet the file has been modified from its trusted version, an error is thrown.
     Thus this step is useful for loading scripts or other files which might otherwise be used to run malicious commands.
-    Like <code>checkout scm</code>, as a convenience it may also be used from a standalone project configured with <i>Pipeline script from SCM</i>,
+    Like <code>checkout scm</code>, as a convenience it may also be used from a standalone project configured with <i>Pipeline from SCM</i>,
     in which case there is no security aspect.
 </div>
diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/multibranch/SCMVar/help.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/multibranch/SCMVar/help.jelly
@@ -27,7 +27,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core">
     Represents the SCM configuration in a multibranch project build.
     Use <code>checkout scm</code> to check out sources matching <code>Jenkinsfile</code>.
-    <br/>You may also use this in a standalone project configured with <i>Pipeline script from SCM</i>,
+    <br/>You may also use this in a standalone project configured with <i>Pipeline from SCM</i>,
     though in that case the checkout will just be of the latest revision in the branch,
-    possibly newer than the revision from which the Pipeline script was loaded.
+    possibly newer than the revision from which the Pipeline was loaded.
 </j:jelly>
diff --git a/...jenkinsci/plugins/workflow/multibranch/WorkflowBranchProjectFactory/getting-started.jelly b/...jenkinsci/plugins/workflow/multibranch/WorkflowBranchProjectFactory/getting-started.jelly
@@ -25,6 +25,6 @@
 <st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
   Pipeline Branch projects support building branches within a repository with a file named <code>Jenkinsfile</code> in the root directory.
   This file should contain a valid 
-  <a target="_blank" href="https://github.com/jenkinsci/workflow-plugin/blob/master/TUTORIAL.md#understanding-flow-scripts">Jenkins Pipeline script</a>. See also: 
+  <a target="_blank" href="https://github.com/jenkinsci/workflow-plugin/blob/master/TUTORIAL.md#understanding-flow-scripts">Jenkins Pipeline</a>. See also:
   <a target="_blank" href="https://github.com/jenkinsci/workflow-plugin/blob/master/TUTORIAL.md#creating-multibranch-projects">Creating Multibranch Projects</a>.
 </st:compress>
diff --git a/...nsci/plugins/workflow/multibranch/WorkflowMultiBranchProjectFactory/getting-started.jelly b/...nsci/plugins/workflow/multibranch/WorkflowMultiBranchProjectFactory/getting-started.jelly
@@ -25,6 +25,6 @@
 <st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:f="/lib/form">
   Pipeline Multibranch projects recognize and build repositories with a file named <code>Jenkinsfile</code> in branches of the repository.
   This file should contain a valid
-  <a target="_blank" href="https://github.com/jenkinsci/workflow-plugin/blob/master/TUTORIAL.md#understanding-flow-scripts">Jenkins Pipeline script</a>. See also: 
+  <a target="_blank" href="https://github.com/jenkinsci/workflow-plugin/blob/master/TUTORIAL.md#understanding-flow-scripts">Jenkins Pipeline</a>. See also:
   <a target="_blank" href="https://github.com/jenkinsci/workflow-plugin/blob/master/TUTORIAL.md#creating-multibranch-projects">Creating Multibranch Projects</a>.
 </st:compress>