summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-09-18 09:47:59 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-09-18 09:47:59 +0000
commitbcc45b342efe77d74e1cf4c4664e1484eefa2bf5 (patch)
tree9124b1482ab022b807bbb3f75b731724d04d65a2
parented52d82b6c600c7a344b6cca79ea646a564e4f06 (diff)
parent714aeb7d377277ae8ccaab68c22c41e6bdbf910a (diff)
downloadgitlab-ce-bcc45b342efe77d74e1cf4c4664e1484eefa2bf5.tar.gz
Merge branch 'patch-3' into 'master'
improve wording on build and push images using GitLab CI docs ## What does this MR do? Improve wording on build and push images using GitLab CI docs ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? Poor wording ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [X] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6001
-rw-r--r--doc/container_registry/README.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/container_registry/README.md b/doc/container_registry/README.md
index 047a0b08406..d7740647a91 100644
--- a/doc/container_registry/README.md
+++ b/doc/container_registry/README.md
@@ -78,9 +78,9 @@ delete them.
> **Note:**
This feature requires GitLab 8.8 and GitLab Runner 1.2.
-Make sure that your GitLab Runner is configured to allow building docker images.
-You have to check the [Using Docker Build documentation](../ci/docker/using_docker_build.md).
-Then see the CI documentation on [Using the GitLab Container Registry](../ci/docker/using_docker_build.md#using-the-gitlab-container-registry).
+Make sure that your GitLab Runner is configured to allow building Docker images by
+following the [Using Docker Build](../ci/docker/using_docker_build.md)
+and [Using the GitLab Container Registry documentation](../ci/docker/using_docker_build.md#using-the-gitlab-container-registry).
## Limitations