Merge branch '43231-document-the-instance-level-auto-devops-domain-option' into 'master'

Resolve "Document the instance level Auto DevOps domain option" Closes #43231 See merge request gitlab-org/gitlab-ce!17132

Merge branch '43231-document-the-instance-level-auto-devops-domain-option' into 'master'
8f74bb89 · Achilleas Pipinellis · Mark Fletcher · 55476813 · 8f74bb89
Commit 8f74bb89 authored Feb 15, 2018 by Achilleas Pipinellis Committed by Mark Fletcher Feb 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

index.md doc/topics/autodevops/index.md +3 -1

No files found.
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -95,7 +95,9 @@ Auto Deploy, and Auto Monitoring will be silently skipped.

 The Auto DevOps base domain is required if you want to make use of [Auto
 Review Apps](#auto-review-apps) and [Auto Deploy](#auto-deploy). It is defined
-under the project's CI/CD settings while [enabling Auto DevOps](#enabling-auto-devops).
+either under the project's CI/CD settings while 
+[enabling Auto DevOps](#enabling-auto-devops) or in instance-wide settings in
+the CI/CD section.
 It can also be set at the project or group level as a variable, `AUTO_DEVOPS_DOMAIN`.

 A wildcard DNS A record matching the base domain is required, for example,