Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42

3 files changed, 11 insertions, 6 deletions

diff --git a/doc/user/project/deploy_tokens/img/deploy_tokens.png b/doc/user/project/deploy_tokens/img/deploy_tokens.png
deleted file mode 100644
index 1981b0747bf..00000000000
--- a/doc/user/project/deploy_tokens/img/deploy_tokens.png
+++ /dev/null
diff --git a/doc/user/project/deploy_tokens/img/deploy_tokens_ui.png b/doc/user/project/deploy_tokens/img/deploy_tokens_ui.png
new file mode 100644
index 00000000000..83f59b8f6f0
--- /dev/null
+++ b/doc/user/project/deploy_tokens/img/deploy_tokens_ui.png
diff --git a/doc/user/project/deploy_tokens/index.md b/doc/user/project/deploy_tokens/index.md
index 1ac528ca4ae..ac19c44c58a 100644
--- a/doc/user/project/deploy_tokens/index.md
+++ b/doc/user/project/deploy_tokens/index.md
@@ -1,7 +1,7 @@
 ---
 stage: Release
-group: Progressive Delivery
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+group: Release
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 type: howto
 ---
 
@@ -18,6 +18,8 @@ container registry images of a project without having a user and a password.
 
 Deploy tokens can be managed by [maintainers only](../../permissions.md).
 
+Deploy tokens cannot be used with the GitLab API.
+
 If you have a key pair, you might want to use [deploy keys](../../../ssh/README.md#deploy-keys)
 instead.
 
@@ -36,7 +38,7 @@ project. Alternatively, you can also create [group-scoped deploy tokens](#group-
 1. Save the deploy token somewhere safe. After you leave or refresh
    the page, **you won't be able to access it again**.
 
-![Personal access tokens page](img/deploy_tokens.png)
+![Personal access tokens page](img/deploy_tokens_ui.png)
 
 ## Deploy token expiration
 
@@ -91,7 +93,7 @@ To read the container registry images, you'll need to:
 
 1. Create a Deploy Token with `read_registry` as a scope.
 1. Take note of your `username` and `token`.
-1. Sign in to GitLab’s Container Registry using the deploy token:
+1. Sign in to the GitLab Container Registry using the deploy token:
 
 ```shell
 docker login -u <username> -p <deploy_token> registry.example.com
@@ -108,7 +110,7 @@ To push the container registry images, you'll need to:
 
 1. Create a Deploy Token with `write_registry` as a scope.
 1. Take note of your `username` and `token`.
-1. Sign in to GitLab’s Container Registry using the deploy token:
+1. Sign in to the GitLab Container Registry using the deploy token:
 
    ```shell
    docker login -u <username> -p <deploy_token> registry.example.com
@@ -149,6 +151,9 @@ belong either to the specific group or to one of its subgroups.
 <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
 For an overview, see [Group Deploy Tokens](https://youtu.be/8kxTJvaD9ks).
 
+The Group Deploy Tokens UI is now accessible under **Settings > Repository**,
+not **Settings > CI/CD** as indicated in the video.
+
 To use a group deploy token:
 
 1. [Create](#creating-a-deploy-token) a deploy token for a group.
@@ -174,7 +179,7 @@ those variables:
 docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY
 ```
 
-NOTE: **Note:**
+NOTE:
 The special handling for the `gitlab-deploy-token` deploy token is not currently
 implemented for group deploy tokens. For the deploy token to be available for
 CI/CD jobs, it must be created at the project level. For details, see