Document how to enable Auto DevOps at the instance leveldocs/autodevops-admin

6 files changed, 45 insertions, 22 deletions

diff --git a/doc/user/admin_area/img/admin_area_settings_button.png b/doc/user/admin_area/img/admin_area_settings_button.png
new file mode 100644
index 00000000000..315ef40a375
--- /dev/null
+++ b/doc/user/admin_area/img/admin_area_settings_button.png
diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md
index 76d9a4ceb03..7a910fdc283 100644
--- a/doc/user/admin_area/settings/continuous_integration.md
+++ b/doc/user/admin_area/settings/continuous_integration.md
@@ -1,22 +1,37 @@
-# Continuous integration Admin settings
+# Continuous Integration and Deployment Admin settings **[CORE ONLY]**
 
-## Maximum artifacts size
+In this area, you will find settings for Auto DevOps, Runners and job artifacts.
+You can find it in the admin area, under **Settings > Continuous Integration and Deployment**.
 
-The maximum size of the [job artifacts][art-yml] can be set in the Admin area
-of your GitLab instance. The value is in *MB* and the default is 100MB. Note
-that this setting is set for each job.
+![Admin area settings button](../img/admin_area_settings_button.png)
+
+## Auto DevOps **[CORE ONLY]**
+
+To enable (or disable) [Auto DevOps](../../../topics/autodevops/index.md)
+for all projects:
 
-1. Go to **Admin area > Settings** (`/admin/application_settings`).
+1. Go to **Admin area > Settings > Continuous Integration and Deployment**
+1. Check (uncheck to disable) the box that says "Default to Auto DevOps pipeline for all projects"
+1. Optionally, set up the [Auto DevOps base domain](../../../topics/autodevops/index.md#auto-devops-base-domain)
+   which is going to be used for Auto Deploy and Auto Review Apps.
+1. Hit **Save changes** for the changes to take effect.
 
-    ![Admin area settings button](img/admin_area_settings_button.png)
+From now on, every existing project and newly created ones that don't have a
+`.gitlab-ci.yml`, will use the Auto DevOps pipelines.
 
-1. Change the value of maximum artifacts size (in MB):
+If you want to disable it for a specific project, you can do so in
+[its settings](../../../topics/autodevops/index.md#enabling-auto-devops).
 
-    ![Admin area maximum artifacts size](img/admin_area_maximum_artifacts_size.png)
+## Maximum artifacts size **[CORE ONLY]**
+
+The maximum size of the [job artifacts][art-yml] can be set in the Admin area
+of your GitLab instance. The value is in *MB* and the default is 100MB per job:
 
-1. Hit **Save** for the changes to take effect.
+1. Go to **Admin area > Settings > Continuous Integration and Deployment**
+1. Change the value of maximum artifacts size (in MB)
+1. Hit **Save changes** for the changes to take effect
 
-## Default artifacts expiration
+## Default artifacts expiration **[CORE ONLY]**
 
 The default expiration time of the [job artifacts][art-yml] can be set in
 the Admin area of your GitLab instance. The syntax of duration is described
@@ -24,16 +39,9 @@ in [artifacts:expire_in][duration-syntax]. The default is `30 days`. Note that
 this setting is set for each job. Set it to `0` if you don't want default
 expiration. The default unit is in seconds.
 
-
-1. Go to **Admin area > Settings** (`/admin/application_settings`).
-
-    ![Admin area settings button](img/admin_area_settings_button.png)
-
-1. Change the value of default expiration time ([syntax][duration-syntax]):
-
-    ![Admin area default artifacts expiration](img/admin_area_default_artifacts_expiration.png)
-
-1. Hit **Save** for the changes to take effect.
+1. Go to **Admin area > Settings > Continuous Integration and Deployment**
+1. Change the value of default expiration time
+1. Hit **Save changes** for the changes to take effect
 
 [art-yml]: ../../../administration/job_artifacts.md
-[duration-syntax]: ../../../ci/yaml/README.md#artifactsexpire_in
+[duration-syntax]: ../../../ci/yaml/README.md#artifacts-expire_in
diff --git a/doc/user/admin_area/settings/img/admin_area_default_artifacts_expiration.png b/doc/user/admin_area/settings/img/admin_area_default_artifacts_expiration.png
deleted file mode 100644
index 50a86ede56b..00000000000
--- a/doc/user/admin_area/settings/img/admin_area_default_artifacts_expiration.png
+++ /dev/null
diff --git a/doc/user/admin_area/settings/img/admin_area_maximum_artifacts_size.png b/doc/user/admin_area/settings/img/admin_area_maximum_artifacts_size.png
deleted file mode 100644
index 33fd29e2039..00000000000
--- a/doc/user/admin_area/settings/img/admin_area_maximum_artifacts_size.png
+++ /dev/null
diff --git a/doc/user/admin_area/settings/img/admin_area_settings_button.png b/doc/user/admin_area/settings/img/admin_area_settings_button.png
deleted file mode 100644
index 1d2c0ac04bc..00000000000
--- a/doc/user/admin_area/settings/img/admin_area_settings_button.png
+++ /dev/null
diff --git a/doc/user/admin_area/settings/index.md b/doc/user/admin_area/settings/index.md
new file mode 100644
index 00000000000..addc5b4df10
--- /dev/null
+++ b/doc/user/admin_area/settings/index.md
@@ -0,0 +1,15 @@
+# Admin area settings
+
+In the admin area settings, you can find various options for your GitLab
+instance like sign-up restrictions, account limits and quota, metrics, etc.
+
+Navigate to it by going to **Admin area > Settings**. Some of the settings
+include:
+
+- [Continuous Integration and Deployment](continuous_integration.md)
+- [Email](email.md)
+- [Sign up restrictions](sign_up_restrictions.md)
+- [Terms](terms.md)
+- [Third party offers](third_party_offers.md)
+- [Usage statistics](usage_statistics.md)
+- [Visibility and access controls](visibility_and_access_controls.md)