summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2018-12-03 06:05:15 +0000
committerEvan Read <eread@gitlab.com>2018-12-03 06:05:15 +0000
commitca5f6f0705d9e454db1667130f8c78d2acf0a009 (patch)
tree2f78d133170a21a10af2a32d35f836b89df5b213
parentfe6adf11b80dbbc01165076e5b5b961ca641350a (diff)
parent37c6a9c1dc6c73f8167274cf02e3a7cf0daaf7b9 (diff)
downloadgitlab-ce-ca5f6f0705d9e454db1667130f8c78d2acf0a009.tar.gz
Merge branch 'patch-34' into 'master'
slightly improve readability See merge request gitlab-org/gitlab-ce!23466
-rw-r--r--doc/ci/yaml/README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index e46b2bbc79c..af7e41db443 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -1590,7 +1590,7 @@ Possible values for `when` are:
> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22631) in GitLab 11.5.
`parallel` allows you to configure how many instances of a job to run in
-parallel. This value has to be greater than or equal to two (2) and less or equal than 50.
+parallel. This value has to be greater than or equal to two (2) and less than or equal to 50.
This creates N instances of the same job that run in parallel. They're named
sequentially from `job_name 1/N` to `job_name N/N`.