Merge branch 'docs-clarify-auto-devops-pipelines' into 'master'

Clarify Auto DevOps pipelines

See merge request gitlab-org/gitlab-ce!16106

2 files changed, 8 insertions, 15 deletions

diff --git a/doc/topics/autodevops/img/auto_devops_settings.png b/doc/topics/autodevops/img/auto_devops_settings.png
deleted file mode 100644
index 067c9da3fdc..00000000000
--- a/doc/topics/autodevops/img/auto_devops_settings.png
+++ /dev/null
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index 0b48596006d..339bc2bd4fe 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -122,11 +122,13 @@ Google Cloud.
 
 ## Enabling Auto DevOps
 
-**Note:**
 If you haven't done already, read the [prerequisites](#prerequisites) to make
 full use of Auto DevOps. If this is your fist time, we recommend you follow the
 [quick start guide](#quick-start).
 
+To enable Auto DevOps to your project:
+
+1. Check that your project doesn't have a `.gitlab-ci.yml`, and remove it otherwise
 1. Go to your project's **Settings > CI/CD > General pipelines settings** and
    find the Auto DevOps section
 1. Select "Enable Auto DevOps"
@@ -134,22 +136,13 @@ full use of Auto DevOps. If this is your fist time, we recommend you follow the
    that will be used by Kubernetes to deploy your application
 1. Hit **Save changes** for the changes to take effect
 
-![Project AutoDevops settings section](img/auto_devops_settings.png)
-
-Now that it's enabled, there are a few more steps depending on whether your project
-has a `.gitlab-ci.yml` or not:
-
-- **For projects with no `.gitlab-ci.yml` present:**
-  A pipeline needs to be triggered either by pushing a new commit to the
-  repository or manually visiting `https://example.gitlab.com/<username>/<project>/pipelines/new`
-  and creating a new pipeline for your default branch, generally `master`.
-- **For projects with a `.gitlab-ci.yml` present:**
-  All you need to do is remove your existing `.gitlab-ci.yml`, and you can even
-  do that in a branch to test Auto DevOps before committing to `master`.
+Once saved, an Auto DevOps pipeline will be triggered on the default branch.
 
 NOTE: **Note:**
-Starting with GitLab 10.3, when enabling Auto DevOps, a pipeline is
-automatically run on the default branch.
+For GitLab versions 10.0 - 10.2, when enabling Auto DevOps, a pipeline needs to be
+manually triggered either by pushing a new commit to the repository or by visiting
+`https://example.gitlab.com/<username>/<project>/pipelines/new` and creating
+a new pipeline for your default branch, generally `master`.
 
 NOTE: **Note:**
 If you are a GitLab Administrator, you can enable Auto DevOps instance wide