From 48aff82709769b098321c738f3444b9bdaa694c6 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 21 Oct 2020 07:08:36 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-5-stable-ee

---
 doc/ci/runners/README.md | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

(limited to 'doc/ci/runners/README.md')

diff --git a/doc/ci/runners/README.md b/doc/ci/runners/README.md
index 32561e6b98c..a3cc46f59bf 100644
--- a/doc/ci/runners/README.md
+++ b/doc/ci/runners/README.md
@@ -18,16 +18,12 @@ Runners can be specific to certain projects or available to all projects.
 
 ## Types of runners
 
-There are three types of runners:
+In the GitLab UI there are three types of runners, based on who you want to have access:
 
-- [Shared](#shared-runners) (for all projects)
-- [Group](#group-runners) (for all projects in a group)
-- [Specific](#specific-runners) (for specific projects)
-
-If you are running self-managed GitLab, you can create your own runners.
-
-If you are using GitLab.com, you can use the shared runners provided by GitLab or
-create your own group or specific runners.
+- [Shared runners](#shared-runners) are available to all groups and projects in a GitLab instance.
+- [Group runners](#group-runners) are available to all projects and subgroups in a group.
+- [Specific runners](#specific-runners) are associated with specific projects.
+  Typically, specific runners are used for one project at a time.
 
 ### Shared runners
 
@@ -39,11 +35,10 @@ multiple projects.
 
 If you are using a self-managed instance of GitLab:
 
-- Your administrator can install and register shared runners by viewing the instructions
-  [here](https://docs.gitlab.com/runner/install/index.html).
+- Your administrator can install and register shared runners by [following the documentation](https://docs.gitlab.com/runner/install/index.html).
   <!-- going to your project's
   <!-- **Settings > CI / CD**, expanding the **Runners** section, and clicking **Show runner installation instructions**.-->
-  <!-- These instructions are also available [here](https://docs.gitlab.com/runner/install/index.html).-->
+  <!-- These instructions are also available [in the documentation](https://docs.gitlab.com/runner/install/index.html).-->
 - The administrator can also configure a maximum number of shared runner [pipeline minutes for
   each group](../../user/admin_area/settings/continuous_integration.md#shared-runners-pipeline-minutes-quota).
 
@@ -123,21 +118,20 @@ To enable shared runners:
 
 #### Disable shared runners
 
-You can disable shared runners for individual projects<!-- or for groups-->.
-You must have Owner permissions for the project<!-- or group-->.
+You can disable shared runners for individual projects or for groups.
+You must have Owner permissions for the project or group.
 
 To disable shared runners for a project:
 
 1. Go to the project's **Settings > CI/CD** and expand the **Runners** section.
 1. In the **Shared runners** area, click **Disable shared runners**.
 
-<!--To disable shared runners for a group:
+To disable shared runners for a group:
 
 1. Go to the group's **Settings > CI/CD** and expand the **Runners** section.
-1. In the **Shared runners** area, click **Disable shared runners globally**.
+1. In the **Shared runners** area, click **Enable shared runners for this group**.
 1. Optionally, to allow shared runners to be enabled for individual projects or subgroups,
-   click **Allow projects/subgroups to override the global setting**.
--->
+   click **Allow projects and subgroups to override the group setting**.
 
 ### Group runners
 
-- 
cgit v1.2.1