summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-01-04 02:03:58 +0000
committerEvan Read <eread@gitlab.com>2019-01-04 02:03:58 +0000
commitc50b0e58feb208fd26129548ad086c3ef50df604 (patch)
treee3307d8091cdefd38f61cfcdd4b297610b9b4376
parent64c582d1841a35193c684a707b9688feb2d21772 (diff)
parent5031eccb710c47cef697dda8bfe8a9ddbf902061 (diff)
downloadgitlab-ce-c50b0e58feb208fd26129548ad086c3ef50df604.tar.gz
Merge branch 'gt-update-inlcude-parameter-description' into 'master'
Update `include` parameter usage description See merge request gitlab-org/gitlab-ce!24118
-rw-r--r--doc/ci/yaml/README.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 5d87a5c0a1f..e94b5211d59 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -1678,9 +1678,9 @@ NOTE: **Note:**
`include` requires the external YAML files to have the extensions `.yml` or `.yaml`.
The external file will not be included if the extension is missing.
-You can define it either as a single string, or, in case you want to include
-more than one files, an array of different values . The following examples
-are both valid cases:
+You can include your extra YAML file either as a single string or
+as an array of multiple values. You can also use full paths or
+relative URLs. The following examples are both valid:
```yaml
# Single string