summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-10-21 16:48:44 +0000
committerRémy Coutable <remy@rymai.me>2016-10-21 16:48:44 +0000
commit9cf5b1cc99c5c8aaa5996472ef42ad0d1708c6d8 (patch)
tree3bb7714595cd01ab7a32a3d37609fb23782180dc
parent4abb495f45a61bfed56ac159816c8649df5c1398 (diff)
parentc920aad3ee82900c11f240f913abcd2caa0a3353 (diff)
downloadgitlab-ce-9cf5b1cc99c5c8aaa5996472ef42ad0d1708c6d8.tar.gz
Merge branch 'patch-6' into 'master'
Grammar fixes in docs Some minor grammar fixes in a page in the docs See merge request !6645
-rw-r--r--doc/ci/docker/using_docker_images.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md
index 520c8b36a95..aba77490915 100644
--- a/doc/ci/docker/using_docker_images.md
+++ b/doc/ci/docker/using_docker_images.md
@@ -37,7 +37,7 @@ The registered runner will use the `ruby:2.1` docker image and will run two
services, `postgres:latest` and `mysql:latest`, both of which will be
accessible during the build process.
-## What is image
+## What is an image
The `image` keyword is the name of the docker image that is present in the
local Docker Engine (list all images with `docker images`) or any image that
@@ -47,7 +47,7 @@ Hub please read the [Docker Fundamentals][] documentation.
In short, with `image` we refer to the docker image, which will be used to
create a container on which your build will run.
-## What is service
+## What is a service
The `services` keyword defines just another docker image that is run during
your build and is linked to the docker image that the `image` keyword defines.
@@ -61,7 +61,7 @@ time the project is built.
You can see some widely used services examples in the relevant documentation of
[CI services examples](../services/README.md).
-### How is service linked to the build
+### How services are linked to the build
To better understand how the container linking works, read
[Linking containers together][linking-containers].