summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Lewis <mlewis@gitlab.com>2019-03-08 16:50:00 +0000
committerMike Lewis <mlewis@gitlab.com>2019-03-08 16:50:00 +0000
commit628b5c099dd6e5f4faca7b024a804ab8bb2f03fa (patch)
treee13f8dd7362d10a84dcd3508041fe57081d9dc9f
parentf3f02f56f05895d40aba887b145b267778d19f69 (diff)
parent63eb4f7d4237d2198a042b60d67c81c6535a3be7 (diff)
downloadgitlab-ce-628b5c099dd6e5f4faca7b024a804ab8bb2f03fa.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
-rw-r--r--doc/ci/introduction/index.md8
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