Merge pull request #296 from recena/JENKINS-31153

[JENKINS-31153] Rename Workflow to Pipeline Originally-Committed-As: 118b89e1b1828a39f50fb955942ffcbbe69e653e
jenkinsci · Jan 15, 2016 · 621569e · 621569e
2 parents d8f52ea + ef4fa63
commit 621569e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/durable-task-step/pom.xml b/durable-task-step/pom.xml
@@ -32,7 +32,7 @@
     </parent>
     <artifactId>workflow-durable-task-step</artifactId>
     <packaging>hpi</packaging>
-    <name>Workflow: Durable Task Step</name>
+    <name>Pipeline: Durable Task Step</name>
     <url>https://wiki.jenkins-ci.org/display/JENKINS/Workflow+Plugin</url>
     <dependencies>
         <dependency>

diff --git a/multibranch/src/main/resources/index.jelly b/multibranch/src/main/resources/index.jelly
@@ -25,5 +25,5 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <div>
-    Defines a project type for multibranch workflows.
+    Defines a project type for multibranch pipelines.
 </div>
diff --git a/...n/java/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerCancelledCause.java b/...n/java/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerCancelledCause.java
@@ -22,6 +22,6 @@ public BuildTriggerCancelledCause(Throwable cause) {
 
     @Override
     public String getShortDescription() {
-        return "Calling workflow was cancelled";
+        return "Calling Pipeline was cancelled";
     }
 }
diff --git a/...sources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/help-job.html b/...sources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/help-job.html
@@ -1,7 +1,7 @@
 <div>
     Name of a downstream job to build.
-    May be another Workflow job, but more commonly a freestyle or other project.
-    Use a simple name if the job is in the same folder as this upstream workflow job;
+    May be another Pipeline job, but more commonly a freestyle or other project.
+    Use a simple name if the job is in the same folder as this upstream Pipeline job;
     otherwise can use relative paths like <code>../sister-folder/downstream</code>
     or absolute paths like <code>/top-level-folder/nested-folder/downstream</code>.
 </div>
diff --git a/...ources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/help-wait.html b/...ources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/help-wait.html
@@ -1,5 +1,5 @@
 <p>
-    You may ask that this workflow build wait for completion of the downstream build.
+    You may ask that this Pipeline build wait for completion of the downstream build.
     In that case the return value of the step is an object on which you can obtain the following read-only properties:
     so you can inspect its <code>result</code> and so on.
 </p>
@@ -19,8 +19,8 @@
     <li><code>absoluteUrl</code></li>
 </ul>
 <p>
-    For a non-Workflow downstream build, the <code>buildVariables</code> property offers access to a map of defined build variables.
-    For a Workflow downstream build, this property gives access to any variables set globally on <code>env</code>.
+    For a non-Pipeline downstream build, the <code>buildVariables</code> property offers access to a map of defined build variables.
+    For a Pipeline downstream build, this property gives access to any variables set globally on <code>env</code>.
 </p>
 <p>
     Administrator-approved scripts outside the sandbox can use the <code>rawBuild</code> property to get access to a <code>hudson.model.Run</code> with further APIs.