Merge branch 'docs/builds-to-jobs-massacre' into 'master'

Rename builds to jobs in docs

See merge request !9204

1 files changed, 14 insertions, 14 deletions

diff --git a/doc/ci/pipelines.md b/doc/ci/pipelines.md
index ab289876252..3134405e10b 100644
--- a/doc/ci/pipelines.md
+++ b/doc/ci/pipelines.md
@@ -1,14 +1,14 @@
-# Introduction to pipelines and builds
+# Introduction to pipelines and jobs
 
 >**Note:**
 Introduced in GitLab 8.8.
 
 ## Pipelines
 
-A pipeline is a group of [builds][] that get executed in [stages][](batches).
-All of the builds in a stage are executed in parallel (if there are enough
+A pipeline is a group of [jobs][] that get executed in [stages][](batches).
+All of the jobs in a stage are executed in parallel (if there are enough
 concurrent [Runners]), and if they all succeed, the pipeline moves on to the
-next stage. If one of the builds fails, the next stage is not (usually)
+next stage. If one of the jobs fails, the next stage is not (usually)
 executed.
 
 ![Pipelines example](img/pipelines.png)
@@ -35,10 +35,10 @@ Example continuous delivery flow:
 
 ![CD Flow](img/pipelines-goal.svg)
 
-## Builds
+## Jobs
 
-Builds are individual runs of [jobs]. Not to be confused with a `build` job or
-`build` stage.
+Jobs can be defined in the [`.gitlab-ci.yml`][jobs-yaml] file. Not to be
+confused with a `build` job or `build` stage.
 
 ## Defining pipelines
 
@@ -52,11 +52,11 @@ See full [documentation](yaml/README.md#jobs).
 You can find the current and historical pipeline runs under **Pipelines** for
 your project.
 
-## Seeing build status
+## Seeing job status
 
-Clicking on a pipeline will show the builds that were run for that pipeline.
-Clicking on an individual build will show you its build trace, and allow you to
-cancel the build, retry it,  or erase the build trace.
+Clicking on a pipeline will show the jobs that were run for that pipeline.
+Clicking on an individual job will show you its job trace, and allow you to
+cancel the job, retry it,  or erase the job trace.
 
 ## How the pipeline duration is calculated
 
@@ -91,11 +91,11 @@ total running time should be:
 
 ## Badges
 
-Build status and test coverage report badges are available. You can find their
+Job status and test coverage report badges are available. You can find their
 respective link in the [Pipelines settings] page.
 
-[builds]: #builds
-[jobs]: yaml/README.md#jobs
+[jobs]: #jobs
+[jobs-yaml]: yaml/README.md#jobs
 [stages]: yaml/README.md#stages
 [runners]: runners/README.html
 [pipelines settings]: ../user/project/pipelines/settings.md