diff options
author | Mike Lewis <mlewis@gitlab.com> | 2019-03-08 16:50:00 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-11 21:39:27 +0000 |
commit | 8803664028b49a14e7a3d04d9baccfba3a4bda8b (patch) | |
tree | 3afd16904fe095d6cf3e95ee5a7223a3a71b163d | |
parent | e9dfe90b9c03fd01ff89d20598b2e1754f534e93 (diff) | |
download | gitlab-ce-8803664028b49a14e7a3d04d9baccfba3a4bda8b.tar.gz |
Merge branch 'docs-fix-ci-intro-typos' into 'master'
Docs: intro to CI/CD - fix typos
See merge request gitlab-org/gitlab-ce!25917
(cherry picked from commit 628b5c099dd6e5f4faca7b024a804ab8bb2f03fa)
bb18480f Fix typos and grammar
9e2bf398 Revert two grammatical changes I disagree with and add a small edit
-rw-r--r-- | doc/ci/introduction/index.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/ci/introduction/index.md b/doc/ci/introduction/index.md index eeb89f80e09..317e2009c26 100644 --- a/doc/ci/introduction/index.md +++ b/doc/ci/introduction/index.md @@ -78,10 +78,10 @@ scripts to be specified in a file called [`.gitlab-ci.yml`](../yaml/README.md), located in the root path of your repository. In this file, you can define the scripts you want to run, define include and -cache dependencies, choose what commands you want to run in sequence +cache dependencies, choose commands you want to run in sequence and those you want to run in parallel, define where you want to -deploy your app, and choose if you want to run the script automatically -or if you want to trigger it manually. Once you're familiar with +deploy your app, and specify whether you will want to run the scripts automatically +or trigger any of them manually. Once you're familiar with GitLab CI/CD you can add more advanced steps into the configuration file. To add scripts to that file, you'll need to organize them in a @@ -175,7 +175,7 @@ file, so we recommend you read through it to understand GitLab's CI/CD logic, and learn how to write your own script (or tweak an existing one) for any application. -For an deep view of GitLab's CI/CD configuration options, check the +For a deep view of GitLab's CI/CD configuration options, check the [`.gitlab-ci.yml` full reference](../yaml/README.md). ### GitLab CI/CD feature set |