Add latest changes from gitlab-org/gitlab@master

2 files changed, 55 insertions, 12 deletions

diff --git a/doc/ci/quick_start/tutorial.md b/doc/ci/quick_start/tutorial.md
index 3e12c319069..88d35bf56b0 100644
--- a/doc/ci/quick_start/tutorial.md
+++ b/doc/ci/quick_start/tutorial.md
@@ -168,7 +168,7 @@ After verifying the Docusaurus site builds in `build-job`, you can add a job tha
 
 This step introduces:
 
-- [`stage`](../yaml/index.md#stage) and [`stages](../yaml/index.md#stage): The most common
+- [`stage`](../yaml/index.md#stage) and [`stages`](../yaml/index.md#stage): The most common
   pipeline configurations group jobs into stages. Jobs in the same stage can run in parallel,
   while jobs in later stages wait for jobs in earlier stages to complete. If a job fails,
   the whole stage is considered failed and jobs in later stages do not start running.
diff --git a/doc/ci/runners/register_runner.md b/doc/ci/runners/register_runner.md
index 21f72552ce3..f53297099d7 100644
--- a/doc/ci/runners/register_runner.md
+++ b/doc/ci/runners/register_runner.md
@@ -13,16 +13,19 @@ To register a runner, you can use either:
 
 ## Generate an authentication token
 
-Registration with an authentication token is only available for shared runners. Support for project and group
-runners is proposed in this [epic](https://gitlab.com/groups/gitlab-org/-/epics/7633).
+Registration with an authentication token is available for all runners.
+
+NOTE:
+The token only displays in the UI for a short period of time during registration.
 
 ### For a shared runner
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/383139) in GitLab 15.10. Deployed behind the `create_runner_workflow_for_admin` [flag](../../administration/feature_flags.md), disabled by default.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/383139) in GitLab 15.10. Deployed behind the `create_runner_workflow_for_admin` [flag](../../administration/feature_flags.md)
+> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/389269) in GitLab 16.0.
 
 FLAG:
-On self-managed GitLab, this feature is not available. To make it available, ask an administrator to [enable the feature flag](../../administration/feature_flags.md) named `create_runner_workflow_for_admin`.
-On GitLab.com, this feature is available but can be configured by GitLab.com administrators only.
+On self-managed GitLab, by default this feature is available. To hide the feature,
+ask an administrator to [disable the feature flag](../../administration/feature_flags.md) named `create_runner_workflow_for_admin`.
 
 Prerequisites:
 
@@ -34,22 +37,62 @@ To generate an authentication token for a shared runner:
 1. On the left sidebar, select **CI/CD > Runners**.
 1. Select **New instance runner**.
 1. Select a platform.
-1. Optional. Enter a description.
-1. Optional. Enter a maintenance note.
 1. Optional. Enter configurations for the runner.
 1. Select **Submit**.
 1. Follow the instructions to register the runner from the command line.
 
-NOTE:
-The token only displays in the UI for a short period of time during registration,
-and is then saved in `config.toml`.
+### For a group runner
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/383143) in GitLab 15.10. Deployed behind the `create_runner_workflow_for_namespace` [flag](../../administration/feature_flags.md). Disabled by default.
+> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/393919) in GitLab 16.0.
+
+FLAG:
+On self-managed GitLab, by default this feature is available. To hide the feature,
+ask an administrator to [disable the feature flag](../../administration/feature_flags.md) named `create_runner_workflow_for_namespace`.
+
+Prerequisites:
+
+- You must have the Owner role for the group.
+
+To generate an authentication token for a group runner:
+
+1. On the top bar, select **Main menu > Groups** and find your group.
+1. On the left sidebar, select **CI/CD > Runners**.
+1. Select **New group runner**.
+1. Select a platform.
+1. Optional. Enter configurations for the runner.
+1. Select **Submit**.
+1. Follow the instructions to register the runner from the command line.
+
+### For a project runner
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/383143) in GitLab 15.10. Deployed behind the `create_runner_workflow_for_namespace` [flag](../../administration/feature_flags.md). Disabled by default.
+> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/issues/393919) in GitLab 16.0.
+
+FLAG:
+On self-managed GitLab, by default this feature is available. To hide the feature,
+ask an administrator to [disable the feature flag](../../administration/feature_flags.md) named `create_runner_workflow_for_namespace`.
+
+Prerequisites:
+
+- You must have the Maintainer role for the project.
+
+To generate an authentication token for a project runner:
+
+1. On the top bar, select **Main menu > Projects** and find your project.
+1. On the left sidebar, select **Settings > CI/CD**.
+1. Select **New project runner**.
+1. Select a platform.
+1. Optional. Enter configurations for the runner.
+1. Select **Submit**.
+1. Follow the instructions to register the runner from the command line.
 
 ## Generate a registration token (deprecated)
 
 WARNING:
 The ability to pass a runner registration token, and support for certain configuration arguments was
 [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/380872) in GitLab 15.6. Authentication tokens
-will be used instead to register runners. Registration tokens, and support for certain configuration arguments
+should be used instead to register runners. Registration tokens, and support for certain configuration arguments
 will be disabled behind a feature flag in GitLab 16.6 and removed in GitLab 17.0. The configuration arguments disabled for `glrt-` tokens are `--locked`, `--access-level`, `--run-untagged`, `--maximum-timeout`, `--paused`, `--tag-list`, and `--maintenance-note`. This change is a breaking
 change.