[JENKINS-31153] More renames.

Originally-Committed-As: 199d8c9dc7ec8d02d6429dd652f666f14cbfc660
jenkinsci · Jan 19, 2016 · 440fd34 · 440fd34
1 parent 94a1ef7
commit 440fd34
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/basic-steps/src/main/resources/index.jelly b/basic-steps/src/main/resources/index.jelly
@@ -25,5 +25,5 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <div>
-    Commonly used steps for workflows.
+    Commonly used steps for Pipelines.
 </div>
diff --git a/cps/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStep.java b/cps/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/LoadStep.java
@@ -38,7 +38,7 @@ public String getFunctionName() {
 
         @Override
         public String getDisplayName() {
-            return "Evaluate a Groovy source file into the workflow script";
+            return "Evaluate a Groovy source file into the Pipeline script";
         }
     }
 

diff --git a/cps/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java b/cps/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java
@@ -225,7 +225,7 @@ public boolean takesImplicitBlockArgument() {
 
         @Override
         public String getDisplayName() {
-            return "Execute sub-workflows in parallel";
+            return "Execute parts of a Pipeline in parallel";
         }
     }
 }
diff --git a/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/help-script.html b/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition/help-script.html
@@ -1,5 +1,5 @@
 <p>
-    Groovy script defining this workflow. A quick example:
+    Groovy script defining this Pipeline. A quick example:
 </p>
 <pre>node {
     sh 'echo hello world'

diff --git a/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-scm.html b/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-scm.html
@@ -1,7 +1,7 @@
 <div>
     Specify where to obtain a source code repository containing your Groovy script.
-    It will be checked out somewhere on the Jenkins master and used to load your workflow script.
-    (If you wish to use other files from the same repository during your flow,
+    It will be checked out somewhere on the Jenkins master and used to load your Pipeline script.
+    (If you wish to use other files from the same repository during your Pipeline,
     you will need to check them out separately on some slave;
     this checkout cannot be reused.)
 </div>
diff --git a/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/EnvActionImpl/Binder/help.jelly b/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/EnvActionImpl/Binder/help.jelly
@@ -16,13 +16,13 @@ node {
         and from upstream Pipeline builds using the <code>build</code> step.
     </p>
     <p>
-        However any variables set this way are global to the workflow build.
+        However any variables set this way are global to the Pipeline build.
         For variables with node-specific content (such as file paths),
         you should instead use the <code>withEnv</code> step,
         to bind the variable only within a <code>node</code> block.
     </p>
     <p>
-        A set of environment variables are made available to all Jenkins projects, including workflows.
+        A set of environment variables are made available to all Jenkins projects, including Pipelines.
         The following is a general list of variables (by name) that are available;
         see the notes below the list for Pipeline-specific details.
     </p>
@@ -31,7 +31,7 @@ node {
         <st:include it="${ec}" page="buildEnv" optional="true"/>
     </j:forEach>
     <p>
-        The following variables are currently unavailable inside a workflow script:
+        The following variables are currently unavailable inside a Pipeline script:
     </p>
     <ul>
         <li><code>NODE_LABELS</code></li>

diff --git a/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/help.html b/cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/steps/LoadStep/help.html
@@ -4,14 +4,14 @@
         The loaded file can contain statements at top level or just load and run a closure. For example:
     </p>
     <pre>
-    def flow
+    def pipeline
     node('slave') {
-        flow = load 'flow.groovy'
-        flow.functionA()
+        pipeline = load 'pipeline.groovy'
+        pipeline.functionA()
     }
-    flow.functionB()
+    pipeline.functionB()
     </pre>
     <p>
-    Where <code>flow.groovy</code> defines functionA and functionB functions (among others) before ending with <code>return this;</code>
+    Where <code>pipeline.groovy</code> defines functionA and functionB functions (among others) before ending with <code>return this;</code>
     <p>
 </div>