summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-08-21 17:22:36 +1000
committerEvan Read <eread@gitlab.com>2019-08-21 17:22:36 +1000
commit2a17a2e90621e418ae5e34a5aef49494c2b092db (patch)
treef6cadf07cb6c963bb9bfb1c8038f609fb289d6eb
parentab397b3652864ece302bad9cb76a7909a36c8ecf (diff)
downloadgitlab-ce-docs/clarify-new-text.tar.gz
Make text clearerdocs/clarify-new-text
-rw-r--r--doc/ci/yaml/README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index c957ed2cc6b..f7a67931793 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -524,7 +524,7 @@ single conjoined expression. That is:
- `only:` means "include this job if all of the conditions match".
- `except:` means "exclude this job if any of the conditions match".
-The the individual keys are logically joined by an AND:
+With `only`, individual keys are logically joined by an AND:
> (any of refs) AND (any of variables) AND (any of changes) AND (if kubernetes is active)
@@ -1735,7 +1735,7 @@ This example creates three paths of execution:
1. If `needs:` is set to point to a job that is not instantiated
because of `only/except` rules or otherwise does not exist, the
job will fail.
-1. Note that on day one of the launch, we are temporarily limiting the
+1. Note that on day one of the launch, we are temporarily limiting the
maximum number of jobs that a single job can need in the `needs:` array. Track
our [infrastructure issue](https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/7541)
for details on the current limit.