Cleanup Auto Review Apps and Deploy

1 files changed, 20 insertions, 12 deletions

diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index 927a15f049e..568f09f294c 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -204,6 +204,11 @@ target branches are
 
 ### Auto Review Apps
 
+NOTE: **Note:**
+This is an optional step, since many projects do not have a Kubernetes cluster
+available. If the [prerequisites](#prerequisites) are not met, the job will
+silently be skipped.
+
 CAUTION: **Caution:**
 Your apps should be manipulated only using Helm and not directly from Kubernetes.
 
@@ -219,23 +224,20 @@ up in the merge request widget for easy discovery. When the branch is deleted,
 for example after the merge request is merged, the Review App will automatically
 be deleted.
 
-This is an optional step, since many projects do not have a Kubernetes cluster
-available. If the Kubernetes service is not configured, or if the variable
-`AUTO_DEVOPS_DOMAIN` is not available (usually set automatically by the Auto
-DevOps setting), the job will silently be skipped.
-
 ### Auto Deploy
 
+NOTE: **Note:**
+This is an optional step, since many projects do not have a Kubernetes cluster
+available. If the [prerequisites](#prerequisites) are not met, the job will
+silently be skipped.
+
 CAUTION: **Caution:**
 Your apps should be manipulated only using Helm and not directly from Kubernetes.
 
-After a branch or merge request is merged into `master`, Auto Deploy deploys the
-application to a `production` environment in the Kubernetes cluster, with a
-namespace based on the project name and unique project ID. e.g. `project-4321`.
-This is an optional step, since many projects do not have a Kubernetes cluster
-available. If the Kubernetes service is not configured, or if the variable
-`AUTO_DEVOPS_DOMAIN` is not available (usually set automatically by the Auto
-DevOps setting), the job will silently be skipped.
+After a branch or merge request is merged into the project's default branch (usually
+`master`), Auto Deploy deploys the application to a `production` environment in
+the Kubernetes cluster, with a namespace based on the project name and unique
+project ID, for example `project-4321`.
 
 Auto Deploy doesn't include deployments to staging or canary by default, but the
 [Auto DevOps template] contains job definitions for these tasks if you want to
@@ -366,6 +368,12 @@ could name your track `beta` or `whatever`. The Auto DevOps template defaults
 to `canary` and empty for canary and stable deployments respectively.
 
 
+usually set automatically by the Auto
+DevOps setting),
+or if the variable
+`AUTO_DEVOPS_DOMAIN` is not available (
+
+
 ## Currently supported languages
 
 >**Note:**