summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-09-01 13:47:58 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-09-01 13:47:58 +0200
commitab8e6c802803dcbfb2624742d79439718deb1956 (patch)
treea76f468703d9559003517d63c5d80a0027fd02fa
parentf911dafe6621c9735a11c6289bc1ef62a302cd7a (diff)
downloadgitlab-ce-ab8e6c802803dcbfb2624742d79439718deb1956.tar.gz
Copy-edit kubernetes: active feature docs
-rw-r--r--doc/ci/yaml/README.md9
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index b281ff386bd..bcf5b5d0b5f 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -500,13 +500,14 @@ except master.
### only and except (complex)
> Introduced in GitLab 10.0
-> This an _alpha_ feature, and it it subject to change at any time without prior notice!
+> This an _alpha_ feature, and it it subject to change at any time without
+ prior notice!
-Since GitLab 10.0 it is possible to define a complex only/except job policy
-configuration.
+Since GitLab 10.0 it is possible to define a more elaborate only/except job
+policy configuration.
GitLab now supports both, simple and complex strategies, so it is possible to
-use array and hash scheme configuration.
+use an array and a hash configuration scheme.
Two keys are now available: `refs` and `kubernetes`. Refs strategy equals to
simplified only/except configuration, whereas kubernetes strategy accepts only